合并分支 'dev_2nd_LCYH' 到 'master'

Dev 2nd lcyh

查看合并请求 laws-nio/laws-weilai!309

jero-boot/db/蔚来标准sql/dev_2nd_period.sql

@@ -619,4 +619,6 @@ INSERT INTO `sys_dict_item`(`id`, `dict_id`, `item_text`, `item_value`, `descrip
 INSERT INTO `sys_dict_item`(`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('1646033251040337922', '1646032917672861697', '地标', 'dfbc363b6e2d4d9c97664aeb6731767e', NULL, 3, 1, 'admin', '2023-04-12 14:11:24', NULL, NULL, 1, NULL, NULL, '0', 'Landmark');
 INSERT INTO `sys_dict_item`(`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('1646033351942709250', '1646032917672861697', '其他', '17a3731e5a374d8ba3909cca2464a8eb', NULL, 4, 1, 'admin', '2023-04-12 14:11:48', NULL, NULL, 1, NULL, NULL, '0', 'Other');
 
-
+-- 市场认证清单 增加字段  2023-04-17  未同步生产环境
+ALTER TABLE `auth_dummy_inventory_info`
+    ADD COLUMN `attestation_type` varchar(2000) NULL COMMENT '认证类型' AFTER `deliverable_template`;

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java

@@ -77,6 +77,11 @@ public class AuthDummyInventoryInfoEO implements Serializable {
     @ApiModelProperty(value = "配置项")
     private java.lang.String configItem;
 
+    /**认证类型名称**/
+    @Excel(name = "认证类型", width = 20)
+    @TableField(exist = false)
+    private String attestationTypeName;
+
 	/**WVTA ID*/
 	@Excel(name = "WVTA ID", width = 15)
     @ApiModelProperty(value = "WVTA ID")
@@ -149,4 +154,8 @@ public class AuthDummyInventoryInfoEO implements Serializable {
     // 1顺序  2倒序
     @TableField(exist = false)
     private String orderBy;
+
+    /**认证类型*/
+    @ApiModelProperty(value = "认证类型")
+    private String attestationType;
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEOEn.java

@@ -74,6 +74,12 @@ public class AuthDummyInventoryInfoEOEn implements Serializable {
     @ApiModelProperty(value = "配置项")
     private String configItem;
 
+    /**认证类型*/
+    @Excel(name = "Certification Type", width = 20)
+    @ApiModelProperty(value = "认证类型")
+    @TableField(exist = false)
+    private String attestationTypeName;
+
 	/**WVTA ID*/
 	@Excel(name = "WVTA ID", width = 15)
     @ApiModelProperty(value = "WVTA ID")

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java

@@ -957,9 +957,9 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
 		if(CollectionUtils.isNotEmpty(baseList)){
 			String title = "";
 			if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEO.getCut())){
-				title = "*类别,*检验项目,*配置项,*WVTA ID,*编号,*责任领域,交付物模板,*交付物类型";
+				title = "*类别,*检验项目,*配置项,*认证类型,*WVTA ID,*编号,*责任领域,*交付物类型,交付物模板";
 			}else{
-				title = "*Category,*Inspection Items,*Configuration Item,*WVTA ID,*Number,*Responsible Field,Deliverable Template,*Deliverable Type";
+				title = "*Category,*Inspection Items,*Configuration Item,*Certification Type,*WVTA ID,*Number,*Responsible Field,*Deliverable Type,Deliverable Template";
 			}
 
 			int pos = file.getOriginalFilename().lastIndexOf(".");
@@ -1077,7 +1077,7 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
 									if (i == 0) {
 										cell.setCellType(HSSFCell.CELL_TYPE_STRING);
 										headerSb.append(cell.getStringCellValue() + ",");
-										if(j == 7){
+										if(j == 8){
 											break;
 										}
 									} else if(i > 1){
@@ -1293,6 +1293,10 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
 			//编号必填
 			flag = must(authDummyInventoryInfoEO, errorMsg, msgList, serialNumber, "编号", "Number");
 
+			// 认证类型
+			String attestationTypeName = authDummyInventoryInfoEO.getAttestationTypeName();
+
+
 
 			//类别
 			if(StringUtils.isNotBlank(category)){
@@ -1361,6 +1365,12 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
 					authDummyInventoryInfoEO.setDeliverableType(treeId);
 				}
 			}
+			if (StringUtils.isNotEmpty(attestationTypeName)) {
+				value = pullMore(dictItemList, authDummyInventoryInfoEO, errorMsg, attestationTypeName,msgList,"认证类型","Certification Type","ren4_zheng4_qing1_dan1_-_ren4_zheng4_lei4_xing2");
+				if(StringUtils.isNotBlank(value)){
+					authDummyInventoryInfoEO.setAttestationType(value);
+				}
+			}
 		}
 		return msgList;
 	}
@@ -1683,6 +1693,7 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
 			case "*类别": return "category";
 			case "*检验项目": return "inspectionItem";
 			case "*配置项": return "configItem";
+			case "*认证类型": return "attestationTypeName";
 			case "*WVTA ID": return "wvtaId";
 			case "*编号" : return "serialNumber";
 			case "*责任领域": return "dutyTerritoryName";
@@ -1692,6 +1703,7 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
 			case "*Category" : return  "Category";
 			case "*Inspection Items" : return"inspectionItem";
 			case "*Configuration Item" : return"configItem";
+			case "*Certification Type": return "attestationTypeName";
 //			case "WVTA ID" : return "wvtaId";
 			case "*Number" : return "serialNumber";
 			case "*Responsible Field" : return "dutyTerritoryName";
@@ -1778,10 +1790,10 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
 		try {
 			String title = "";
 			if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEO.getCut())){
-				title = "*类别,*检验项目,*配置项,*WVTA ID," +
+				title = "*类别,*检验项目,*配置项,*认证类型,*WVTA ID," +
 						"*编号,*责任领域,*交付物类型,交付物模板,";
 			}else{
-				title = "*Category,*Inspection Items,*Configuration Item,*WVTA ID," +
+				title = "*Category,*Inspection Items,*Configuration Item,*Certification Type,*WVTA ID," +
 						"*Number,*Responsible Field,*Deliverable Type,Deliverable Template,";
 			}
 			List<String> list = Arrays.asList(title.split(","));
@@ -1896,6 +1908,10 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
 					}).map(OSSFile::getFileName).collect(Collectors.joining(","));
 					data.setDeliverableTemplateName(deliverableTemplateName);
 				}
+				if(StringUtils.isNotEmpty(data.getAttestationType())){
+					String attestationTypeName = this.sysDictItemService.disposeShowDictItemValue(sysDictItems,data.getAttestationType(),cut, "ren4_zheng4_qing1_dan1_-_ren4_zheng4_lei4_xing2");
+					data.setAttestationTypeName(attestationTypeName);
+				}
 			}
 
 		}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java

@@ -2820,6 +2820,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 
                     if(StringUtils.isNotBlank(paramsCollectManifestVO.getProjectId())){
                         ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(paramsCollectManifestVO.getProjectId());
+                        if(ObjectUtils.isNotEmpty(projectLibraryBase)){
                             String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
                             String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
                             // 获取法规清单 - 飞书跳转链接
@@ -2843,6 +2844,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 //                        params.put("back_url_en",(String)hrefFeishuMap.get("hrefFeishu_en"));
                             feishuService.sendMessageHomoParameterCollection(TemplateInfoEnum2.HOMO_PARAMETER_COLLECTION_GREEN.getValue(),params,null);
                         }
+                    }
                 } catch (Exception e) {
                     log.error("飞书消息推送失败");
                 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java

@@ -260,4 +260,18 @@ public class ProjectRelatedPersonnelController extends JeroController<ProjectRel
 		List<Map<String,Object>> regulatoryEngineerMapList = projectRelatedPersonnelService.queryLawEngineerByProjectId(params);
 		return Result.OK(regulatoryEngineerMapList);
 	}
+
+	//engineeringInterfacePerson
+	/**
+	 * 通过projectId查询法规工程师
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "项目库-相关人员维护表-根据projectId查询工程接口人")
+	@ApiOperation(value="项目库-相关人员维护表-根据projectId查询工程接口人", notes="项目库-相关人员维护表-根据projectId查询工程接口人")
+	@GetMapping(value = "/queryEngineeringInterfacePersonByProjectId")
+	public Result<?> queryEngineeringInterfacePersonByProjectId(@RequestParam Map<String,Object> params){
+		List<Map<String,Object>> engineeringInterfacePersonMapList = projectRelatedPersonnelService.queryEngineeringInterfacePersonByProjectId(params);
+		return Result.OK(engineeringInterfacePersonMapList);
+	}
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java

@@ -80,6 +80,11 @@ public class ProjectCertificationInventoryEO implements Serializable {
     @Dict(dicCode = "ren4_zheng4_qing1_dan1_-_pei4_zhi4_xiang4")
     private String configItem;
 
+    /**认证类型名称**/
+    @Excel(name = "认证类型", width = 20)
+    @TableField(exist = false)
+    private String attestationTypeName;
+
 	/**WVTA ID*/
 	@Excel(name = "WVTA ID", width = 20)
     @ApiModelProperty(value = "WVTA ID")
@@ -183,10 +188,13 @@ public class ProjectCertificationInventoryEO implements Serializable {
     private String productionEnterpriseName;
 
 	/**认证进度*/
-
     @ApiModelProperty(value = "认证进度")
     private String certificationProgress;
 
+    // 认证进度排序字段
+    @TableField(exist = false)
+    private String certificationProgressNumber;
+
 	/**认证进度展示名称**/
     @Excel(name = "认证进度", width = 20)
 	@TableField(exist = false)
@@ -246,9 +254,4 @@ public class ProjectCertificationInventoryEO implements Serializable {
     /**认证类型*/
     @ApiModelProperty(value = "认证类型")
     private String attestationType;
-
-    /**认证类型名称**/
-    @Excel(name = "认证类型", width = 20)
-    @TableField(exist = false)
-    private String attestationTypeName;
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEOEn.java

@@ -78,6 +78,12 @@ public class ProjectCertificationInventoryEOEn implements Serializable {
     @Dict(dicCode = "ren4_zheng4_qing1_dan1_-_pei4_zhi4_xiang4")
     private java.lang.String configItem;
 
+    /**认证类型*/
+    @Excel(name = "Certification Type", width = 20)
+    @ApiModelProperty(value = "认证类型")
+    @TableField(exist = false)
+    private String attestationTypeName;
+
     /**WVTA ID*/
     @Excel(name = "WVTA ID", width = 20)
     @ApiModelProperty(value = "WVTA ID")
@@ -219,9 +225,4 @@ public class ProjectCertificationInventoryEOEn implements Serializable {
     @TableField(exist = false)
     private String endTimeStr;
 
-    /**认证类型*/
-    @Excel(name = "Certification Type", width = 20)
-    @ApiModelProperty(value = "认证类型")
-    @TableField(exist = false)
-    private String attestationTypeName;
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CertificationProgressEnum.java

@@ -7,22 +7,24 @@ import com.jero.common.constant.enums.CutEnum;
  * 认证进度枚举类
  */
 public enum CertificationProgressEnum {
-    TEST_PASSED("实验通过","Test passed"),
+    NOT_START("未开始","Not start","1"),
-    TEST_FAILED("实验失败","Test failed"),
+    IN_PROGRESS("进行中","In progress","2"),
-    NOT_START("未开始","Not start"),
+    TEST_PASSED("实验通过","Test passed","3"),
-    IN_PROGRESS("进行中","In progress"),
+    TEST_FAILED("实验失败","Test failed","4"),
 //    NA("不涉及","NA"),// 04-12弃用，
-    COMPONENT_REPORT_NOT_SUBMITTED("部件报告未提交","Component report not submitted"),
+    COMPONENT_REPORT_NOT_SUBMITTED("部件报告未提交","Component report not submitted","5"),
-    COMPONENT_REPORT_SUBMITTED("部件报告已提交","Component report submitted"),
+    COMPONENT_REPORT_SUBMITTED("部件报告已提交","Component report submitted","6"),
-    COMPONENT_REPORT_HAS_BEEN_STORED("部件报告已入库","Component report has been stored"),
+    COMPONENT_REPORT_HAS_BEEN_STORED("部件报告已入库","Component report has been stored","7"),
     ;
 
     String name;
     String value;
+    String number;
 
-    private CertificationProgressEnum(String name, String value) {
+    private CertificationProgressEnum(String name, String value,String number) {
         this.name = name;
         this.value = value;
+        this.number = number;
     }
 
     public String getName() {
@@ -41,7 +43,15 @@ public enum CertificationProgressEnum {
         this.value = value;
     }
 
-    public static String getTextByValue(String value,String cut) {
+    public String getNumber() {
+        return number;
+    }
+
+    public void setNumber(String number) {
+        this.number = number;
+    }
+
+    public static String getTextByValue(String value, String cut) {
         CertificationProgressEnum[] values = values();
         for (CertificationProgressEnum certificationProgressEnum : values) {
             if (certificationProgressEnum.value.equals(value)) {
@@ -54,4 +64,14 @@ public enum CertificationProgressEnum {
         }
         return null;
     }
+
+    public static String getNumberByValue(String value) {
+        CertificationProgressEnum[] values = values();
+        for (CertificationProgressEnum certificationProgressEnum : values) {
+            if (certificationProgressEnum.value.equals(value)) {
+                return certificationProgressEnum.number;
+            }
+        }
+        return null;
+    }
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/CertificationInventoryJob.java

@@ -70,7 +70,7 @@ public class CertificationInventoryJob implements Job {
 
                     if(CollectionUtils.isNotEmpty(projectCertificationInventoryEOS)){
                         ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
-
+                        if(ObjectUtils.isNotEmpty(projectLibraryBase)){
                             if(StringUtils.isNotEmpty(projectLibraryBase.getCertificationEngineer())){
                                 // 消息提醒 认证工程师 认证清单数据
                                 this.remindCertificationEngineer(projectCertificationInventoryEOS,projectLibraryBase);
@@ -81,6 +81,7 @@ public class CertificationInventoryJob implements Job {
                     }
                 }
             }
+        }
         log.info("认证清单，定时任务结束 =====================================================");
     }
 
@@ -210,20 +211,20 @@ public class CertificationInventoryJob implements Job {
      * @param projectLibraryBase
      */
     private void remindDutyPerson(List<ProjectCertificationInventoryEO> projectCertificationInventoryEOS,ProjectLibraryBase projectLibraryBase) {
-        Map<String, List<ProjectCertificationInventoryEO>> certifycationInventoryListByDutyPersonMap = projectCertificationInventoryEOS.stream().filter(data -> {
+        // 结果待提交 、审查退回
+        Map<String, List<ProjectCertificationInventoryEO>> toBeSubmittedCiEoListByDutyPersonMap = projectCertificationInventoryEOS.stream().filter(data -> {
             boolean flag = (
-                    StringUtils.equals(data.getFlowStatus(), CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
+                    StringUtils.equals(data.getFlowStatus(), CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
-                    || StringUtils.equals(data.getFlowStatus(), CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
                     || StringUtils.equals(data.getFlowStatus(), CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue())
             );
             return flag;
         }).collect(Collectors.groupingBy(ProjectCertificationInventoryEO::getDutyPerson));
 
-        if(ObjectUtils.isNotEmpty(certifycationInventoryListByDutyPersonMap)){
+        if(ObjectUtils.isNotEmpty(toBeSubmittedCiEoListByDutyPersonMap)){
             List<String> dutyPersonIdList = projectCertificationInventoryEOS.stream().map(ProjectCertificationInventoryEO::getDutyPerson).distinct().collect(Collectors.toList());
             List<SysUser> dutyPersonList = this.sysUserService.querySysUserListByIdList(dutyPersonIdList);
 
-            for (Map.Entry<String, List<ProjectCertificationInventoryEO>> dataByDutyPersonMap : certifycationInventoryListByDutyPersonMap.entrySet()) {
+            for (Map.Entry<String, List<ProjectCertificationInventoryEO>> dataByDutyPersonMap : toBeSubmittedCiEoListByDutyPersonMap.entrySet()) {
                 String dutyPersonUserId = dataByDutyPersonMap.getKey();
                 List<ProjectCertificationInventoryEO> dutyPersonDataList = dataByDutyPersonMap.getValue();
                 if(CollectionUtils.isEmpty(dutyPersonDataList)){
@@ -295,6 +296,78 @@ public class CertificationInventoryJob implements Job {
                 }
             }
         }
+
+        // 任务待确认
+        Map<String, List<ProjectCertificationInventoryEO>> toBeConfirmedCiEoListByDutyPersonMap = projectCertificationInventoryEOS.stream().filter(data -> {
+            boolean flag = (StringUtils.equals(data.getFlowStatus(), CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()));
+            return flag;
+        }).collect(Collectors.groupingBy(ProjectCertificationInventoryEO::getDutyPerson));
+
+        if(ObjectUtils.isNotEmpty(toBeConfirmedCiEoListByDutyPersonMap)){
+            List<String> dutyPersonIdList = projectCertificationInventoryEOS.stream().map(ProjectCertificationInventoryEO::getDutyPerson).distinct().collect(Collectors.toList());
+            List<SysUser> dutyPersonList = this.sysUserService.querySysUserListByIdList(dutyPersonIdList);
+
+            for (Map.Entry<String, List<ProjectCertificationInventoryEO>> dataByDutyPersonMap : toBeConfirmedCiEoListByDutyPersonMap.entrySet()) {
+                String dutyPersonUserId = dataByDutyPersonMap.getKey();
+                List<ProjectCertificationInventoryEO> dutyPersonDataList = dataByDutyPersonMap.getValue();
+                if(CollectionUtils.isEmpty(dutyPersonDataList)){
+                    continue;
+                }
+
+                Map<String, Object> sendMsgDataListMap = this.disposeSendMsgDataListByTaskConfirmEndTime(dutyPersonDataList);
+
+                // 十四天后结束的
+                List<ProjectCertificationInventoryEO> fourteenDaysList = (List<ProjectCertificationInventoryEO>) sendMsgDataListMap.get("fourteenDaysList");
+                if(CollectionUtils.isNotEmpty(fourteenDaysList)){
+                    this.sendLarkCardMsgByTemplate(
+                            projectLibraryBase,
+                            dutyPersonList,
+                            dutyPersonUserId,
+                            fourteenDaysList,
+                            TemplateInfoEnum2.CERTIFICATION_MESSAGE19.getValue(),
+                            fourteenDaysList.get(0).getTaskConfirmEndTime()
+                    );
+                }
+
+                // 七天后结束的
+                List<ProjectCertificationInventoryEO> sevenDaysList = (List<ProjectCertificationInventoryEO>) sendMsgDataListMap.get("sevenDaysList");
+                if(CollectionUtils.isNotEmpty(sevenDaysList)){
+                    this.sendLarkCardMsgByTemplate(
+                            projectLibraryBase,
+                            dutyPersonList,
+                            dutyPersonUserId,
+                            sevenDaysList,
+                            TemplateInfoEnum2.CERTIFICATION_MESSAGE20.getValue(),
+                            sevenDaysList.get(0).getTaskConfirmEndTime()
+                    );
+                }
+
+                // 当天结束的
+                List<ProjectCertificationInventoryEO> currentDaysList = (List<ProjectCertificationInventoryEO>) sendMsgDataListMap.get("currentDaysList");
+                if(CollectionUtils.isNotEmpty(currentDaysList)){
+                    this.sendLarkCardMsgByTemplate(
+                            projectLibraryBase,
+                            dutyPersonList,
+                            dutyPersonUserId,
+                            currentDaysList,
+                            TemplateInfoEnum2.CERTIFICATION_MESSAGE21.getValue(),
+                            currentDaysList.get(0).getTaskConfirmEndTime()
+                    );
+                }
+                // 逾期的
+                List<ProjectCertificationInventoryEO> overdueList = (List<ProjectCertificationInventoryEO>) sendMsgDataListMap.get("overdueList");
+                if(CollectionUtils.isNotEmpty(overdueList)){
+                    this.sendLarkCardMsgByTemplate(
+                            projectLibraryBase,
+                            dutyPersonList,
+                            dutyPersonUserId,
+                            overdueList,
+                            TemplateInfoEnum2.CERTIFICATION_MESSAGE22.getValue(),
+                            overdueList.get(0).getTaskConfirmEndTime()
+                    );
+                }
+            }
+        }
     }
 
     /**
@@ -508,6 +581,101 @@ public class CertificationInventoryJob implements Job {
         return result;
     }
 
+    /**
+     * 处理需要发送消息的数据
+     * @param pciEoList
+     * @return
+     */
+    private Map<String,Object> disposeSendMsgDataListByTaskConfirmEndTime(List<ProjectCertificationInventoryEO> pciEoList) {
+        Map<String,Object> result = new HashMap<>();
+        Date currentDate = new Date();
+
+        //获取后三天前的时间
+        Calendar calendar=new GregorianCalendar();
+        calendar.setTime(new Date());
+        calendar.add(Calendar.DATE,3);
+        Date threeDays = calendar.getTime();
+
+        //获取后七天后的时间
+        Calendar sevenCalendar=new GregorianCalendar();
+        sevenCalendar.setTime(new Date());
+        sevenCalendar.add(Calendar.DATE,7);
+        Date sevenDays = sevenCalendar.getTime();
+
+        //获取后十四天后的时间
+        Calendar fourteenCalendar=new GregorianCalendar();
+        fourteenCalendar.setTime(new Date());
+        fourteenCalendar.add(Calendar.DATE,14);
+        Date fourteenDays = fourteenCalendar.getTime();
+
+        String threeDaysStr = sdf.format(threeDays);
+        String sevenDaysStr = sdf.format(sevenDays);
+        String fourteenDaysStr = sdf.format(fourteenDays);
+        String currentDateStr = sdf.format(currentDate);
+
+        // 当天结束的
+        List<ProjectCertificationInventoryEO> currentDaysList = pciEoList.stream().filter(data -> {
+            boolean flag = false;
+            //结束日期是当前日期
+            if(data.getTaskConfirmEndTime() != null){
+                if (StringUtils.equals(currentDateStr, sdf.format(data.getTaskConfirmEndTime()))) {
+                    flag = true;
+                }
+            }
+            return flag;
+        }).collect(Collectors.toList());
+
+        // 三天后结束的
+        List<ProjectCertificationInventoryEO> threeDaysList = pciEoList.stream().filter(data -> {
+            boolean flag = false;
+            if(data.getTaskConfirmEndTime() != null){
+                if (StringUtils.equals(threeDaysStr, sdf.format(data.getTaskConfirmEndTime()))) {
+                    flag = true;
+                }
+            }
+            return flag;
+        }).collect(Collectors.toList());
+
+        // 七天后结束的
+        List<ProjectCertificationInventoryEO> sevenDaysList = pciEoList.stream().filter(data -> {
+            boolean flag = false;
+            if(data.getTaskConfirmEndTime()!=null){
+                if (StringUtils.equals(sevenDaysStr, sdf.format(data.getTaskConfirmEndTime()))) {
+                    flag = true;
+                }
+            }
+            return flag;
+        }).collect(Collectors.toList());
+
+        // 十四天后结束的
+        List<ProjectCertificationInventoryEO> fourteenDaysList = pciEoList.stream().filter(data -> {
+            boolean flag = false;
+            if(data.getTaskConfirmEndTime() != null){
+                if (StringUtils.equals(fourteenDaysStr, sdf.format(data.getTaskConfirmEndTime()))) {
+                    flag = true;
+                }
+            }
+            return flag;
+        }).collect(Collectors.toList());
+
+        // 逾期的
+        List<ProjectCertificationInventoryEO> overdueList = pciEoList.stream().filter(data -> {
+            // 只要早于当前日期都算逾期
+            boolean flag = false;
+            if(data.getTaskConfirmEndTime() != null){
+                flag = (data.getTaskConfirmEndTime().before(currentDate) && !StringUtils.equals(currentDateStr, sdf.format(data.getTaskConfirmEndTime())));
+            }
+            return flag;
+        }).collect(Collectors.toList());
+
+        result.put("currentDaysList",currentDaysList);
+        result.put("threeDaysList",threeDaysList);
+        result.put("overdueList",overdueList);
+        result.put("sevenDaysList",sevenDaysList);
+        result.put("fourteenDaysList",fourteenDaysList);
+        return result;
+    }
+
     /**
      * 根据模板 发送飞书消息
      * @param projectLibraryBase

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java

@@ -130,6 +130,7 @@ public class InventoryAffirmJob implements Job {
                         params.put("serialNumbers",serialNumbers);
 
                         ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+                        if(ObjectUtils.isNotEmpty(projectLibraryBase)){
                             String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
                             String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
                             // 获取法规清单 - 飞书跳转链接
@@ -140,6 +141,7 @@ public class InventoryAffirmJob implements Job {
 
                             this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE4.getValue(),params);
                         }
+                    }
                     // 当天结束的
                     List<ProjectLawsInventoryEO> currentDaysList = (List<ProjectLawsInventoryEO>) sendMsgDataListMap.get("currentDaysList");
                     if(CollectionUtils.isNotEmpty(currentDaysList)){
@@ -159,6 +161,7 @@ public class InventoryAffirmJob implements Job {
                         params.put("serialNumbers",serialNumbers);
 
                         ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+                        if(ObjectUtils.isNotEmpty(projectLibraryBase)){
                             String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
                             String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
                             // 获取法规清单 - 飞书跳转链接
@@ -169,6 +172,7 @@ public class InventoryAffirmJob implements Job {
 
                             this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE4.getValue(),params);
                         }
+                    }
                     // 逾期的
                     List<ProjectLawsInventoryEO> overdueList = (List<ProjectLawsInventoryEO>) sendMsgDataListMap.get("overdueList");
                     if(CollectionUtils.isNotEmpty(overdueList)){
@@ -188,6 +192,7 @@ public class InventoryAffirmJob implements Job {
                         params.put("serialNumbers",serialNumbers);
 
                         ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+                        if(ObjectUtils.isNotEmpty(projectLibraryBase)){
                             String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
                             String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
                             // 获取法规清单 - 飞书跳转链接
@@ -201,6 +206,7 @@ public class InventoryAffirmJob implements Job {
                     }
                 }
             }
+        }
 
 
       /*   //获取状态为待确认的数据

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/TaskAffirmJob.java

@@ -137,6 +137,7 @@ public class TaskAffirmJob implements Job {
                         params.put("flowTypeEn","Design Compliance Process");
 
                         ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+                        if(ObjectUtils.isNotEmpty(projectLibraryBase)){
                             String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
                             String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
                             // 获取待办中心 - 飞书跳转链接
@@ -154,6 +155,7 @@ public class TaskAffirmJob implements Job {
 
                             this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION4.getValue(),params);
                         }
+                    }
                     // 当天结束的
                     List<ProjectLawsInventoryEO> currentDaysList = (List<ProjectLawsInventoryEO>) sendMsgDataListMap.get("currentDaysList");
                     if(CollectionUtils.isNotEmpty(currentDaysList)){
@@ -175,6 +177,7 @@ public class TaskAffirmJob implements Job {
                         params.put("flowTypeEn","Design Compliance Process");
 
                         ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+                        if(ObjectUtils.isNotEmpty(projectLibraryBase)){
                             String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
                             String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
                             // 获取待办中心 - 飞书跳转链接
@@ -192,6 +195,7 @@ public class TaskAffirmJob implements Job {
 
                             this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION4.getValue(),params);
                         }
+                    }
                     // 逾期的
                     List<ProjectLawsInventoryEO> overdueList = (List<ProjectLawsInventoryEO>) sendMsgDataListMap.get("overdueList");
                     if(CollectionUtils.isNotEmpty(overdueList)){
@@ -213,6 +217,7 @@ public class TaskAffirmJob implements Job {
                         params.put("flowTypeEn","Design Compliance Process");
 
                         ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+                        if(ObjectUtils.isNotEmpty(projectLibraryBase)){
                             String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
                             String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
                             // 获取待办中心 - 飞书跳转链接
@@ -231,6 +236,7 @@ public class TaskAffirmJob implements Job {
                             this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION5.getValue(),params);
                         }
                     }
+                }
                 // 验证符合性
                 Map<String, List<ProjectLawsInventoryEO>> lawsInventoryByVerifyDutyIdGroupMap = lawsInventoryListByProjectLibraryId.stream().collect(Collectors.groupingBy(ProjectLawsInventoryEO::getVerifyDutyId));
 
@@ -266,6 +272,7 @@ public class TaskAffirmJob implements Job {
                         params.put("flowTypeEn","Validation Compliance Process");
 
                         ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+                        if(ObjectUtils.isNotEmpty(projectLibraryBase)){
                             String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
                             String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
                             // 获取待办中心 - 飞书跳转链接
@@ -283,6 +290,7 @@ public class TaskAffirmJob implements Job {
 
                             this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION4.getValue(),params);
                         }
+                    }
                     // 当天结束的
                     List<ProjectLawsInventoryEO> currentDaysList = (List<ProjectLawsInventoryEO>) sendMsgDataListMap.get("currentDaysList");
                     if(CollectionUtils.isNotEmpty(currentDaysList)){
@@ -304,6 +312,7 @@ public class TaskAffirmJob implements Job {
                         params.put("flowTypeEn","Validation Compliance Process");
 
                         ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+                        if(ObjectUtils.isNotEmpty(projectLibraryBase)){
                             String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
                             String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
                             // 获取待办中心 - 飞书跳转链接
@@ -321,6 +330,7 @@ public class TaskAffirmJob implements Job {
 
                             this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION4.getValue(),params);
                         }
+                    }
                     // 逾期的
                     List<ProjectLawsInventoryEO> overdueList = (List<ProjectLawsInventoryEO>) sendMsgDataListMap.get("overdueList");
                     if(CollectionUtils.isNotEmpty(overdueList)){
@@ -342,6 +352,7 @@ public class TaskAffirmJob implements Job {
                         params.put("flowTypeEn","Validation Compliance Process");
 
                         ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+                        if(ObjectUtils.isNotEmpty(projectLibraryBase)){
                             String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
                             String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
                             // 获取待办中心 - 飞书跳转链接
@@ -361,6 +372,7 @@ public class TaskAffirmJob implements Job {
                         }
                     }
                 }
+            }
 
         }
 

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/VerifyComplianceJob.java

@@ -126,6 +126,7 @@ public class VerifyComplianceJob implements Job {
                         params.put("serialNumbers",serialNumbers);
 
                         ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+                        if(ObjectUtils.isNotEmpty(projectLibraryBase)){
                             String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
                             String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
                             // 获取待办中心 - 飞书跳转链接
@@ -143,6 +144,7 @@ public class VerifyComplianceJob implements Job {
 
                             this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION1.getValue(),params);
                         }
+                    }
 
                     // 七天后结束的
                     List<ProjectLawsInventoryEO> sevenDaysList = (List<ProjectLawsInventoryEO>) sendMsgDataListMap.get("sevenDaysList");
@@ -163,6 +165,7 @@ public class VerifyComplianceJob implements Job {
                         params.put("serialNumbers",serialNumbers);
 
                         ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+                        if(ObjectUtils.isNotEmpty(projectLibraryBase)){
                             String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
                             String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
                             // 获取待办中心 - 飞书跳转链接
@@ -180,6 +183,7 @@ public class VerifyComplianceJob implements Job {
 
                             this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION1.getValue(),params);
                         }
+                    }
 
                     // 当天结束的
                     List<ProjectLawsInventoryEO> currentDaysList = (List<ProjectLawsInventoryEO>) sendMsgDataListMap.get("currentDaysList");
@@ -200,6 +204,7 @@ public class VerifyComplianceJob implements Job {
                         params.put("serialNumbers",serialNumbers);
 
                         ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+                        if(ObjectUtils.isNotEmpty(projectLibraryBase)){
                             String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
                             String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
                             // 获取待办中心 - 飞书跳转链接
@@ -217,6 +222,7 @@ public class VerifyComplianceJob implements Job {
 
                             this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION1.getValue(),params);
                         }
+                    }
                     // 逾期的
                     List<ProjectLawsInventoryEO> overdueList = (List<ProjectLawsInventoryEO>) sendMsgDataListMap.get("overdueList");
                     if(CollectionUtils.isNotEmpty(overdueList)){
@@ -236,6 +242,7 @@ public class VerifyComplianceJob implements Job {
                         params.put("serialNumbers",serialNumbers);
 
                         ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+                        if(ObjectUtils.isNotEmpty(projectLibraryBase)){
                             String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
                             String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
                             // 获取待办中心 - 飞书跳转链接
@@ -256,6 +263,7 @@ public class VerifyComplianceJob implements Job {
                     }
                 }
             }
+        }
 
         //查询出已经启动了验证符合性流程的数据。 并且流程没有结束。
         /*QueryWrapper<ProjectTaskInventoryEO> queryProjectTaskInventoryWrapper = new QueryWrapper<>();

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/designComplianceJob.java

@@ -126,6 +126,7 @@ public class designComplianceJob implements Job {
                         params.put("serialNumbers",serialNumbers);
 
                         ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+                        if(ObjectUtils.isNotEmpty(projectLibraryBase)){
                             String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
                             String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
                             // 获取待办中心 - 飞书跳转链接
@@ -143,6 +144,7 @@ public class designComplianceJob implements Job {
 
                             this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION1.getValue(),params);
                         }
+                    }
 
                     // 七天后结束的
                     List<ProjectLawsInventoryEO> sevenDaysList = (List<ProjectLawsInventoryEO>) sendMsgDataListMap.get("sevenDaysList");
@@ -163,6 +165,7 @@ public class designComplianceJob implements Job {
                         params.put("serialNumbers",serialNumbers);
 
                         ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+                        if(ObjectUtils.isNotEmpty(projectLibraryBase)){
                             String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
                             String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
                             // 获取待办中心 - 飞书跳转链接
@@ -180,6 +183,7 @@ public class designComplianceJob implements Job {
 
                             this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION1.getValue(),params);
                         }
+                    }
 
                     // 当天结束的
                     List<ProjectLawsInventoryEO> currentDaysList = (List<ProjectLawsInventoryEO>) sendMsgDataListMap.get("currentDaysList");
@@ -200,6 +204,7 @@ public class designComplianceJob implements Job {
                         params.put("serialNumbers",serialNumbers);
 
                         ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+                        if(ObjectUtils.isNotEmpty(projectLibraryBase)){
                             String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
                             String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
                             // 获取待办中心 - 飞书跳转链接
@@ -217,6 +222,7 @@ public class designComplianceJob implements Job {
 
                             this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION1.getValue(),params);
                         }
+                    }
                     // 逾期的
                     List<ProjectLawsInventoryEO> overdueList = (List<ProjectLawsInventoryEO>) sendMsgDataListMap.get("overdueList");
                     if(CollectionUtils.isNotEmpty(overdueList)){
@@ -236,6 +242,7 @@ public class designComplianceJob implements Job {
                         params.put("serialNumbers",serialNumbers);
 
                         ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+                        if(ObjectUtils.isNotEmpty(projectLibraryBase)){
                             String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
                             String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
                             // 获取待办中心 - 飞书跳转链接
@@ -255,6 +262,7 @@ public class designComplianceJob implements Job {
                         }
                     }
                 }
+            }
 
         }
 

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java

@@ -101,4 +101,6 @@ public interface IProjectRelatedPersonnelService extends IService<ProjectRelated
 	 * @return
 	 */
 	List<Map<String, Object>> queryLawEngineerByProjectId(Map<String, Object> params);
+
+    List<Map<String, Object>> queryEngineeringInterfacePersonByProjectId(Map<String, Object> params);
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java

@@ -213,6 +213,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 			if(CollectionUtils.isNotEmpty(editEndTimeCertificationInventoryEOS)){
 
 				ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(editEndTimeCertificationInventoryEOS.get(0).getProjectLibraryId());
+				if(ObjectUtils.isNotEmpty(projectLibraryBase)){
 					List<String> userIdList = Arrays.asList(projectLibraryBase.getCertificationEngineer().split(","));
 					List<SysUser> userInfoList = this.sysUserService.querySysUserListByIdList(userIdList);
 
@@ -227,6 +228,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 					);
 				}
 			}
+		}
 
 		// 如果编辑了责任人，给责任人发消息
 		if(StringUtils.isNotEmpty(projectCertificationInventoryEO.getDutyPerson())){
@@ -622,6 +624,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 
 				if (CollectionUtils.isNotEmpty(projectCertificationInventoryEOS)) {
 					ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectCertificationInventoryEOS.get(0).getProjectLibraryId());
+					if(ObjectUtils.isNotEmpty(projectLibraryBase)){
 						List<String> userIdList = Arrays.asList(projectLibraryBase.getCertificationEngineer().split(","));
 						List<SysUser> userInfoList = this.sysUserService.querySysUserListByIdList(userIdList);
 
@@ -634,6 +637,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 						);
 					}
 				}
+			}
 			if(CollectionUtils.isNotEmpty(updateList)){
 				this.updateBatchById(updateList);
 			}
@@ -674,7 +678,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 
 		ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectCertificationInventoryEOS.get(0).getProjectLibraryId());
-
+		if(ObjectUtils.isNotEmpty(projectLibraryBase)){
 			String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 			String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
 
@@ -719,6 +723,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 				log.error("飞书消息推送失败");
 			}
 		}
+	}
 
 	/**
 	 * 处理提示信息
@@ -1000,6 +1005,11 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 					String attestationTypeName = this.sysDictItemService.disposeShowDictItemValue(sysDictItems,data.getAttestationType(),cut, "ren4_zheng4_qing1_dan1_-_ren4_zheng4_lei4_xing2");
 					data.setAttestationTypeName(attestationTypeName);
 				}
+
+				if(StringUtils.isNotEmpty(data.getCertificationProgress())){
+					String cpNumber = CertificationProgressEnum.getNumberByValue(data.getCertificationProgress());
+					data.setCertificationProgressNumber(cpNumber);
+				}
 			}
 		}
 	}
@@ -1079,6 +1089,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 		String projectLibraryId = json.getString("projectLibraryId");
 		// 获取项目信息，获取认证工程师，给认证工程师分配待办任务
 		ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+		if(ObjectUtils.isNotEmpty(projectLibraryBase)){
 			String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 			String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
 			if(ObjectUtils.isEmpty(projectLibraryBase)){
@@ -1150,6 +1161,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 					log.error("飞书消息推送失败");
 				}
 			});
+		}
 
 		return Result.OK("发布成功！");
 	}
@@ -1439,6 +1451,24 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 					});
 				}
 			}
+
+			// WVTA ID wvtaId
+			if(StringUtils.equals("wvtaId",orderByField)){
+				if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
+					Collections.sort(datas,(e1, e2)->{
+						String e1WvtaId = (StringUtils.isNotEmpty(e1.getWvtaId()) ? e1.getWvtaId() : "");
+						String e2WvtaId = (StringUtils.isNotEmpty(e2.getWvtaId()) ? e2.getWvtaId() : "");
+						return comparator.compare(e1WvtaId,e2WvtaId);
+					});
+				}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
+					Collections.sort(datas,(e1,e2)->{
+						String e1WvtaId = (StringUtils.isNotEmpty(e1.getWvtaId()) ? e1.getWvtaId() : "");
+						String e2WvtaId = (StringUtils.isNotEmpty(e2.getWvtaId()) ? e2.getWvtaId() : "");
+						return comparator.compare(e2WvtaId,e1WvtaId);
+					});
+				}
+			}
+
 			// 标准编号 serialNumber
 			if(StringUtils.equals("serialNumber",orderByField)){
 				if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
@@ -1456,6 +1486,57 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 				}
 			}
 
+			// 责任领域 dutyTerritoryName
+			if(StringUtils.equals("dutyTerritoryName",orderByField)){
+				if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
+					Collections.sort(datas,(e1, e2)->{
+						String e1DutyTerritoryName = (StringUtils.isNotEmpty(e1.getDutyTerritoryName()) ? e1.getDutyTerritoryName() : "");
+						String e2DutyTerritoryName = (StringUtils.isNotEmpty(e2.getDutyTerritoryName()) ? e2.getDutyTerritoryName() : "");
+						return comparator.compare(e1DutyTerritoryName,e2DutyTerritoryName);
+					});
+				}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
+					Collections.sort(datas,(e1,e2)->{
+						String e1DutyTerritoryName = (StringUtils.isNotEmpty(e1.getDutyTerritoryName()) ? e1.getDutyTerritoryName() : "");
+						String e2DutyTerritoryName = (StringUtils.isNotEmpty(e2.getDutyTerritoryName()) ? e2.getDutyTerritoryName() : "");
+						return comparator.compare(e2DutyTerritoryName,e1DutyTerritoryName);
+					});
+				}
+			}
+
+			// 工程接口人 sdtName
+			if(StringUtils.equals("sdtName",orderByField)){
+				if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
+					Collections.sort(datas,(e1, e2)->{
+						String e1SdtName = (StringUtils.isNotEmpty(e1.getSdtName()) ? e1.getSdtName() : "");
+						String e2SdtName = (StringUtils.isNotEmpty(e2.getSdtName()) ? e2.getSdtName() : "");
+						return comparator.compare(e1SdtName,e2SdtName);
+					});
+				}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
+					Collections.sort(datas,(e1,e2)->{
+						String e1SdtName = (StringUtils.isNotEmpty(e1.getSdtName()) ? e1.getSdtName() : "");
+						String e2SdtName = (StringUtils.isNotEmpty(e2.getSdtName()) ? e2.getSdtName() : "");
+						return comparator.compare(e2SdtName,e1SdtName);
+					});
+				}
+			}
+
+			// 责任人 dutyPersonName
+			if(StringUtils.equals("dutyPersonName",orderByField)){
+				if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
+					Collections.sort(datas,(e1, e2)->{
+						String e1DutyPersonName = (StringUtils.isNotEmpty(e1.getDutyPersonName()) ? e1.getDutyPersonName() : "");
+						String e2DutyPersonName = (StringUtils.isNotEmpty(e2.getDutyPersonName()) ? e2.getDutyPersonName() : "");
+						return comparator.compare(e1DutyPersonName,e2DutyPersonName);
+					});
+				}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
+					Collections.sort(datas,(e1,e2)->{
+						String e1DutyPersonName = (StringUtils.isNotEmpty(e1.getDutyPersonName()) ? e1.getDutyPersonName() : "");
+						String e2DutyPersonName = (StringUtils.isNotEmpty(e2.getDutyPersonName()) ? e2.getDutyPersonName() : "");
+						return comparator.compare(e2DutyPersonName,e1DutyPersonName);
+					});
+				}
+			}
+
 			// 交付物类型 deliverableTypeName
 			if(StringUtils.equals("deliverableTypeName",orderByField)){
 				if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
@@ -1506,6 +1587,23 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 					});
 				}
 			}
+
+			// 认证进度 certificationProgress
+			if(StringUtils.equals("certificationProgress",orderByField)){
+				if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
+					Collections.sort(datas,(e1, e2)->{
+						String e1CertificationProgressNumber = (StringUtils.isNotEmpty(e1.getCertificationProgressNumber()) ? e1.getCertificationProgressNumber() : "");
+						String e2CertificationProgressNumber = (StringUtils.isNotEmpty(e2.getCertificationProgressNumber()) ? e2.getCertificationProgressNumber() : "");
+						return comparator.compare(e1CertificationProgressNumber,e2CertificationProgressNumber);
+					});
+				}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
+					Collections.sort(datas,(e1,e2)->{
+						String e1CertificationProgressNumber = (StringUtils.isNotEmpty(e1.getCertificationProgressNumber()) ? e1.getCertificationProgressNumber() : "");
+						String e2CertificationProgressNumber = (StringUtils.isNotEmpty(e2.getCertificationProgressNumber()) ? e2.getCertificationProgressNumber() : "");
+						return comparator.compare(e2CertificationProgressNumber,e1CertificationProgressNumber);
+					});
+				}
+			}
 		}
 		return datas;
 	}
@@ -2212,7 +2310,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 
 				if(StringUtils.isNotEmpty(thirdId)){
 					// 根据结束时间进行排序，获取最近的时间，发消息时使用。
-					Collections.sort(projectCertificationInventoryEOList, new Comparator<ProjectCertificationInventoryEO>() {
+					/*Collections.sort(projectCertificationInventoryEOList, new Comparator<ProjectCertificationInventoryEO>() {
 						@Override
 						public int compare(ProjectCertificationInventoryEO p1, ProjectCertificationInventoryEO p2) {
 							if(p1.getEndTime() != null && p2.getEndTime() != null){
@@ -2221,7 +2319,9 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 							return 1;
 						}
 					});
-					Date endTime = projectCertificationInventoryEOList.get(0).getEndTime();
+					Date endTime = projectCertificationInventoryEOList.get(0).getEndTime();*/
+					this.certificationInventoryEOListSortByInventoryVerifyEndTimeAsc(projectCertificationInventoryEOList);
+					Date endTime = projectCertificationInventoryEOList.get(0).getInventoryVerifyEndTime();
 
 					JSONObject larkMesJson = new JSONObject();
 					larkMesJson.put("template_id", TemplateInfoEnum2.CERTIFICATION_MESSAGE3.getValue());
@@ -2561,6 +2661,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 
 							JSONObject larkMesJson = new JSONObject();
 							if(StringUtils.equals(operatorType,OperatorTypeEnum.CERTIFICATION_INVENTORY_STUDIO_WITHDRAW.getValue())){
+								this.certificationInventoryEOListSortByInventoryVerifyEndTimeAsc(projectCertificationInventoryEOList);
+								endTime = projectCertificationInventoryEOList.get(0).getInventoryVerifyEndTime();
 								larkMesJson.put("template_id", TemplateInfoEnum2.CERTIFICATION_MESSAGE4.getValue());
 							}else if(StringUtils.equals(operatorType,OperatorTypeEnum.CERTIFICATION_INVENTORY_STUDIO_RESET.getValue())){
 								larkMesJson.put("template_id", TemplateInfoEnum2.CERTIFICATION_MESSAGE5.getValue());
@@ -3262,12 +3364,12 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 	public void importData(MultipartFile file, ProjectCertificationInventoryEO projectCertificationInventoryEO) {
 		String title = "";
 		if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
-			title = "*类别,*检验项目,*配置项,*WVTA ID," +
+			title = "*类别,*检验项目,*配置项,*认证类型,*WVTA ID," +
-					"*标准编号,*责任领域,*认证类型,*工程接口人,*责任人," +
+					"*标准编号,*责任领域,*工程接口人,*责任人," +
 					"交付物模板,*交付物类型,*截止日期,报告编号,产品型号,生产企业名称";
 		}else {
-			title = "*Category,*Inspection Items,*Configuration Item,*WVTA ID," +
+			title = "*Category,*Inspection Items,*Configuration Item,*Certification Type,*WVTA ID," +
-					"*Standard No,*Responsible Field,*Certification Type,*Eng. Interface,*Assignee," +
+					"*Standard No,*Responsible Field,*Eng. Interface,*Assignee," +
 					"Deliverable Template,*Deliverable Type,*Due Date,Report No,Product Model,Name Of Manufacturer";
 		}
 
@@ -4501,12 +4603,12 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 		try {
 			String title = "";
 			if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
-				title = "*类别,*检验项目,*配置项,*WVTA ID," +
+				title = "*类别,*检验项目,*配置项,*认证类型,*WVTA ID," +
-						"*标准编号,*责任领域,*认证类型,*工程接口人,*责任人," +
+						"*标准编号,*责任领域,*工程接口人,*责任人," +
 						"交付物模板,*交付物类型,*截止日期,报告编号,产品型号,生产企业名称";
 			}else {
-				title = "*Category,*Inspection Items,*Configuration Item,*WVTA ID," +
+				title = "*Category,*Inspection Items,*Configuration Item,*Certification Type,*WVTA ID," +
-						"*Standard No,*Responsible Field,*Certification Type,*Eng. Interface,*Assignee," +
+						"*Standard No,*Responsible Field,*Eng. Interface,*Assignee," +
 						"Deliverable Template,*Deliverable Type,*Due Date,Report No,Product Model,Name Of Manufacturer";
 			}
 
@@ -4652,7 +4754,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 					if(StringUtils.isNotBlank(deliveryResult)){
 						projectCertificationInventoryEO.setDeliveryResult(deliveryResult);
 					}else {
-						noCiteInspectionItem.add(projectCertificationInventoryEO.getInspectionItem());
+						noCiteInspectionItem.add(projectCertificationInventoryEO.getInspectionItem() + "-" +projectCertificationInventoryEO.getConfigItem());
 					}
 				}
 
@@ -4707,6 +4809,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 			LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 			String projectLibraryId = pciList.get(0).getProjectLibraryId();
 			ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+			if(ObjectUtils.isNotEmpty(projectLibraryBase)){
 				List<SysUser> studioEngineerUserInfo = this.sysUserService.querySysUserListByIdList(Arrays.asList(projectLibraryBase.getStudioEngineer().split(",")));
 
 				String certificationEngineerUserNames = "";
@@ -4831,6 +4934,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 				}
 			}
 		}
+	}
 
 	/**
 	 * 保存认证清单修改历史（编辑、批量设置专用）

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java

@@ -790,6 +790,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				params.put("serialNumbers",projectLawsInventoryOld.getSerialNumber());
 
 				ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLawsInventoryEO.getProjectLibraryId());
+				if(ObjectUtils.isNotEmpty(projectLibraryBase)){
 					String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 					String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
 					// 获取待办中心 - 飞书跳转链接
@@ -873,6 +874,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					}
 				}
 			}
+		}
 		if((projectLawsInventoryOld.getDesignDueDate() != null && projectLawsInventoryEO.getDesignDueDate() != null) && toBeCheckedFlag){
 			if(!projectLawsInventoryOld.getDesignDueDate().equals(projectLawsInventoryEO.getDesignDueDate())){
 				String endTime = "";
@@ -891,6 +893,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				params.put("serialNumbers",projectLawsInventoryOld.getSerialNumber());
 
 				ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLawsInventoryEO.getProjectLibraryId());
+				if(ObjectUtils.isNotEmpty(projectLibraryBase)){
 					String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 					String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
 					// 获取待办中心 - 飞书跳转链接
@@ -907,6 +910,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(),params);
 				}
 			}
+		}
 		if((projectLawsInventoryOld.getVerifyDueDate() != null && projectLawsInventoryEO.getVerifyDueDate() != null) && toBeCheckedFlag){
 			if(!projectLawsInventoryOld.getVerifyDueDate().equals(projectLawsInventoryEO.getVerifyDueDate())){
 				String endTime = "";
@@ -925,6 +929,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				params.put("serialNumbers",projectLawsInventoryOld.getSerialNumber());
 
 				ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLawsInventoryEO.getProjectLibraryId());
+				if(ObjectUtils.isNotEmpty(projectLibraryBase)){
 					String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 					String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
 					// 获取待办中心 - 飞书跳转链接
@@ -941,6 +946,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(),params);
 				}
 			}
+		}
 
 		// 设计符合性 任务待确认消息 标识
 		boolean toBeConfirmedDesignFlag = (
@@ -966,6 +972,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				params.put("serialNumbers",projectLawsInventoryOld.getSerialNumber());
 
 				ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLawsInventoryEO.getProjectLibraryId());
+				if(ObjectUtils.isNotEmpty(projectLibraryBase)){
 					String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 					String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
 					// 获取待办中心 - 飞书跳转链接
@@ -982,6 +989,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(),params);
 				}
 			}
+		}
 
 		// 验证符合性 任务待确认消息 标识
 		boolean toBeConfirmedVerifyFlag = (
@@ -1006,6 +1014,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				params.put("serialNumbers",projectLawsInventoryOld.getSerialNumber());
 
 				ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLawsInventoryEO.getProjectLibraryId());
+				if(ObjectUtils.isNotEmpty(projectLibraryBase)){
 					String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 					String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
 					// 获取待办中心 - 飞书跳转链接
@@ -1022,6 +1031,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(),params);
 				}
 			}
+		}
 
 		// 如果编辑了法规工程师，给新的法规工程师发消息
 		if((StringUtils.isNotEmpty(projectLawsInventoryOld.getRegulationOwnerId()) && StringUtils.isNotEmpty(projectLawsInventoryEO.getRegulationOwnerId()))){
@@ -1050,6 +1060,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					params.put("serialNumbers",projectLawsInventoryEO.getSerialNumber());
 
 					ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLawsInventoryEO.getProjectLibraryId());
+					if(ObjectUtils.isNotEmpty(projectLibraryBase)){
 						String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 						String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
 						// 获取待办中心 - 飞书跳转链接
@@ -1066,6 +1077,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 						this.sendMessageByTemplateId(TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION1.getValue(),params);
 					}
+				}
 
 				// 验证符合性 结果待审查、结果待提交 标识  判断法规工程师是否被修改了  如果被修改了，给新的法规工程师发消息
 				boolean toBeReviewedVerifyFlag = (
@@ -1088,6 +1100,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 
 					ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLawsInventoryEO.getProjectLibraryId());
+					if(ObjectUtils.isNotEmpty(projectLibraryBase)){
 						String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 						String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
 						// 获取待办中心 - 飞书跳转链接
@@ -1107,6 +1120,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				}
 			}
 		}
+	}
 
 	private void setProjectLawsInventoryPermission(String userId, String projectId,String lawsInventoryId,Date now, List<ProjectUserPermission> adds, String belong) {
 		QueryWrapper<ProjectUserPermission> del = new QueryWrapper<>();
@@ -1588,6 +1602,24 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					});
 				}
 			}
+			// 设计符合性-流程状态  designFlowStatusName
+			if("designFlowStatusName".equals(orderByField)){
+//				if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
+//					Collections.sort(result,(e1, e2)->{
+//						if(e1.getDesignDeliverableTypeName() != null && e2.getDesignDeliverableTypeName() != null){
+//							return comparator.compare(e1.getDesignDeliverableTypeName(),e2.getDesignDeliverableTypeName());
+//						}
+//						return -1;
+//					});
+//				}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
+//					Collections.sort(result,(e1,e2)->{
+//						if(e1.getDesignDeliverableTypeName() != null && e2.getDesignDeliverableTypeName() != null){
+//							return comparator.compare(e2.getDesignDeliverableTypeName(),e1.getDesignDeliverableTypeName());
+//						}
+//						return -1;
+//					});
+//				}
+			}
 
 			// 验证符合性排序
 			// 验证符合性-责任人   verifyDutyId
@@ -1642,6 +1674,24 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					});
 				}
 			}
+			// 验证符合性-流程状态  designFlowStatusName
+			if("verifyFlowStatusName".equals(orderByField)){
+//				if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
+//					Collections.sort(result,(e1, e2)->{
+//						if(e1.getDesignDeliverableTypeName() != null && e2.getDesignDeliverableTypeName() != null){
+//							return comparator.compare(e1.getDesignDeliverableTypeName(),e2.getDesignDeliverableTypeName());
+//						}
+//						return -1;
+//					});
+//				}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
+//					Collections.sort(result,(e1,e2)->{
+//						if(e1.getDesignDeliverableTypeName() != null && e2.getDesignDeliverableTypeName() != null){
+//							return comparator.compare(e2.getDesignDeliverableTypeName(),e1.getDesignDeliverableTypeName());
+//						}
+//						return -1;
+//					});
+//				}
+			}
 		}
 		return result;
 	}
@@ -3479,6 +3529,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 			String projectLibraryId = (String) prarams.get("projectLibraryId");
 			ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+			if(ObjectUtils.isNotEmpty(projectLibraryBase)){
 				String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 				String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
 				// 获取待办中心 - 飞书跳转链接
@@ -3498,6 +3549,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 				this.sendMessageByTemplateId(templateId,prarams);
 			}
+		}
 
 		// 将法规工程师的 法规清单确认待办中心任务转为已办
 		if(StringUtils.equals(operatorType,OperatorTypeEnum.TO_DO_CENTER_FG_CONVERT_TO_HAVE_DONE.getValue())){
@@ -6612,6 +6664,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			paramsMsg.put("serialNumbers",serialNumbers);
 
 			ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+			if(ObjectUtils.isNotEmpty(projectLibraryBase)){
 				String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 				String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
 				// 获取法规清单 - 飞书跳转链接
@@ -6620,9 +6673,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				paramsMsg.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
 				paramsMsg.put("Initiator",projectLibraryBase.getStudioEngineerName());
 
-
 				this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE2.getValue(),paramsMsg);
 			}
+		}
 		return Result.OK("变更成功！");
 	}
 
@@ -10278,6 +10331,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				params.put("serialNumbers",serialNumbers);
 
 				ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+				if(ObjectUtils.isNotEmpty(projectLibraryBase)){
 					String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 					String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
 					// 获取待办中心 - 飞书跳转链接
@@ -10297,6 +10351,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				}
 			}
 		}
+	}
 
 	/**
 	 * 验证符合性 清单待确认状态数据催办
@@ -10340,6 +10395,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				params.put("serialNumbers",serialNumbers);
 
 				ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+				if(ObjectUtils.isNotEmpty(projectLibraryBase)){
 					String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 					String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
 					// 获取待办中心 - 飞书跳转链接
@@ -10359,6 +10415,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				}
 			}
 		}
+	}
 
 	/**
 	 * 验证符合性 结果待审查状态数据催办。
@@ -10403,6 +10460,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				params.put("serialNumbers",serialNumbers);
 
 				ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+				if(ObjectUtils.isNotEmpty(projectLibraryBase)){
 					String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 					String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
 					// 获取待办中心 - 飞书跳转链接
@@ -10421,6 +10479,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				}
 			}
 		}
+	}
 
 	/**
 	 * 验证符合性 清单待校核状态数据催办。
@@ -10465,6 +10524,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				params.put("serialNumbers",serialNumbers);
 
 				ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+				if(ObjectUtils.isNotEmpty(projectLibraryBase)){
 					String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 					String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
 					// 获取法规清单 - 飞书跳转链接
@@ -10477,6 +10537,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				}
 			}
 		}
+	}
 
 	/**
 	 * 设计符合性 结果待提交状态数据催办
@@ -10520,6 +10581,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				params.put("serialNumbers",serialNumbers);
 
 				ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+				if(ObjectUtils.isNotEmpty(projectLibraryBase)){
 					String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 					String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
 					// 获取待办中心 - 飞书跳转链接
@@ -10539,6 +10601,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				}
 			}
 		}
+	}
 
 	/**
 	 * 设计符合性 清单待确认状态数据催办
@@ -10582,6 +10645,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				params.put("serialNumbers",serialNumbers);
 
 				ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+				if(ObjectUtils.isNotEmpty(projectLibraryBase)){
 					String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 					String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
 					// 获取待办中心 - 飞书跳转链接
@@ -10601,6 +10665,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				}
 			}
 		}
+	}
 
 	/**
 	 * 设计符合性 结果待审查状态数据催办
@@ -10645,6 +10710,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				params.put("serialNumbers",serialNumbers);
 
 				ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+				if(ObjectUtils.isNotEmpty(projectLibraryBase)){
 					String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 					String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
 					// 获取待办中心 - 飞书跳转链接
@@ -10663,6 +10729,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				}
 			}
 		}
+	}
 
 	/**
 	 * 设计符合性 清单待校核状态数据催办
@@ -10707,6 +10774,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				params.put("serialNumbers",serialNumbers);
 
 				ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+				if(ObjectUtils.isNotEmpty(projectLibraryBase)){
 					String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 					String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
 					// 获取法规清单 - 飞书跳转链接
@@ -10719,6 +10787,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				}
 			}
 		}
+	}
 
 
 	@Override
@@ -11400,6 +11469,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		params.put("userIdList",userIdList);
 
 		ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+		if(ObjectUtils.isNotEmpty(projectLibraryBase)){
 			String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 			String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
 			// 获取法规清单 - 飞书跳转链接
@@ -11409,6 +11479,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			params.put("Initiator",projectLibraryBase.getStudioEngineerName());
 
 			this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE1.getValue(),params);
+		}
 
 		return Result.OK("发起清单确认成功！");
 	}
@@ -11489,6 +11560,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		params.put("serialNumbers",serialNumbers);
 
 		ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+		if(ObjectUtils.isNotEmpty(projectLibraryBase)){
 			String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 			String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
 			// 获取法规清单 - 飞书跳转链接
@@ -11498,6 +11570,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			params.put("Initiator",projectLibraryBase.getStudioEngineerName());
 
 			this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE2.getValue(),params);
+		}
 
 		return Result.OK("撤回成功！");
 	}
@@ -11509,6 +11582,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 
 		ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
+		if(ObjectUtils.isNotEmpty(projectLibraryBase)){
 			String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 			String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
 
@@ -11566,6 +11640,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			params.put("Initiator",projectLibraryBase.getStudioEngineerName());
 
 			this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE3.getValue(),params);
+		}
 		return Result.OK("退回成功！");
 	}
 
@@ -11626,11 +11701,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			String hrefFeishu_EN = (String) params.get("hrefFeishu_EN");
 
 			ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
-
+			if(ObjectUtils.isNotEmpty(projectLibraryBase)){
 				String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 				String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
 
-
 				try {
 					for (String userId : userIdList) {
 						String thirdId = this.sysUserService.getUserThirdIdByUserId(userInfoList,userId);
@@ -11665,6 +11739,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				}
 			}
 		}
+	}
 
 	@Override
 	public Map<String, Object> getProjectLawsInventoryLinkHrefFeishu(String projectLibraryId, String PRN_CN, String PRN_EN,String roleOpen) {
@@ -12048,7 +12123,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 		QueryWrapper<ProjectLawsInventoryEO> pliQueryWrap = new QueryWrapper<>();
 		pliQueryWrap.lambda().in(ProjectLawsInventoryEO::getId,projectLawsInventoryIdList);
-		List<ProjectLawsInventoryEO> pliEoList = this.list();
+		List<ProjectLawsInventoryEO> pliEoList = this.list(pliQueryWrap);
 		if(CollectionUtils.isNotEmpty(pliEoList)){
 			QueryWrapper<ProcessInfoEO> piQueryWrap = new QueryWrapper<>();
 			piQueryWrap.lambda().in(ProcessInfoEO::getProjectLawsInventoryId,projectLawsInventoryIdList);
@@ -12056,13 +12131,21 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 			if(CollectionUtils.isNotEmpty(piEoList)){
 				if (StringUtils.isNotEmpty(designTransferUserId)) {
+					pliEoList.forEach(pliEo -> {
+						pliEo.setDesignDutyId(designTransferUserId);
+					});
 					// 设计符合性相关待办任务强制转办
 					this.designCompulsoryTransfer(projectLibraryId, designTransferUserId, pliEoList, piEoList);
 				}
 				if(StringUtils.isNotEmpty(verifyTransferUserId)){
+					pliEoList.forEach(pliEo -> {
+						pliEo.setVerifyDutyId(verifyTransferUserId);
+					});
 					// 验证符合性相关待办任务强制转办
 					this.verifyCompulsoryTransfer(projectLibraryId,verifyTransferUserId, pliEoList, piEoList);
 				}
+
+				this.updateBatchById(pliEoList);
 			}
 		}
 		return Result.OK("强制转办成功！");

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java

@@ -2014,7 +2014,9 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 
 	@Override
 	public ProjectLibraryBase selectById(String projectLibraryId) {
+		ProjectLibraryBase result = null;
 		List<ProjectLibraryBase> records = this.projectLibraryBaseMapper.queryById(projectLibraryId);
+		if(CollectionUtils.isNotEmpty(records)){
 			List<String> studioEngineerUserIdList = records.stream().map(ProjectLibraryBase::getStudioEngineer).distinct().collect(Collectors.toList());
 			List<SysUser> studioEngineerUserInfo = this.sysUserService.querySysUserListByIdList(studioEngineerUserIdList);
 			disposeData(records,"",false);
@@ -2068,7 +2070,10 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 					}
 				}
 			}
-		return records.get(0);
+
+			result = records.get(0);
+		}
+		return result;
 	}
 }
 

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java

@@ -1823,4 +1823,45 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 		return resultList;
 	}
 
+	@Override
+	public List<Map<String, Object>> queryEngineeringInterfacePersonByProjectId(Map<String, Object> params) {
+		List<Map<String, Object>> resultList = new ArrayList<>();
+		String projectLibraryId = (String) params.get("projectLibraryId");
+		QueryWrapper<ProjectRelatedPersonnel> queryWrapper = new QueryWrapper<>();
+		List<ProjectRelatedPersonnel> prpEoList = this.list(queryWrapper.eq("project_id", projectLibraryId));
+		if(CollectionUtils.isNotEmpty(prpEoList)){
+			List<String> userIdList = new ArrayList<>();
+
+			String engineeringInterfacePersonIds = prpEoList.stream().map(ProjectRelatedPersonnel::getEngineeringInterfacePerson)
+					.filter(e->StringUtils.isNotEmpty(e)).collect(Collectors.joining(","));
+			if(StringUtils.isNotEmpty(engineeringInterfacePersonIds)){
+				userIdList.addAll(Arrays.asList(engineeringInterfacePersonIds.split(",")));
+			}
+			String engineerAttSetIds = prpEoList.stream().map(ProjectRelatedPersonnel::getEngineerAttSet)
+					.filter(e->StringUtils.isNotEmpty(e)).collect(Collectors.joining(","));
+			if(StringUtils.isNotEmpty(engineerAttSetIds)){
+				userIdList.addAll(Arrays.asList(engineerAttSetIds.split(",")));
+			}
+			String engineerLawSetIds = prpEoList.stream().map(ProjectRelatedPersonnel::getEngineerLawSet)
+					.filter(e->StringUtils.isNotEmpty(e)).collect(Collectors.joining(","));
+			if(StringUtils.isNotEmpty(engineerLawSetIds)){
+				userIdList.addAll(Arrays.asList(engineerLawSetIds.split(",")));
+			}
+
+			if(CollectionUtils.isNotEmpty(userIdList)){
+				userIdList = userIdList.stream().filter(userId -> StringUtils.isNotEmpty(userId)).collect(Collectors.toList());
+				List<SysUser> engineeringInterfacePersonList = this.sysUserService.querySysUserListByIdList(userIdList);
+				if(CollectionUtils.isNotEmpty(engineeringInterfacePersonList)){
+					for (SysUser engineeringInterfacePerson : engineeringInterfacePersonList) {
+						Map<String,Object> engineeringInterfacePersonMap = new HashMap<>();
+						engineeringInterfacePersonMap.put("id",engineeringInterfacePerson.getId());
+						engineeringInterfacePersonMap.put("userName",engineeringInterfacePerson.getUsername());
+						resultList.add(engineeringInterfacePersonMap);
+					}
+				}
+			}
+		}
+		return resultList;
+	}
+
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java

@@ -767,7 +767,7 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl<ProcessInfoEOMapper, P
 					data.setTaskDefinitionKeyName(taskDefinitionKeyName);
 				}
 				// 如果是Pre-Homo流程
-				if(StringUtils.equals(data.getFlowType(),FlowTypeEnum.CERTIFICATION_LC.getValue())){
+				if(StringUtils.equals(data.getFlowType(),FlowTypeEnum.CERTIFICATION_LC.getValue()) && data.getEndTime() != null){
 					String taskDefinitionKey = "";
 
 					String processInfoId = data.getId();
@@ -817,6 +817,7 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl<ProcessInfoEOMapper, P
 						taskDefinitionKey = CertificationFlowNodeEnum.TASK_REVIEW.getKey();
 					}
 
+					data.setTaskDefinitionKey(taskDefinitionKey);
 					data.setTaskDefinitionKeyName(CertificationFlowNodeEnum.getTextByValue(taskDefinitionKey,cut));
 				}
 			});

jero-web/src/common/lang/en-us.js

@@ -1724,7 +1724,7 @@ module.exports = {
   cantTransferToYourself:"Can't transfer to yourself",
   theDataYouInitiate:'The data you selected does not meet the process initiation criteria. Please recheck and initiate',
   dataWithProcessReleasedCannotBeReset:'Data with a process status of list to be released cannot be reset',
-  reasonForReturnOfDesignCompliance:'Reason for compliance return',
+  reasonForReturnOfDesignCompliance:'Reason for the return by the regulation engineer',
   noteone:'Note: CSV format is supported. The value is within 20M and the number is 1 to 10',
   notetwo:'\n1. Provide the modified or expanded batch of "Announcement" and supporting materials;\n2. Verification materials shall be submitted to ensure that products meet the relevant requirements of national laws and regulations, technologies, standards and technical specifications;\n',
   notethree:'Provide supporting materials',
@@ -1796,4 +1796,8 @@ module.exports = {
   verify:'Verify',
   inventoryVerifyEndTime:'Inventory Verify End Time',
   taskConfirmEndTime:'Task Confirm End Time',
+  responsiblepersonfordesigncompliance:'Responsible person for design compliance',
+  responsiblepersonforverifyingcompliance:'Responsible person for verifying compliance',
+  verifytheconformancedeliverabletype:'Verify the conformance deliverable type',
+  designaconformancedeliverabletype:'Design a conformance deliverable type',
 }

jero-web/src/common/lang/zh-cn.js

@@ -1827,7 +1827,7 @@ module.exports = {
   notecsv: '注:支持CSV格式，大小20M以内',
   theDataYouInitiate: '您所选的数据，均不符合流程发起条件，请重新检查后发起',
   dataWithProcessReleasedCannotBeReset: '流程状态为清单待发布的数据不能被重置',
-  reasonForReturnOfDesignCompliance: '符合性退回原因',
+  reasonForReturnOfDesignCompliance: '法规工程师退回原因',
   notetwo: '\n1、提供变更或扩展后的《公告》批次及证明材料;\n2、应提交验证材料，保障产品符合国家法律法规、技术、标准及技术规范等相关要求;\n',
   notethree: '\n提供证明材料\n',
   verifyComplianceConfirmReturnReason: '验证符合性确认退回原因',
@@ -1898,4 +1898,8 @@ module.exports = {
   verify:'验证',
   inventoryVerifyEndTime:'清单校核截止时间',
   taskConfirmEndTime:'责任确认截止时间',
+  responsiblepersonfordesigncompliance:'设计符合性责任人',
+  responsiblepersonforverifyingcompliance:'验证符合性责任人',
+  verifytheconformancedeliverabletype:'验证符合性交付物类型',
+  designaconformancedeliverabletype:'设计符合性交付物类型',
 }

jero-web/src/components/globalAdvancedQuery/index.vue

@@ -141,7 +141,20 @@
                   :tree-data="item.tree"
                   :placeholder="$t('PleaseSelect')"
                 />
-
+<!--                交付物类型-->
+                <template v-else-if="item.type === 'deliverables'">
+                  <a-tree-select
+                    tree-node-filter-prop="title"
+                    v-model="item.val"
+                    :maxTagCount="1"
+                    :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                    class="box-input"
+                    style="width: 100%"
+                    :tree-data="DeliverableTreeList"
+                    tree-checkable
+                    :placeholder="$t('PleaseSelect')"
+                  />
+                </template>
                 <PersonnelSelection
                   v-else-if="item.type == 'Personnel'"
                   :query="{db_field_name:'valueId',db_field_txt:'',subscript:index}"
@@ -283,6 +296,7 @@
   import moment from 'moment'
   import * as utils from '@/utils/util'
   import { mixinDevice } from '@/utils/mixin'
+  import { getAction, postAction } from '@/api/manage'
   import JDate from '@/components/jero/JDate.vue'
   import JSelectDepart from '@/components/jerobiz/JSelectDepart'
   import JSelectMultiUser from '@/components/jerobiz/JSelectMultiUser'
@@ -338,6 +352,7 @@
       return {
         moment,
         fieldTreeData: [],
+        DeliverableTreeList:[],
 
         prompt: {
           visible: false,
@@ -386,6 +401,7 @@
         deep: true,
         immediate: true,
         handler(val) {
+          console.log(val,'11')
           let mainData = [], subData = []
           val.forEach(item => {
             let data = { ...item }
@@ -412,8 +428,16 @@
         }
       }
     },
-
     methods: {
+      getDeliverableTree() {
+        getAction('/sys/category/getDeliverableTree', {}).then((res) => {
+          if (res.success) {
+            this.DeliverableTreeList = res.result
+          } else {
+            this.DeliverableTreeList = []
+          }
+        })
+      },
       show() {
         if (!this.queryParamsModel || this.queryParamsModel.length === 0) {
           this.resetLine()
@@ -484,6 +508,7 @@
       },
       handleSelected(node, item) {
         console.log(node)
+        console.log(item)
         let { type, options, dictCode, dictTable, dictText, customReturnField, popup } = node.dataRef
         item['type'] = type
         item['options'] = options
@@ -498,6 +523,9 @@
         this.$set(item, 'val', undefined)
         this.$set(item, 'valueName', undefined)
         this.$set(item, 'valueId', undefined)
+        if(item.type == 'deliverables'){
+          this.getDeliverableTree()
+        }
       },
       handleOpen() {
         this.show()

jero-web/src/views/parameter/managementdetails/index.vue

@@ -101,8 +101,9 @@
         {{$t('CustomExport')}}
       </div>
       <!--        列表设置-->
+<!--      v-if="!this.$route.query.it"-->
       <a-popconfirm :visible="customizevisible" overlayClassName="popconfirmClassName"
-                    placement="bottomRight" v-if="!this.$route.query.it">
+                    placement="bottomRight" >
         <template slot="title" id="popconfirmmize">
           <div style="max-height:360px;overflow:scroll;overflow-x: auto;width: 211px">
             <a-checkbox

jero-web/src/views/projectManagement/ProjectDetails/index.vue

@@ -105,6 +105,7 @@
           </div>
           <div class="Virtual-detail-left-text"
                :title="$t('projectStatus')"
+               v-has="'projectLawsInventory:ProjectStatus'"
                @click="textClick(5,$t('projectStatus'))">
             <a-icon type="cluster"/>
             {{$t('projectStatus')}}
@@ -144,6 +145,7 @@
           </div>
           <div class="Virtual-detail-left-text"
                :title="$t('projectStatus')"
+               v-has="'projectLawsInventory:ProjectStatus'"
                @click="textClick(5,$t('projectStatus'))">
             <a-icon type="cluster"/>
           </div>
@@ -270,11 +272,14 @@
           this.textColor(this.$t('listOfRegulations'))
           this.textTitle = this.$t('listOfRegulations')
         } else if (this.$route.query.type == '103') {
-          this.textColor(this.$t('taskList'))
+          // this.textColor(this.$t('taskList'))
-          this.textTitle = this.$t('taskList')
+          // this.textTitle = this.$t('taskList')
+          this.$router.push({
+              path:'/projectRegulationTasks',
+          })
         } else if (this.$route.query.type == '104') {
-          this.textColor(this.$t('nonConformance'))
+          // this.textColor(this.$t('nonConformance'))
-          this.textTitle = this.$t('nonConformance')
+          // this.textTitle = this.$t('nonConformance')
         } else if (this.$route.query.type == '105') {
           this.textColor(this.$t('TaskParameterCollection'))
           this.textTitle = this.$t('TaskParameterCollection')

jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue

@@ -269,8 +269,9 @@
               {{$t('CompulsoryWithdrawal')}}
             </div>
             <!--        列表设置-->
+<!--            v-if="!this.$route.query.it"-->
             <a-popconfirm :visible="customizevisible" overlayClassName="popconfirmIndex"
-                          placement="bottomRight" v-if="!this.$route.query.it">
+                          placement="bottomRight" >
               <template slot="title" id="popconfirmmize">
                 <div style="max-height:360px;overflow:scroll;overflow-x: auto;width: 211px">
                   <a-checkbox

jero-web/src/views/projectManagement/components/certificationList/index.vue

@@ -572,6 +572,12 @@
             value: 'wvtaId',
             text: 'WVTA ID'
           },
+          {
+            type: 'list_multi',
+            value: 'attestationType',
+            text: this.$t('certificationType'),
+            dictCode: 'ren4_zheng4_qing1_dan1_-_ren4_zheng4_lei4_xing2'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
+          },
           {
             type: 'string',
             value: 'serialNumber',
@@ -593,7 +599,7 @@
             type: 'date',
             value: 'endTime',
             text: this.$t('closingDate')
-          }
+          },
         ],
         disabled: false,
         queryParamQuery: {},
@@ -647,7 +653,7 @@
             title: this.$t('category'),
             align: 'left',
             dataIndex: 'category',
-            width: 180,
+            width: 120,
             ellipsis: true,
             fixed: 'left',
             sorter: true
@@ -665,6 +671,13 @@
             title: this.$t('configurationItem'),
             align: 'left',
             dataIndex: 'configItem',
+            width: 75,
+            ellipsis: true
+          },
+          {
+            title: this.$t('certificationType'),
+            align: 'left',
+            dataIndex: 'attestationTypeName',
             width: 100,
             ellipsis: true
           },
@@ -672,14 +685,15 @@
             title: 'WVTA ID',
             align: 'left',
             dataIndex: 'wvtaId',
-            width: 180,
+            width: 75,
+            sorter: true,
             ellipsis: true
           },
           {
             title: this.$t('standardNo'),
             align: 'left',
             dataIndex: 'serialNumber',
-            width: 180,
+            width: 150,
             ellipsis: true,
             sorter: true,
             scopedSlots: { customRender: 'serialNumber' }
@@ -688,28 +702,24 @@
             title: this.$t('areaOfResponsibility'),
             align: 'left',
             dataIndex: 'dutyTerritoryName',
-            width: 180,
+            width: 100,
-            ellipsis: true
+            sorter: true,
-          },
-          {
-            title: this.$t('certificationType'),
-            align: 'left',
-            dataIndex: 'attestationTypeName',
-            width: 180,
             ellipsis: true
           },
           {
             title: this.$t('engineeringInterfacePerson'),
             align: 'left',
             dataIndex: 'sdtName',
-            width: 180,
+            width: 90,
+            sorter: true,
             ellipsis: true
           },
           {
             title: this.$t('personLiable'),
             align: 'left',
             dataIndex: 'dutyPersonName',
-            width: 180,
+            width: 120,
+            sorter: true,
             ellipsis: true
           },
           {
@@ -740,7 +750,7 @@
             title: this.$t('closingDate'),
             align: 'left',
             dataIndex: 'endTime',
-            width: 180,
+            width: 100,
             sorter: true,
             ellipsis: true
           },
@@ -780,6 +790,7 @@
             title: this.$t('CertificationProgress'),
             align: 'left',
             dataIndex: 'certificationProgress',
+            sorter: true,
             width: localStorage.getItem('language') == 'zh-cn' ? 180 : 200,
             ellipsis: true,
             scopedSlots: { customRender: 'CertificationProgress' }

jero-web/src/views/projectManagement/components/listOfRegulations.vue

@@ -143,9 +143,10 @@
           {{ $t('copy') }}
         </div>
         <!--        列表设置-->
+<!--        v-if="this.roleSwitchingCode == '0' || this.roleSwitchingCode == '1' || this.roleSwitchingCode == '13'"-->
         <a-popconfirm :visible="customizevisible" overlayClassName="popconfirmmize"
                       placement="bottomRight"
-                      v-if="this.roleSwitchingCode == '0' || this.roleSwitchingCode == '1' || this.roleSwitchingCode == '13'">
+                      >
           <template slot="title" id="popconfirmmize">
             <div style="max-height:360px;overflow:scroll;overflow-x: auto;">
               <a-checkbox
@@ -1248,18 +1249,40 @@
             text: this.$t('certificationLevel'),
             dictCode: 'attestation_rank'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
           },
+          {
+            type: 'deliverables',
+            value: 'designDeliverableType',
+            text: this.$t('designaconformancedeliverabletype'),
+          },
+          {
+            type: 'deliverables',
+            value: 'verifyDeliverableType',
+            text: this.$t('verifytheconformancedeliverabletype'),
+          },
+          {
+            type: 'Personnel',
+            value: 'designDutyId',
+            valueName: 'designDutyIdName',
+            text: this.$t('responsiblepersonfordesigncompliance')
+          },
+          {
+            type: 'Personnel',
+            value: 'verifyDutyId',
+            valueName: 'verifyDutyIdName',
+            text: this.$t('responsiblepersonforverifyingcompliance')
+          },
           // {
           //   type: '',
           //   value: 'dutyTerritory',
           //   text: this.$t('areaOfResponsibility'),
           //   dictCode: 'duty_territory'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
           // },
-          {
+          // {
-            type: 'Personnel',
+          //   type: 'Personnel',
-            value: 'engineeringInterfacePerson',
+          //   value: 'engineeringInterfacePerson',
-            valueName: 'engineeringInterfacePersonName',
+          //   valueName: 'engineeringInterfacePersonName',
-            text: this.$t('engineeringInterfacePerson')
+          //   text: this.$t('engineeringInterfacePerson')
-          }
+          // }
         ],
         listOptions: [
           {
@@ -1411,6 +1434,7 @@
       this.JLoading = true
       this.getHeader()
       this.queryLawEngineerByProjectId()
+      this.queryengineeringInterfacePersonId()
       this.getRoleByUserId(() => {
         this.getAndUserId()
       })
@@ -1527,6 +1551,32 @@
           }
         })
       },
+      queryengineeringInterfacePersonId() {
+        let query = {
+          projectLibraryId: this.$route.query.id
+        }
+        getAction('/project/projectRelatedPersonnel/queryEngineeringInterfacePersonByProjectId', query).then((res) => {
+          if (res.success) {
+            let engineeringInterfacePerson = {
+              value: 'engineeringInterfacePerson',
+              text: this.$t('engineeringInterfacePerson'),
+              options: []
+            }
+            if (res.result && res.result.length > 0) {
+              res.result.forEach(val => {
+                engineeringInterfacePerson.options.push({
+                  value: val.id,
+                  key: val.id,
+                  label: val.userName
+                })
+              })
+            }
+            this.fieldList.push(engineeringInterfacePerson)
+          } else {
+
+          }
+        })
+      },
       //流程状态点击事件
       designFlowStatusClick(row, name) {
         let query = {}
@@ -2254,6 +2304,10 @@
           this.orderByField = 'designDutyId'
         } else if (sorter.columnKey == 'verifyDutyIdName') {
           this.orderByField = 'verifyDutyId'
+        }  else if (sorter.columnKey == 'verifyFlowStatusName') {
+          this.orderByField = 'verifyFlowStatus'
+        }  else if (sorter.columnKey == 'designFlowStatusName') {
+          this.orderByField = 'designFlowStatus'
         } else {
           this.orderByField = sorter.columnKey
         }

jero-web/src/views/virtualAuthenticationList/components/addModel.vue

@@ -146,6 +146,23 @@
               </a-col>
             </a-row>
             <a-row :gutter="24">
+              <a-col :span="12">
+                <div class="box-title-text">
+                  <div class="title-text">
+                    <span class="Required">*</span>
+                <span class="title-text-text"
+                      :title="$t('certificationType')">{{$t('certificationType')}}</span>
+                  </div>
+                  <a-form-model-item class="itemModel attestationType"
+                                     :prop="'dataList.'+index+'.attestationType'"
+                                     :rules="[{ required: true, message: $t('certificationType') + $t('cannotEmpty'), trigger: 'change'}]">
+                    <j-multi-select-tag class="box-input" v-model="item.attestationType"
+                                        :placeholder="$t('PleaseSelect')+$t('certificationType')"
+                                        :type="'select'"
+                                        :triggerChange="false" :dictCode="'ren4_zheng4_qing1_dan1_-_ren4_zheng4_lei4_xing2'"/>
+                  </a-form-model-item>
+                </div>
+              </a-col>
               <a-col :span="12">
                 <div class="box-title-text">
                   <div class="title-text">
@@ -435,4 +452,7 @@ export default {
   border: 1px #00B3BE solid;
   color: #00B3BE;
 }
+::v-deep .attestationType .ant-form-explain{
+  margin-top: -16px;
+}
 </style>

jero-web/src/views/virtualAuthenticationList/components/editModel.vue

@@ -61,6 +61,22 @@
                 </a-form-model-item>
               </div>
             </a-col>
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="Required" v-if="!disabled">*</span>
+                <span class="title-text-text"
+                      :title="$t('certificationType')">{{$t('certificationType')}}</span>
+                </div>
+                <a-form-model-item class="itemModel attestationType" prop="attestationType">
+                  <j-multi-select-tag class="box-input" v-model="formInline.attestationType"
+                                      :disabled="disabled"
+                                      :placeholder="$t('PleaseSelect')+$t('certificationType')"
+                                      :type="'select'"
+                                      :triggerChange="false" :dictCode="'ren4_zheng4_qing1_dan1_-_ren4_zheng4_lei4_xing2'"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
           </a-row>
           <a-row :gutter="24">
             <a-col :span="12">
@@ -211,6 +227,13 @@ export default {
             trigger: 'change'
           }
         ],
+        attestationType: [
+          {
+            required: true,
+            message: this.$t('certificationType') + this.$t('cannotEmpty'),
+            trigger: 'change'
+          }
+        ],
         category: [
           {
             required: true,
@@ -425,4 +448,7 @@ export default {
   ::v-deep .ant-select-disabled .ant-select-selection-selected-value{
     color: #040B29!important;
   }
+::v-deep .attestationType .ant-form-explain{
+  margin-top: -16px;
+}
 </style>

jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue

@@ -331,12 +331,19 @@
             width: 200,
             ellipsis: true
           },
+          {
+            title: this.$t('certificationType'),
+            align: 'left',
+            dataIndex: 'attestationTypeName',
+            width: 100,
+            ellipsis: true
+          },
           {
             title: 'WVTA ID',
             align: 'left',
             sorter: true,
             dataIndex: 'wvtaId',
-            width: 200,
+            width: 75,
             ellipsis: true
           },
           {
@@ -352,7 +359,7 @@
             title: this.$t('areaOfResponsibility'),
             align: 'left',
             dataIndex: 'dutyTerritoryName',
-            width: 200,
+            width: 150,
             sorter: true,
             ellipsis: true
           },