检验非空判断
This commit is contained in:
parent
1c5a3595da
commit
136a6fd7dd
@ -84,17 +84,20 @@ public class ProjectAssessmentIndicatorsController implements ProjectAssessmentI
|
||||
@PostMapping(Api.PROJECT_QUARTERLY_EVALUATION_LIST)
|
||||
public String list(@RequestHeader Long userId, @RequestBody PageNoUtil<ProjectAssessmentIndicatorsDto> pageNoUtil) throws XQException {
|
||||
try {
|
||||
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<>();
|
||||
listReqUtil.setLs(indicatorsServiceList);
|
||||
listReqUtil.setPages(page.getPages());
|
||||
listReqUtil.setTotal(page.getTotal());
|
||||
return ApiResponse.fillSuccess(listReqUtil);
|
||||
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<>();
|
||||
listReqUtil.setLs(indicatorsServiceList);
|
||||
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
|
||||
|
||||
@ -48,48 +48,51 @@ public class ProjectBudgetImplementController implements ProjectBudgetImplementA
|
||||
@Override
|
||||
public String list(@RequestHeader Long userId,@RequestBody ProjectBudgetImplementFindReq projectBudgetImplementFindReq) throws XQException {
|
||||
try {
|
||||
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(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);
|
||||
|
||||
implementAddDto.setImplementationRate(String.format("%.2f%%",rate));
|
||||
}
|
||||
// 修改日期格式
|
||||
implementAddDto.setImplementationRate(String.format("%.2f%%", rate));
|
||||
}
|
||||
// 修改日期格式
|
||||
/* Timestamp updatedAt = implementAddDto.getUpdatedAt();
|
||||
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||
String format= sdf.format(updatedAt);
|
||||
implementAddDto.setUpdatedAt();*/
|
||||
}
|
||||
//向listReq中加入财务专员id
|
||||
EntityWrapper<SystemUserRole> userRole = new EntityWrapper<>();
|
||||
Long roleId = 943384938727391233L;
|
||||
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) {
|
||||
Long UserId = role.getUserId();
|
||||
roleUserId.add(UserId.toString());
|
||||
}
|
||||
// 将userid存入listReq中
|
||||
EntityWrapper<SystemUserLogin> userLoginEntityWrapper = new EntityWrapper<>();
|
||||
userLoginEntityWrapper.eq("id_",userId);
|
||||
SystemUserLogin systemUserLogin = systemUserLoginService.selectOne(userLoginEntityWrapper);
|
||||
}
|
||||
//向listReq中加入财务专员id
|
||||
EntityWrapper<SystemUserRole> userRole = new EntityWrapper<>();
|
||||
Long roleId = 943384938727391233L;
|
||||
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) {
|
||||
Long UserId = role.getUserId();
|
||||
roleUserId.add(UserId.toString());
|
||||
}
|
||||
// 将userid存入listReq中
|
||||
EntityWrapper<SystemUserLogin> userLoginEntityWrapper = new EntityWrapper<>();
|
||||
userLoginEntityWrapper.eq("id_", userId);
|
||||
SystemUserLogin systemUserLogin = systemUserLoginService.selectOne(userLoginEntityWrapper);
|
||||
|
||||
ResultListReqUtil listReq = new ResultListReqUtil();
|
||||
listReq.setLs(list);
|
||||
listReq.setRoleUserId(roleUserId);
|
||||
listReq.setUserId(String.valueOf(systemUserLogin.getUserinfoId()));
|
||||
listReq.setTotal(page.getTotal());
|
||||
listReq.setPages(page.getPages());
|
||||
return ApiResponse.fillSuccess(listReq);
|
||||
ResultListReqUtil listReq = new ResultListReqUtil();
|
||||
listReq.setLs(list);
|
||||
listReq.setRoleUserId(roleUserId);
|
||||
listReq.setUserId(String.valueOf(systemUserLogin.getUserinfoId()));
|
||||
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("获取失败!");
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -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,19 +149,21 @@ public class ProjectDepartmentController implements ProjectDepartmentApi {
|
||||
* @return List<ProjectWeeklyDto>
|
||||
**/
|
||||
private List<ProjectWeeklyDto> getThisWeek(List<ProjectWeeklyDto> 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();
|
||||
wrapper.eq("parent_id", list.get(i).getId());
|
||||
List<ProjectWeekly> projectWeeklies = projectWeeklyService.selectList(wrapper);
|
||||
StringBuilder thisWeekBuilder = new StringBuilder();
|
||||
StringBuilder nextWeekBuilder = new StringBuilder();
|
||||
for (int j = 0; j < projectWeeklies.size(); j++) {
|
||||
thisWeekBuilder.append((j + 1) + ". " + projectWeeklies.get(j).getThisWeek() + "\n");
|
||||
nextWeekBuilder.append((j + 1) + ". " + projectWeeklies.get(j).getNextWeek() + "\n");
|
||||
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();
|
||||
wrapper.eq("parent_id", list.get(i).getId());
|
||||
List<ProjectWeekly> projectWeeklies = projectWeeklyService.selectList(wrapper);
|
||||
StringBuilder thisWeekBuilder = new StringBuilder();
|
||||
StringBuilder nextWeekBuilder = new StringBuilder();
|
||||
for (int j = 0; j < projectWeeklies.size(); j++) {
|
||||
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;
|
||||
@ -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("获取失败!");
|
||||
}
|
||||
}
|
||||
|
||||
@ -124,125 +124,126 @@ 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 {
|
||||
//判断项目名是否重复
|
||||
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();
|
||||
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 branchLeaders = String.valueOf(((ArrayList) ext.get("branchLeaders")).get(1));
|
||||
// String MainLeader = String.valueOf(((ArrayList) ext.get("MainLeader")).get(1));
|
||||
String projectManagerData = String.valueOf(((ArrayList) ext.get("projectManagerData")).get(1));
|
||||
List<ProjectAssessmentIndicators> membersList = initDto.getMembersList();
|
||||
if (!membersList.isEmpty()) {
|
||||
JSONObject jsonObject = new JSONObject();
|
||||
jsonObject.put("executor", getSystemUserLogin(projectManagerData).getId());//第一个节点执行人一定是项目负责人
|
||||
jsonObject.put("historyExecutor", jsonObject.get("executor"));
|
||||
jsonObject.put("taskName", "季度审核填报");
|
||||
jsonObject.put("projectManager", jsonObject.get("executor"));
|
||||
String projectManagerData = String.valueOf(((ArrayList) ext.get("projectManagerData")).get(1));
|
||||
List<ProjectAssessmentIndicators> membersList = initDto.getMembersList();
|
||||
if (!membersList.isEmpty()) {
|
||||
JSONObject jsonObject = new JSONObject();
|
||||
jsonObject.put("executor", getSystemUserLogin(projectManagerData).getId());//第一个节点执行人一定是项目负责人
|
||||
jsonObject.put("historyExecutor", jsonObject.get("executor"));
|
||||
jsonObject.put("taskName", "季度审核填报");
|
||||
jsonObject.put("projectManager", jsonObject.get("executor"));
|
||||
// jsonObject.put("projectAdmin", getSystemUserLogin(projectAdmin).getId());
|
||||
// jsonObject.put("branchLeaders", getSystemUserLogin(branchLeaders).getId());
|
||||
// jsonObject.put("MainLeader", getSystemUserLogin(MainLeader).getId());
|
||||
membersList.forEach(item -> {
|
||||
item.setProjectId(info.getId());
|
||||
item.setCreatedBy(userId);
|
||||
item.setExt(jsonObject);
|
||||
item.setCreatedAt(new Timestamp(System.currentTimeMillis()));
|
||||
item.setUpdatedBy(null);
|
||||
});
|
||||
indicatorsService.insertBatch(membersList);
|
||||
membersList.forEach(item -> {
|
||||
item.setProjectId(info.getId());
|
||||
item.setCreatedBy(userId);
|
||||
item.setExt(jsonObject);
|
||||
item.setCreatedAt(new Timestamp(System.currentTimeMillis()));
|
||||
item.setUpdatedBy(null);
|
||||
});
|
||||
indicatorsService.insertBatch(membersList);
|
||||
}
|
||||
}
|
||||
}
|
||||
//审批流程
|
||||
activitiEnum.activitiClass aClass = Enum.valueOf(activitiEnum.activitiClass.class, infoReq.getProjectStep());
|
||||
String projectCategory = infoReq.getProjectCategory();
|
||||
activitiEnum.activitiType aType = getActivitiType(projectCategory, aClass);
|
||||
//添加启动参数
|
||||
Map map = new HashMap();
|
||||
if (!ObjectUtils.isEmpty(initDto)) {
|
||||
if (!ObjectUtils.isEmpty(initDto.getMap())) {
|
||||
map = initDto.getMap();
|
||||
if (!ObjectUtils.isEmpty(map)) {//存入流程委托人，并将前台传的人事ID转为账号ID
|
||||
if (!ObjectUtils.isEmpty(map.get("projectManagerData"))) {
|
||||
SystemUserLogin systemUserLogin = getSystemUserLogin(map, "projectManagerData");
|
||||
map.put("projectManagerData", systemUserLogin.getId());
|
||||
}
|
||||
//审批流程
|
||||
activitiEnum.activitiClass aClass = Enum.valueOf(activitiEnum.activitiClass.class, infoReq.getProjectStep());
|
||||
String projectCategory = infoReq.getProjectCategory();
|
||||
activitiEnum.activitiType aType = getActivitiType(projectCategory, aClass);
|
||||
//添加启动参数
|
||||
Map map = new HashMap();
|
||||
if (!ObjectUtils.isEmpty(initDto)) {
|
||||
if (!ObjectUtils.isEmpty(initDto.getMap())) {
|
||||
map = initDto.getMap();
|
||||
if (!ObjectUtils.isEmpty(map)) {//存入流程委托人，并将前台传的人事ID转为账号ID
|
||||
if (!ObjectUtils.isEmpty(map.get("projectManagerData"))) {
|
||||
SystemUserLogin systemUserLogin = getSystemUserLogin(map, "projectManagerData");
|
||||
map.put("projectManagerData", systemUserLogin.getId());
|
||||
}
|
||||
// if (!ObjectUtils.isEmpty(map.get("projectAdmin"))) {
|
||||
// SystemUserLogin systemUserLogin = getSystemUserLogin(map, "projectAdmin");
|
||||
// map.put("projectAdmin", systemUserLogin.getId());
|
||||
@ -255,19 +256,21 @@ public class ProjectInitComtroller implements ProjectInitApi {
|
||||
// SystemUserLogin systemUserLogin = getSystemUserLogin(map, "MainLeader");
|
||||
// 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")) {
|
||||
baseActiviti.startWorkflow(userId, info.getId(), aType, aClass, map);
|
||||
}
|
||||
return ApiResponse.fillSuccess("添加成功");
|
||||
return ApiResponse.fillFail("操作失败");
|
||||
} catch (Exception e) {
|
||||
log.error("ProjectInitController.add", e);
|
||||
// 批量新增出现异常被捕获时，手动回滚事务，保证数据库一致
|
||||
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
|
||||
throw new XQException(ErrorCode.PROJECTINFO_EXCEPTION_ERROR, null);
|
||||
}
|
||||
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
|
||||
throw new XQException(ErrorCode.PROJECTINFO_EXCEPTION_ERROR, null);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
@ -319,46 +322,49 @@ public class ProjectInitComtroller implements ProjectInitApi {
|
||||
@PostMapping(Api.PROJECT_INIT_LIST)
|
||||
public String list(@RequestHeader("userId") Long userId, @RequestBody ProjectFindReq projectFindReq) throws XQException {
|
||||
try {
|
||||
String projectName = projectFindReq.getProjectName();
|
||||
String projectCategory = projectFindReq.getProjectCategory();
|
||||
String projectStep = projectFindReq.getProjectStep();
|
||||
Integer activitiStatus = projectFindReq.getActivitiStatus();
|
||||
String applyDate = projectFindReq.getApplyDate();
|
||||
String membersList = projectFindReq.getMembersList();
|
||||
String projectManager = projectFindReq.getProjectManagerData();
|
||||
if (projectFindReq.getPageNo() == null || projectFindReq.getPageNo() == 0) {
|
||||
projectFindReq.setPageNo(1);
|
||||
}
|
||||
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,
|
||||
activitiStatus, userId, applyDate, membersList, projectManager);
|
||||
if (list != null && list.size() > 0) {
|
||||
for (ProjectInfoListItemResp projectInfoListItemResp : list) {
|
||||
JSONObject ext = projectInfoListItemResp.getExt();
|
||||
if (ext.containsKey("projectManagerData")) {
|
||||
List<Long> projectManagerData = ext.getJSONArray("projectManagerData").toJavaList(Long.class);
|
||||
for (Long id : projectManagerData) {
|
||||
PersonalMember personalMember = personalMemberService.selectById(id);
|
||||
if (personalMember != null) {
|
||||
projectInfoListItemResp.setProjectManagerData(personalMember.getPersonName());
|
||||
if (!ObjectUtils.isEmpty(projectFindReq)) {
|
||||
String projectName = projectFindReq.getProjectName();
|
||||
String projectCategory = projectFindReq.getProjectCategory();
|
||||
String projectStep = projectFindReq.getProjectStep();
|
||||
Integer activitiStatus = projectFindReq.getActivitiStatus();
|
||||
String applyDate = projectFindReq.getApplyDate();
|
||||
String membersList = projectFindReq.getMembersList();
|
||||
String projectManager = projectFindReq.getProjectManagerData();
|
||||
if (projectFindReq.getPageNo() == null || projectFindReq.getPageNo() == 0) {
|
||||
projectFindReq.setPageNo(1);
|
||||
}
|
||||
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,
|
||||
activitiStatus, userId, applyDate, membersList, projectManager);
|
||||
if (list != null && list.size() > 0) {
|
||||
for (ProjectInfoListItemResp projectInfoListItemResp : list) {
|
||||
JSONObject ext = projectInfoListItemResp.getExt();
|
||||
if (ext.containsKey("projectManagerData")) {
|
||||
List<Long> projectManagerData = ext.getJSONArray("projectManagerData").toJavaList(Long.class);
|
||||
for (Long id : projectManagerData) {
|
||||
PersonalMember personalMember = personalMemberService.selectById(id);
|
||||
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) {
|
||||
log.error("ProjectInfoController.list", e);
|
||||
throw new XQException(ErrorCode.PROJECTINFO_EXCEPTION_ERROR, null);
|
||||
}
|
||||
return ApiResponse.fillFail("获取失败!");
|
||||
}
|
||||
|
||||
@Transactional
|
||||
|
||||
@ -40,26 +40,29 @@ public class ProjectQuarterlyEvaluationController implements ProjectQuarterlyEva
|
||||
@PostMapping(Api.PROJECT_QUARTERLY_EVALUATION)
|
||||
public String list(@RequestHeader Long userId, @RequestBody PageNoUtil<ProjectQuarterlyEvaluation> pageNoUtil) throws XQException {
|
||||
try {
|
||||
//先拿到季度审核表数据
|
||||
EntityWrapper<SystemUserLogin> userLoginEntityWrapper = new EntityWrapper<>();
|
||||
userLoginEntityWrapper.eq("id_", userId);
|
||||
SystemUserLogin systemUserLogin = userLoginService.selectOne(userLoginEntityWrapper);
|
||||
EntityWrapper<ProjectQuarterlyEvaluation> evaluationEntityWrapper = new EntityWrapper<>();
|
||||
evaluationEntityWrapper.eq("is_deleted", "0");
|
||||
evaluationEntityWrapper.and("ext_->> 'executor' like " + "'%" + userId + "%'");
|
||||
evaluationEntityWrapper.setSqlSelect("project_id");
|
||||
List<Object> evaluationList = quarterlyEvaluationService.selectObjs(evaluationEntityWrapper);
|
||||
Page<ProjectInfo> page = new Page<>(pageNoUtil.getPageNo(), pageNoUtil.getPageSize());
|
||||
List<ProjectInfoListItemResp> list = new ArrayList<>();
|
||||
//通过季度审核表的项目id集合，查询到当前负责人下面的项目列表
|
||||
if (!ObjectUtils.isEmpty(evaluationList)) {
|
||||
list = projectInfoService.getListByIds(page, evaluationList);
|
||||
if (!ObjectUtils.isEmpty(pageNoUtil)) {
|
||||
//先拿到季度审核表数据
|
||||
EntityWrapper<SystemUserLogin> userLoginEntityWrapper = new EntityWrapper<>();
|
||||
userLoginEntityWrapper.eq("id_", userId);
|
||||
SystemUserLogin systemUserLogin = userLoginService.selectOne(userLoginEntityWrapper);
|
||||
EntityWrapper<ProjectQuarterlyEvaluation> evaluationEntityWrapper = new EntityWrapper<>();
|
||||
evaluationEntityWrapper.eq("is_deleted", "0");
|
||||
evaluationEntityWrapper.and("ext_->> 'executor' like " + "'%" + userId + "%'");
|
||||
evaluationEntityWrapper.setSqlSelect("project_id");
|
||||
List<Object> evaluationList = quarterlyEvaluationService.selectObjs(evaluationEntityWrapper);
|
||||
Page<ProjectInfo> page = new Page<>(pageNoUtil.getPageNo(), pageNoUtil.getPageSize());
|
||||
List<ProjectInfoListItemResp> list = new ArrayList<>();
|
||||
//通过季度审核表的项目id集合，查询到当前负责人下面的项目列表
|
||||
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) {
|
||||
log.error("ProjectQuarterlyEvaluationController.list", e);
|
||||
throw new XQException(ErrorCode.PROJECTINFO_EXCEPTION_ERROR, null);
|
||||
}
|
||||
return ApiResponse.fillFail("获取失败!");
|
||||
}
|
||||
}
|
||||
|
||||
@ -106,7 +106,7 @@ public class ProjectWholeFirmController implements ProjectWholeFirmApi {
|
||||
listResp.setUserId(String.valueOf(systemUserLogin.getUserinfoId()));
|
||||
return ApiResponse.fillSuccess(listResp);
|
||||
}
|
||||
return null;
|
||||
return ApiResponse.fillFail("获取失败!");
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user