diff --git a/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/domain/RequestEntity.java b/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/domain/RequestEntity.java index bd5f58e..7c13fbc 100644 --- a/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/domain/RequestEntity.java +++ b/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/domain/RequestEntity.java @@ -70,4 +70,24 @@ public class RequestEntity implements Serializable { private String taskType; private String reasonForWithdrawal; private String checkType = "1"; + /** + * 类型 + */ + private String type; + /** + * 版本 + */ + private String vision; + /** + * 审核类型 + */ + private String examType; + /** + * 排序 + */ + private String sort; + + + + } 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 94b9bac..9a97e8a 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 @@ -1,6 +1,7 @@ package com.bonus.flowable.mapper; import com.bonus.common.core.domain.BaseBean; +import com.bonus.common.core.domain.RequestEntity; import com.bonus.common.safetycheck.NewHiddenDangerDto; import com.bonus.common.safetycheck.SecurityCheckDto; import com.bonus.flowable.entity.*; @@ -461,4 +462,31 @@ public interface BusinessMapper { * @return */ List getUserPhone(@Param("list") List userList); + + /** + * 查询监理人员id + * @param supUuid + * @return + */ + List getJlUserList(@Param("uuid") String supUuid); + + /** + * 插入人员审核信息表 + * @param entity + */ + void addCheckPersonRemark(RequestEntity entity); + + /** + * 查询信息 + * @param entity + * @return + */ + List getRequestData(RequestEntity entity); + + /** + * 查询是否审核的数据 + * @param params + * @return + */ + Integer getAuditRemark(RequestEntity params); } 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 e506cf2..65c8938 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 @@ -454,13 +454,17 @@ public class BusinessServiceImpl implements BusinessService { if (StringUtils.isNotEmpty(auditTask.getSubUuid())) { auditTask.setSubUuid(auditTask.getSubUuid()); } - + List userList=new ArrayList<>(); if (StringUtils.isNotEmpty(auditTask.getSupUuid())) { auditTask.setSupUuid(auditTask.getSupUuid()); + List jlList=mapper.getJlUserList(auditTask.getSupUuid()); + if(jlList!=null && !jlList.isEmpty()){ + userList.addAll(jlList); + } } auditTask.setExamineId(newExamineId); auditTask.setExamineType(examineType); - addCheckPerson(auditTask,null); + addCheckPerson(auditTask,userList); return startFlowAble(auditTask, finalList, userId, taskId, ProcessConstants.OWNER, newFinalJudgment , newExamineId, newSort, newProcessKey, iaAdd,"1",version); }else{ 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 6198d39..9f4ef9a 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 @@ -12,6 +12,7 @@ import com.bonus.flowable.flow.FlowableUtils; import com.bonus.flowable.mapper.BusinessMapper; import com.bonus.flowable.service.BusinessService; import com.bonus.flowable.service.FlowTaskService; +import liquibase.pro.packaged.S; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.flowable.bpmn.model.Process; @@ -547,6 +548,8 @@ public class FlowTaskUtils extends FlowServiceFactory { if (variables == null) { variables = new HashMap<>(); } + + // Task task = taskService.createTaskQuery().taskId(taskId).singleResult(); Task task = taskService.createTaskQuery() .processInstanceId(procInsId) @@ -631,12 +634,60 @@ public class FlowTaskUtils extends FlowServiceFactory { } else { businessService.addComment(taskId, procInsId, userId, opinions, agree, reject); } - - + // + RequestEntity params=new RequestEntity(); + params.setTaskId(entity.getTaskId()); + params.setType("1"); + params.setUserId(entity.getUserId()); + List queryList=mapper.getRequestData(params); + RequestEntity query=queryList.get(0); + //审核状态 + query.setAgree(entity.getAgree()); + //审核意见 + query.setRejectReason(entity.getRejectReason()); + //审核人的审核信息查询 + mapper.addCheckPersonRemark(query); + //审核流程节点 + params.setType("2"); + params.setUserId(","+entity.getUserId()+","); + params.setVision(query.getVision()); + List queryList2=mapper.getRequestData(params); + RequestEntity query2=queryList2.get(0); + if("1".equals(agree)){ + String auditUser=query2.getUserId(); + List userList=Arrays.asList(auditUser.split(",")); + //多人审核 并且不是 或签的 + if(userList.size()>1 && !"2".equals(query2.getExamType()) ){ + boolean isNext=true; + for (String otherId:userList){ + if(!otherId.equals(entity.getUserId())){ + query.setType("1"); + query.setUserId(otherId); + Integer num=mapper.getAuditRemark(query); + if(num==null || num==0){ + isNext=false; + } + } + } + if(isNext){ + query2.setAgree(entity.getAgree()); + query2.setRejectReason(entity.getRejectReason()); + mapper.addCheckPersonRemark(query2); + } + }else{ + query2.setAgree(entity.getAgree()); + query2.setRejectReason(entity.getRejectReason()); + mapper.addCheckPersonRemark(query2); + } + //不通过直接记录不通过即可 + }else if("2".equals(agree) || "3".equals(agree)){ + query2.setAgree(entity.getAgree()); + query2.setRejectReason(entity.getRejectReason()); + mapper.addCheckPersonRemark(query2); + } // } return AjaxResult.success(); } - /** * 提前修改审核状态 * 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 28eafbd..94d0283 100644 --- a/bonus-modules/bonus-flowable/src/main/resources/mapper/BusinessMapper.xml +++ b/bonus-modules/bonus-flowable/src/main/resources/mapper/BusinessMapper.xml @@ -399,6 +399,13 @@ insert into nxdt_ii.pt_check_comment(task_id, proc_inst_id, user_id, comment, agree, reject) values (#{taskId}, #{processInstanceId}, #{userId}, #{comment}, #{agree}, #{rejectReason}) + + + replace into nxdt_ii.pt_check_person_remark( + task_id, user_id,type,version,audit_status,remark,audit_time + )values (#{taskId},#{userId},#{type},#{vision},#{agree},#{rejectReason},now()) + + + + + diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ImportServiceImpl.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ImportServiceImpl.java index 5512d01..5ab410a 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ImportServiceImpl.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ImportServiceImpl.java @@ -117,6 +117,7 @@ public class ImportServiceImpl implements ImportService { } result = AjaxResult.success("导入成功"); } catch (Exception e) { + log.error(e.toString(),e); throw new RuntimeException("导入失败：" + e); } return result;