From 870c277a9eab08333730ac2b7becfb42d17ad7b1 Mon Sep 17 00:00:00 2001 From: haozq <1611483981@qq.com> Date: Fri, 28 Feb 2025 12:28:17 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/domain/RequestEntity.java | 2 + .../bonus/flowable/entity/CheckComment.java | 15 +++++ .../bonus/flowable/mapper/BusinessMapper.java | 7 +++ .../service/impl/BusinessServiceImpl.java | 58 ++++++++++++++++++- .../main/resources/mapper/BusinessMapper.xml | 20 ++++++- .../mapper/system/AdmissionRequestMapper.xml | 3 +- 6 files changed, 99 insertions(+), 6 deletions(-) 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 7c13fbc..68cc7e4 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 @@ -87,6 +87,8 @@ public class RequestEntity implements Serializable { */ private String sort; + private String dataType; + diff --git a/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/entity/CheckComment.java b/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/entity/CheckComment.java index 2e16051..4765fb3 100644 --- a/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/entity/CheckComment.java +++ b/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/entity/CheckComment.java @@ -12,16 +12,31 @@ import javax.naming.ldap.PagedResultsControl; public class CheckComment { private String id; + private String userId; + private String name; + private String section; + private String turnDownReason; + private String reason; + private String time; + private String taskId; + private String status; + private String examType; + private String sort; + private Integer agree; + private String version; + + private String auditStatus; + } 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 dfbc4c8..6ef2e94 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 @@ -498,4 +498,11 @@ public interface BusinessMapper { void deleteCheckRemark(String taskId); List checkHistory(RequestEntity entity); + + /** + * 查询树结构数据 + * @param entity + * @return + */ + List getTreeList(RequestEntity entity); } 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 4771bef..3c7e29e 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 @@ -18,6 +18,7 @@ import com.bonus.flowable.service.BusinessService; import com.bonus.system.api.RemoteUserService; import com.bonus.system.api.domain.SysUser; import com.bonus.system.api.model.LoginUser; +import liquibase.pro.packaged.C; import liquibase.pro.packaged.E; import liquibase.pro.packaged.M; import liquibase.pro.packaged.S; @@ -52,7 +53,7 @@ public class BusinessServiceImpl implements BusinessService { @Override public AjaxResult submitApproval(AuditTask auditTask) { String taskId = null; - if (StringUtils.isBlank(auditTask.getTaskId())) { + if (StringUtils.isNotEmpty(auditTask.getTaskId())) { //任务id taskId = auditTask.getTaskId(); } @@ -826,6 +827,7 @@ public class BusinessServiceImpl implements BusinessService { for (int i = 0; i < stringArray.length; i++) { ConfigurationVo newBean = new ConfigurationVo(); newBean.setId(bean.getId()); + newBean.setAuditStatus(bean.getAuditStatus()); newBean.setExamineId(bean.getExamineId()); newBean.setTaskId(bean.getTaskId()); newBean.setNodeName(bean.getNodeName()); @@ -960,7 +962,59 @@ public class BusinessServiceImpl implements BusinessService { @Override public List checkHistory(RequestEntity entity) { - return mapper.checkHistory(entity); + List list=new ArrayList<>(); + try{ + List treeList=mapper.getTreeList(entity); + RequestEntity re=new RequestEntity(); + re.setTaskId(entity.getTaskId()); + for (CheckComment vo:treeList){ + re.setVision(vo.getVersion()); + String userId=vo.getUserId(); + List userIds=Arrays.asList(userId.split(",")); + //审核通过的 + if("1".equals(vo.getAuditStatus())){ + if("2".equals(vo.getExamType())){ + re.setVision(vo.getVersion()); + re.setDataType("5"); + for (String id:userIds){ + if(StringUtils.isNotEmpty(id)){ + re.setUserId(id); + List childList=mapper.checkHistory(re); + if(StringUtils.isNotEmpty(childList)){ + list.addAll(childList); + } + + } + } + }else{ + for (String id:userIds){ + if(StringUtils.isNotEmpty(id)){ + re.setUserId(id); + re.setDataType(""); + List childList=mapper.checkHistory(re); + if(StringUtils.isNotEmpty(childList)){ + list.addAll(childList); + } + } + } + } + }else{ + for (String id:userIds){ + if(StringUtils.isNotEmpty(id)){ + re.setUserId(id); + re.setDataType(""); + List childList=mapper.checkHistory(re); + if(StringUtils.isNotEmpty(childList)){ + list.addAll(childList); + } + } + } + } + } + }catch (Exception e){ + log.error(e.toString(),e); + } + return list; } @Override 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 0ace9fb..7725c42 100644 --- a/bonus-modules/bonus-flowable/src/main/resources/mapper/BusinessMapper.xml +++ b/bonus-modules/bonus-flowable/src/main/resources/mapper/BusinessMapper.xml @@ -840,11 +840,27 @@ LEFT JOIN nxdt_ii.pt_check_person_remark pcpr ON pcp.task_id = pcpr.task_id AND pcp.user_id = pcpr.user_id AND pcp.version = pcpr.version + and pcp.type=pcpr.type LEFT JOIN nxdt_ii.sys_user su ON pcp.user_id = su.user_id LEFT JOIN nxdt_ii.sys_dept sd ON su.dept_id = sd.dept_id WHERE - pcp.task_id = #{taskId} - AND pcp.type = 1 + pcp.task_id = #{taskId} AND pcp.type = 1 + + and pcp.user_id=#{userId} and pcp.version=#{vision} + + + and pcpr.audit_status is not null + + + diff --git a/bonus-modules/bonus-project/src/main/resources/mapper/system/AdmissionRequestMapper.xml b/bonus-modules/bonus-project/src/main/resources/mapper/system/AdmissionRequestMapper.xml index c5d3776..1033f9e 100644 --- a/bonus-modules/bonus-project/src/main/resources/mapper/system/AdmissionRequestMapper.xml +++ b/bonus-modules/bonus-project/src/main/resources/mapper/system/AdmissionRequestMapper.xml @@ -344,11 +344,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" lk_cont_person lkc LEFT JOIN pt_cons_person pcp ON lkc.cons_persion_id = pcp.cons_user_id - AND pcp.is_active = '1' left join sys_dict_data sdd on sdd.dict_value = pcp.post and sdd.dict_type = 'sys_cons_post' and sdd.status = '0' WHERE - lkc.into_status = '3' and lkc.out_status = '0' + lkc.into_status = '3' and lkc.out_status = '0' AND pcp.is_active = '1' and lkc.pro_id = #{bean.proId}