Merge branch '20240913'

db/update/测试阶段.sql

@@ -370,8 +370,10 @@ ALTER TABLE `laws_conformity_assessment_library_detail`
 -- 2024年9月13日15:38:30 拆分目录表字段长度和标签库改为一致
 ALTER TABLE `sar_file_split_menu`
     MODIFY COLUMN `item_name` varchar(500) NULL COMMENT '条款名称';
+ALTER TABLE `sar_file_split_info`
+    MODIFY COLUMN `title` varchar(500) NULL COMMENT '标题-条款名称';
 
 -- 2024-09-13 不符合项增加关闭人、关闭时间
 ALTER TABLE `laws_evaluation_not_met_library`
     ADD COLUMN `close_user` varchar(50) NULL COMMENT '关闭人' AFTER `all_approval_user`,
-    ADD COLUMN `close_time` datetime NULL COMMENT '关闭时间' AFTER `close_user`;
+    ADD COLUMN `close_time` datetime NULL COMMENT '关闭时间' AFTER `close_user`;

laws-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java

@@ -135,7 +135,9 @@ public class SysDictItemController {
 				if(!CollectionUtils.isEmpty(listSub)){
 					sysDictItem.setChildren(listSub);
 				}
-				listAll.add(sysDictItem);
+				if(!listAll.contains(sysDictItem)){
+					listAll.add(sysDictItem);
+				}
 			}
 		}
 		return listAll;
@@ -232,11 +234,25 @@ public class SysDictItemController {
 					listSelectAll.add(dictItem);
 					List<SysDictItem> sub = getParentData(dictItem.getParentId());
 					if(!CollectionUtils.isEmpty(sub)){
-						listSelectAll.addAll(sub);
+						for (SysDictItem item : sub) {
+							if(!listSelectAll.contains(item)){
+								listSelectAll.add(item);
+							}
+						}
 					}
 				}
+				listSysDictItem = new ArrayList<>();
 				if(!CollectionUtils.isEmpty(listSelectAll)){
-					listSysDictItem = listSelectAll.stream().distinct().collect(Collectors.toList());
+					for (SysDictItem dictItem : listSelectAll) {
+						if(!CollectionUtils.isEmpty(listSysDictItem)){
+							long l = listSysDictItem.stream().filter(o->Objects.equals(o.getId(),dictItem.getId())).count();
+							if(l == 0){
+								listSysDictItem.add(dictItem);
+							}
+						}else{
+							listSysDictItem.add(dictItem);
+						}
+					}
 				}
 			}
 			List<SysDictItem> listSysDictItemParent = listSysDictItem.stream().filter(o->Objects.equals(o.getParentId(),"0")).collect(Collectors.toList());
@@ -245,7 +261,9 @@ public class SysDictItemController {
 				if(!CollectionUtils.isEmpty(listRes)){
 					dictItem.setChildren(listRes);
 				}
-				listAll.add(dictItem);
+				if(!listAll.contains(dictItem)){
+					listAll.add(dictItem);
+				}
 			}
 		}
 
@@ -264,7 +282,11 @@ public class SysDictItemController {
 					&& !Objects.equals(dictItemChildren.getParentId(),"0")){
 				List<SysDictItem> sub = getParentData(dictItemChildren.getParentId());
 				if(!CollectionUtils.isEmpty(sub)){
-					listSelectAll.addAll(sub);
+					for (SysDictItem item : sub) {
+						if(!listSelectAll.contains(item)){
+							listSelectAll.add(item);
+						}
+					}
 				}
 			}
 		}

laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/entity/ProcessStandardInterpretClauseSublist.java

@@ -73,7 +73,7 @@ public class ProcessStandardInterpretClauseSublist extends BaseEntity {
     private String regulatoryNotes;
     /**涉及系统/部件）*/
     @ApiModelProperty(value = "涉及系统/部件）")
-    @Excel(name = "涉及系统/部件", width = 15)
+    @Excel(name = "涉及系统/部件", width = 15, dictTable = "laws_part_name", dicCode = "code", dicText = "name")
     @Dict(dictTable = "laws_part_name", dicCode = "code", dicText = "name")
     private String partName;
     /**涉及系统/部件）*/

laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsEvaluationNotMetLibrary.java

@@ -182,7 +182,7 @@ public class LawsEvaluationNotMetLibrary implements Serializable {
      * PCR编号
      */
     @ApiModelProperty(value = "PCR编号")
-    @Excel(name = "PCR编号", width = 15, orderNum = "11")
+    @Excel(name = "PCR编号", width = 15, orderNum = "13")
     private String pcrNo;
 
     /**
@@ -206,7 +206,7 @@ public class LawsEvaluationNotMetLibrary implements Serializable {
     @ApiModelProperty(value = "整改完成日期")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
-    @Excel(name = "整改完成日期", width = 15, orderNum = "12", format = "yyyy-MM-dd")
+    @Excel(name = "整改完成日期", width = 15, orderNum = "14", format = "yyyy-MM-dd")
     private Date rectifyCompleteDate;
 
     /**
@@ -220,7 +220,7 @@ public class LawsEvaluationNotMetLibrary implements Serializable {
      * 附件
      */
     @ApiModelProperty(value = "附件")
-    @ExcelCollection(name = "", orderNum = "13")
+    @ExcelCollection(name = "", orderNum = "15")
     @TableField(exist = false)
     private List<ExcelExportUtilPro.FileDetails> fileList = Collections.emptyList();
 
@@ -270,7 +270,7 @@ public class LawsEvaluationNotMetLibrary implements Serializable {
      * 关闭人
      */
     @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
-    @Excel(name = "关闭人", width = 15, orderNum = "8", dictTable = "sys_user", dicCode = "id", dicText = "CONCAT(realname, '(', username, ')')")
+    @Excel(name = "关闭人", width = 15, orderNum = "11", dictTable = "sys_user", dicCode = "id", dicText = "CONCAT(realname, '(', username, ')')")
     @ApiModelProperty(value = "关闭人")
     private String closeUser;