认证清单-处理认证进度展示数据，增加认证进度备注字段。处理SQL

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

@@ -293,4 +293,10 @@ ALTER TABLE `project_library_role_rel`
     ADD COLUMN `model_type` varchar(64) NULL COMMENT '模块类型，对应系统中枚举类 RoleRelModelTypeEnum ' AFTER `role_code`;
 
 -- 初始化历史数据
-update project_library_role_rel set model_type = 'Laws inventory'
+update project_library_role_rel set model_type = 'Laws inventory';
+
+-- 项目库-认证清单表-增加认证进度备注 2023-03-08 未同步生产环境
+ALTER TABLE `project_certification_inventory`
+    ADD COLUMN `certification_progress_remark` varchar(2000) NULL COMMENT '认证进度备注' AFTER `certification_progress`;
+-- 将之前的任务清单-认证进度，修改为 认证清单-认证进度  2023-03-08 未同步生产环境
+UPDATE `sys_dict` SET `dict_name` = '认证清单-认证进度', `description` = '认证清单-认证进度' WHERE `id` = '1524311122804346881';

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/enums/EvaluationTypeEnum.java

@@ -37,12 +37,12 @@ public enum EvaluationTypeEnum {
 
     public static String getTextByValue(String value,String cut) {
         EvaluationTypeEnum[] values = values();
-        for (EvaluationTypeEnum certificationProgressEnum : values) {
-            if (certificationProgressEnum.value.equals(value)) {
+        for (EvaluationTypeEnum evaluationTypeEnum : values) {
+            if (evaluationTypeEnum.value.equals(value)) {
                 if(StringUtils.equals(cut, CutEnum.CN.getValue())){
-                    return certificationProgressEnum.name;
+                    return evaluationTypeEnum.name;
                 }else {
-                    return certificationProgressEnum.value;
+                    return evaluationTypeEnum.value;
                 }
             }
         }

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

@@ -174,6 +174,14 @@ public class ProjectCertificationInventoryEO implements Serializable {
     @ApiModelProperty(value = "认证进度")
     private java.lang.String certificationProgress;
 
+	/**认证进度展示名称**/
+	@TableField(exist = false)
+    private String certificationProgress_dictText;
+
+	@Excel(name = "认证进度备注", width = 15)
+    @ApiModelProperty(value = "认证进度备注")
+    private String certificationProgressRemark;
+
     /**项目库id*/
     @ApiModelProperty(value = "项目库id")
     private String projectLibraryId;

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

@@ -209,6 +209,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 		if (CollectionUtils.isNotEmpty(datas)) {
 			List<SysCategory> categoryList = this.sysCategoryService.list();
 			List<SysDictItem> sysDictItems = this.sysDictItemServiceImpl.getBaseMapper().selectItemsAll();
+			List<SysDictItem> certificationProgress = this.sysDictItemServiceImpl.selectItemsByDictCode("certification_progress");
 
 			List<String> userIdList = new ArrayList<>();
 
@@ -248,6 +249,20 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 					String dutyTerritoryName = this.sysDictItemService.disposeShowDictItemValue(sysDictItems,data.getDutyTerritory(),cut, ProjectInventoryFieldEnum.DUTY_TERRITORY.getValue());
 					data.setDutyTerritoryName(dutyTerritoryName);
 				}
+				if(StringUtils.isNotEmpty(data.getCertificationProgress())){
+					String certificationProgress_dictText = "";
+					List<SysDictItem> collect = certificationProgress.stream()
+							.filter(dict -> StringUtils.equals(dict.getItemValue(), data.getCertificationProgress()))
+							.collect(Collectors.toList());
+					if(CollectionUtils.isNotEmpty(collect)){
+						if(StringUtils.equals(cut,CutEnum.CN.getValue())){
+							certificationProgress_dictText = collect.get(0).getItemText();
+						}else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
+							certificationProgress_dictText = collect.get(0).getEnName();
+						}
+					}
+					data.setCertificationProgress_dictText(certificationProgress_dictText);
+				}
 			}
 		}
 	}
@@ -619,6 +634,10 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 
 	@Override
 	public Result<?> submitTask(JSONObject json) {
+		if (!json.containsKey("nodeKey")) {
+			throw new JeroBootException("nodeKey不能为空，请联系管理员！");
+		}
+
 		String nodeKey = json.getString("nodeKey");
 
 		CertificationFlowNodeEnum flowNodeEnum = CertificationFlowNodeEnum.getEnumByKey(nodeKey);
@@ -626,6 +645,13 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 			throw new JeroBootException("根据" + nodeKey + " 的操作节点没有获取到节点信息，请联系管理员！");
 		}
 
+		String projectLibraryId = json.getString("projectLibraryId");
+		ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.getBaseMapper().selectById(projectLibraryId);
+		if(ObjectUtils.isEmpty(projectLibraryBase)){
+			throw new JeroBootException("无法获取项目库信息，项目库id为：" + projectLibraryId + " 请联系管理员！");
+		}
+
+
 		switch (flowNodeEnum){
 			case RZGCSJSRW:
 				return this.certificationInitiatingTask(json);