diff --git a/db/update/测试阶段.sql b/db/update/测试阶段.sql index 4f8ad290..d6c3fe4a 100644 --- a/db/update/测试阶段.sql +++ b/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`; \ No newline at end of file + ADD COLUMN `close_time` datetime NULL COMMENT '关闭时间' AFTER `close_user`; diff --git a/laws-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java b/laws-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java index fea1f6d9..15dcccb1 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java +++ b/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 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 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 sub = getParentData(dictItemChildren.getParentId()); if(!CollectionUtils.isEmpty(sub)){ - listSelectAll.addAll(sub); + for (SysDictItem item : sub) { + if(!listSelectAll.contains(item)){ + listSelectAll.add(item); + } + } } } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/entity/ProcessStandardInterpretClauseSublist.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/entity/ProcessStandardInterpretClauseSublist.java index 34e6609a..2ba3f4a6 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/entity/ProcessStandardInterpretClauseSublist.java +++ b/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; /**涉及系统/部件）*/ diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsEvaluationNotMetLibrary.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsEvaluationNotMetLibrary.java index 864a2aee..ad3c2ba5 100644 --- a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsEvaluationNotMetLibrary.java +++ b/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 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;