From ce0a40425d80404fcc3dfd6a59e758e694b83f5b Mon Sep 17 00:00:00 2001 From: caihaohan Date: Wed, 11 Sep 2024 10:32:21 +0800 Subject: [PATCH 01/42] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E5=A4=96?= =?UTF-8?q?=E9=83=A8=E6=A0=87=E5=87=86=E5=AE=9E=E6=96=BD=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E4=B8=BA=E5=A4=9A=E9=80=89SQL?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/update/测试阶段.sql | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/db/update/测试阶段.sql b/db/update/测试阶段.sql index ef038a87..6e62860e 100644 --- a/db/update/测试阶段.sql +++ b/db/update/测试阶段.sql @@ -277,11 +277,6 @@ CREATE INDEX lds_idx_standard_id ON laws_document_split (standard_id); -- 2024-09-03 修改标签管理条款在高级检索中搜索条件与导出全部数据 update laws_tag set is_show_search = 1 where table_name = 'laws_document_split'; --- 2024-09-04 修改外部标准实施日期为多选日期 -# UPDATE laws_tag SET `db_length` = 200,`field_show_type` = '4' WHERE `id` = '1695991006579912706'; -# ALTER TABLE `laws_domestic_standard` -# MODIFY COLUMN `implementation_date` varchar(200) NULL DEFAULT NULL COMMENT '实施日期'; - -- 2024-09-04 条款添加标题译文 ALTER TABLE laws_document_split ADD title_translation longtext NULL DEFAULT NULL COMMENT '标题译文'; INSERT INTO `laws_tag`(`id`, `table_name`, `db_field_name`, `db_field_en_name`, `db_field_txt`, `order_num`, `db_field_name_old`, `db_is_key`, `db_is_null`, `db_type`, `db_length`, `db_point_length`, `db_default_val`, `dict_field`, `dict_table`, `dict_text`, `field_show_type`, `field_href`, `field_length`, `field_valid_type`, `field_must_input`, `field_extend_json`, `field_default_value`, `is_show_form_create`, `is_query`, `is_show_form`, `is_show_list`, `is_read_only`, `query_mode`, `main_table`, `main_field`, `update_by`, `update_time`, `create_time`, `create_by`, `converter`, `query_def_val`, `query_dict_text`, `query_dict_field`, `query_dict_table`, `query_show_type`, `query_config_flag`, `query_valid_type`, `query_must_input`, `sort_flag`, `show_area`, `is_show_laws_list`, `is_show_search`, `del_flag`, `is_model`, `dict_id`, `home_search_context_order`, `home_search_file_order`, `dict_field_search`, `dict_table_search`, `dict_text_search`, `usable_range`, `tree_first_href`, `import_sort`) VALUES ('1701142687771348923', 'laws_document_split', 'title_translation', 'Title Translation', '标题译文', 3, 'title_translation', 0, 1, 'String', 500, NULL, NULL, NULL, NULL, NULL, '9', NULL, NULL, NULL, '0', NULL, NULL, 1, 1, 1, 1, 1, NULL, NULL, NULL, 'admin', '2023-10-30 13:36:07', '2023-09-11 15:56:37', 'admin', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, 0, '4', NULL, NULL, NULL, NULL, NULL, NULL, '1,3', NULL, 2); @@ -336,3 +331,8 @@ update process_node set node_name = '部门接口人分发' where node_name = ' UPDATE `sys_permission` SET `name` = '市场法规清单发布流程' WHERE `id` = '897f89d790485b5c0190485b5c110000'; UPDATE `sys_permission` SET `name` = '市场法规清单发布流程' WHERE `id` = '897f89d790485b5c0190485ca6e10001'; UPDATE `sys_dict_item` SET `item_text` = '市场法规清单发布流程' WHERE `id` = '1808773975469953026'; + +-- 2024-09-11 修改外部标准实施日期为多选日期 +UPDATE laws_tag SET `db_length` = 200,`field_show_type` = '4' WHERE `id` = '1695991006579912706'; +ALTER TABLE `laws_domestic_standard` + MODIFY COLUMN `implementation_date` varchar(200) NULL DEFAULT NULL COMMENT '实施日期'; \ No newline at end of file From 06e591fecf53037b3752ab87c33dc3029d38382e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Wed, 11 Sep 2024 11:03:32 +0800 Subject: [PATCH 02/42] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=96=E6=9D=A5?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=AE=9E=E6=96=BD=E6=97=A5=E6=9C=9F=E4=B8=BA?= =?UTF-8?q?=E5=A4=9A=E9=80=89=EF=BC=8C=E4=B8=80=E8=88=AC=E6=A3=80=E7=B4=A2?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=AE=9E=E6=96=BD=E6=97=A5=E6=9C=9F=E6=8E=92?= =?UTF-8?q?=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../home/mapper/xml/LawsHomeSearchMapper.xml | 1 - .../impl/LawsHomeSearchServiceImpl.java | 44 +++++++++---------- .../vo/LawsHomeNormalSearchExportExcelVO.java | 4 +- .../laws/home/vo/LawsHomeNormalSearchVO.java | 2 +- .../standard/entity/LawsDomesticStandard.java | 2 +- 5 files changed, 26 insertions(+), 27 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/mapper/xml/LawsHomeSearchMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/home/mapper/xml/LawsHomeSearchMapper.xml index a6934ea6..765cc432 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/home/mapper/xml/LawsHomeSearchMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/home/mapper/xml/LawsHomeSearchMapper.xml @@ -58,7 +58,6 @@ sort_index DESC, standard_type_order ASC, standard_state_order ASC, - implementation_date DESC, create_time DESC + select l2.id from laws_domestic_standard l1 + left join sar_file_split_info l2 on l1.id = l2.standard_id and l2.del_flag = 0 + where l1.del_flag = 0 and l2.id is not null + and + + CONCAT(',',l1.applicable_market,',') like CONCAT('%,',#{item},',%') + + diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java index f5ebdb3f..73b18b02 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java @@ -82,6 +82,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.support.DefaultTransactionDefinition; import org.springframework.web.util.HtmlUtils; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.File; @@ -194,6 +195,7 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService { private static final String MENU_ID = "menu_id"; private static final String CREATE_TIME = "create_time"; private static final String SPLIT_STATUS = "split_status"; + private static final String COUNTRY = "country"; private static final int NUMBER = 500; @@ -1858,6 +1860,17 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService { parameter.remove(MENU_ID); } } + // 适用市场 + if (parameter.containsKey(COUNTRY) && !StringUtils.isBlank(parameter.get(COUNTRY).toString())){ + // 查询市场下的标准 + List countryList = Arrays.asList(parameter.get(COUNTRY).toString().split(",")); + List ids = documentSplitMapper.getSplitSelectIds(countryList); + if(!CollectionUtils.isEmpty(ids)){ + // in查询 + selectCondition.append(" and s.info_id" + " in('").append(String.join("','",ids)).append("')"); + } + parameter.remove(COUNTRY); + } } /** From 6cb0290a62100b82f09eb3329c5f1ac905e0f818 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Wed, 11 Sep 2024 18:47:35 +0800 Subject: [PATCH 09/42] =?UTF-8?q?=E6=9D=A1=E6=AC=BE=E6=A3=80=E7=B4=A2?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=80=82=E7=94=A8=E5=B8=82=E5=9C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DocumentSplitServiceImpl.java | 33 +++++++++++-------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java index 73b18b02..fb2f6413 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java @@ -483,25 +483,28 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService { // 组织结构 List lawsTags2 = fieldListSelect.stream() .filter(j -> FieldCommon.GROUP.contains(j.getFieldShowType())).collect(Collectors.toList()); - + List sysDictList = sysDictService.list(); + List sysDictItemList = sysDictItemService.list(); + List sysDepartListAll = sysDepartService.list(); records.parallelStream().forEach(map->{ for (LawsTag lawsTag : lawsTags) { String dbFieldName = lawsTag.getDbFieldName(); if (map.containsKey(dbFieldName)){ // 字典查找 - SysDict sysDict = sysDictService.getById(lawsTag.getDictId()); - if (!Objects.isNull(sysDict)){ - setDicText(map, dbFieldName, sysDict); - } + Optional op = sysDictList.stream().filter(o->Objects.equals(o.getId(),lawsTag.getDictId())).findFirst(); + op.ifPresent(sysDict -> setDicText(map, dbFieldName, sysDict, sysDictItemList)); } } for (LawsTag lawsTag : lawsTags2) { String dbFieldName = lawsTag.getDbFieldName(); if (map.containsKey(dbFieldName)){ - List sysDepartList = - sysDepartService.listByIds(Arrays.asList(map.get(dbFieldName).toString().split(","))); - List itemTextList = sysDepartList.stream().map(SysDepart::getDepartName).collect(Collectors.toList()); - map.put(dbFieldName + DocumentSplitCommon.DIC_TEXT, String.join(",", itemTextList)); + if(!CollectionUtils.isEmpty(sysDepartListAll)){ + List sysDepartList = sysDepartListAll.stream().filter(o-> + Arrays.asList(map.get(dbFieldName).toString().split(",")).contains(o.getId())) + .collect(Collectors.toList()); + List itemTextList = sysDepartList.stream().map(SysDepart::getDepartName).collect(Collectors.toList()); + map.put(dbFieldName + DocumentSplitCommon.DIC_TEXT, String.join(",", itemTextList)); + } } } // 特殊翻译 @@ -531,12 +534,14 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService { } } - private void setDicText(Map map, String dbFieldName, SysDict sysDict) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() - .eq(SysDictItem::getDictId, sysDict.getId()) - .in(SysDictItem::getItemValue, Arrays.asList(map.get(dbFieldName).toString().split(","))); + private void setDicText(Map map, String dbFieldName, SysDict sysDict,List sysDictItemList) { + if(CollectionUtils.isEmpty(sysDictItemList)){ + return; + } // 字典值查询 - List list = sysDictItemService.list(queryWrapper); + List list = sysDictItemList.stream().filter(o->Objects.equals(sysDict.getId(),o.getDictId()) && + Arrays.asList(map.get(dbFieldName).toString().split(",")).contains(o.getItemValue())) + .collect(Collectors.toList()); if(!list.isEmpty()){ List itemTextList = list.stream().map(SysDictItem::getItemText).collect(Collectors.toList()); map.put(dbFieldName + DocumentSplitCommon.DIC_TEXT, String.join(",", itemTextList)); From 4d796ac2ada03d752d28c73b176438993fee5c28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Thu, 12 Sep 2024 09:56:07 +0800 Subject: [PATCH 10/42] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=8B=86=E5=88=86?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E6=96=87=E4=BB=B6=E5=8C=85=E5=90=AB=E6=9D=A1?= =?UTF-8?q?=E6=AC=BE=E5=AF=BC=E5=85=A5=E6=A8=A1=E7=89=88=E5=8D=B3=E5=8F=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/split/service/impl/FileSplitItemsEOServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java index 5b982612..f7a2b88b 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java @@ -2210,7 +2210,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl Date: Thu, 12 Sep 2024 10:17:33 +0800 Subject: [PATCH 11/42] =?UTF-8?q?=E5=A4=96=E6=9D=A5=E6=A0=87=E5=87=86?= =?UTF-8?q?=E3=80=81=E5=B8=82=E5=9C=BA=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?= =?UTF-8?q?=20=E4=B8=BB=E6=8E=A7=E9=83=A8=E9=97=A8=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=88=90=E5=A4=9A=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/update/测试阶段.sql | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/db/update/测试阶段.sql b/db/update/测试阶段.sql index 8984185c..b6b1b1ca 100644 --- a/db/update/测试阶段.sql +++ b/db/update/测试阶段.sql @@ -340,3 +340,10 @@ ALTER TABLE `laws_domestic_standard` -- 2024-09-11 外来标准 ALTER TABLE `laws_domestic_standard` MODIFY COLUMN `applicable_market` longtext NULL DEFAULT NULL COMMENT '适用市场'; + +-- 2024-09-12 修改主控部门字段长度 +ALTER TABLE `laws_market_standard_detail` + MODIFY COLUMN `main_dept` longtext NULL DEFAULT NULL COMMENT '主控部门'; +ALTER TABLE `laws_domestic_standard` + MODIFY COLUMN `main_dept` longtext NULL DEFAULT NULL COMMENT '主控部门'; +UPDATE `laws_tag` SET `field_show_type` = '7' WHERE `id` = '1800826537491943426'; From 4af549cc24f3dff5c3ab6de257f0419359b02244 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Thu, 12 Sep 2024 10:58:31 +0800 Subject: [PATCH 12/42] =?UTF-8?q?=E5=AE=9E=E6=96=BD=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../standardinterpret/entity/ProcessStandardInterpret.java | 2 +- .../standardinterpret/vo/HomeNewestStandardInterpret.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/entity/ProcessStandardInterpret.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/entity/ProcessStandardInterpret.java index d398080b..95a44ab9 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/entity/ProcessStandardInterpret.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/entity/ProcessStandardInterpret.java @@ -52,7 +52,7 @@ public class ProcessStandardInterpret extends BaseEntity { @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "实施日期") @TableField(exist = false) - private java.util.Date implementationDate; + private java.lang.String implementationDate; /**新生产车实施日*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/vo/HomeNewestStandardInterpret.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/vo/HomeNewestStandardInterpret.java index 240bba77..58498ad7 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/vo/HomeNewestStandardInterpret.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/vo/HomeNewestStandardInterpret.java @@ -37,7 +37,7 @@ public class HomeNewestStandardInterpret { @ApiModelProperty(value = "实施日期") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") - private Date implementationDate; + private String implementationDate; // 代替标准编号 @ApiModelProperty(value = "代替标准编号") private String substituteStandardNumber; From 107cdd48ae0008995d8238214e9ea0ab29cd2e73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Thu, 12 Sep 2024 10:59:32 +0800 Subject: [PATCH 13/42] =?UTF-8?q?=E5=AE=9E=E6=96=BD=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../standardinterpret/vo/HomeNewestStandardInterpret.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/vo/HomeNewestStandardInterpret.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/vo/HomeNewestStandardInterpret.java index 58498ad7..f43bc8c2 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/vo/HomeNewestStandardInterpret.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/vo/HomeNewestStandardInterpret.java @@ -35,8 +35,6 @@ public class HomeNewestStandardInterpret { private String standardState; // 实施日期 @ApiModelProperty(value = "实施日期") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") private String implementationDate; // 代替标准编号 @ApiModelProperty(value = "代替标准编号") From 5e274119cb3d7e52a6c40af222161fef9b3aa888 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Thu, 12 Sep 2024 11:16:12 +0800 Subject: [PATCH 14/42] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E5=8F=91=E5=B8=83=E6=B5=81=E7=A8=8B=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E9=99=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/update/测试阶段.sql | 4 ++++ .../process/ms/entity/ProcessMarketStandardRelease.java | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/db/update/测试阶段.sql b/db/update/测试阶段.sql index b6b1b1ca..d0f9c27f 100644 --- a/db/update/测试阶段.sql +++ b/db/update/测试阶段.sql @@ -347,3 +347,7 @@ ALTER TABLE `laws_market_standard_detail` ALTER TABLE `laws_domestic_standard` MODIFY COLUMN `main_dept` longtext NULL DEFAULT NULL COMMENT '主控部门'; UPDATE `laws_tag` SET `field_show_type` = '7' WHERE `id` = '1800826537491943426'; + +-- 2024-09-12 市场法规清单发布流程添加附件 +ALTER TABLE `process_market_standard_release` + ADD COLUMN `file` varchar(2000) NULL DEFAULT NULL COMMENT '附件'; diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/entity/ProcessMarketStandardRelease.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/entity/ProcessMarketStandardRelease.java index ad87e059..dbc3628a 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/entity/ProcessMarketStandardRelease.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/entity/ProcessMarketStandardRelease.java @@ -88,6 +88,11 @@ public class ProcessMarketStandardRelease implements Serializable { @ApiModelProperty(value = "清单说明") private String manifestDesc; + + /**附件*/ + @ApiModelProperty(value = "附件") + private String file; + /** * 标准详情列表 */ From c1c15f9cc98670e30ffa0c84eeb621c76fa01c4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Thu, 12 Sep 2024 14:52:08 +0800 Subject: [PATCH 15/42] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E5=8F=91=E8=8E=B7=E5=8F=96=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E7=BC=96=E5=8F=B7=E5=8F=96=E6=8E=92=E5=BA=8F=E6=9C=80=E5=B0=8F?= =?UTF-8?q?=E7=9A=84=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../laws/marketStandard/mapper/xml/LawsMarketStandardMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/mapper/xml/LawsMarketStandardMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/mapper/xml/LawsMarketStandardMapper.xml index d9a222ec..90974624 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/mapper/xml/LawsMarketStandardMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/mapper/xml/LawsMarketStandardMapper.xml @@ -74,6 +74,6 @@ #{item} - order by s2.create_time asc + order by s2.item_value asc limit 1 From 8e049ca69d9c62e0a4d717adad900124c5863faf Mon Sep 17 00:00:00 2001 From: caihaohan Date: Fri, 13 Sep 2024 14:12:44 +0800 Subject: [PATCH 16/42] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E8=BE=85?= =?UTF-8?q?=E5=8A=A9=E8=AF=B4=E6=98=8E=E6=9D=90=E6=96=99=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/update/测试阶段.sql | 5 +++++ .../entity/ProcessStandardComplianceCheckDetail.java | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/db/update/测试阶段.sql b/db/update/测试阶段.sql index d0f9c27f..b4ef229a 100644 --- a/db/update/测试阶段.sql +++ b/db/update/测试阶段.sql @@ -351,3 +351,8 @@ UPDATE `laws_tag` SET `field_show_type` = '7' WHERE `id` = '1800826537491943426 -- 2024-09-12 市场法规清单发布流程添加附件 ALTER TABLE `process_market_standard_release` ADD COLUMN `file` varchar(2000) NULL DEFAULT NULL COMMENT '附件'; + + +-- 2024-09-13 增加辅助说明材料字段 +ALTER TABLE `process_standard_compliance_check_detail` + ADD COLUMN `unsatisfied_require_attach` varchar(500) NULL COMMENT '辅助说明材料' AFTER `assessor`; \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheckDetail.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheckDetail.java index bab30ede..e37c0a5f 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheckDetail.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheckDetail.java @@ -222,6 +222,12 @@ public class ProcessStandardComplianceCheckDetail implements Serializable, Compa @ApiModelProperty(value = "分发批次唯一Id") private String batchId; + /** + * 辅助说明材料 + */ + @ApiModelProperty(value = "辅助说明材料") + private String unsatisfiedRequireAttach; + @ApiModelProperty(value = "是否与上一版相同（字典：1：是，0：否）") @Dict(dicCode = "yn") @TableField(exist = false) From 7de362af4b11500ef202ebe3db5fb6d7617fb340 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Fri, 13 Sep 2024 14:23:36 +0800 Subject: [PATCH 17/42] =?UTF-8?q?feat:=20scc=E6=B5=81=E7=A8=8B=E9=80=82?= =?UTF-8?q?=E7=94=A8=E5=B8=82=E5=9C=BA=E6=94=B9=E4=B8=BA=E5=9B=BD=E5=AE=B6?= =?UTF-8?q?/=E5=9C=B0=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/ProcessStandardComplianceCheck.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheck.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheck.java index a0909ff9..ff32d2be 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheck.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheck.java @@ -118,7 +118,7 @@ public class ProcessStandardComplianceCheck implements Serializable { * 适用市场 */ @ApiModelProperty(value = "适用市场") - @Dict(dictTable = "laws_market_standard", dicText = "manifest_name", dicCode = "id") + @Dict(dicCode = "market_state") private String applicableMarket; /** From 6b8524f9b8a3c0e2d315eb8b999dc61b712bc2bf Mon Sep 17 00:00:00 2001 From: caihaohan Date: Fri, 13 Sep 2024 14:32:27 +0800 Subject: [PATCH 18/42] =?UTF-8?q?feat:=20=E6=B3=95=E8=A7=84=E7=AC=A6?= =?UTF-8?q?=E5=90=88=E6=80=A7=E8=AF=84=E4=BC=B0=E5=BA=93=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E5=AE=8C=E6=88=90=E6=97=A5=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/LawsConformityAssessmentLibrary.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsConformityAssessmentLibrary.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsConformityAssessmentLibrary.java index 83d077e1..4fc5a3e5 100644 --- a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsConformityAssessmentLibrary.java +++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsConformityAssessmentLibrary.java @@ -50,7 +50,7 @@ public class LawsConformityAssessmentLibrary implements Serializable { /** * 评估日期 */ - @ApiModelProperty(value = "评估日期") + @ApiModelProperty(value = "评估完成日期") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") private Date valuationTime; From ff83657f599ac9d2858a8fa62a4d136f535405ea Mon Sep 17 00:00:00 2001 From: caihaohan Date: Fri, 13 Sep 2024 14:54:13 +0800 Subject: [PATCH 19/42] =?UTF-8?q?feat:=20=E6=B3=95=E8=A7=84=E7=AC=A6?= =?UTF-8?q?=E5=90=88=E6=80=A7=E8=AF=84=E4=BC=B0=E5=BA=93=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AF=84=E4=BC=B0=E5=8F=91=E8=B5=B7=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/update/测试阶段.sql | 6 +++++- .../listener/ProcessSCCEndListener.java | 6 ++++++ .../entity/LawsConformityAssessmentLibraryDetail.java | 7 +++++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/db/update/测试阶段.sql b/db/update/测试阶段.sql index b4ef229a..4c46ec19 100644 --- a/db/update/测试阶段.sql +++ b/db/update/测试阶段.sql @@ -355,4 +355,8 @@ ALTER TABLE `process_market_standard_release` -- 2024-09-13 增加辅助说明材料字段 ALTER TABLE `process_standard_compliance_check_detail` - ADD COLUMN `unsatisfied_require_attach` varchar(500) NULL COMMENT '辅助说明材料' AFTER `assessor`; \ No newline at end of file + ADD COLUMN `unsatisfied_require_attach` varchar(500) NULL COMMENT '辅助说明材料' AFTER `assessor`; + +-- 2024-09-13 增加评估发起人 +ALTER TABLE `laws_conformity_assessment_library_detail` + ADD COLUMN `assessor_initiator` varchar(500) NULL COMMENT '评估发起人' AFTER `bind_id`; \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/listener/ProcessSCCEndListener.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/listener/ProcessSCCEndListener.java index 769018a9..071ca23f 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/listener/ProcessSCCEndListener.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/listener/ProcessSCCEndListener.java @@ -7,6 +7,7 @@ import com.jero.modules.activiti.process.standardComplianceCheck.entity.ProcessS import com.jero.modules.activiti.process.standardComplianceCheck.entity.ProcessStandardComplianceCheckDetail; import com.jero.modules.activiti.process.standardComplianceCheck.service.IProcessStandardComplianceCheckDetailService; import com.jero.modules.activiti.process.standardComplianceCheck.service.IProcessStandardComplianceCheckService; +import com.jero.modules.activiti.service.ProcessAllService; import com.jero.modules.activiti.service.ProcessApprovalRecordService; import com.jero.modules.assessmentLibrary.entity.LawsConformityAssessmentLibrary; import com.jero.modules.assessmentLibrary.entity.LawsConformityAssessmentLibraryDetail; @@ -61,6 +62,9 @@ public class ProcessSCCEndListener implements ExecutionListener { @Resource private ProcessApprovalRecordService processApprovalRecordService; + @Resource + private ProcessAllService paService; + public static final String TO_BE_RECTIFIED = "1"; @Override @@ -140,10 +144,12 @@ public class ProcessSCCEndListener implements ExecutionListener { calService.updateById(lawsConformityAssessmentLibrary); } + String processInitiator = paService.getByProcessInstanceId(processInstanceId).getCreateUserId(); List lawsConformityAssessmentLibraryDetails = BeanCopyUtils.copyBeanList(list, LawsConformityAssessmentLibraryDetail.class); LawsConformityAssessmentLibrary finalLawsConformityAssessmentLibrary = lawsConformityAssessmentLibrary; lawsConformityAssessmentLibraryDetails.forEach(detail -> { detail.setBindId(finalLawsConformityAssessmentLibrary.getId()); + detail.setAssessorInitiator(processInitiator); }); calDetailService.saveBatch(lawsConformityAssessmentLibraryDetails); // 找出不符合和待验证的存入不符合项库 diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsConformityAssessmentLibraryDetail.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsConformityAssessmentLibraryDetail.java index 99347f6a..5c0ea10e 100644 --- a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsConformityAssessmentLibraryDetail.java +++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsConformityAssessmentLibraryDetail.java @@ -95,6 +95,13 @@ public class LawsConformityAssessmentLibraryDetail implements Serializable { @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname") private String assessor; + /** + * 评估发起人 + */ + @ApiModelProperty(value = "评估发起人") + @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname") + private String assessorInitiator; + /** * 评估结果 */ From 55e5b033919fc678a492481b2c06b3eaf873e315 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Fri, 13 Sep 2024 15:13:51 +0800 Subject: [PATCH 20/42] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=A4=96=E6=9D=A5?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=B1=95=E7=A4=BA=E6=9C=80=E6=96=B0=E7=9A=84?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/LawsStandardEarlyWarningServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/localTool/service/impl/LawsStandardEarlyWarningServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/localTool/service/impl/LawsStandardEarlyWarningServiceImpl.java index bccb82b9..f7245f1a 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/localTool/service/impl/LawsStandardEarlyWarningServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/localTool/service/impl/LawsStandardEarlyWarningServiceImpl.java @@ -68,7 +68,7 @@ public class LawsStandardEarlyWarningServiceImpl implements ILawsStandardEarlyWa // 获取当前日期往前90天以内创建的外部标准 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.ne(LawsDomesticStandard::getStandardState, OutStandardStateEnum.ABOLISH.getStateValue()); - queryWrapper.between(LawsDomesticStandard::getCreateTime, LocalDateTime.now().minusDays(90), LocalDateTime.now()); + queryWrapper.ge(LawsDomesticStandard::getCreateTime, LocalDateTime.now().minusDays(90)); queryWrapper.orderByDesc(LawsDomesticStandard::getCreateTime); IPage page = new Page<>(pageNo, pageSize); return domesticStandardService.page(page, queryWrapper); From 443ef5c45d54cd7720184be9f49be1f80c97c6d6 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Fri, 13 Sep 2024 15:19:19 +0800 Subject: [PATCH 21/42] =?UTF-8?q?fix:=20=E6=B3=95=E8=A7=84=E7=AC=A6?= =?UTF-8?q?=E5=90=88=E6=80=A7=E8=AF=84=E4=BC=B0=E5=BA=93=20=E6=AC=A7?= =?UTF-8?q?=E7=9B=9F=E9=87=8C=E9=9D=A2=E6=9C=89=E5=8D=B0=E5=BA=A6=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/LawsConformityAssessmentLibraryServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsConformityAssessmentLibraryServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsConformityAssessmentLibraryServiceImpl.java index 0f76d793..ee29a0f4 100644 --- a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsConformityAssessmentLibraryServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsConformityAssessmentLibraryServiceImpl.java @@ -89,7 +89,7 @@ public class LawsConformityAssessmentLibraryServiceImpl extends ServiceImpl Date: Fri, 13 Sep 2024 15:22:20 +0800 Subject: [PATCH 22/42] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=A4=96=E6=9D=A5?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=B1=95=E7=A4=BA=E6=9C=80=E6=96=B0=E7=9A=84?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/LawsStandardEarlyWarningServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/localTool/service/impl/LawsStandardEarlyWarningServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/localTool/service/impl/LawsStandardEarlyWarningServiceImpl.java index f7245f1a..9ea9729d 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/localTool/service/impl/LawsStandardEarlyWarningServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/localTool/service/impl/LawsStandardEarlyWarningServiceImpl.java @@ -79,7 +79,7 @@ public class LawsStandardEarlyWarningServiceImpl implements ILawsStandardEarlyWa // 获取当前日期往前90天以内创建的企业标准 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.ne(LawsEnterpriseStandard::getStandardState, StandardStateEnum.ABOLISH.getStateValue()); - queryWrapper.between(LawsEnterpriseStandard::getCreateTime, LocalDateTime.now().minusDays(90), LocalDateTime.now()); + queryWrapper.ge(LawsEnterpriseStandard::getCreateTime, LocalDateTime.now().minusDays(90)); queryWrapper.orderByDesc(LawsEnterpriseStandard::getCreateTime); IPage page = new Page<>(pageNo, pageSize); IPage dataPage = enterpriseStandardService.page(page, queryWrapper); From baba223d4fe800045ef76533e2f7c312e65bc7c0 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Fri, 13 Sep 2024 15:42:08 +0800 Subject: [PATCH 23/42] =?UTF-8?q?feat:=20=E4=B8=8D=E7=AC=A6=E5=90=88?= =?UTF-8?q?=E9=A1=B9=E5=BA=93=20=E5=A2=9E=E5=8A=A0=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E4=BA=BA=E5=85=B3=E9=97=AD=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/update/测试阶段.sql | 7 ++++++- .../entity/LawsEvaluationNotMetLibrary.java | 15 +++++++++++++++ .../LawsEvaluationNotMetLibraryServiceImpl.java | 2 ++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/db/update/测试阶段.sql b/db/update/测试阶段.sql index 4c46ec19..9d3091df 100644 --- a/db/update/测试阶段.sql +++ b/db/update/测试阶段.sql @@ -359,4 +359,9 @@ ALTER TABLE `process_standard_compliance_check_detail` -- 2024-09-13 增加评估发起人 ALTER TABLE `laws_conformity_assessment_library_detail` - ADD COLUMN `assessor_initiator` varchar(500) NULL COMMENT '评估发起人' AFTER `bind_id`; \ No newline at end of file + ADD COLUMN `assessor_initiator` varchar(500) NULL COMMENT '评估发起人' AFTER `bind_id`; + +-- 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 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 eec9c6f4..6dd17cfa 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 @@ -254,6 +254,21 @@ public class LawsEvaluationNotMetLibrary implements Serializable { @ApiModelProperty(value = "这条数据的所有审批人员") private String allApprovalUser; + /** + * 关闭人 + */ + @ApiModelProperty(value = "关闭人") + private String closeUser; + + /** + * 关闭时间 + */ + @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") + private Date closeTime; + /** * 关闭用主键ids */ diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsEvaluationNotMetLibraryServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsEvaluationNotMetLibraryServiceImpl.java index 9c1d49c5..3d16bea5 100644 --- a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsEvaluationNotMetLibraryServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsEvaluationNotMetLibraryServiceImpl.java @@ -101,6 +101,8 @@ public class LawsEvaluationNotMetLibraryServiceImpl extends ServiceImpl Date: Fri, 13 Sep 2024 15:49:21 +0800 Subject: [PATCH 24/42] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AD=97=E5=85=B8=E8=8B=B1=E6=96=87=E7=AE=80?= =?UTF-8?q?=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/system/controller/SysDictItemController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 1d39469e..fea1f6d9 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 @@ -221,7 +221,7 @@ public class SysDictItemController { @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(sysDictItem, req.getParameterMap()); queryWrapper.select("del_flag","description","dict_id","en_name","id","is_read_only","is_tag_dict","item_text", - "item_value","item_text as name","parent_id as pId","parent_id","sort_order","status"); + "item_value","item_text as name","parent_id as pId","parent_id","sort_order","status","en_base"); List listSysDictItem = sysDictItemService.list(queryWrapper); List listAll = new ArrayList<>(); // 树形查询手动封装分页 From 4becffcb1259ffabcf10bc1712123cdc09dbe90a Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 13 Sep 2024 15:58:42 +0800 Subject: [PATCH 25/42] =?UTF-8?q?update=20=E6=8B=86=E5=88=86=E7=9B=AE?= =?UTF-8?q?=E5=BD=95=E8=A1=A8=E5=AD=97=E6=AE=B5=E9=95=BF=E5=BA=A6=E5=92=8C?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E5=BA=93=E6=94=B9=E4=B8=BA=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/update/测试阶段.sql | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/db/update/测试阶段.sql b/db/update/测试阶段.sql index 9d3091df..fa0e30f0 100644 --- a/db/update/测试阶段.sql +++ b/db/update/测试阶段.sql @@ -361,6 +361,10 @@ ALTER TABLE `process_standard_compliance_check_detail` ALTER TABLE `laws_conformity_assessment_library_detail` ADD COLUMN `assessor_initiator` varchar(500) NULL COMMENT '评估发起人' AFTER `bind_id`; +-- 2024年9月13日15:38:30 拆分目录表字段长度和标签库改为一致 +ALTER TABLE `sar_file_split_menu` + MODIFY COLUMN `item_name` 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`, From ec1fbaa715047d8336dc1c97b02b7d8614ea5ce5 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Fri, 13 Sep 2024 16:11:34 +0800 Subject: [PATCH 26/42] =?UTF-8?q?feat:=20=E4=B8=8D=E7=AC=A6=E5=90=88?= =?UTF-8?q?=E9=A1=B9=E5=BA=93=20=E8=AF=84=E4=BC=B0=E5=BA=93=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E8=BE=85=E5=8A=A9=E8=AF=B4=E6=98=8E=E6=9D=90=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/update/测试阶段.sql | 6 ++++++ .../entity/ProcessStandardComplianceCheckDetail.java | 1 + .../entity/LawsConformityAssessmentLibraryDetail.java | 7 +++++++ .../entity/LawsEvaluationNotMetLibrary.java | 7 +++++++ 4 files changed, 21 insertions(+) diff --git a/db/update/测试阶段.sql b/db/update/测试阶段.sql index fa0e30f0..4f8ad290 100644 --- a/db/update/测试阶段.sql +++ b/db/update/测试阶段.sql @@ -356,6 +356,12 @@ ALTER TABLE `process_market_standard_release` -- 2024-09-13 增加辅助说明材料字段 ALTER TABLE `process_standard_compliance_check_detail` ADD COLUMN `unsatisfied_require_attach` varchar(500) NULL COMMENT '辅助说明材料' AFTER `assessor`; +-- 2024-09-13 增加辅助说明材料字段 +ALTER TABLE `laws_evaluation_not_met_library` + ADD COLUMN `unsatisfied_require_attach` varchar(500) NULL COMMENT '辅助说明材料'; +-- 2024-09-13 增加辅助说明材料字段 +ALTER TABLE `laws_conformity_assessment_library_detail` + ADD COLUMN `unsatisfied_require_attach` varchar(500) NULL COMMENT '辅助说明材料'; -- 2024-09-13 增加评估发起人 ALTER TABLE `laws_conformity_assessment_library_detail` diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheckDetail.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheckDetail.java index e37c0a5f..44f502c1 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheckDetail.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheckDetail.java @@ -226,6 +226,7 @@ public class ProcessStandardComplianceCheckDetail implements Serializable, Compa * 辅助说明材料 */ @ApiModelProperty(value = "辅助说明材料") + @Dict(dictTable = "oss_file", dicCode = "id", dicText = "file_name") private String unsatisfiedRequireAttach; @ApiModelProperty(value = "是否与上一版相同（字典：1：是，0：否）") diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsConformityAssessmentLibraryDetail.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsConformityAssessmentLibraryDetail.java index 5c0ea10e..6068cb2a 100644 --- a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsConformityAssessmentLibraryDetail.java +++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsConformityAssessmentLibraryDetail.java @@ -165,6 +165,13 @@ public class LawsConformityAssessmentLibraryDetail implements Serializable { @Dict(dictTable = "oss_file", dicCode = "id", dicText = "file_name") private String material; + /** + * 辅助说明材料 + */ + @ApiModelProperty(value = "辅助说明材料") + @Dict(dictTable = "oss_file", dicCode = "id", dicText = "file_name") + private String unsatisfiedRequireAttach; + /** * 关联主表Id */ 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 6dd17cfa..8906c897 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 @@ -276,6 +276,13 @@ public class LawsEvaluationNotMetLibrary implements Serializable { @ApiModelProperty(value = "关闭用主键ids") private String selections; + /** + * 辅助说明材料 + */ + @ApiModelProperty(value = "辅助说明材料") + @Dict(dictTable = "oss_file", dicCode = "id", dicText = "file_name") + private String unsatisfiedRequireAttach; + @TableField(exist = false) private static final long serialVersionUID = 1L; } \ No newline at end of file From 212501db9f04a9c568e8b85350550dcafa6c44fd Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 13 Sep 2024 16:15:47 +0800 Subject: [PATCH 27/42] =?UTF-8?q?update=20=E5=AF=BC=E5=85=A5=E6=8B=86?= =?UTF-8?q?=E5=88=86=E7=BB=93=E6=9E=9C=E6=97=B6=E5=A2=9E=E5=8A=A0=E8=AF=86?= =?UTF-8?q?=E5=88=AB=E7=88=B6=E5=AD=90=E5=85=B3=E7=B3=BB=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6=E6=8C=89=E7=85=A7=E5=BA=8F?= =?UTF-8?q?=E5=8F=B7=E7=88=B6=E5=AD=90=E5=85=B3=E7=B3=BB=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FileSplitItemsEOController.java | 3 +- .../split/entity/SarFileSplitInfoEO.java | 7 ++ .../impl/FileSplitItemsEOServiceImpl.java | 69 ++++++++++++------- 3 files changed, 51 insertions(+), 28 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java b/laws-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java index ad0aa7a5..0cc9758f 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java +++ b/laws-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java @@ -92,9 +92,8 @@ public class FileSplitItemsEOController extends JeroController importSplitResult(@ApiParam("标准拆分条id") String splitFileId, - @ApiParam("国际化") String cut, SarFileSplitInfoEO splitInfoEO) throws IOException { - cut = CutUtils.getCurrentCut(); + String cut = CutUtils.getCurrentCut(); return fileSplitItemsEOService.importSplitResult(splitFileId, cut,splitInfoEO); } diff --git a/laws-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitInfoEO.java b/laws-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitInfoEO.java index 7b9bd629..cbe999fa 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitInfoEO.java +++ b/laws-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitInfoEO.java @@ -8,6 +8,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.jero.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -156,4 +157,10 @@ public class SarFileSplitInfoEO implements Serializable { @ApiModelProperty(value = "标准类别") @TableField(exist = false) private String standardClass; + /** + * 识别父子关系 + */ + @ApiModelProperty(value = "识别父子关系") + @TableField(exist = false) + private String childParentLink; } diff --git a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java index f7a2b88b..66d02c5c 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java @@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.api.vo.Result; import com.jero.common.api.vo.ResultCommon; +import com.jero.common.constant.CommonConstant; import com.jero.common.constant.enums.IsMustEnum; import com.jero.common.constant.enums.LanguageEnum; import com.jero.common.constant.enums.ModuleEnum; @@ -1990,7 +1991,10 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl buildTree(List> addItemsEOList, Long treeListDisplay, String menuId){ + private List buildTree(List> addItemsEOList, Long treeListDisplay, String menuId, String childParentLink){ //排序 // addItemsEOList.sort(new DirectoryComparator()); @@ -3540,32 +3545,44 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl p = treeNodeList.stream().filter(e -> e.getName().equals(parentName)).collect(Collectors.toList()); - // if (CollectionUtil.isNotEmpty(p)) { - // //其他节点 - // treeNode.setParentId(p.get(0).getId()); - // }else{ - // //一级节点 - // treeNode.setParentId(menuId); - // } - // }else{ - // treeNode.setParentId(menuId); - // } - //} - //else + if(CommonConstant.STATUS_1.equals(childParentLink)){ + if(itemNum.matches(regex)) { + //父级是 总目录时，不做处理 + if(itemNum.contains(".")) { + String parentName = itemNum.substring(0, itemNum.lastIndexOf(".")); + treeNode.setParentName(parentName); + + List p = treeNodeList.stream().filter(e -> e.getName().equals(parentName)).collect(Collectors.toList()); + if (CollectionUtil.isNotEmpty(p)) { + //其他节点 + treeNode.setParentId(p.get(0).getId()); + }else{ + //一级节点 + treeNode.setParentId(menuId); + } + }else{ + treeNode.setParentId(menuId); + } + } + else if (StringUtils.isBlank(itemTitle)){ - treeNode.setParentId(parentId); - } - else{ - treeNode.setParentId(menuId); - parentId = treeNode.getId(); + treeNode.setParentId(parentId); + } + else{ + treeNode.setParentId(menuId); + parentId = treeNode.getId(); + } + }else { + if (StringUtils.isBlank(itemTitle)){ + treeNode.setParentId(parentId); + } + else{ + treeNode.setParentId(menuId); + parentId = treeNode.getId(); + } } + + ++treeListDisplay; treeNode.setOrderNum(treeListDisplay); treeNode.setItemName(itemTitle); From 149fdb4957b434690e210a5c7e26abba177626df Mon Sep 17 00:00:00 2001 From: caihaohan Date: Fri, 13 Sep 2024 16:19:17 +0800 Subject: [PATCH 28/42] =?UTF-8?q?feat:=20=E8=AF=A6=E6=83=85=E9=A1=B5?= =?UTF-8?q?=E5=8A=A0=E6=94=B6=E8=97=8F=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/LawsCommonServiceImpl.java | 38 +++++++++++++++++-- 1 file changed, 35 insertions(+), 3 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java index 4bd74645..c32fd67a 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java @@ -457,6 +457,36 @@ public class LawsCommonServiceImpl implements ILawsCommonService { * @Date: 2023/9/11 14:49 * @Description: 是否收藏标识判断 **/ + private void collectionFlag(Map stringObjectMap) { + // 获取全部id集合 + String id = String.valueOf(stringObjectMap.get("id")); + if (StrUtil.isBlank(id)) return; + // 获取登录用户 + LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + // 查询标准收藏表 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(LawsStandardCollection::getCollectorId, loginUser.getId()); + queryWrapper.eq(LawsStandardCollection::getStandardId, id); + List standardCollectionList = lawsStandardCollectionService.list(queryWrapper); + if (CollectionUtils.isEmpty(standardCollectionList)) { + stringObjectMap.put(FieldCommon.COLLECTION_FLAG, false); + return; + } + List standardIdList = standardCollectionList.stream() + .map(LawsStandardCollection::getStandardId).collect(Collectors.toList()); + if (standardIdList.contains(id)) { + stringObjectMap.put(FieldCommon.COLLECTION_FLAG, true); + } else { + stringObjectMap.put(FieldCommon.COLLECTION_FLAG, false); + } + } + + + /** + * @Author: liao + * @Date: 2023/9/11 14:49 + * @Description: 标准详情是否收藏标识 + **/ private void collectionFlag(List> records) { // 获取全部id集合 List ids = records.stream().map(kv -> @@ -1225,6 +1255,8 @@ public class LawsCommonServiceImpl implements ILawsCommonService { splitFlag(stringObjectMap); // 添加固定字段 this.setFixedUserInfo(stringObjectMap, singleStandard); + // 标准收藏标识 + collectionFlag(stringObjectMap); // 对返回的字段做处理 return stringObjectMap; } @@ -1293,16 +1325,16 @@ public class LawsCommonServiceImpl implements ILawsCommonService { List nodeCode = lawsTreeNodeList.stream() .map(LawsTreeNode::getNodeCode).collect(Collectors.toList()); LambdaQueryWrapper query = new LambdaQueryWrapper<>(); - query.and(o->{ + query.and(o -> { for (int i = 0; i < nodeCode.size(); i++) { o.likeRight(LawsNodeRelation::getNodeCode, nodeCode.get(i)); - if(i != (nodeCode.size() - 1)){ + if (i != (nodeCode.size() - 1)) { o.or(); } } }); List lawsNodeRelationListAll = lawsNodeRelationService.list(query); - if(!CollectionUtils.isEmpty(lawsNodeRelationListAll)){ + if (!CollectionUtils.isEmpty(lawsNodeRelationListAll)) { String ids = lawsNodeRelationListAll.stream().map(LawsNodeRelation::getUniqueRelationFlag) .collect(Collectors.joining(",")); selectionBoxVO.setIds(ids); From d758782dd6833be5ba69bf43aa740d51804aff19 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Fri, 13 Sep 2024 16:52:12 +0800 Subject: [PATCH 29/42] =?UTF-8?q?feat:=20=E4=B8=8D=E7=AC=A6=E5=90=88?= =?UTF-8?q?=E9=A1=B9=E5=BA=93=E5=A2=9E=E5=8A=A0=E5=85=B3=E9=97=AD=E4=BA=BA?= =?UTF-8?q?=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../assessmentLibrary/entity/LawsEvaluationNotMetLibrary.java | 2 ++ 1 file changed, 2 insertions(+) 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 8906c897..c3abf825 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 @@ -257,6 +257,8 @@ 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, ')')") @ApiModelProperty(value = "关闭人") private String closeUser; From 469186e7388dda2e9b349055f7c61a3ac08ba429 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Fri, 13 Sep 2024 16:57:02 +0800 Subject: [PATCH 30/42] =?UTF-8?q?feat:=20scc=E6=B5=81=E7=A8=8B=E6=9C=AA?= =?UTF-8?q?=E5=88=86=E5=8F=91=E5=AF=BC=E5=87=BA=E6=94=AF=E6=8C=81=E2=80=9C?= =?UTF-8?q?=E8=BE=85=E5=8A=A9=E8=AF=B4=E6=98=8E=E6=9D=90=E6=96=99=20?= =?UTF-8?q?=E2=80=9D=20=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProcessStandardComplianceCheckDetail.java | 12 +++++++++++ .../vo/WithoutDistributeExcelTemplate.java | 20 ++++++++----------- ...essStandardComplianceCheckServiceImpl.java | 8 ++++++++ 3 files changed, 28 insertions(+), 12 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheckDetail.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheckDetail.java index 44f502c1..f837d482 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheckDetail.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheckDetail.java @@ -246,6 +246,18 @@ public class ProcessStandardComplianceCheckDetail implements Serializable, Compa return material != null ? Arrays.asList(material.split(",")) : Collections.emptyList(); } + /** + * 附件 + */ + @ApiModelProperty(value = "辅助说明材料") + @ExcelCollection(name = "", orderNum = "17") + @TableField(exist = false) + private List fileListTwo = Collections.emptyList(); + + public List obtainFileTwoIds() { + return unsatisfiedRequireAttach != null ? Arrays.asList(unsatisfiedRequireAttach.split(",")) : Collections.emptyList(); + } + @TableField(exist = false) private static final long serialVersionUID = 1L; diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/vo/WithoutDistributeExcelTemplate.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/vo/WithoutDistributeExcelTemplate.java index e02f4a2f..ded8b546 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/vo/WithoutDistributeExcelTemplate.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/vo/WithoutDistributeExcelTemplate.java @@ -119,14 +119,6 @@ public class WithoutDistributeExcelTemplate { @Excel(name = "备注", width = 15, orderNum = "13") private String remark; - /** - * 附件 - */ -// @ApiModelProperty(value = "佐证材料") -// @ExcelCollection(name = "", orderNum = "14") -// @TableField(exist = false) -// private List fileList = Collections.emptyList(); - /** * 佐证材料 */ @@ -135,11 +127,15 @@ public class WithoutDistributeExcelTemplate { @Dict(dictTable = "oss_file", dicCode = "id", dicText = "file_name") private String material; - private String sort; + /** + * 佐证材料 + */ + @ApiModelProperty(value = "辅助说明材料") + @Excel(name = "辅助说明材料", width = 15, orderNum = "14") + @Dict(dictTable = "oss_file", dicCode = "id", dicText = "file_name") + private String unsatisfiedRequireAttach; -// public List obtainFileIds() { -// return material != null ? Arrays.asList(material.split(",")) : Collections.emptyList(); -// } + private String sort; } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java index 6bebb991..9afcc750 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java @@ -627,6 +627,10 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl String regex = "<[^>]*>"; @@ -650,6 +654,10 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl Date: Fri, 13 Sep 2024 17:08:00 +0800 Subject: [PATCH 31/42] =?UTF-8?q?feat:=20scc=E6=B5=81=E7=A8=8B=E6=9C=AA?= =?UTF-8?q?=E5=88=86=E5=8F=91=E5=AF=BC=E5=87=BA=E6=94=AF=E6=8C=81=E2=80=9C?= =?UTF-8?q?=E8=BE=85=E5=8A=A9=E8=AF=B4=E6=98=8E=E6=9D=90=E6=96=99=20?= =?UTF-8?q?=E2=80=9D=20=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProcessStandardComplianceCheckServiceImpl.java | 4 +++- .../main/java/com/jero/modules/activiti/util/ExcelUtils.java | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java index 9afcc750..eae5c265 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java @@ -918,6 +918,7 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl { item.setResult(excelUtils.translateDictValue("evaluation_result", item.getResult(), listDict)); item.setMaterial(excelUtils.uploadFile(item.getMaterial(), fileMap)); + item.setUnsatisfiedRequireAttach(excelUtils.uploadFile(item.getUnsatisfiedRequireAttach(), fileMap)); }); } @@ -944,7 +945,8 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl 0) { errorMsgs.add(errMsgHeader.append(errMsg).toString()); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/util/ExcelUtils.java b/laws-modules/src/main/java/com/jero/modules/activiti/util/ExcelUtils.java index c7e615d3..fecbabff 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/util/ExcelUtils.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/util/ExcelUtils.java @@ -596,12 +596,12 @@ public class ExcelUtils { return ""; } - public String validMaterial(String value, Map fileMap) { + public String validMaterial(String value, Map fileMap, String title) { if (StrUtil.isBlank(value)) { return ""; } if (!importUtil.fileValid(value, fileMap)) { - return "'佐证材料'无效。"; + return "'" + title + "'无效。"; } return ""; } From ee337530c4d91aa498dd2ea8ae7badb430401b3e Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 13 Sep 2024 17:12:24 +0800 Subject: [PATCH 32/42] =?UTF-8?q?update=20=E6=8B=86=E5=88=86=E7=BB=93?= =?UTF-8?q?=E6=9E=9C=E7=BC=96=E8=BE=91=20=E7=9B=AE=E5=BD=95=E5=BE=80?= =?UTF-8?q?=E4=B8=80=E7=BA=A7=E6=8B=96=E5=8A=A8=E5=86=85=E5=AE=B9=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E5=90=8E=E6=8B=96=E5=85=A5=E7=9A=84=EF=BC=8C=E6=94=BE?= =?UTF-8?q?=E5=9C=A8=E5=90=8E=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/xml/SarFileSplitMenuEOMapper.xml | 7 +- .../impl/SarFileSplitMenuEOServiceImpl.java | 69 +++++++++++++------ 2 files changed, 52 insertions(+), 24 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitMenuEOMapper.xml b/laws-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitMenuEOMapper.xml index 8d447559..85827283 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitMenuEOMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitMenuEOMapper.xml @@ -375,8 +375,11 @@ select * from SAR_FILE_SPLIT_MENU where parent_id = #{parentId} AND valid_flag = '0' - and display_seq > #{displaySeq} - order by display_seq desc + + and display_seq > #{displaySeq} + + + order by display_seq diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsConformityAssessmentLibraryServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsConformityAssessmentLibraryServiceImpl.java index 6c3fa313..515ab4e5 100644 --- a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsConformityAssessmentLibraryServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsConformityAssessmentLibraryServiceImpl.java @@ -6,12 +6,15 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.api.CommonAPI; import com.jero.common.api.vo.ResultCommon; import com.jero.common.exception.JeroBootException; import com.jero.common.system.vo.LoginUser; +import com.jero.common.system.vo.SysDictItemCore; import com.jero.common.util.FileUtils; import com.jero.common.util.ZipUtil; import com.jero.common.util.obs.ObsBootUtil; +import com.jero.modules.activiti.util.ExcelUtils; import com.jero.modules.assessmentLibrary.entity.LawsConformityAssessmentLibrary; import com.jero.modules.assessmentLibrary.entity.LawsConformityAssessmentLibraryDetail; import com.jero.modules.assessmentLibrary.entity.vo.LawsConformityAssessmentLibraryExportVO; @@ -66,6 +69,12 @@ public class LawsConformityAssessmentLibraryServiceImpl extends ServiceImpl listDict = commonAPI.getDictItemAll(); String url = exportExcelTempPath.replace(EXPORT_EXCEL_TEMP, fileName); File file = new File(url); if (!file.exists()) { @@ -199,6 +209,17 @@ public class LawsConformityAssessmentLibraryServiceImpl extends ServiceImpl newRecordsExport = new ArrayList<>(recordsExport); Workbook workbook = ExcelExportUtil.exportExcel(exportParams, LawsConformityAssessmentLibraryExportVO.class, recordsExport); + // 翻译评估结果和佐证材料字段 + newRecordsExport.parallelStream().forEach(item -> { + String material = excelUtils.translateDictValue("id", "file_name", "oss_file", item.getMaterial(), listDict); + if (StrUtil.isNotBlank(material)) { + item.setMaterial("佐证材料/" + material); + } + String unsatisfiedRequireAttach = excelUtils.translateDictValue("id", "file_name", "oss_file", item.getUnsatisfiedRequireAttach(), listDict); + if (StrUtil.isNotBlank(unsatisfiedRequireAttach)) { + item.setUnsatisfiedRequireAttach("辅助说明材料/" + unsatisfiedRequireAttach); + } + }); // 生成超链接 generateHyperlink("佐证材料", newRecordsExport, workbook); generateHyperlinkTwo("辅助说明材料", newRecordsExport, workbook); diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsEvaluationNotMetLibraryServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsEvaluationNotMetLibraryServiceImpl.java index 3d16bea5..9ddb47f0 100644 --- a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsEvaluationNotMetLibraryServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsEvaluationNotMetLibraryServiceImpl.java @@ -6,16 +6,21 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.api.CommonAPI; import com.jero.common.api.vo.ResultCommon; import com.jero.common.exception.JeroBootException; +import com.jero.common.system.vo.SysDictItemCore; import com.jero.common.util.FileUtils; import com.jero.common.util.ZipUtil; +import com.jero.modules.activiti.util.ExcelUtils; import com.jero.modules.assessmentLibrary.entity.AssessCommon; import com.jero.modules.assessmentLibrary.entity.LawsEvaluationNotMetLibrary; import com.jero.modules.assessmentLibrary.mapper.LawsEvaluationNotMetLibraryMapper; import com.jero.modules.assessmentLibrary.service.ILawsConformityAssessmentLibraryService; import com.jero.modules.assessmentLibrary.service.ILawsEvaluationNotMetLibraryService; import com.jero.modules.laws.utils.ExcelExportUtilPro; +import com.jero.modules.laws.utils.ExcelExportUtilPro.FileDetails; +import com.jero.modules.laws.utils.ExcelExportUtilPro.UnsatisfiedRequireAttachFile; import com.jero.modules.sys.utils.UserUtils; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -52,6 +57,10 @@ public class LawsEvaluationNotMetLibraryServiceImpl extends ServiceImpl listDict = commonAPI.getDictItemAll(); horizontalCheck(lawsEvaluationNotMet.getSelections()); - String url = exportExcelTempPath.replace(EXPORT_EXCEL_TEMP, fileName); File file = new File(url); if (!file.exists()) { @@ -123,7 +132,8 @@ public class LawsEvaluationNotMetLibraryServiceImpl extends ServiceImpl lawsEvaluationNotMets = this.queryPage(lawsEvaluationNotMet, 1, Integer.MAX_VALUE, req); List records = lawsEvaluationNotMets.getRecords(); - excelExportUtilPro.settleDocuments(url, "附件", records, LawsEvaluationNotMetLibrary::obtainFileIds, LawsEvaluationNotMetLibrary::setFileList); + excelExportUtilPro.settleDocuments(url, "附件", records, LawsEvaluationNotMetLibrary::obtainFileIds, LawsEvaluationNotMetLibrary::setFileList, FileDetails.class); + excelExportUtilPro.settleDocuments(url, "辅助说明材料", records, LawsEvaluationNotMetLibrary::obtainFileTwoIds, LawsEvaluationNotMetLibrary::setFileListTwo, UnsatisfiedRequireAttachFile.class); // 去除文本的

String regex = "<[^>]*>"; @@ -140,8 +150,20 @@ public class LawsEvaluationNotMetLibraryServiceImpl extends ServiceImpl newRecordsExport = new ArrayList<>(records); Workbook workbook = ExcelExportUtil.exportExcel(exportParams, LawsEvaluationNotMetLibrary.class, records); + // 翻译评估结果和佐证材料字段 + newRecordsExport.parallelStream().forEach(item -> { + String material = excelUtils.translateDictValue("id", "file_name", "oss_file", item.getFile(), listDict); + if (StrUtil.isNotBlank(material)) { + item.setFile("附件/" + material); + } + String unsatisfiedRequireAttach = excelUtils.translateDictValue("id", "file_name", "oss_file", item.getUnsatisfiedRequireAttach(), listDict); + if (StrUtil.isNotBlank(unsatisfiedRequireAttach)) { + item.setUnsatisfiedRequireAttach("辅助说明材料/" + unsatisfiedRequireAttach); + } + }); // 生成超链接 excelExportUtilPro.generateHyperlink("附件", newRecordsExport, workbook, LawsEvaluationNotMetLibrary::getFileList, 12); + excelExportUtilPro.generateHyperlink("辅助说明材料", newRecordsExport, workbook, LawsEvaluationNotMetLibrary::getFileList, 13); // 导出excel workbook.write(fos); // 生成并导出zip diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java b/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java index 1d14d956..eff4fb78 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java @@ -389,6 +389,18 @@ public class ImportUtil { parameterMap.put(tag.getDbFieldName(), this.convertInspectContentFile(cellValue, fileMap)); } } + // 企标稽查内容文件导入 + if (FieldCommon.REFERENCE_STANDARD.equals(tag.getDbFieldName()) && + TableNameEnum.ENTERPRISE_STANDARDS.getValue().equals(tag.getIsModel())) { +// if (!this.inspectContentFileValid(cellValue, fileMap)) { +// log.error("第" + row + "列" + tag.getDbFieldTxt() + "填写错误 "); +// errMsg.append("第").append(row).append("列").append(tag.getDbFieldTxt()).append("填写错误 "); +// } else { +// // 转为List +// // 将转好的值加入Map +// parameterMap.put(tag.getDbFieldName(), this.convertInspectContentFile(cellValue, fileMap)); +// } + } } if (errMsg.toString().contains("列") || errMsg.toString().contains("重复") || errMsg.toString().contains("已存在")) { errMsgList.add(errMsg.toString()); diff --git a/laws-modules/src/main/java/com/jero/modules/laws/utils/ExcelExportUtilPro.java b/laws-modules/src/main/java/com/jero/modules/laws/utils/ExcelExportUtilPro.java index a09f9021..8a8887a4 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/utils/ExcelExportUtilPro.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/utils/ExcelExportUtilPro.java @@ -39,8 +39,30 @@ public class ExcelExportUtilPro { @ApiModelProperty(value = "id") private String id; - @Excel(name = "附件/佐证材料", width = 15) - @ApiModelProperty(value = "附件/佐证材料") + @Excel(name = "附件", width = 15) + @ApiModelProperty(value = "附件") + private String fileName; + } + + @Setter + @Getter + public static class MaterialFile { + @ApiModelProperty(value = "id") + private String id; + + @Excel(name = "佐证材料", width = 15) + @ApiModelProperty(value = "佐证材料") + private String fileName; + } + + @Setter + @Getter + public static class UnsatisfiedRequireAttachFile { + @ApiModelProperty(value = "id") + private String id; + + @Excel(name = "辅助说明材料", width = 15) + @ApiModelProperty(value = "辅助说明材料") private String fileName; } @@ -78,9 +100,10 @@ public class ExcelExportUtilPro { return cellStyle; } - public void settleDocuments(String url, String folderName, List items, - Function> fileIdProvider, - BiConsumer> fileDetailsConsumer) throws IOException { + public void settleDocuments(String url, String folderName, List items, + Function> fileIdProvider, + BiConsumer> fileDetailsConsumer, + Class fileDetailsClass) throws IOException { // 构建完整的文件夹路径 String directoryPath = url + File.separator + folderName; @@ -95,7 +118,8 @@ public class ExcelExportUtilPro { if (fileIdList != null && !fileIdList.isEmpty()) { List ossFileList = ossFileService.listByIds(fileIdList); if (!ossFileList.isEmpty()) { - List fileDetailsList = BeanCopyUtils.copyBeanList(ossFileList, FileDetails.class); + // 将OSSFile列表复制为泛型R的列表 + List fileDetailsList = BeanCopyUtils.copyBeanList(ossFileList, fileDetailsClass); fileDetailsConsumer.accept(item, fileDetailsList); for (OSSFile ossFile : ossFileList) { InputStream inputStream = ObsBootUtil.getOssFile(ossFile.getUrl()); @@ -110,6 +134,7 @@ public class ExcelExportUtilPro { } } + public void writeToLocal(String filePath, InputStream input) throws IOException { int index; byte[] bytes = new byte[1024]; From ce48098cb40bc2a25d617c88a3ea178e1253936c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Fri, 13 Sep 2024 19:46:48 +0800 Subject: [PATCH 40/42] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8B=86=E5=88=86?= =?UTF-8?q?=E6=9D=A1=E6=AC=BE=E5=AF=BC=E5=85=A5=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/FileSplitItemsEOServiceImpl.java | 58 +++++++++++++------ 1 file changed, 40 insertions(+), 18 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java index cdc7fe0e..7606c490 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java @@ -2263,10 +2263,14 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl sysDictItemList = getLevelPath(sysDictItemLists); List path = - sysDictItemList.stream().filter(o -> treePath.equals(o.getLevelPath())) + sysDictItemLists.stream().filter(o -> treePath.equals(o.getItemText())) .collect(Collectors.toList()); - if(!path.isEmpty()){ - if (path.size() > 1) { - if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) { - errorMsg += fieldName + "中" + treePath + "存在多个；"; - countError++; - valueList = Collections.emptyList(); - } else { - errorMsg += fieldName + " " + treePath + "Exist in multiple;"; + if (!path.isEmpty()){ + // 如果有多个，按照全路径去匹配一遍 + if(path.size() > 1){ + List sysDictItemList = getLevelPath(sysDictItemLists); + List pathOther = + sysDictItemList.stream().filter(o -> treePath.equals(o.getLevelPath())) + .collect(Collectors.toList()); + if(!pathOther.isEmpty()){ + if (path.size() > 1) { + if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) { + errorMsg += fieldName + "中" + treePath + "存在多个；"; + countError++; + valueList = Collections.emptyList(); + } else { + errorMsg += fieldName + " " + treePath + "Exist in multiple;"; + } + continue; + } + valueList.add(pathOther.get(0).getItemValue()); + }else{ + if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) { + errorMsg += fieldName + "中" + treePath + "存在多个；"; + countError++; + valueList = Collections.emptyList(); + } else { + errorMsg += fieldName + " " + treePath + "Not exist;"; + } + continue; } - continue; } - valueList.add(path.get(0).getItemValue()); - }else{ + }else { + List sysDictItemList = getLevelPath(sysDictItemLists); List pathOther = - sysDictItemLists.stream().filter(o -> treePath.equals(o.getItemText())) + sysDictItemList.stream().filter(o -> treePath.equals(o.getLevelPath())) .collect(Collectors.toList()); if(!pathOther.isEmpty()){ if (path.size() > 1) { From 6df10430c0c254939dcaef9e91bbd58f1f3c9f3c Mon Sep 17 00:00:00 2001 From: caihaohan Date: Fri, 13 Sep 2024 20:18:07 +0800 Subject: [PATCH 41/42] =?UTF-8?q?feat:=20=E5=AF=BC=E5=85=A5=E4=BC=81?= =?UTF-8?q?=E6=A0=87=E5=BC=95=E7=94=A8=E6=A0=87=E5=87=86=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=B8=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/LawsCommonServiceImpl.java | 8 +++- .../modules/laws/common/util/ImportUtil.java | 42 ++++++++++++++----- 2 files changed, 39 insertions(+), 11 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java index c32fd67a..2866b2dc 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java @@ -1720,10 +1720,16 @@ public class LawsCommonServiceImpl implements ILawsCommonService { headerList.remove(headerList.size() - 1); headerList.add(inspectContentTag); } + + List list = lawsDomesticStandardService.list(); + List standardNoList = list.stream().map(LawsDomesticStandard::getStandardNumber) + .filter(e -> !e.contains("-") & !e.contains("—")) + .collect(Collectors.toList()); // 获取错误信息 errMsgList = importUtil.validExcelData(sheet, headerList, fileMap, insertDataList, treeNodeMap, treeNodePathMap, - sysDeaprtMap, sysDepartPathMap); + sysDeaprtMap, sysDepartPathMap, + standardNoList); } return errMsgList; } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java b/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java index eff4fb78..3a5e6ae2 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java @@ -77,7 +77,8 @@ public class ImportUtil { Map> treeNodeMap, Map treeNodePathMap, Map> sysDepartMap, - Map sysDepartPathMap + Map sysDepartPathMap, + List fbStandardNoList ) { List errMsgList = new ArrayList<>(); Map keyMap = new HashMap<>(); @@ -273,7 +274,6 @@ public class ImportUtil { cellValue = this.convertDictValue(tag.getDictField(), cellValue); } } - // 组织机构 if (FieldShowTypeEnum.SINGLE_ORGANIZATION_DIALOG.getValue().equals(tag.getFieldShowType()) || FieldShowTypeEnum.MULTI_ORGANIZATION_DIALOG.getValue().equals(tag.getFieldShowType())) { @@ -392,14 +392,8 @@ public class ImportUtil { // 企标稽查内容文件导入 if (FieldCommon.REFERENCE_STANDARD.equals(tag.getDbFieldName()) && TableNameEnum.ENTERPRISE_STANDARDS.getValue().equals(tag.getIsModel())) { -// if (!this.inspectContentFileValid(cellValue, fileMap)) { -// log.error("第" + row + "列" + tag.getDbFieldTxt() + "填写错误 "); -// errMsg.append("第").append(row).append("列").append(tag.getDbFieldTxt()).append("填写错误 "); -// } else { -// // 转为List -// // 将转好的值加入Map -// parameterMap.put(tag.getDbFieldName(), this.convertInspectContentFile(cellValue, fileMap)); -// } + // 将转好的值加入Map + parameterMap.put(FieldCommon.REFERENCE_STANDARD, this.convertReferenceStandard(cellValue, fbStandardNoList)); } } if (errMsg.toString().contains("列") || errMsg.toString().contains("重复") || errMsg.toString().contains("已存在")) { @@ -411,6 +405,34 @@ public class ImportUtil { return errMsgList; } + private String convertReferenceStandard(String cellValue, List fbStandardNoList) { + if (StrUtil.isBlank(cellValue)) { + return ""; + } + List standardNoList = new ArrayList<>(Arrays.asList(cellValue.split(","))); + Iterator iterator = standardNoList.iterator(); + List addStandardNoList = new ArrayList<>(); + while (iterator.hasNext()) { + String standardNo = iterator.next(); + if (standardNo.contains("-") || standardNo.contains("—")) { + continue; + } + List match = fbStandardNoList.stream().filter(s -> s.contains(standardNo)).collect(Collectors.toList()); + if (!match.isEmpty()) { + iterator.remove(); + addStandardNoList.addAll(match); + } + } + String result = String.join(",", standardNoList); + if (!addStandardNoList.isEmpty()) { + if (!result.isEmpty()) { + result += ","; + } + result += String.join(",", addStandardNoList); + } + return result; + } + // 体系校验 public boolean standardSystemValid(String cellValue, Map> treeNodeMap, Map treeNodePathMap) { String[] cellValues = cellValue.split(","); From d343300ae9c2a44fe277572b4c556e7ab7a93c66 Mon Sep 17 00:00:00 2001 From: fengchenchen Date: Fri, 13 Sep 2024 20:19:26 +0800 Subject: [PATCH 42/42] =?UTF-8?q?[update]=20sheet2=E8=A1=A8=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E4=BF=AE=E6=94=B9=E6=88=90=E8=BD=A6=E5=9E=8B=E7=8A=B6?= =?UTF-8?q?=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ProcessStandardComplianceCheckController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/controller/ProcessStandardComplianceCheckController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/controller/ProcessStandardComplianceCheckController.java index 5a5df2bf..87ae9d3e 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/controller/ProcessStandardComplianceCheckController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/controller/ProcessStandardComplianceCheckController.java @@ -161,7 +161,7 @@ public class ProcessStandardComplianceCheckController extends JeroController()); list.add(map); Map map1 = new HashMap<>(); - map1.put("title",new ExportParams(null, "字典")); + map1.put("title",new ExportParams(null, "车型状态")); map1.put(CLASS, DictExcelVO.class); List dictItems = sysBaseAPI.getDictItems("model_status"); ArrayList dictExcelVOS = new ArrayList<>();