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

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

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

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

@ -48,48 +48,51 @@ public class ProjectBudgetImplementController implements ProjectBudgetImplementA
@Override @Override
public String list(@RequestHeader Long userId,@RequestBody ProjectBudgetImplementFindReq projectBudgetImplementFindReq) throws XQException { public String list(@RequestHeader Long userId,@RequestBody ProjectBudgetImplementFindReq projectBudgetImplementFindReq) throws XQException {
try { try {
Page<ProjectBudgetImplementAddDto> page = new Page<>(projectBudgetImplementFindReq.getPageNo(), projectBudgetImplementFindReq.getPageSize()); if (!ObjectUtils.isEmpty(projectBudgetImplementFindReq)) {
List<ProjectBudgetImplementAddDto> list = projectBudgetImplementService.getList(page, projectBudgetImplementFindReq); Page<ProjectBudgetImplementAddDto> page = new Page<>(projectBudgetImplementFindReq.getPageNo(), projectBudgetImplementFindReq.getPageSize());
for (ProjectBudgetImplementAddDto implementAddDto : list) { List<ProjectBudgetImplementAddDto> list = projectBudgetImplementService.getList(page, projectBudgetImplementFindReq);
if (!ObjectUtils.isEmpty(implementAddDto.getExecute())){ for (ProjectBudgetImplementAddDto implementAddDto : list) {
Double rate =(Double.parseDouble(implementAddDto.getExecute()) / if (!ObjectUtils.isEmpty(implementAddDto.getExecute())) {
Integer.parseInt(implementAddDto.getBudget()) *100.0); 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(); /* Timestamp updatedAt = implementAddDto.getUpdatedAt();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String format= sdf.format(updatedAt); String format= sdf.format(updatedAt);
implementAddDto.setUpdatedAt();*/ implementAddDto.setUpdatedAt();*/
} }
//向listReq中加入财务专员id //向listReq中加入财务专员id
EntityWrapper<SystemUserRole> userRole = new EntityWrapper<>(); EntityWrapper<SystemUserRole> userRole = new EntityWrapper<>();
Long roleId = 943384938727391233L; Long roleId = 943384938727391233L;
userRole.eq("role_id",roleId); userRole.eq("role_id", roleId);
userRole.eq("is_deleted",false); userRole.eq("is_deleted", false);
List<SystemUserRole> systemUserRoles = systemUserRoleService.selectList(userRole); List<SystemUserRole> systemUserRoles = systemUserRoleService.selectList(userRole);
List<String> roleUserId = new ArrayList<>(); List<String> roleUserId = new ArrayList<>();
for (SystemUserRole role : systemUserRoles) { for (SystemUserRole role : systemUserRoles) {
Long UserId = role.getUserId(); Long UserId = role.getUserId();
roleUserId.add(UserId.toString()); roleUserId.add(UserId.toString());
} }
// 将userid存入listReq中 // 将userid存入listReq中
EntityWrapper<SystemUserLogin> userLoginEntityWrapper = new EntityWrapper<>(); EntityWrapper<SystemUserLogin> userLoginEntityWrapper = new EntityWrapper<>();
userLoginEntityWrapper.eq("id_",userId); userLoginEntityWrapper.eq("id_", userId);
SystemUserLogin systemUserLogin = systemUserLoginService.selectOne(userLoginEntityWrapper); SystemUserLogin systemUserLogin = systemUserLoginService.selectOne(userLoginEntityWrapper);
ResultListReqUtil listReq = new ResultListReqUtil(); ResultListReqUtil listReq = new ResultListReqUtil();
listReq.setLs(list); listReq.setLs(list);
listReq.setRoleUserId(roleUserId); listReq.setRoleUserId(roleUserId);
listReq.setUserId(String.valueOf(systemUserLogin.getUserinfoId())); listReq.setUserId(String.valueOf(systemUserLogin.getUserinfoId()));
listReq.setTotal(page.getTotal()); listReq.setTotal(page.getTotal());
listReq.setPages(page.getPages()); listReq.setPages(page.getPages());
return ApiResponse.fillSuccess(listReq); return ApiResponse.fillSuccess(listReq);
}
} catch (Exception e) { } catch (Exception e) {
log.error("ProjectBudgetImplementController.list", e); log.error("ProjectBudgetImplementController.list", e);
throw new XQException(ErrorCode.PROJECTINFO_EXCEPTION_ERROR, null); throw new XQException(ErrorCode.PROJECTINFO_EXCEPTION_ERROR, null);
} }
return ApiResponse.fillFail("获取失败!");
} }

30
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); log.error("ProjectDepartmentController.list", e);
throw new XQException(ErrorCode.PROJECTINFO_EXCEPTION_ERROR, null); throw new XQException(ErrorCode.PROJECTINFO_EXCEPTION_ERROR, null);
} }
return null; return ApiResponse.fillFail("获取失败!");
} }
/** /**
@ -149,19 +149,21 @@ public class ProjectDepartmentController implements ProjectDepartmentApi {
* @return List<ProjectWeeklyDto> * @return List<ProjectWeeklyDto>
**/ **/
private List<ProjectWeeklyDto> getThisWeek(List<ProjectWeeklyDto> list) { private List<ProjectWeeklyDto> getThisWeek(List<ProjectWeeklyDto> list) {
for (int i = 0; i < list.size(); i++) { if (!ObjectUtils.isEmpty(list)) {
if (ObjectUtils.isEmpty(list.get(i).getThisWeek()) && ObjectUtils.isEmpty(list.get(i).getNextWeek())) { for (int i = 0; i < list.size(); i++) {
EntityWrapper<ProjectWeekly> wrapper = new EntityWrapper(); if (ObjectUtils.isEmpty(list.get(i).getThisWeek()) && ObjectUtils.isEmpty(list.get(i).getNextWeek())) {
wrapper.eq("parent_id", list.get(i).getId()); EntityWrapper<ProjectWeekly> wrapper = new EntityWrapper();
List<ProjectWeekly> projectWeeklies = projectWeeklyService.selectList(wrapper); wrapper.eq("parent_id", list.get(i).getId());
StringBuilder thisWeekBuilder = new StringBuilder(); List<ProjectWeekly> projectWeeklies = projectWeeklyService.selectList(wrapper);
StringBuilder nextWeekBuilder = new StringBuilder(); StringBuilder thisWeekBuilder = new StringBuilder();
for (int j = 0; j < projectWeeklies.size(); j++) { StringBuilder nextWeekBuilder = new StringBuilder();
thisWeekBuilder.append((j + 1) + ". " + projectWeeklies.get(j).getThisWeek() + "\n"); for (int j = 0; j < projectWeeklies.size(); j++) {
nextWeekBuilder.append((j + 1) + ". " + projectWeeklies.get(j).getNextWeek() + "\n"); thisWeekBuilder.append((j + 1) + ". " + projectWeeklies.get(j).getThisWeek() + "\n");
nextWeekBuilder.append((j + 1) + ". " + projectWeeklies.get(j).getNextWeek() + "\n");
}
list.get(i).setThisWeek(thisWeekBuilder.toString());
list.get(i).setNextWeek(nextWeekBuilder.toString());
} }
list.get(i).setThisWeek(thisWeekBuilder.toString());
list.get(i).setNextWeek(nextWeekBuilder.toString());
} }
} }
return list; return list;
@ -235,6 +237,6 @@ public class ProjectDepartmentController implements ProjectDepartmentApi {
log.error("ProjectDepartmentController.list", e); log.error("ProjectDepartmentController.list", e);
throw new XQException(ErrorCode.PROJECTINFO_EXCEPTION_ERROR, null); throw new XQException(ErrorCode.PROJECTINFO_EXCEPTION_ERROR, null);
} }
return null; return ApiResponse.fillFail("获取失败!");
} }
} }

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

@ -124,125 +124,126 @@ public class ProjectInitComtroller implements ProjectInitApi {
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public String addInit(@RequestHeader("userId") Long userId, @RequestBody ProjectInfoInitDto initDto) throws XQException { public String addInit(@RequestHeader("userId") Long userId, @RequestBody ProjectInfoInitDto initDto) throws XQException {
ProjectInfoReq infoReq = initDto.getProjectInfoReq();
try { try {
//判断项目名是否重复
ProjectInfo info = new JacksonUtil<ProjectInfo>().setAddEntity(userId, infoReq, ProjectInfo.class);
EntityWrapper<ProjectInfo> wrapper = new EntityWrapper<>();
wrapper.eq("project_name", info.getProjectName());
wrapper.eq("project_category", "init");
wrapper.eq("is_deleted", false);
List<ProjectInfo> infos = projectInfoService.selectList(wrapper);
if (!ObjectUtils.isEmpty(infos)) {
return ApiResponse.fillFail("项目名称已存在!");
}
//自送生成项目编号
JSONObject infoExt = info.getExt();//拿到当前的ext
//年份
Calendar cal = Calendar.getInstance(); // 获取当前时间的Calendar实例
int year = cal.get(Calendar.YEAR); // 获取年份
//部门编码
//项目编号:年份-部门-类别-序号
StringBuffer buffer = new StringBuffer();
buffer.append(year).append("-");
ArrayList signedDepts = (ArrayList) infoExt.get("signedDepts");//获取立项部门
String orgId = String.valueOf(signedDepts.get(0));//获取立项Id//根据项目名称拼接
switch (orgId) {
case "1215549953418465281":
buffer.append("BGS");//办公室
break;
case "939036815719927809":
buffer.append("GHB");//战略规划部
break;
case "1496282215842058241":
buffer.append("CPB");//服务产品部
break;
case "1215550126769049601":
buffer.append("SCB");//市场发展部
break;
case "1215550163188191233":
buffer.append("PTB");//平台建设部
break;
}
//项目类别
buffer.append("-");
String openRange = String.valueOf(infoExt.get("openRange"));
switch (openRange) {
case "1":
buffer.append("TT");
break;
case "2":
buffer.append("SC");
break;
case "3":
buffer.append("RD");
break;
case "4":
buffer.append("CK");
break;
case "5":
buffer.append("ZX");
break;
case "6":
buffer.append("ZR");
break;
case "7":
buffer.append("ZY");
break;
default:
buffer.append("TPT");//临时
break;
}
//序号
EntityWrapper<ProjectInfo> infoEntityWrapper = new EntityWrapper<>();
infoEntityWrapper.eq(ProjectInfo.IS_DELETED, false);
infoEntityWrapper.like(ProjectInfo.PROJECT_NO, buffer.toString());
int count = infoService.selectCount(infoEntityWrapper); //条数
count++;
buffer.append("-").append(String.format("%03d", count)); //生成编号
info.setProjectNo(buffer.toString());
infoService.insert(info);
//批量新增项目考核季度表
if (!ObjectUtils.isEmpty(initDto)) { if (!ObjectUtils.isEmpty(initDto)) {
JSONObject ext = info.getExt(); ProjectInfoReq infoReq = initDto.getProjectInfoReq();
//判断项目名是否重复
ProjectInfo info = new JacksonUtil<ProjectInfo>().setAddEntity(userId, infoReq, ProjectInfo.class);
EntityWrapper<ProjectInfo> wrapper = new EntityWrapper<>();
wrapper.eq("project_name", info.getProjectName());
wrapper.eq("project_category", "init");
wrapper.eq("is_deleted", false);
List<ProjectInfo> infos = projectInfoService.selectList(wrapper);
if (!ObjectUtils.isEmpty(infos)) {
return ApiResponse.fillFail("项目名称已存在!");
}
//自送生成项目编号
JSONObject infoExt = info.getExt();//拿到当前的ext
//年份
Calendar cal = Calendar.getInstance(); // 获取当前时间的Calendar实例
int year = cal.get(Calendar.YEAR); // 获取年份
//部门编码
//项目编号:年份-部门-类别-序号
StringBuffer buffer = new StringBuffer();
buffer.append(year).append("-");
ArrayList signedDepts = (ArrayList) infoExt.get("signedDepts");//获取立项部门
String orgId = String.valueOf(signedDepts.get(0));//获取立项Id//根据项目名称拼接
switch (orgId) {
case "1215549953418465281":
buffer.append("BGS");//办公室
break;
case "939036815719927809":
buffer.append("GHB");//战略规划部
break;
case "1496282215842058241":
buffer.append("CPB");//服务产品部
break;
case "1215550126769049601":
buffer.append("SCB");//市场发展部
break;
case "1215550163188191233":
buffer.append("PTB");//平台建设部
break;
}
//项目类别
buffer.append("-");
String openRange = String.valueOf(infoExt.get("openRange"));
switch (openRange) {
case "1":
buffer.append("TT");
break;
case "2":
buffer.append("SC");
break;
case "3":
buffer.append("RD");
break;
case "4":
buffer.append("CK");
break;
case "5":
buffer.append("ZX");
break;
case "6":
buffer.append("ZR");
break;
case "7":
buffer.append("ZY");
break;
default:
buffer.append("TPT");//临时
break;
}
//序号
EntityWrapper<ProjectInfo> infoEntityWrapper = new EntityWrapper<>();
infoEntityWrapper.eq(ProjectInfo.IS_DELETED, false);
infoEntityWrapper.like(ProjectInfo.PROJECT_NO, buffer.toString());
int count = infoService.selectCount(infoEntityWrapper); //条数
count++;
buffer.append("-").append(String.format("%03d", count)); //生成编号
info.setProjectNo(buffer.toString());
infoService.insert(info);
//批量新增项目考核季度表
if (!ObjectUtils.isEmpty(initDto)) {
JSONObject ext = info.getExt();
// String projectAdmin = String.valueOf(((ArrayList) ext.get("projectAdmin")).get(1)); // String projectAdmin = String.valueOf(((ArrayList) ext.get("projectAdmin")).get(1));
// String branchLeaders = String.valueOf(((ArrayList) ext.get("branchLeaders")).get(1)); // String branchLeaders = String.valueOf(((ArrayList) ext.get("branchLeaders")).get(1));
// String MainLeader = String.valueOf(((ArrayList) ext.get("MainLeader")).get(1)); // String MainLeader = String.valueOf(((ArrayList) ext.get("MainLeader")).get(1));
String projectManagerData = String.valueOf(((ArrayList) ext.get("projectManagerData")).get(1)); String projectManagerData = String.valueOf(((ArrayList) ext.get("projectManagerData")).get(1));
List<ProjectAssessmentIndicators> membersList = initDto.getMembersList(); List<ProjectAssessmentIndicators> membersList = initDto.getMembersList();
if (!membersList.isEmpty()) { if (!membersList.isEmpty()) {
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
jsonObject.put("executor", getSystemUserLogin(projectManagerData).getId());//第一个节点执行人一定是项目负责人 jsonObject.put("executor", getSystemUserLogin(projectManagerData).getId());//第一个节点执行人一定是项目负责人
jsonObject.put("historyExecutor", jsonObject.get("executor")); jsonObject.put("historyExecutor", jsonObject.get("executor"));
jsonObject.put("taskName", "季度审核填报"); jsonObject.put("taskName", "季度审核填报");
jsonObject.put("projectManager", jsonObject.get("executor")); jsonObject.put("projectManager", jsonObject.get("executor"));
// jsonObject.put("projectAdmin", getSystemUserLogin(projectAdmin).getId()); // jsonObject.put("projectAdmin", getSystemUserLogin(projectAdmin).getId());
// jsonObject.put("branchLeaders", getSystemUserLogin(branchLeaders).getId()); // jsonObject.put("branchLeaders", getSystemUserLogin(branchLeaders).getId());
// jsonObject.put("MainLeader", getSystemUserLogin(MainLeader).getId()); // jsonObject.put("MainLeader", getSystemUserLogin(MainLeader).getId());
membersList.forEach(item -> { membersList.forEach(item -> {
item.setProjectId(info.getId()); item.setProjectId(info.getId());
item.setCreatedBy(userId); item.setCreatedBy(userId);
item.setExt(jsonObject); item.setExt(jsonObject);
item.setCreatedAt(new Timestamp(System.currentTimeMillis())); item.setCreatedAt(new Timestamp(System.currentTimeMillis()));
item.setUpdatedBy(null); item.setUpdatedBy(null);
}); });
indicatorsService.insertBatch(membersList); indicatorsService.insertBatch(membersList);
}
} }
} //审批流程
//审批流程 activitiEnum.activitiClass aClass = Enum.valueOf(activitiEnum.activitiClass.class, infoReq.getProjectStep());
activitiEnum.activitiClass aClass = Enum.valueOf(activitiEnum.activitiClass.class, infoReq.getProjectStep()); String projectCategory = infoReq.getProjectCategory();
String projectCategory = infoReq.getProjectCategory(); activitiEnum.activitiType aType = getActivitiType(projectCategory, aClass);
activitiEnum.activitiType aType = getActivitiType(projectCategory, aClass); //添加启动参数
//添加启动参数 Map map = new HashMap();
Map map = new HashMap(); if (!ObjectUtils.isEmpty(initDto)) {
if (!ObjectUtils.isEmpty(initDto)) { if (!ObjectUtils.isEmpty(initDto.getMap())) {
if (!ObjectUtils.isEmpty(initDto.getMap())) { map = initDto.getMap();
map = initDto.getMap(); if (!ObjectUtils.isEmpty(map)) {//存入流程委托人，并将前台传的人事ID转为账号ID
if (!ObjectUtils.isEmpty(map)) {//存入流程委托人，并将前台传的人事ID转为账号ID if (!ObjectUtils.isEmpty(map.get("projectManagerData"))) {
if (!ObjectUtils.isEmpty(map.get("projectManagerData"))) { SystemUserLogin systemUserLogin = getSystemUserLogin(map, "projectManagerData");
SystemUserLogin systemUserLogin = getSystemUserLogin(map, "projectManagerData"); map.put("projectManagerData", systemUserLogin.getId());
map.put("projectManagerData", systemUserLogin.getId()); }
}
// if (!ObjectUtils.isEmpty(map.get("projectAdmin"))) { // if (!ObjectUtils.isEmpty(map.get("projectAdmin"))) {
// SystemUserLogin systemUserLogin = getSystemUserLogin(map, "projectAdmin"); // SystemUserLogin systemUserLogin = getSystemUserLogin(map, "projectAdmin");
// map.put("projectAdmin", systemUserLogin.getId()); // map.put("projectAdmin", systemUserLogin.getId());
@ -255,19 +256,21 @@ public class ProjectInitComtroller implements ProjectInitApi {
// SystemUserLogin systemUserLogin = getSystemUserLogin(map, "MainLeader"); // SystemUserLogin systemUserLogin = getSystemUserLogin(map, "MainLeader");
// map.put("MainLeader", systemUserLogin.getId()); // map.put("MainLeader", systemUserLogin.getId());
// } // }
}
} }
} }
if (infoReq.getProjectStep().equals("init")) {
baseActiviti.startWorkflow(userId, info.getId(), aType, aClass, map);
}
return ApiResponse.fillSuccess("添加成功");
} }
if (infoReq.getProjectStep().equals("init")) { return ApiResponse.fillFail("操作失败");
baseActiviti.startWorkflow(userId, info.getId(), aType, aClass, map);
}
return ApiResponse.fillSuccess("添加成功");
} catch (Exception e) { } catch (Exception e) {
log.error("ProjectInitController.add", e); log.error("ProjectInitController.add", e);
// 批量新增出现异常被捕获时，手动回滚事务，保证数据库一致 // 批量新增出现异常被捕获时，手动回滚事务，保证数据库一致
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
throw new XQException(ErrorCode.PROJECTINFO_EXCEPTION_ERROR, null); throw new XQException(ErrorCode.PROJECTINFO_EXCEPTION_ERROR, null);
} }
} }
/** /**
@ -319,46 +322,49 @@ public class ProjectInitComtroller implements ProjectInitApi {
@PostMapping(Api.PROJECT_INIT_LIST) @PostMapping(Api.PROJECT_INIT_LIST)
public String list(@RequestHeader("userId") Long userId, @RequestBody ProjectFindReq projectFindReq) throws XQException { public String list(@RequestHeader("userId") Long userId, @RequestBody ProjectFindReq projectFindReq) throws XQException {
try { try {
String projectName = projectFindReq.getProjectName(); if (!ObjectUtils.isEmpty(projectFindReq)) {
String projectCategory = projectFindReq.getProjectCategory(); String projectName = projectFindReq.getProjectName();
String projectStep = projectFindReq.getProjectStep(); String projectCategory = projectFindReq.getProjectCategory();
Integer activitiStatus = projectFindReq.getActivitiStatus(); String projectStep = projectFindReq.getProjectStep();
String applyDate = projectFindReq.getApplyDate(); Integer activitiStatus = projectFindReq.getActivitiStatus();
String membersList = projectFindReq.getMembersList(); String applyDate = projectFindReq.getApplyDate();
String projectManager = projectFindReq.getProjectManagerData(); String membersList = projectFindReq.getMembersList();
if (projectFindReq.getPageNo() == null || projectFindReq.getPageNo() == 0) { String projectManager = projectFindReq.getProjectManagerData();
projectFindReq.setPageNo(1); if (projectFindReq.getPageNo() == null || projectFindReq.getPageNo() == 0) {
} projectFindReq.setPageNo(1);
if (projectFindReq.getPageSize() == null || projectFindReq.getPageSize() == 0) { }
projectFindReq.setPageSize(10); if (projectFindReq.getPageSize() == null || projectFindReq.getPageSize() == 0) {
} projectFindReq.setPageSize(10);
Page<ProjectInfoListItemResp> page = new Page<>(projectFindReq.getPageNo(), projectFindReq.getPageSize()); }
List<ProjectInfoListItemResp> list = infoService.getListByParam(page, projectName, projectCategory, projectStep, Page<ProjectInfoListItemResp> page = new Page<>(projectFindReq.getPageNo(), projectFindReq.getPageSize());
activitiStatus, userId, applyDate, membersList, projectManager); List<ProjectInfoListItemResp> list = infoService.getListByParam(page, projectName, projectCategory, projectStep,
if (list != null && list.size() > 0) { activitiStatus, userId, applyDate, membersList, projectManager);
for (ProjectInfoListItemResp projectInfoListItemResp : list) { if (list != null && list.size() > 0) {
JSONObject ext = projectInfoListItemResp.getExt(); for (ProjectInfoListItemResp projectInfoListItemResp : list) {
if (ext.containsKey("projectManagerData")) { JSONObject ext = projectInfoListItemResp.getExt();
List<Long> projectManagerData = ext.getJSONArray("projectManagerData").toJavaList(Long.class); if (ext.containsKey("projectManagerData")) {
for (Long id : projectManagerData) { List<Long> projectManagerData = ext.getJSONArray("projectManagerData").toJavaList(Long.class);
PersonalMember personalMember = personalMemberService.selectById(id); for (Long id : projectManagerData) {
if (personalMember != null) { PersonalMember personalMember = personalMemberService.selectById(id);
projectInfoListItemResp.setProjectManagerData(personalMember.getPersonName()); if (personalMember != null) {
projectInfoListItemResp.setProjectManagerData(personalMember.getPersonName());
}
} }
} }
projectInfoListItemResp.setIsEdit(flowsService.isEdit(projectInfoListItemResp.getId()));
} }
projectInfoListItemResp.setIsEdit(flowsService.isEdit(projectInfoListItemResp.getId()));
} }
ProjectInfoListResp resp = new ProjectInfoListResp();
resp.setLs(list);
resp.setPages(page.getPages());
resp.setTotal(page.getTotal());
return ApiResponse.fillSuccess(resp);
} }
ProjectInfoListResp resp = new ProjectInfoListResp();
resp.setLs(list);
resp.setPages(page.getPages());
resp.setTotal(page.getTotal());
return ApiResponse.fillSuccess(resp);
} catch (Exception e) { } catch (Exception e) {
log.error("ProjectInfoController.list", e); log.error("ProjectInfoController.list", e);
throw new XQException(ErrorCode.PROJECTINFO_EXCEPTION_ERROR, null); throw new XQException(ErrorCode.PROJECTINFO_EXCEPTION_ERROR, null);
} }
return ApiResponse.fillFail("获取失败!");
} }
@Transactional @Transactional

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

@ -40,26 +40,29 @@ public class ProjectQuarterlyEvaluationController implements ProjectQuarterlyEva
@PostMapping(Api.PROJECT_QUARTERLY_EVALUATION) @PostMapping(Api.PROJECT_QUARTERLY_EVALUATION)
public String list(@RequestHeader Long userId, @RequestBody PageNoUtil<ProjectQuarterlyEvaluation> pageNoUtil) throws XQException { public String list(@RequestHeader Long userId, @RequestBody PageNoUtil<ProjectQuarterlyEvaluation> pageNoUtil) throws XQException {
try { try {
//先拿到季度审核表数据 if (!ObjectUtils.isEmpty(pageNoUtil)) {
EntityWrapper<SystemUserLogin> userLoginEntityWrapper = new EntityWrapper<>(); //先拿到季度审核表数据
userLoginEntityWrapper.eq("id_", userId); EntityWrapper<SystemUserLogin> userLoginEntityWrapper = new EntityWrapper<>();
SystemUserLogin systemUserLogin = userLoginService.selectOne(userLoginEntityWrapper); userLoginEntityWrapper.eq("id_", userId);
EntityWrapper<ProjectQuarterlyEvaluation> evaluationEntityWrapper = new EntityWrapper<>(); SystemUserLogin systemUserLogin = userLoginService.selectOne(userLoginEntityWrapper);
evaluationEntityWrapper.eq("is_deleted", "0"); EntityWrapper<ProjectQuarterlyEvaluation> evaluationEntityWrapper = new EntityWrapper<>();
evaluationEntityWrapper.and("ext_->> 'executor' like " + "'%" + userId + "%'"); evaluationEntityWrapper.eq("is_deleted", "0");
evaluationEntityWrapper.setSqlSelect("project_id"); evaluationEntityWrapper.and("ext_->> 'executor' like " + "'%" + userId + "%'");
List<Object> evaluationList = quarterlyEvaluationService.selectObjs(evaluationEntityWrapper); evaluationEntityWrapper.setSqlSelect("project_id");
Page<ProjectInfo> page = new Page<>(pageNoUtil.getPageNo(), pageNoUtil.getPageSize()); List<Object> evaluationList = quarterlyEvaluationService.selectObjs(evaluationEntityWrapper);
List<ProjectInfoListItemResp> list = new ArrayList<>(); Page<ProjectInfo> page = new Page<>(pageNoUtil.getPageNo(), pageNoUtil.getPageSize());
//通过季度审核表的项目id集合，查询到当前负责人下面的项目列表 List<ProjectInfoListItemResp> list = new ArrayList<>();
if (!ObjectUtils.isEmpty(evaluationList)) { //通过季度审核表的项目id集合，查询到当前负责人下面的项目列表
list = projectInfoService.getListByIds(page, evaluationList); if (!ObjectUtils.isEmpty(evaluationList)) {
list = projectInfoService.getListByIds(page, evaluationList);
}
ResultListReqUtil<ProjectInfoListItemResp> listReqUtil = new ResultListReqUtil<>(list, page.getTotal(), page.getPages());
return ApiResponse.fillSuccess(listReqUtil);
} }
ResultListReqUtil<ProjectInfoListItemResp> listReqUtil = new ResultListReqUtil<>(list, page.getTotal(), page.getPages());
return ApiResponse.fillSuccess(listReqUtil);
} catch (Exception e) { } catch (Exception e) {
log.error("ProjectQuarterlyEvaluationController.list", e); log.error("ProjectQuarterlyEvaluationController.list", e);
throw new XQException(ErrorCode.PROJECTINFO_EXCEPTION_ERROR, null); 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())); listResp.setUserId(String.valueOf(systemUserLogin.getUserinfoId()));
return ApiResponse.fillSuccess(listResp); return ApiResponse.fillSuccess(listResp);
} }
return null; return ApiResponse.fillFail("获取失败!");
} }
/** /**