ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(企标稽查计划): 80713

Browse Source
This commit is contained in:
yjz
2024-01-15 14:13:14 +08:00
parent 65a620a9cd
commit d9c79ff82d
1 changed files with 31 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/ProcessEsInspectPlanServiceImpl.java
+31 -18
View File
@@ -71,6 +71,7 @@ public class ProcessEsInspectPlanServiceImpl extends ServiceImpl<ProcessEsInspec
this.sysUserService = sysUserService;
this.sysDepartService = sysDepartService;
}
private static final String ERROR_MESSAGE = "模板错误，按照系统模板导入!";
private final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
@@ -136,7 +137,7 @@ public class ProcessEsInspectPlanServiceImpl extends ServiceImpl<ProcessEsInspec
if (StringUtils.isNotBlank(processEsInspectPlan.getNodeId()) && EsInspectPlanCommon.PROCESS_NODE_2.equals(processEsInspectPlan.getNodeId())){
queryWrapper.and(qw ->
qw.like("object_of_consultation", loginUser.getId())
.or().eq("create_by", loginUser.getUsername()));
.or().eq("create_by", loginUser.getUsername()));
}
queryWrapper.orderByAsc("create_time");
return queryWrapper;
@@ -236,11 +237,13 @@ public class ProcessEsInspectPlanServiceImpl extends ServiceImpl<ProcessEsInspec
List<String> secondVerify = secondVerify(list.get(i));
List<String> thirdVerify = thirdVerify(list.get(i));
List<String> fifthVerify = fifthVerify(list.get(i));
List<String> sixthVerify = sixthVerify(list.get(i), true);
List<String> sixthVerify = sixthVerify(list.get(i));
List<String> seventhVerify = seventhVerify(list.get(i));
firstVerify.addAll(secondVerify);
firstVerify.addAll(thirdVerify);
firstVerify.addAll(fifthVerify);
firstVerify.addAll(sixthVerify);
firstVerify.addAll(seventhVerify);
if (!firstVerify.isEmpty()){
errorMSG.append(head).append(String.join("", firstVerify)).append("<br/>");
@@ -297,6 +300,7 @@ public class ProcessEsInspectPlanServiceImpl extends ServiceImpl<ProcessEsInspec
lists.remove(0);
List<ProcessEsInspectPlan> list = BeanCopyUtils.copyBeanList(lists, ProcessEsInspectPlan.class);
StringBuilder errorMSG = new StringBuilder();
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
// 字段校验
for (int i = 0; i < list.size(); i++) {
list.get(i).setProjectId(projectId);
@@ -305,7 +309,8 @@ public class ProcessEsInspectPlanServiceImpl extends ServiceImpl<ProcessEsInspec
List<String> secondVerify = secondVerify(list.get(i));
List<String> thirdVerify = thirdVerify(list.get(i));
List<String> fifthVerify = fifthVerify(list.get(i));
List<String> sixthVerify = sixthVerify(list.get(i), false);
List<String> sixthVerify = sixthVerify(list.get(i));
list.get(i).setObjectOfConsultation(loginUser.getId());
firstVerify.addAll(secondVerify);
firstVerify.addAll(thirdVerify);
firstVerify.addAll(fifthVerify);
@@ -345,7 +350,29 @@ public class ProcessEsInspectPlanServiceImpl extends ServiceImpl<ProcessEsInspec
}
}
private List<String> sixthVerify(ProcessEsInspectPlan processEsInspectPlan, boolean flag) {
private List<String> seventhVerify(ProcessEsInspectPlan processEsInspectPlan) {
List<String> errorList = new ArrayList<>();
if (StringUtils.isNotBlank(processEsInspectPlan.getObjectOfConsultation())){
String[] objectOfConsultationArr = processEsInspectPlan.getObjectOfConsultation().split(",");
List<String> userList = new ArrayList<>();
for (String objectOfConsultation : objectOfConsultationArr) {
SysUser sysUser = sysUserService.findUserByCalcNameWorkNo(objectOfConsultation);
if (Objects.isNull(sysUser)){
errorList.add("征求意见对象不存在!");
}else {
userList.add(sysUser.getId());
}
}
if (!userList.isEmpty()){
processEsInspectPlan.setObjectOfConsultation(String.join(",", userList));
}
}else {
errorList.add("征求意见对象不能为空!");
}
return errorList;
}
private List<String> sixthVerify(ProcessEsInspectPlan processEsInspectPlan) {
List<String> errorList = new ArrayList<>();
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
if (StringUtils.isNotBlank(processEsInspectPlan.getStandardizationDockingUser())){
@@ -358,20 +385,6 @@ public class ProcessEsInspectPlanServiceImpl extends ServiceImpl<ProcessEsInspec
}else {
errorList.add("标准化组对接人不能为空!");
}
if (flag){
if (StringUtils.isNotBlank(processEsInspectPlan.getObjectOfConsultation())){
SysUser sysUser = sysUserService.findUserByCalcNameWorkNo(processEsInspectPlan.getObjectOfConsultation());
if (Objects.isNull(sysUser)){
errorList.add("征求意见对象不存在!");
}else {
processEsInspectPlan.setObjectOfConsultation(sysUser.getId());
}
}else {
errorList.add("征求意见对象不能为空!");
}
}else {
processEsInspectPlan.setObjectOfConsultation(loginUser.getId());
}
// 填充创建人
processEsInspectPlan.setCreateBy(loginUser.getId());
processEsInspectPlan.setCreateByDictText(loginUser.calcNameWorkNo());