|
@@ -83,48 +83,36 @@ public class ProjectService {
|
|
|
|
|
|
/**
|
|
|
* @param request 公司项目查询条件
|
|
|
- * @return RestResponse 公司项目分页列表结果
|
|
|
+ * @return IPage<ProjectResponse> 公司项目分页列表结果
|
|
|
* @description 查询公司项目列表
|
|
|
* @date 2019/12/9 10:32 AM
|
|
|
*/
|
|
|
- public RestResponse companyList(ProjectRequest request) {
|
|
|
+ public IPage<ProjectResponse> companyList(ProjectRequest request) {
|
|
|
IPage<ProjectResponse> page = new Page<>(request.getPageNum(), request.getPageSize());
|
|
|
- IPage<ProjectResponse> companyProjects = projectMapper.findCompanyListByCondition(page, request);
|
|
|
- List<ProjectResponse> projectList = companyProjects.getRecords();
|
|
|
- if (projectList.isEmpty()) {
|
|
|
- return RestResponse.ok(null, ApiConstants.RESULT_NO_DATA, MessageUtils.get("msg.data.empty"));
|
|
|
- }
|
|
|
- return RestResponse.ok(page, ApiConstants.RESULT_SUCCESS, MessageUtils.get("msg.query.success"));
|
|
|
+ return projectMapper.findCompanyListByCondition(page, request);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* @param request 项目操作记录查询条件
|
|
|
- * @return RestResponse 结果集
|
|
|
+ * @return IPage<ProjectHistory> 结果集
|
|
|
* @description 查询项目操作记录列表
|
|
|
* @date 2019/11/27 2:10 PM
|
|
|
*/
|
|
|
- public RestResponse list(ProjectHistoryRequest request) {
|
|
|
+ public IPage<ProjectHistory> list(ProjectHistoryRequest request) {
|
|
|
IPage<ProjectHistory> page = new Page<>(request.getPageNum(), request.getPageSize());
|
|
|
- IPage<ProjectHistory> historys = projectHistoryMapper.findByCondition(page, request);
|
|
|
- List<ProjectHistory> historyList = historys.getRecords();
|
|
|
- if (historyList.isEmpty()) {
|
|
|
- return RestResponse.ok(null, ApiConstants.RESULT_NO_DATA, MessageUtils.get("msg.data.empty"));
|
|
|
- }
|
|
|
- return RestResponse.ok(page, ApiConstants.RESULT_SUCCESS, MessageUtils.get("msg.query.success"));
|
|
|
+
|
|
|
+ return projectHistoryMapper.findByCondition(page, request);
|
|
|
+
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* @param request projectId 项目ID
|
|
|
- * @return RestResponse userList项目组成员列表
|
|
|
+ * @return List<ProjectUser> userList项目组成员列表
|
|
|
* @description 查询项目组成员
|
|
|
* @date 2019/12/13 2:40 PM
|
|
|
*/
|
|
|
- public RestResponse userList(ProjectRequest request) {
|
|
|
- List<ProjectUser> userList = projectUserMapper.findUserListById(request.getProjectId());
|
|
|
- if (userList.isEmpty()) {
|
|
|
- return RestResponse.ok(null, ApiConstants.RESULT_NO_DATA, MessageUtils.get("msg.data.empty"));
|
|
|
- }
|
|
|
- return RestResponse.ok(userList, ApiConstants.RESULT_SUCCESS, MessageUtils.get("msg.query.success"));
|
|
|
+ public List<ProjectUser> userList(ProjectRequest request) {
|
|
|
+ return projectUserMapper.findUserListById(request.getProjectId());
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -158,47 +146,35 @@ public class ProjectService {
|
|
|
|
|
|
/**
|
|
|
* @param project 新增项目数据项
|
|
|
- * @return RestResponse 状态码和返回消息
|
|
|
+ * @return Integer 成功1或失败0
|
|
|
* @description 新增项目
|
|
|
* @date 2019/11/27 2:22 PM
|
|
|
*/
|
|
|
- public RestResponse add(Project project) {
|
|
|
+ public Integer add(Project project) {
|
|
|
//按当前日期时间戳自动生成项目编号
|
|
|
String projectCode = DateUtils.generateCode();
|
|
|
project.setProjectCode("XM" + projectCode);
|
|
|
- int result = projectMapper.insert(project);
|
|
|
- if (result > 0) {
|
|
|
- return RestResponse.ok(result, ApiConstants.RESULT_SUCCESS, MessageUtils.get("msg.add.success"));
|
|
|
- }
|
|
|
- return RestResponse.error(ApiConstants.RESULT_ERROR, MessageUtils.get("msg.add.fail"));
|
|
|
+ return projectMapper.insert(project);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* @param projectUser 新增维保工数据项
|
|
|
- * @return RestResponse 状态码和返回消息
|
|
|
+ * @return Integer 成功1或失败0
|
|
|
* @description 新增维保工
|
|
|
* @date 2019/12/4 4:41 PM
|
|
|
*/
|
|
|
- public RestResponse add(ProjectUser projectUser) {
|
|
|
- int result = projectUserMapper.insert(projectUser);
|
|
|
- if (result > 0) {
|
|
|
- return RestResponse.ok(result, ApiConstants.RESULT_SUCCESS, MessageUtils.get("msg.add.success"));
|
|
|
- }
|
|
|
- return RestResponse.error(ApiConstants.RESULT_ERROR, MessageUtils.get("msg.add.fail"));
|
|
|
+ public Integer add(ProjectUser projectUser) {
|
|
|
+ return projectUserMapper.insert(projectUser);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* @param project 修改项目数据项
|
|
|
- * @return RestResponse 状态码和返回消息
|
|
|
+ * @return Integer 成功1或失败0
|
|
|
* @description 修改项目
|
|
|
* @date 2019/11/27 2:22 PM
|
|
|
*/
|
|
|
- public RestResponse modify(Project project) {
|
|
|
- int result = projectMapper.updateById(project);
|
|
|
- if (result > 0) {
|
|
|
- return RestResponse.ok(result, ApiConstants.RESULT_SUCCESS, MessageUtils.get("msg.modify.success"));
|
|
|
- }
|
|
|
- return RestResponse.error(ApiConstants.RESULT_ERROR, MessageUtils.get("msg.modify.fail"));
|
|
|
+ public Integer modify(Project project) {
|
|
|
+ return projectMapper.updateById(project);
|
|
|
}
|
|
|
|
|
|
/**
|