From ab06e5c34517f8c3d0dff9656facdff5faceb77d Mon Sep 17 00:00:00 2001 From: haozq <1611483981@qq.com> Date: Wed, 5 Mar 2025 15:15:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E4=B8=9A=E5=8A=A1=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../flowable/entity/ConfigurationVo.java | 12 +++ .../bonus/flowable/mapper/BusinessMapper.java | 40 +++++++++ .../flowable/service/BusinessService.java | 2 +- .../service/impl/BusinessServiceImpl.java | 84 +++++++++++++------ .../bonus/flowable/utils/FlowTaskUtils.java | 40 ++++++++- .../main/resources/mapper/BusinessMapper.xml | 62 ++++++++++++++ .../impl/AdmissionRequestServiceImpl.java | 10 +-- .../service/impl/ConsApprovalServiceImpl.java | 8 +- .../impl/ContEntryExitServiceImpl.java | 11 +-- .../EngineeringEquipmentBindServiceImpl.java | 6 +- .../service/impl/EquipServiceImpl.java | 12 +-- .../service/impl/MaterialServiceImpl.java | 6 +- .../impl/SecurityCheckServiceImpl.java | 18 ++-- .../service/impl/SubEntryExitServiceImpl.java | 12 +-- .../project/service/impl/SubServiceImpl.java | 6 +- .../impl/SupervisionUnitServiceImpl.java | 6 +- .../impl/ViolationManagementServiceImpl.java | 5 +- .../mapper/system/ConsApprovalMapper.xml | 4 +- .../mapper/system/ContEntryExitMapper.xml | 3 +- 19 files changed, 245 insertions(+), 102 deletions(-) diff --git a/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/entity/ConfigurationVo.java b/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/entity/ConfigurationVo.java index 3db2c25..49468ea 100644 --- a/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/entity/ConfigurationVo.java +++ b/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/entity/ConfigurationVo.java @@ -29,4 +29,16 @@ public class ConfigurationVo { */ private String type; private Integer auditStatus; + + + /** + * 是否当前节点 + */ + private String isNow; + + private String state; + + private String isAudit; + + } diff --git a/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/mapper/BusinessMapper.java b/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/mapper/BusinessMapper.java index 6ef2e94..c1a77a1 100644 --- a/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/mapper/BusinessMapper.java +++ b/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/mapper/BusinessMapper.java @@ -505,4 +505,44 @@ public interface BusinessMapper { * @return */ List getTreeList(RequestEntity entity); + + /** + * 查询审核人员是否存在 + * @param bean + * @return + */ + int getUserIsCz(ConfigurationVo bean); + + /** + * 查询版本是否一致 + * @param taskId + * @return + */ + String getAuditUserVersion(String taskId); + + void deleteAuditUserInfo(String taskId); + + /** + * 提交审核 + * @param bean + */ + // void updateUserAuditInfo(ConfigurationVo bean); + //插入待审核的人员信息 + void insertUserInfoData(ConfigurationVo bean); + + /** + * 查询是否有驳回记录 + * @param taskId + * @return + */ + String getCheckRemark(String taskId); + + /** + * 查询审核树 + * @param taskId + * @return + */ + String getCheckTree(String taskId); + + void updateAuditUserInfo(ConfigurationVo add); } diff --git a/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/service/BusinessService.java b/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/service/BusinessService.java index 23217f2..47d677f 100644 --- a/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/service/BusinessService.java +++ b/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/service/BusinessService.java @@ -48,7 +48,7 @@ public interface BusinessService { * @param auditTask * @return */ - void addCheckPerson(AuditTask auditTask,List stringList); + void addCheckPerson(AuditTask auditTask,List stringList,String version); /** * diff --git a/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/service/impl/BusinessServiceImpl.java b/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/service/impl/BusinessServiceImpl.java index fc73e21..22273ea 100644 --- a/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/service/impl/BusinessServiceImpl.java +++ b/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/service/impl/BusinessServiceImpl.java @@ -24,6 +24,7 @@ import liquibase.pro.packaged.M; import liquibase.pro.packaged.S; import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.annotations.Param; +import org.hibernate.validator.internal.util.StringHelper; import org.jetbrains.annotations.Nullable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -184,7 +185,7 @@ public class BusinessServiceImpl implements BusinessService { } auditTask.setExamineId(newExamineId); auditTask.setExamineType(examineType); - addCheckPerson(auditTask, null); + addCheckPerson(auditTask, null,version); return startFlowAble(auditTask, userList, userId, taskId, ProcessConstants.BASE, newFinalJudgment , newExamineId, newSort, newProcessKey, iaAdd, "1", version); } @@ -208,7 +209,7 @@ public class BusinessServiceImpl implements BusinessService { System.err.println("exId==" + exId); auditTask.setExamineType(examineType); auditTask.setExamineId(cd.getExamineId()); - addCheckPerson(auditTask, list); + addCheckPerson(auditTask, list,version); return startFlowAble(auditTask, list, userId, taskId, ProcessConstants.BASE, ProcessConstants.FINAL_CHECK_FALSE, exId, "0", "0", iaAdd, "1", version); } else { @@ -253,7 +254,7 @@ public class BusinessServiceImpl implements BusinessService { } auditTask.setExamineId(newExamineId); auditTask.setExamineType(examineType); - addCheckPerson(auditTask, null); + addCheckPerson(auditTask, null,version); //addCheckPerson(auditTask,userList); return startFlowAble(auditTask, userList, userId, taskId, ProcessConstants.BASE, newFinalJudgment, newExamineId, newSort, newProcessKey, iaAdd, "1", version); @@ -289,7 +290,7 @@ public class BusinessServiceImpl implements BusinessService { System.err.println("taskId==" + taskId); auditTask.setExamineType(examineType); auditTask.setExamineId(cd.getExamineId()); - addCheckPerson(auditTask, list); + addCheckPerson(auditTask, list,version); return startFlowAble(auditTask, list, userId, taskId, ProcessConstants.BASE, ProcessConstants.FINAL_CHECK_FALSE, exId, "0", "0", iaAdd, "1", version); } else { @@ -341,7 +342,7 @@ public class BusinessServiceImpl implements BusinessService { } auditTask.setExamineId(newExamineId); auditTask.setExamineType(examineType); - addCheckPerson(auditTask, null); + addCheckPerson(auditTask, null,version); return startFlowAble(auditTask, userList, userId, taskId, ProcessConstants.BASE, newFinalJudgment , newExamineId, newSort, newProcessKey, iaAdd, "1", version); } @@ -469,9 +470,9 @@ public class BusinessServiceImpl implements BusinessService { auditTask.setExamineId(newExamineId); auditTask.setExamineType(examineType); if("01".equals(auditTask.getUserType())){ - addCheckPerson(auditTask, null); + addCheckPerson(auditTask, null,version); }else{ - addCheckPerson(auditTask, userList); + addCheckPerson(auditTask, userList,version); } return startFlowAble(auditTask, finalList, userId, taskId, ProcessConstants.OWNER, newFinalJudgment @@ -484,7 +485,7 @@ public class BusinessServiceImpl implements BusinessService { } @Override - public void addCheckPerson(AuditTask auditTask, List stringList) { + public void addCheckPerson(AuditTask auditTask, List stringList,String versions) { mapper.delectCheckPerson(auditTask.getTaskId()); List finaList = new ArrayList<>(); //审批流程配置信息 @@ -499,7 +500,7 @@ public class BusinessServiceImpl implements BusinessService { configurationVo.setCheckPerson(s); configurationVo.setExamineType("0"); configurationVo.setSort("0"); - configurationVo.setVersion("0"); + configurationVo.setVersion(versions); configurationVo.setIsActive("2"); configurationVo.setTaskId(auditTask.getTaskId()); allList.add(configurationVo); @@ -507,21 +508,6 @@ public class BusinessServiceImpl implements BusinessService { finaList.addAll(allList); } finaList.addAll(checkDetailsList); -// if (checkDetailsList != null) { -// for (ConfigurationVo bean:checkDetailsList) { -// String newUser = bean.getCheckPerson(); -// String examineType = bean.getExamineType(); -// String version = bean.getVersion(); -// String rejectSort = bean.getSort(); -// // 将字符串按逗号拆分并转换为 List -// List userList = Arrays.asList(newUser.split(",")); -// -// -// allList.addAll(userList); -// bean.setTaskId(auditTask.getTaskId()); -// bean.setIsActive("2"); -// } -// } List configDetailsList = new ArrayList<>(); for (ConfigurationVo bean : finaList) { if (StringUtils.isBlank(bean.getCheckPerson())) { @@ -543,15 +529,45 @@ public class BusinessServiceImpl implements BusinessService { configDetailsList.add(configurationVo); } } - + String version=mapper.getAuditUserVersion(auditTask.getTaskId()); + if(!StringHelper.isNullOrEmptyString(version)){ + if(!version.equals(versions)){ + mapper.deleteAuditUserInfo(auditTask.getTaskId()); + mapper.deleteCheckRemark(auditTask.getTaskId()); + } + } //添加审核人员信息 mapper.insertCheckPerson(configDetailsList); for (ConfigurationVo bean : checkDetailsList) { bean.setIsActive("2"); bean.setTaskId(auditTask.getTaskId()); + //查询审核人员是否存在 + int num=mapper.getUserIsCz(bean); + if(num>0){ + // mapper.updateUserAuditInfo(bean); + }else{ + //插入待审核的人员信息 + } } + //添加审核人员树信息 mapper.insertCheckPerson(finaList); + // 添加需要审核的人员信息 + String userIds=mapper.getCheckRemark(auditTask.getTaskId()); + if(StringUtils.isEmpty(userIds)){ + userIds=mapper.getCheckTree(auditTask.getTaskId()); + } + List ids=Arrays.asList(userIds.split(",")); + for (String userId:ids){ + ConfigurationVo add=new ConfigurationVo(); + add.setTaskId(auditTask.getTaskId()); + add.setUserId(userId); + add.setVersion(versions); + add.setIsNow("1"); + add.setState("1"); + add.setIsAudit("0"); + mapper.insertUserInfoData(add); + } mapper.deleteCheckRemark(auditTask.getTaskId()); } @@ -632,7 +648,9 @@ public class BusinessServiceImpl implements BusinessService { int num = addTask(auditTask.getProId(), taskId, userId, auditTask.getTaskType(), auditTask.getParentUuid(), processInstanceId, auditTask.getUuid(), "1", sort, iaAdd, enterStatus, version, examineId); if (num > 0) { - // sedPhoneMsg(auditTask,list); + //添加下一个审核节点数据 + addUserInfoData(taskId,list,version); + // sedPhoneMsg(auditTask,list); return AjaxResult.success("审核提交成功"); } else { return AjaxResult.error("审核提交失败"); @@ -644,6 +662,7 @@ public class BusinessServiceImpl implements BusinessService { } + @Override public int addTask(String proId, String taskId, String userId, String taskType, String parentUuid, String processInstanceId, String uuid, String type, String sort, boolean iaAdd, @@ -1246,6 +1265,19 @@ public class BusinessServiceImpl implements BusinessService { mapper.updateTaskIsPassStatus(taskId, isPass); } + private void addUserInfoData(String taskId, List userList,String version) { + for (String userId:userList){ + ConfigurationVo add=new ConfigurationVo(); + add.setTaskId(taskId); + add.setUserId(userId); + add.setVersion(version); + add.setIsNow("1"); + add.setState("1"); + add.setIsAudit("0"); + mapper.insertUserInfoData(add); + } + } + public void sedPhoneMsg(AuditTask auditTask, List userList) { try { diff --git a/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/utils/FlowTaskUtils.java b/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/utils/FlowTaskUtils.java index 06354e7..8942049 100644 --- a/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/utils/FlowTaskUtils.java +++ b/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/utils/FlowTaskUtils.java @@ -7,6 +7,7 @@ import com.bonus.common.security.utils.SecurityUtils; import com.bonus.flowable.common.enums.FlowComment; import com.bonus.flowable.config.ProcessConstants; import com.bonus.flowable.entity.CheckComment; +import com.bonus.flowable.entity.ConfigurationVo; import com.bonus.flowable.factory.FlowServiceFactory; import com.bonus.flowable.flow.FlowableUtils; import com.bonus.flowable.mapper.BusinessMapper; @@ -634,6 +635,9 @@ public class FlowTaskUtils extends FlowServiceFactory { } else { businessService.addComment(taskId, procInsId, userId, opinions, agree, reject); } + + List nowList=new ArrayList<>(); + nowList.add(userId); // RequestEntity params=new RequestEntity(); params.setTaskId(entity.getTaskId()); @@ -646,7 +650,7 @@ public class FlowTaskUtils extends FlowServiceFactory { //审核意见 query.setRejectReason(entity.getRejectReason()); query.setReason(entity.getReason()); - //审核人的审核信息查询 + //审核记录添加 mapper.addCheckPersonRemark(query); //审核流程节点 params.setType("2"); @@ -659,6 +663,8 @@ public class FlowTaskUtils extends FlowServiceFactory { List userList=Arrays.asList(auditUser.split(",")); //多人审核 并且不是 或签的 if(userList.size()>1 && !"2".equals(query2.getExamType()) ){ + //会签 审核通的只需要修改当前用户的审核信息 + addUserInfoData(nowList,userId,taskId,"2"); boolean isNext=true; for (String otherId:userList){ if(!otherId.equals(entity.getUserId())){ @@ -677,6 +683,8 @@ public class FlowTaskUtils extends FlowServiceFactory { mapper.addCheckPersonRemark(query2); } }else{ + //或签直接记录数据即可 + addUserInfoData(userList,userId,taskId,"2"); query2.setAgree(entity.getAgree()); query2.setRejectReason(entity.getRejectReason()); query2.setReason(entity.getReason()); @@ -684,14 +692,42 @@ public class FlowTaskUtils extends FlowServiceFactory { } //不通过直接记录不通过即可 }else if("2".equals(agree) || "3".equals(agree)){ + //会签还是 + String auditUser=query2.getUserId(); + List userList=Arrays.asList(auditUser.split(",")); + if(userList.size()>1 && !"2".equals(query2.getExamType()) ){ + addUserInfoData(nowList,userId,taskId,"3"); + }else{ + addUserInfoData(userList,userId,taskId,"3"); + } query2.setAgree(entity.getAgree()); query2.setRejectReason(entity.getRejectReason()); query2.setReason(entity.getReason()); mapper.addCheckPersonRemark(query2); } -// } + + + return AjaxResult.success(); } + + public void addUserInfoData(List userList,String nowUser,String taskId,String status){ + for (String ids:userList){ + ConfigurationVo add=new ConfigurationVo(); + add.setTaskId(taskId); + add.setUserId(ids); + add.setIsNow("2"); + add.setState(status); + if(nowUser.equals(ids)){ + add.setIsAudit("1"); + }else { + add.setIsAudit("0"); + } + mapper.updateAuditUserInfo(add); + } + + } + /** * 提前修改审核状态 * diff --git a/bonus-modules/bonus-flowable/src/main/resources/mapper/BusinessMapper.xml b/bonus-modules/bonus-flowable/src/main/resources/mapper/BusinessMapper.xml index 7725c42..adc57f0 100644 --- a/bonus-modules/bonus-flowable/src/main/resources/mapper/BusinessMapper.xml +++ b/bonus-modules/bonus-flowable/src/main/resources/mapper/BusinessMapper.xml @@ -186,6 +186,9 @@ delete from nxdt_ii.pt_check_person_remark where task_id = #{taskId} and audit_status=2 + + delete from nxdt_ii.lk_audit_user_info where task_id = #{taskId} + insert into nxdt_ii.pt_check_person(task_id, user_id,exam_type,type,sort,version) @@ -408,6 +411,34 @@ task_id, user_id,type,version,audit_status,remark,audit_time,audit_remark )values (#{taskId},#{userId},#{type},#{vision},#{agree},#{rejectReason},now(),#{reason}) + + replace into nxdt_ii.lk_audit_user_info( + task_id,audit_user + + ,audit_status + + + ,is_audit + + ,version + + ,is_now + + ) values + (#{taskId}, + #{userId} + + ,#{state} + + + ,#{isAudit} + + , #{version} + + ,#{isNow} + + ) + select distinct a.id ,a.task_id as taskId,a.user_id as userId,a.exam_type as examineType, @@ -862,5 +899,30 @@ where pcp.type=2 and pcp.task_id = #{taskId} + + + + diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/AdmissionRequestServiceImpl.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/AdmissionRequestServiceImpl.java index 8812777..8136247 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/AdmissionRequestServiceImpl.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/AdmissionRequestServiceImpl.java @@ -108,7 +108,7 @@ public class AdmissionRequestServiceImpl implements AdmissionRequestService { RequestEntity entity = new RequestEntity(); //数据查询 Map checkMaps= Maps.newHashMap(); - if("1".equals(bean.getStatus()) || "2".equals(bean.getStatus())){ + if("1".equals(bean.getStatus())){ entity.setUserId(String.valueOf(SecurityUtils.getLoginUser().getUserid())); AjaxResult ajaxResult = flowTaskService.getStayFlow(entity); if (ajaxResult.isSuccess()) { @@ -127,9 +127,6 @@ public class AdmissionRequestServiceImpl implements AdmissionRequestService { PageUtils.startPage(); List list = arMapper.getContPersonByProIdAndOtherId(bean); list.forEach(data->{ - if ("2".equals(data.getIntoStatus())) { - data.setIntoStatus("1"); - } if("1".equals(data.getStatus()) && bean.getDataType()==1){ data.setFinalCheck(checkMaps.get(data.getProcInsId())); } @@ -393,7 +390,7 @@ public class AdmissionRequestServiceImpl implements AdmissionRequestService { RequestEntity entity = new RequestEntity(); //数据查询 Map checkMaps= Maps.newHashMap(); - if("1".equals(bean.getStatus()) || "2".equals(bean.getStatus())){ + if("1".equals(bean.getStatus())){ entity.setUserId(String.valueOf(SecurityUtils.getLoginUser().getUserid())); AjaxResult ajaxResult = flowTaskService.getStayFlow(entity); if (ajaxResult.isSuccess()) { @@ -412,9 +409,6 @@ public class AdmissionRequestServiceImpl implements AdmissionRequestService { PageUtils.startPage(); List list = arMapper.listEntranceOfPersonnel(bean); list.forEach(data->{ - if ("2".equals(data.getIntoStatus())) { - data.setIntoStatus("1"); - } if("1".equals(data.getStatus()) && bean.getDataType()==1){ data.setFinalCheck(checkMaps.get(data.getProcInsId())); } diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ConsApprovalServiceImpl.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ConsApprovalServiceImpl.java index 39a2b21..a925e29 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ConsApprovalServiceImpl.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ConsApprovalServiceImpl.java @@ -49,7 +49,7 @@ public class ConsApprovalServiceImpl implements ConsApprovalService { RequestEntity entity = new RequestEntity(); //数据查询 Map checkMaps= Maps.newHashMap(); - if("1".equals(bean.getStatus()) || "2".equals(bean.getStatus())){ + if("1".equals(bean.getStatus())){ entity.setUserId(String.valueOf(SecurityUtils.getLoginUser().getUserid())); AjaxResult ajaxResult = flowTaskService.getStayFlow(entity); if (ajaxResult.isSuccess()) { @@ -69,9 +69,9 @@ public class ConsApprovalServiceImpl implements ConsApprovalService { PageUtils.startPage(); List list = mapper.getConsEntranceList(bean); list.forEach(data->{ - if ("2".equals(data.getIntoStatus())) { - data.setIntoStatus("1"); - } +// if ("2".equals(data.getIntoStatus())) { +// data.setIntoStatus("1"); +// } if("1".equals(data.getStatus()) && bean.getDataType()==1){ data.setFinalCheck(checkMaps.get(data.getProcInsId())); } diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ContEntryExitServiceImpl.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ContEntryExitServiceImpl.java index 4901ff2..1261a15 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ContEntryExitServiceImpl.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ContEntryExitServiceImpl.java @@ -78,7 +78,7 @@ public class ContEntryExitServiceImpl implements ContEntryExitService { RequestEntity entity = new RequestEntity(); //数据查询 Map checkMaps= Maps.newHashMap(); - if("1".equals(bean.getStatus()) || "2".equals(bean.getStatus())){ + if("1".equals(bean.getStatus()) ){ entity.setUserId(String.valueOf(SecurityUtils.getLoginUser().getUserid())); AjaxResult ajaxResult = flowTaskService.getStayFlow(entity); if (ajaxResult.isSuccess()) { @@ -98,9 +98,6 @@ public class ContEntryExitServiceImpl implements ContEntryExitService { PageUtils.startPage(); List list = ceMapper.listCommencementApproval(bean); list.forEach(data->{ - if ("2".equals(data.getIntoStatus())) { - data.setIntoStatus("1"); - } if("1".equals(data.getStatus()) && bean.getDataType()==1){ data.setFinalCheck(checkMaps.get(data.getProcInsId())); } @@ -218,7 +215,7 @@ public class ContEntryExitServiceImpl implements ContEntryExitService { RequestEntity entity = new RequestEntity(); //数据查询 Map checkMaps= Maps.newHashMap(); - if("1".equals(bean.getStatus()) || "2".equals(bean.getStatus())){ + if("1".equals(bean.getStatus()) ){ entity.setUserId(String.valueOf(SecurityUtils.getLoginUser().getUserid())); AjaxResult ajaxResult = flowTaskService.getStayFlow(entity); if (ajaxResult.isSuccess()) { @@ -237,9 +234,7 @@ public class ContEntryExitServiceImpl implements ContEntryExitService { PageUtils.startPage(); List list = ceMapper.listCompleteApproval(bean); list.forEach(data->{ - if ("2".equals(data.getIntoStatus())) { - data.setIntoStatus("1"); - } + if("1".equals(data.getStatus()) && bean.getDataType()==1){ data.setFinalCheck(checkMaps.get(data.getProcInsId())); } diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/EngineeringEquipmentBindServiceImpl.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/EngineeringEquipmentBindServiceImpl.java index adc4a3f..c25adc4 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/EngineeringEquipmentBindServiceImpl.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/EngineeringEquipmentBindServiceImpl.java @@ -82,7 +82,7 @@ public class EngineeringEquipmentBindServiceImpl implements EngineeringEquipment RequestEntity entity = new RequestEntity(); //数据查询 Map checkMaps= Maps.newHashMap(); - if("1".equals(bean.getStatus()) || "2".equals(bean.getStatus())){ + if("1".equals(bean.getStatus()) ){ entity.setUserId(String.valueOf(SecurityUtils.getLoginUser().getUserid())); AjaxResult ajaxResult = flowTaskService.getStayFlow(entity); if (ajaxResult.isSuccess()) { @@ -101,9 +101,7 @@ public class EngineeringEquipmentBindServiceImpl implements EngineeringEquipment PageUtils.startPage(); List list = mapper.listConstructionMaterial(bean); list.forEach(data->{ - if ("2".equals(data.getIntoStatus())) { - data.setIntoStatus("1"); - } + if("1".equals(data.getStatus()) && bean.getDataType()==1){ data.setFinalCheck(checkMaps.get(data.getProcInsId())); } diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/EquipServiceImpl.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/EquipServiceImpl.java index abe9779..57402c7 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/EquipServiceImpl.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/EquipServiceImpl.java @@ -55,7 +55,7 @@ public class EquipServiceImpl implements EquipService { RequestEntity entity = new RequestEntity(); //数据查询 Map checkMaps= Maps.newHashMap(); - if("1".equals(bean.getStatus()) || "2".equals(bean.getStatus())){ + if("1".equals(bean.getStatus())){ entity.setUserId(String.valueOf(SecurityUtils.getLoginUser().getUserid())); AjaxResult ajaxResult = flowTaskService.getStayFlow(entity); if (ajaxResult.isSuccess()) { @@ -74,9 +74,7 @@ public class EquipServiceImpl implements EquipService { PageUtils.startPage(); List list = mapper.selectEquipList(bean); list.forEach(data->{ - if ("2".equals(data.getIntoStatus())) { - data.setIntoStatus("1"); - } + if("1".equals(data.getStatus()) && bean.getDataType()==1){ data.setFinalCheck(checkMaps.get(data.getProcInsId())); } @@ -195,7 +193,7 @@ public class EquipServiceImpl implements EquipService { RequestEntity entity = new RequestEntity(); //数据查询 Map checkMaps= Maps.newHashMap(); - if("1".equals(bean.getStatus()) || "2".equals(bean.getStatus())){ + if("1".equals(bean.getStatus()) ){ entity.setUserId(String.valueOf(SecurityUtils.getLoginUser().getUserid())); AjaxResult ajaxResult = flowTaskService.getStayFlow(entity); if (ajaxResult.isSuccess()) { @@ -214,9 +212,7 @@ public class EquipServiceImpl implements EquipService { PageUtils.startPage(); List list = mapper.entryOfUtensilsList(bean); list.forEach(data->{ - if ("2".equals(data.getIntoStatus())) { - data.setIntoStatus("1"); - } + if("1".equals(data.getStatus()) && bean.getDataType()==1){ data.setFinalCheck(checkMaps.get(data.getProcInsId())); } diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/MaterialServiceImpl.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/MaterialServiceImpl.java index 7cdbbf3..71bcc3d 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/MaterialServiceImpl.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/MaterialServiceImpl.java @@ -59,7 +59,7 @@ public class MaterialServiceImpl implements MaterialService { RequestEntity entity = new RequestEntity(); //数据查询 Map checkMaps= Maps.newHashMap(); - if("1".equals(bean.getStatus()) || "2".equals(bean.getStatus())){ + if("1".equals(bean.getStatus()) ){ entity.setUserId(String.valueOf(SecurityUtils.getLoginUser().getUserid())); AjaxResult ajaxResult = flowTaskService.getStayFlow(entity); if (ajaxResult.isSuccess()) { @@ -78,9 +78,7 @@ public class MaterialServiceImpl implements MaterialService { PageUtils.startPage(); List list = mapper.getEnterFileList(bean); list.forEach(data->{ - if ("2".equals(data.getIntoStatus())) { - data.setIntoStatus("1"); - } + if("1".equals(data.getStatus()) && bean.getDataType()==1){ data.setFinalCheck(checkMaps.get(data.getProcInsId())); } diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SecurityCheckServiceImpl.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SecurityCheckServiceImpl.java index b873077..89d5b89 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SecurityCheckServiceImpl.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SecurityCheckServiceImpl.java @@ -404,7 +404,7 @@ public class SecurityCheckServiceImpl implements SecurityCheckService { RequestEntity entity = new RequestEntity(); //数据查询 Map checkMaps= Maps.newHashMap(); - if("1".equals(dto.getStatus()) || "2".equals(dto.getStatus())){ + if("1".equals(dto.getStatus())){ entity.setUserId(String.valueOf(SecurityUtils.getLoginUser().getUserid())); AjaxResult ajaxResult = flowTaskService.getStayFlow(entity); if (ajaxResult.isSuccess()) { @@ -423,9 +423,7 @@ public class SecurityCheckServiceImpl implements SecurityCheckService { PageUtils.startPage(); List list = mapper.getHiddenDangerRectificationList(dto); list.forEach(data->{ - if ("2".equals(data.getIntoStatus())) { - data.setIntoStatus("1"); - } + if("1".equals(data.getStatus()) && dto.getDataType()==1){ data.setFinalCheck(checkMaps.get(data.getProcInsId())); } @@ -516,7 +514,7 @@ public class SecurityCheckServiceImpl implements SecurityCheckService { RequestEntity entity = new RequestEntity(); //数据查询 Map checkMaps= Maps.newHashMap(); - if("1".equals(dto.getStatus()) || "2".equals(dto.getStatus())){ + if("1".equals(dto.getStatus())){ entity.setUserId(String.valueOf(SecurityUtils.getLoginUser().getUserid())); AjaxResult ajaxResult = flowTaskService.getStayFlow(entity); if (ajaxResult.isSuccess()) { @@ -535,9 +533,7 @@ public class SecurityCheckServiceImpl implements SecurityCheckService { PageUtils.startPage(); List list = mapper.getHiddenDangerRectificationApprovalList(dto); list.forEach(data->{ - if ("2".equals(data.getIntoStatus())) { - data.setIntoStatus("1"); - } + if("1".equals(data.getStatus()) && dto.getDataType()==1){ data.setFinalCheck(checkMaps.get(data.getProcInsId())); } @@ -715,7 +711,7 @@ public class SecurityCheckServiceImpl implements SecurityCheckService { RequestEntity entity = new RequestEntity(); //数据查询 Map checkMaps= Maps.newHashMap(); - if("1".equals(dto.getStatus()) || "2".equals(dto.getStatus())){ + if("1".equals(dto.getStatus()) ){ entity.setUserId(String.valueOf(SecurityUtils.getLoginUser().getUserid())); AjaxResult ajaxResult = flowTaskService.getStayFlow(entity); if (ajaxResult.isSuccess()) { @@ -734,9 +730,7 @@ public class SecurityCheckServiceImpl implements SecurityCheckService { PageUtils.startPage(); List list = mapper.getReviewOfDeferredApprovalList(dto); list.forEach(data->{ - if ("2".equals(data.getIntoStatus())) { - data.setIntoStatus("1"); - } + if("1".equals(data.getStatus()) && dto.getDataType()==1){ data.setFinalCheck(checkMaps.get(data.getProcInsId())); } diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SubEntryExitServiceImpl.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SubEntryExitServiceImpl.java index 2be1f2b..40962ec 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SubEntryExitServiceImpl.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SubEntryExitServiceImpl.java @@ -47,7 +47,7 @@ public class SubEntryExitServiceImpl implements SubEntryExitService { RequestEntity entity = new RequestEntity(); //数据查询 Map checkMaps= Maps.newHashMap(); - if("1".equals(bean.getStatus()) || "2".equals(bean.getStatus())){ + if("1".equals(bean.getStatus()) ){ entity.setUserId(String.valueOf(SecurityUtils.getLoginUser().getUserid())); AjaxResult ajaxResult = flowTaskService.getStayFlow(entity); if (ajaxResult.isSuccess()) { @@ -66,9 +66,7 @@ public class SubEntryExitServiceImpl implements SubEntryExitService { PageUtils.startPage(); List list = seMapper.listSubEntry(bean); list.forEach(data->{ - if ("2".equals(data.getIntoStatus())) { - data.setIntoStatus("1"); - } + if("1".equals(data.getStatus()) && bean.getDataType()==1){ data.setFinalCheck(checkMaps.get(data.getProcInsId())); } @@ -106,7 +104,7 @@ public class SubEntryExitServiceImpl implements SubEntryExitService { RequestEntity entity = new RequestEntity(); //数据查询 Map checkMaps= Maps.newHashMap(); - if("1".equals(bean.getStatus()) || "2".equals(bean.getStatus())){ + if("1".equals(bean.getStatus()) ){ entity.setUserId(String.valueOf(SecurityUtils.getLoginUser().getUserid())); AjaxResult ajaxResult = flowTaskService.getStayFlow(entity); if (ajaxResult.isSuccess()) { @@ -125,9 +123,7 @@ public class SubEntryExitServiceImpl implements SubEntryExitService { PageUtils.startPage(); List list = seMapper.listSubExit(bean); list.forEach(data->{ - if ("2".equals(data.getIntoStatus())) { - data.setIntoStatus("1"); - } + if("1".equals(data.getStatus()) && bean.getDataType()==1){ data.setFinalCheck(checkMaps.get(data.getProcInsId())); } diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SubServiceImpl.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SubServiceImpl.java index 0b8c018..94270f0 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SubServiceImpl.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SubServiceImpl.java @@ -162,7 +162,7 @@ public class SubServiceImpl implements SubService { RequestEntity entity = new RequestEntity(); //数据查询 Map checkMaps= Maps.newHashMap(); - if("1".equals(bean.getStatus()) || "2".equals(bean.getStatus())){ + if("1".equals(bean.getStatus())){ entity.setUserId(String.valueOf(SecurityUtils.getLoginUser().getUserid())); AjaxResult ajaxResult = flowTaskService.getStayFlow(entity); if (ajaxResult.isSuccess()) { @@ -181,9 +181,7 @@ public class SubServiceImpl implements SubService { PageUtils.startPage(); List list = mapper.enterPersonList(bean); list.forEach(data->{ - if ("2".equals(data.getIntoStatus())) { - data.setIntoStatus("1"); - } + if("1".equals(data.getStatus()) && bean.getDataType()==1){ data.setFinalCheck(checkMaps.get(data.getProcInsId())); } diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SupervisionUnitServiceImpl.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SupervisionUnitServiceImpl.java index 6faf6d2..d6ffdf9 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SupervisionUnitServiceImpl.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SupervisionUnitServiceImpl.java @@ -129,7 +129,7 @@ public class SupervisionUnitServiceImpl implements SupervisionUnitService { RequestEntity entity = new RequestEntity(); //数据查询 Map checkMaps= Maps.newHashMap(); - if("1".equals(bean.getStatus()) || "2".equals(bean.getStatus())){ + if("1".equals(bean.getStatus()) ){ entity.setUserId(String.valueOf(SecurityUtils.getLoginUser().getUserid())); AjaxResult ajaxResult = flowTaskService.getStayFlow(entity); if (ajaxResult.isSuccess()) { @@ -148,9 +148,7 @@ public class SupervisionUnitServiceImpl implements SupervisionUnitService { PageUtils.startPage(); List list = suMapper.listSupEntry(bean); list.forEach(data->{ - if ("2".equals(data.getIntoStatus())) { - data.setIntoStatus("1"); - } + if("1".equals(data.getStatus()) && bean.getDataType()==1){ data.setFinalCheck(checkMaps.get(data.getProcInsId())); } diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ViolationManagementServiceImpl.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ViolationManagementServiceImpl.java index a34a37e..71f0afc 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ViolationManagementServiceImpl.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ViolationManagementServiceImpl.java @@ -151,7 +151,7 @@ public class ViolationManagementServiceImpl implements ViolationManagementServic RequestEntity entity = new RequestEntity(); //数据查询 Map checkMaps= Maps.newHashMap(); - if("1".equals(dto.getStatus()) || "2".equals(dto.getStatus())){ + if("1".equals(dto.getStatus()) ){ entity.setUserId(String.valueOf(SecurityUtils.getLoginUser().getUserid())); AjaxResult ajaxResult = flowTaskService.getStayFlow(entity); if (ajaxResult.isSuccess()) { @@ -170,9 +170,6 @@ public class ViolationManagementServiceImpl implements ViolationManagementServic PageUtils.startPage(); List list = mapper.getViolationPunishApprovalList(dto); list.forEach(data->{ - if ("2".equals(data.getIntoStatus())) { - data.setIntoStatus("1"); - } if("1".equals(data.getStatus()) && dto.getDataType()==1){ data.setFinalCheck(checkMaps.get(data.getProcInsId())); } diff --git a/bonus-modules/bonus-project/src/main/resources/mapper/system/ConsApprovalMapper.xml b/bonus-modules/bonus-project/src/main/resources/mapper/system/ConsApprovalMapper.xml index 97af13a..bc96fca 100644 --- a/bonus-modules/bonus-project/src/main/resources/mapper/system/ConsApprovalMapper.xml +++ b/bonus-modules/bonus-project/src/main/resources/mapper/system/ConsApprovalMapper.xml @@ -78,9 +78,7 @@ ) - - - +