xh/kehui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

检验非空判断

Browse Source
This commit is contained in:
chen 2024-08-05 16:07:04 +08:00
parent 1c5a3595da
commit 136a6fd7dd
6 changed files with 235 additions and 218 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/xqopen/kehui/project/action/ProjectAssessmentIndicatorsController.java
View File

@ -84,6 +84,7 @@ public class ProjectAssessmentIndicatorsController implements ProjectAssessmentI
@PostMapping(Api.PROJECT_QUARTERLY_EVALUATION_LIST)
public String list(@RequestHeader Long userId, @RequestBody PageNoUtil<ProjectAssessmentIndicatorsDto> pageNoUtil) throws XQException {
try {
if (!ObjectUtils.isEmpty(pageNoUtil)) {
Page<ProjectAssessmentIndicatorsDto> page = new Page<>(pageNoUtil.getPageNo(), pageNoUtil.getPageSize());
List<ProjectAssessmentIndicators> indicatorsServiceList = indicatorsService.getList(page, pageNoUtil.getT(), String.valueOf(userId));
ResultListReqUtil<ProjectAssessmentIndicators> listReqUtil = new ResultListReqUtil<>();
@ -91,10 +92,12 @@ public class ProjectAssessmentIndicatorsController implements ProjectAssessmentI
listReqUtil.setPages(page.getPages());
listReqUtil.setTotal(page.getTotal());
return ApiResponse.fillSuccess(listReqUtil);
}
} catch (Exception e) {
log.error("ProjectAssessmentIndicatorsController.list", e);
throw new XQException(ErrorCode.PROJECTINFO_EXCEPTION_ERROR, null);
}
return ApiResponse.fillFail("获取失败!");
}
@Override

17
src/main/java/com/xqopen/kehui/project/action/ProjectBudgetImplementController.java
View File

@ -48,14 +48,15 @@ public class ProjectBudgetImplementController implements ProjectBudgetImplementA
@Override
public String list(@RequestHeader Long userId,@RequestBody ProjectBudgetImplementFindReq projectBudgetImplementFindReq) throws XQException {
try {
if (!ObjectUtils.isEmpty(projectBudgetImplementFindReq)) {
Page<ProjectBudgetImplementAddDto> page = new Page<>(projectBudgetImplementFindReq.getPageNo(), projectBudgetImplementFindReq.getPageSize());
List<ProjectBudgetImplementAddDto> list = projectBudgetImplementService.getList(page, projectBudgetImplementFindReq);
for (ProjectBudgetImplementAddDto implementAddDto : list) {
if (!ObjectUtils.isEmpty(implementAddDto.getExecute())){
Double rate =(Double.parseDouble(implementAddDto.getExecute()) /
Integer.parseInt(implementAddDto.getBudget()) *100.0);
if (!ObjectUtils.isEmpty(implementAddDto.getExecute())) {
Double rate = (Double.parseDouble(implementAddDto.getExecute()) /
Integer.parseInt(implementAddDto.getBudget()) * 100.0);
implementAddDto.setImplementationRate(String.format("%.2f%%",rate));
implementAddDto.setImplementationRate(String.format("%.2f%%", rate));
}
// 修改日期格式
/* Timestamp updatedAt = implementAddDto.getUpdatedAt();
@ -66,8 +67,8 @@ public class ProjectBudgetImplementController implements ProjectBudgetImplementA
//向listReq中加入财务专员id
EntityWrapper<SystemUserRole> userRole = new EntityWrapper<>();
Long roleId = 943384938727391233L;
userRole.eq("role_id",roleId);
userRole.eq("is_deleted",false);
userRole.eq("role_id", roleId);
userRole.eq("is_deleted", false);
List<SystemUserRole> systemUserRoles = systemUserRoleService.selectList(userRole);
List<String> roleUserId = new ArrayList<>();
for (SystemUserRole role : systemUserRoles) {
@ -76,7 +77,7 @@ public class ProjectBudgetImplementController implements ProjectBudgetImplementA
}
// 将userid存入listReq中
EntityWrapper<SystemUserLogin> userLoginEntityWrapper = new EntityWrapper<>();
userLoginEntityWrapper.eq("id_",userId);
userLoginEntityWrapper.eq("id_", userId);
SystemUserLogin systemUserLogin = systemUserLoginService.selectOne(userLoginEntityWrapper);
ResultListReqUtil listReq = new ResultListReqUtil();
@ -86,10 +87,12 @@ public class ProjectBudgetImplementController implements ProjectBudgetImplementA
listReq.setTotal(page.getTotal());
listReq.setPages(page.getPages());
return ApiResponse.fillSuccess(listReq);
}
} catch (Exception e) {
log.error("ProjectBudgetImplementController.list", e);
throw new XQException(ErrorCode.PROJECTINFO_EXCEPTION_ERROR, null);
}
return ApiResponse.fillFail("获取失败!");
}

6
src/main/java/com/xqopen/kehui/project/action/ProjectDepartmentController.java
View File

@ -140,7 +140,7 @@ public class ProjectDepartmentController implements ProjectDepartmentApi {
log.error("ProjectDepartmentController.list", e);
throw new XQException(ErrorCode.PROJECTINFO_EXCEPTION_ERROR, null);
}
return null;
return ApiResponse.fillFail("获取失败!");
}
/**
@ -149,6 +149,7 @@ public class ProjectDepartmentController implements ProjectDepartmentApi {
* @return List<ProjectWeeklyDto>
**/
private List<ProjectWeeklyDto> getThisWeek(List<ProjectWeeklyDto> list) {
if (!ObjectUtils.isEmpty(list)) {
for (int i = 0; i < list.size(); i++) {
if (ObjectUtils.isEmpty(list.get(i).getThisWeek()) && ObjectUtils.isEmpty(list.get(i).getNextWeek())) {
EntityWrapper<ProjectWeekly> wrapper = new EntityWrapper();
@ -164,6 +165,7 @@ public class ProjectDepartmentController implements ProjectDepartmentApi {
list.get(i).setNextWeek(nextWeekBuilder.toString());
}
}
}
return list;
}
@ -235,6 +237,6 @@ public class ProjectDepartmentController implements ProjectDepartmentApi {
log.error("ProjectDepartmentController.list", e);
throw new XQException(ErrorCode.PROJECTINFO_EXCEPTION_ERROR, null);
}
return null;
return ApiResponse.fillFail("获取失败!");
}
}

8
src/main/java/com/xqopen/kehui/project/action/ProjectInitComtroller.java
View File

@ -124,8 +124,9 @@ public class ProjectInitComtroller implements ProjectInitApi {
@Override
@Transactional(rollbackFor = Exception.class)
public String addInit(@RequestHeader("userId") Long userId, @RequestBody ProjectInfoInitDto initDto) throws XQException {
ProjectInfoReq infoReq = initDto.getProjectInfoReq();
try {
if (!ObjectUtils.isEmpty(initDto)) {
ProjectInfoReq infoReq = initDto.getProjectInfoReq();
//判断项目名是否重复
ProjectInfo info = new JacksonUtil<ProjectInfo>().setAddEntity(userId, infoReq, ProjectInfo.class);
EntityWrapper<ProjectInfo> wrapper = new EntityWrapper<>();
@ -262,6 +263,8 @@ public class ProjectInitComtroller implements ProjectInitApi {
baseActiviti.startWorkflow(userId, info.getId(), aType, aClass, map);
}
return ApiResponse.fillSuccess("添加成功");
}
return ApiResponse.fillFail("操作失败");
} catch (Exception e) {
log.error("ProjectInitController.add", e);
// 批量新增出现异常被捕获时，手动回滚事务，保证数据库一致
@ -319,6 +322,7 @@ public class ProjectInitComtroller implements ProjectInitApi {
@PostMapping(Api.PROJECT_INIT_LIST)
public String list(@RequestHeader("userId") Long userId, @RequestBody ProjectFindReq projectFindReq) throws XQException {
try {
if (!ObjectUtils.isEmpty(projectFindReq)) {
String projectName = projectFindReq.getProjectName();
String projectCategory = projectFindReq.getProjectCategory();
String projectStep = projectFindReq.getProjectStep();
@ -355,10 +359,12 @@ public class ProjectInitComtroller implements ProjectInitApi {
resp.setPages(page.getPages());
resp.setTotal(page.getTotal());
return ApiResponse.fillSuccess(resp);
}
} catch (Exception e) {
log.error("ProjectInfoController.list", e);
throw new XQException(ErrorCode.PROJECTINFO_EXCEPTION_ERROR, null);
}
return ApiResponse.fillFail("获取失败!");
}
@Transactional

3
src/main/java/com/xqopen/kehui/project/action/ProjectQuarterlyEvaluationController.java
View File

@ -40,6 +40,7 @@ public class ProjectQuarterlyEvaluationController implements ProjectQuarterlyEva
@PostMapping(Api.PROJECT_QUARTERLY_EVALUATION)
public String list(@RequestHeader Long userId, @RequestBody PageNoUtil<ProjectQuarterlyEvaluation> pageNoUtil) throws XQException {
try {
if (!ObjectUtils.isEmpty(pageNoUtil)) {
//先拿到季度审核表数据
EntityWrapper<SystemUserLogin> userLoginEntityWrapper = new EntityWrapper<>();
userLoginEntityWrapper.eq("id_", userId);
@ -57,9 +58,11 @@ public class ProjectQuarterlyEvaluationController implements ProjectQuarterlyEva
}
ResultListReqUtil<ProjectInfoListItemResp> listReqUtil = new ResultListReqUtil<>(list, page.getTotal(), page.getPages());
return ApiResponse.fillSuccess(listReqUtil);
}
} catch (Exception e) {
log.error("ProjectQuarterlyEvaluationController.list", e);
throw new XQException(ErrorCode.PROJECTINFO_EXCEPTION_ERROR, null);
}
return ApiResponse.fillFail("获取失败!");
}
}

2
src/main/java/com/xqopen/kehui/project/action/ProjectWholeFirmController.java
View File

@ -106,7 +106,7 @@ public class ProjectWholeFirmController implements ProjectWholeFirmApi {
listResp.setUserId(String.valueOf(systemUserLogin.getUserinfoId()));
return ApiResponse.fillSuccess(listResp);
}
return null;
return ApiResponse.fillFail("获取失败!");
}
/**