From 000e85a0350be469b6743dfbab6244ccb0d5586a Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Tue, 18 Oct 2022 14:12:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=B8=AD=E5=BF=83=E5=BC=80?= =?UTF-8?q?=E5=8F=91-=E5=BE=85=E5=8A=9E=E5=88=97=E8=A1=A8=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_third_record.sql | 4 + .../ProjectLawsInventoryEOServiceImpl.java | 31 +++--- .../entity/ProcessInfoDetailEO.java | 6 ++ .../todoCenter/entity/ProcessInfoEO.java | 6 ++ .../mapper/ProcessInfoEOMapper.java | 4 +- .../mapper/xml/ProcessInfoEOMapper.xml | 102 ++++++++++++++++++ .../impl/ProcessInfoEOServiceImpl.java | 8 +- 7 files changed, 142 insertions(+), 19 deletions(-) diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index 5a2d069a1..b14b0fb2a 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -1218,3 +1218,7 @@ CREATE TABLE `laws_weilai`.`process_info_detail` ( `flow_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '流程类型', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '流程信息明细表' ROW_FORMAT = Dynamic; + +-- 待办中心 流程信息明细表 增加字段 2022-10-18 未同步生产环境 +ALTER TABLE `laws_weilai`.`process_info_detail` + ADD COLUMN `end_time` datetime NULL COMMENT '截止时间' AFTER `flow_type`; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 11cf2a288..483262b5e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -1393,6 +1393,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); if(StringUtils.isNotEmpty(ids)){ @@ -1404,9 +1410,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl userIdList = new ArrayList<>(); List processInfoDetailEOList = new ArrayList<>(); for (ProjectLawsInventoryEO projectLawsInventoryEO : projectLawsInventoryEOS) { - List tempUserIdList = new ArrayList<>(); - - //tempUserIdList 未发起或拒绝 可以发起清单确认 + //未发起或拒绝 可以发起清单确认 boolean checkStatus = (StringUtils.equals(projectLawsInventoryEO.getInventoryAffirmStatus(),InventoryAffirmStatusEnum.NOT_STARTED.getValue()) ||StringUtils.equals(projectLawsInventoryEO.getInventoryAffirmStatus(),InventoryAffirmStatusEnum.REJECTED.getValue())); //如果该数据的法规工程师、认证工程师都不为空 @@ -1436,6 +1440,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl processInfoQueryWrap = new QueryWrapper<>(); @@ -8643,13 +8649,6 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl processInfoDetailEOList){ + public void addProcessInfoDetail(String processInfoId,List processInfoDetailEOList,Date endTime){ LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); processInfoDetailEOList.forEach(detail -> { @@ -8691,6 +8691,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl { IPage queryPageList(IPage page,Map params); + + IPage queryProjectProcessTodoTaskListList(IPage page,Map params); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml index 505eacf15..a1f4e52dc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml @@ -85,5 +85,107 @@ left join project_laws_inventory pli on pi.project_laws_inventory_id = pli.id LEFT JOIN sys_user createBy on createBy.id = pi.create_by + order by pi.create_time desc + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java index 4bd2d95bd..92b05bd5e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java @@ -150,13 +150,17 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl flowTypeList = new ArrayList<>(); - this.setFlowTypeList(flowTypeList); + flowTypeList.add(FlowTypeEnum.RWQRLC.getValue()); + flowTypeList.add(FlowTypeEnum.SJFHXSHLC.getValue()); + flowTypeList.add(FlowTypeEnum.YZFHXSCLC.getValue()); + flowTypeList.add(FlowTypeEnum.PREHOMOQRLC.getValue()); params.put("flowTypeList",flowTypeList); params.put("taskStatus", TaskStatusEnum.NOT_DONE.getValue()); params.put("currentUserId",currentUser.getId()); + params.put("qdqrFlowTypeValue",FlowTypeEnum.QDQR.getValue()); IPage page = new Page(pageNo, pageSize); - IPage result = this.baseMapper.queryPageList(page,params); + IPage result = this.baseMapper.queryProjectProcessTodoTaskListList(page,params); this.disposeData(result.getRecords(),cut); return result; }