From 9a8508951ab424848372d3fe5d18be5cf0a16dd1 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 24 Aug 2022 20:06:06 +0800 Subject: [PATCH 01/19] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BussDocumentLibraryEOController.java | 6 ++ .../IBussDocumentLibraryEOService.java | 2 + .../BussDocumentLibraryEOServiceImpl.java | 76 ++++++++++++++++++- 3 files changed, 82 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java index 3fc1bd7d9..4227e3341 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java @@ -494,4 +494,10 @@ public class BussDocumentLibraryEOController extends JeroController getTitle() { + int count = bussDocumentLibraryEOService.updateES(); + return Result.OK(count); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IBussDocumentLibraryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IBussDocumentLibraryEOService.java index 4b392e7fb..cc0bffe37 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IBussDocumentLibraryEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IBussDocumentLibraryEOService.java @@ -223,4 +223,6 @@ public interface IBussDocumentLibraryEOService extends IService queryConditionVOList); + + int updateES(); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index bef304927..6ff4ef6bd 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -51,6 +51,7 @@ import com.jero.modules.message.websocket.WebSocket; import com.jero.modules.ocr.service.IOcrRecordEOService; import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; +import com.jero.modules.searchcenter.enums.ModuleTypeFlagEnum; import com.jero.modules.split.common.FileUnZip; import com.jero.modules.split.entity.SarFileSplitInfoEO; import com.jero.modules.split.service.ISarFileSplitInfoService; @@ -1759,6 +1760,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl stringMapCn = new HashMap<>(); Map stringMapEn = new HashMap<>(); + stringMapCn.put("create_time",new Date()); + stringMapEn.put("create_time",new Date()); String fileText = ""; if (ossFile.getFileName().endsWith(".doc") || ossFile.getFileName().endsWith(".docx") @@ -1839,11 +1842,19 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl stringMapCn = new HashMap<>(); Map stringMapEn = new HashMap<>(); + Map mapBaseDateCn = new HashMap<>(); + Map mapBaseDateEn = new HashMap<>(); + stringMapCn.put("create_time",new Date()); + stringMapEn.put("create_time",new Date()); + mapBaseDateCn.put("create_time",new Date()); + mapBaseDateEn.put("create_time",new Date()); for (OnlCgformField onlCgformField : searchFieldList) { String s = StringUtils.valueOf(map.get(onlCgformField.getDbFieldName())); if(StringUtils.isNotBlank(s)){ stringMapCn.put(onlCgformField.getDbFieldName(), s); stringMapEn.put(onlCgformField.getDbFieldName(), s); + mapBaseDateCn.put(onlCgformField.getDbFieldName(), s); + mapBaseDateEn.put(onlCgformField.getDbFieldName(), s); } } //封装中文的全文内容(es) @@ -1856,8 +1867,23 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl stringMapCn = new HashMap<>(); Map stringMapEn = new HashMap<>(); + Map mapBaseDateCn = new HashMap<>(); + Map mapBaseDateEn = new HashMap<>(); + stringMapCn.put("create_time",new Date()); + stringMapEn.put("create_time",new Date()); + mapBaseDateCn.put("create_time",new Date()); + mapBaseDateEn.put("create_time",new Date()); for (OnlCgformField onlCgformField : searchFieldList) { String s = (String) map.get(onlCgformField.getDbFieldName()); if(FieldTypeEnum.DATE_SINGLE.getValue().equals(onlCgformField.getFieldShowType()) && StringUtils.isNotBlank(s)){ @@ -2435,8 +2477,23 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl objectMapTemp = new HashMap<>(); for (Map.Entry entry : map.entrySet()) { @@ -2481,7 +2540,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl> mapList = this.listMaps(); + int count = 0; + for (Map map : mapList) { + map.put("es_update_flag","es_update_flag"); + updateInfo(map); + count ++; + } + return count; + } + } From a16d2399250f1990db13f861b062b58789bc0842 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 24 Aug 2022 20:22:07 +0800 Subject: [PATCH 02/19] =?UTF-8?q?=E7=BC=96=E8=BE=91ES=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../document/service/impl/BussDocumentLibraryEOServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index 6ff4ef6bd..cc6186c08 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -5983,7 +5983,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl> mapList = this.listMaps(); + List> mapList = bussDocumentLibraryEOMapper.selectMapsAll(null); int count = 0; for (Map map : mapList) { map.put("es_update_flag","es_update_flag"); From 256d5eef5d0239e8008bf1818966cee24aacff84 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 25 Aug 2022 09:12:40 +0800 Subject: [PATCH 03/19] =?UTF-8?q?=E6=94=BE=E5=BC=80=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/documentTools/searchCenter/index.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jero-web/src/views/documentTools/searchCenter/index.vue b/jero-web/src/views/documentTools/searchCenter/index.vue index 7e7cd2b69..8270a0c4b 100644 --- a/jero-web/src/views/documentTools/searchCenter/index.vue +++ b/jero-web/src/views/documentTools/searchCenter/index.vue @@ -65,10 +65,10 @@ - - - - + + + + From 6a6e4683804dd1033cbf704ee63c03d5bb42f839 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167@qq.com> Date: Thu, 25 Aug 2022 09:46:48 +0800 Subject: [PATCH 04/19] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../searchCenter/components/problemKnowledgeBase.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue b/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue index 0df134b63..c0644dbab 100644 --- a/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue +++ b/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue @@ -7,6 +7,7 @@ {{$t('problemClassification')}} From 37872bd10aa91785ee0fd2fddf46e50796c81119 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 25 Aug 2022 09:59:37 +0800 Subject: [PATCH 05/19] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=9C=88=E6=8A=A5?= =?UTF-8?q?=E5=A1=AB=E5=86=99--=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_third_record.sql | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index f52e1d14e..6a24c7bd5 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -958,3 +958,11 @@ DROP INDEX `uniq_sys_user_work_no`; -- 工作流 流程表增加流程名称 英文字段 2022-08-19 已同步生产环境 ALTER TABLE `laws_weilai_wkflow`.`bus_process_name` ADD COLUMN `PRC_NAME_EN` varchar(255) NULL COMMENT '流程名称（英文）' AFTER `PROJECT_LAWS_INVENTORY_ID`; + +-- 法规月报填写 新增字段 2022-08-25 未同步生产环境 +ALTER TABLE `laws_weilai`.`laws_monthly_report_write` +ADD COLUMN `related_areas_cn` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '相关领域中文' AFTER `export_state`, +ADD COLUMN `related_areas_en` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '相关领域英文' AFTER `related_areas_cn`, +ADD COLUMN `source_cn` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '来源中文' AFTER `related_areas_en`, +ADD COLUMN `time` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '日期' AFTER `source_cn`, +ADD COLUMN `source_en` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '来源英文' AFTER `time`; From a56244fca8ca80427ef1218123a8083610cbe3ce Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Thu, 25 Aug 2022 10:12:54 +0800 Subject: [PATCH 06/19] =?UTF-8?q?58582=20=E9=97=AE=E9=A2=98=E7=9F=A5?= =?UTF-8?q?=E8=AF=86=E5=BA=93-=E9=97=AE=E9=A2=98=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E3=80=81=E5=B8=82=E5=9C=BA=E6=A3=80=E7=B4=A2=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=A4=9A=E9=80=89=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProblemKnowledgeBaseEOServiceImpl.java | 10 +++++----- .../service/impl/DocumentSearchServiceImpl.java | 15 +++++++++------ 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java index e1e298f70..087d3aabf 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java @@ -92,7 +92,7 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl problemTypeList = Arrays.asList(problem_type.split(",")); + + Map problemTypeKeyMap = new HashMap<>(); + Map problemTypeMatchMap = new HashMap<>(); + problemTypeKeyMap.put("problem_type", problemTypeList); + problemTypeMatchMap.put("terms",problemTypeKeyMap); + queryMapJson.add(problemTypeMatchMap); } //封装市场选择框查询条件。 From e031fa8a678f63c9af24f18fb59a71824697b343 Mon Sep 17 00:00:00 2001 From: liyawei Date: Thu, 25 Aug 2022 10:38:34 +0800 Subject: [PATCH 07/19] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=B8=AD=E5=BF=83-?= =?UTF-8?q?=E5=85=A8=E5=B1=80-=E8=A7=A3=E5=86=B3=E5=8C=85=E5=86=B2?= =?UTF-8?q?=E7=AA=81=E5=AF=BC=E8=87=B4=E4=B8=8D=E8=83=BD=E8=AF=BB=E5=8F=96?= =?UTF-8?q?.doc=E6=96=87=E4=BB=B6=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/jero-boot-modules/pom.xml | 20 +++++++++++++++++++ .../LawsMonthlyReportManageEOServiceImpl.java | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/pom.xml b/jero-boot/jero-boot-modules/pom.xml index 98a1510d4..1f4c12fa2 100644 --- a/jero-boot/jero-boot-modules/pom.xml +++ b/jero-boot/jero-boot-modules/pom.xml @@ -125,6 +125,20 @@ cn.afterturn easypoi-base 3.2.0 + + + org.apache.poi + poi-ooxml-schemas + + + org.apache.poi + poi-ooxml + + + org.apache.poi + poi + + cn.afterturn @@ -220,6 +234,12 @@ hanlp portable-1.7.5 + + org.apache.xmlbeans + xmlbeans + 2.6.0 + compile + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java index b8d67b793..c96a1553d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java @@ -146,7 +146,7 @@ public class LawsMonthlyReportManageEOServiceImpl extends ServiceImpl Date: Thu, 25 Aug 2022 11:00:22 +0800 Subject: [PATCH 08/19] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../splitting/modules/SplitAddForm.vue | 12 ++++++++++++ .../components/listOfRelevantPersonnel.vue | 19 ++++++++++++------- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue b/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue index 5c9a49c3b..dc02a0bb9 100644 --- a/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue +++ b/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue @@ -1324,6 +1324,18 @@ border: 1px #00B3BE solid; color: #00B3BE; } + + ::v-deep .ant-select-tree { + width: auto; + height: 300px; + overflow: auto; + position: absolute; + /*background: #fff;*/ + } + + ::v-deep .ant-select-tree-dropdown { + min-height: 320px; + } \ No newline at end of file diff --git a/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue b/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue index 68a37617b..20843f030 100644 --- a/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue +++ b/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue @@ -79,10 +79,14 @@ + + {{text ? text : '--'}} + @@ -193,6 +197,14 @@ align: 'center', width: 180, scopedSlots: { customRender: 'complianceResults' } + }, + { + title: this.$t('sponsorFeedback'), + dataIndex: 'sponsorFeedback', + align: 'center', + width: 180, + ellipsis: true, + scopedSlots: { customRender: 'sponsorFeedbackIndex' } } ], columnsThree: [ From e8023f07c7ee3c52294b7bfd1da97cc44c4ba07e Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Thu, 25 Aug 2022 14:21:55 +0800 Subject: [PATCH 10/19] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E6=A0=87=E9=A2=98=E6=97=B6=E9=9A=90=E8=97=8F=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E7=B1=BB=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../parameterlist/components/addModel.vue | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue index 4635092ce..00f1cd2d1 100644 --- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue +++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue @@ -134,7 +134,8 @@ - + +
@@ -248,8 +249,9 @@
+ - + @@ -470,11 +472,11 @@ export default { }, controlTypeChange(value){ this.$refs.ruleForm.clearValidate(['controlVerify','titleDefaultValue','controlValues']) - if(value == 11){ - this.required = false - }else { - this.required = true - } + // if(value == 11){ + // this.required = false + // }else { + // this.required = true + // } }, uploadSuccess(data) { let attIdList = [] @@ -645,11 +647,11 @@ export default { // value.technologyTerritory = value.technologyTerritory.split(',') // } this.formInline = value - if(this.formInline.controlType == 11){ - this.required = false - }else{ - this.required = true - } + // if(this.formInline.controlType == 11){ + // this.required = false + // }else{ + // this.required = true + // } this.title = this.$t('edit') this.flag = 0 // 获取认证类别 From af79dcad7adbd69d6f329d5d779ece16862050e9 Mon Sep 17 00:00:00 2001 From: liyawei Date: Thu, 25 Aug 2022 14:27:58 +0800 Subject: [PATCH 11/19] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=A1=B9-=E6=A0=87=E9=A2=98=E7=B1=BB=E5=9E=8B=EF=BC=8C?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E7=B1=BB=E5=88=AB=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ParamsInfoEOController.java | 6 ++---- .../service/impl/ParamsInfoEOServiceImpl.java | 18 +++++++----------- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java index 7723c44be..bad589083 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java @@ -137,8 +137,7 @@ public class ParamsInfoEOController extends JeroController add(@Validated @RequestBody ParamsInfoEO paramsInfoEO) { - if (StringUtils.isEmpty(paramsInfoEO.getCertCategory()) - && !ControlTypeEnum.Title.getValue().equals(paramsInfoEO.getControlType())) { + if (StringUtils.isEmpty(paramsInfoEO.getCertCategory())) { return Result.error("认证类别不能为空！"); } boolean isSuccess = paramsInfoEOService.add(paramsInfoEO); @@ -160,8 +159,7 @@ public class ParamsInfoEOController extends JeroController edit(@Validated @RequestBody ParamsInfoEO paramsInfoEO) { - if (StringUtils.isEmpty(paramsInfoEO.getCertCategory()) - && !ControlTypeEnum.Title.getValue().equals(paramsInfoEO.getControlType())) { + if (StringUtils.isEmpty(paramsInfoEO.getCertCategory())) { return Result.error("认证类别不能为空！"); } boolean isSuccess = paramsInfoEOService.editById(paramsInfoEO); diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java index b2dadc5c4..e88b4368f 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java @@ -1311,6 +1311,13 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl Date: Thu, 25 Aug 2022 14:34:41 +0800 Subject: [PATCH 12/19] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E6=A0=87=E9=A2=98=E6=97=B6=E9=9A=90=E8=97=8F=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E7=B1=BB=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../parameterlist/components/addModel.vue | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue index 00f1cd2d1..5d5bd090f 100644 --- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue +++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue @@ -676,7 +676,8 @@ export default { this.$refs['ruleForm'].resetFields() }, handleSubmit() { - if(this.formInline.certCategory == undefined && this.formInline.controlType != 11) { + // && this.formInline.controlType != 11 + if(this.formInline.certCategory == undefined ) { this.$message.warning(this.$t('certificationCategory')+this.$t('cannotEmpty')) return } @@ -738,12 +739,12 @@ export default { }) let querycontentList = JSON.parse(JSON.stringify(this.contentList)) query.certCategoryParamsInfoEOList = querycontentList - if(this.formInline.controlType == 11){ - query.certCategoryParamsInfoEOList = [] - query.certCategory = '' - }else{ - query.titleDefaultValue = '' - } + // if(this.formInline.controlType == 11){ + // query.certCategoryParamsInfoEOList = [] + // query.certCategory = '' + // }else{ + // query.titleDefaultValue = '' + // } this.confirmLoading = true Action(url, query).then((res) => { if (res.success) { From 9563e6e93a9ed10351415fe1461457ad1fceecb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167@qq.com> Date: Thu, 25 Aug 2022 14:46:01 +0800 Subject: [PATCH 13/19] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/mixins/JeroListMixin.js | 4 ++++ .../collectionOfRegulatoryOpinions/index.vue | 5 +++++ .../components/countryCardList.vue | 5 +++++ .../components/countryCardRelease.vue | 5 +++++ .../components/problemKnowledgeBaseList.vue | 5 +++++ .../components/problemKnowledgeBaseRelease.vue | 5 +++++ .../components/RegulationMonthlyFill.vue | 2 +- .../components/RegulationMonthlyManagement.vue | 2 +- .../businessSupport/technologyAssessment/index.vue | 5 +++++ .../src/views/documentManage/collection/index.vue | 5 +++++ .../src/views/documentManage/subscribtion/index.vue | 5 +++++ .../components/initiateComparison.vue | 12 +++++++++++- .../views/documentTools/documentComparison/index.vue | 9 +++++++-- .../documentTools/documentTranslation/index.vue | 5 +++++ .../src/views/documentTools/virtualList/index.vue | 2 +- .../src/views/parameter/ParameterTemplate/index.vue | 2 +- .../src/views/parameter/escalationlibrary/index.vue | 2 +- .../src/views/parameter/managementdetails/index.vue | 2 +- .../src/views/parameter/parameterexport/index.vue | 2 +- jero-web/src/views/parameter/parameterlist/index.vue | 2 +- .../views/projectManagement/projectLibrary/index.vue | 2 +- .../projectNonConformance/index.vue | 5 +++++ jero-web/src/views/regulationsKanban/index.vue | 4 +--- 23 files changed, 82 insertions(+), 15 deletions(-) diff --git a/jero-web/src/mixins/JeroListMixin.js b/jero-web/src/mixins/JeroListMixin.js index a63723895..a5ddfabce 100644 --- a/jero-web/src/mixins/JeroListMixin.js +++ b/jero-web/src/mixins/JeroListMixin.js @@ -87,6 +87,10 @@ export const JeroListMixin = { getAction(this.url.list, params).then((res) => { if (res.success) { //update-begin---author:zhangyafei Date:20201118 for：适配不分页的数据列表------------ + if (res.result.current > 1 && res.result.records.length == 0) { + this.loadData(1) + return + } this.dataSource = res.result.records||res.result; if(res.result.total) { diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue index d24754c0c..fe5a2a79f 100644 --- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue @@ -261,6 +261,11 @@ this.loading = true getAction(this.url.list, query).then((res) => { if (res.success) { + if (res.result.current > 1 && res.result.records.length == 0) { + this.pageNo = 1 + this.getList() + return + } this.dataSource = res.result.records || [] this.total = res.result.total this.loading = false diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue index 5ab1f05dc..bbab9da1b 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue @@ -126,6 +126,11 @@ this.loading = true getAction(this.url.getInfoList, query).then((res) => { if (res.success) { + if (res.result.current > 1 && res.result.records.length == 0) { + this.pageNo = 1 + this.getList() + return + } this.conList = res.result.records this.total = res.result.total this.loading = false diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue index 335d28489..ef8eccc3b 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue @@ -241,6 +241,11 @@ this.loading = true getAction(this.url.list, query).then((res) => { if (res.success) { + if (res.result.current > 1 && res.result.records.length == 0) { + this.pageNo = 1 + this.getList() + return + } this.dataSource = res.result.records || [] this.total = res.result.total this.loading = false diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue index e8efb5c01..4e5f366ef 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue @@ -183,6 +183,11 @@ this.loading = true getAction(this.url.getInfoList, query).then((res) => { if (res.success) { + if (res.result.current > 1 && res.result.records.length == 0) { + this.pageNo = 1 + this.getList() + return + } this.conList = res.result.records if (this.conList && this.conList.length > 0) { this.conList.forEach(val => { diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue index 674d582b4..f752ef697 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue @@ -131,6 +131,11 @@ this.loading = true getAction(this.url.getInfoList, query).then((res) => { if (res.success) { + if (res.result.current > 1 && res.result.records.length == 0) { + this.pageNo = 1 + this.getList() + return + } this.conList = res.result.records if (this.conList && this.conList.length > 0) { this.conList.forEach(val => { diff --git a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue index 16c344de0..d002831c3 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue @@ -206,7 +206,7 @@ getAction(this.url.list, query).then((res) => { if (res.success) { if (res.result.current > 1 && res.result.records.length == 0) { - this.pageNo = res.result.current - 1 + this.pageNo = 1 this.getList() return } diff --git a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue index ed6094a76..ff3d45cfd 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue @@ -194,7 +194,7 @@ getAction(this.url.list, query).then((res) => { if (res.success) { if (res.result.current > 1 && res.result.records.length == 0) { - this.pageNo = res.result.current - 1 + this.pageNo = 1 this.getList() return } diff --git a/jero-web/src/views/businessSupport/technologyAssessment/index.vue b/jero-web/src/views/businessSupport/technologyAssessment/index.vue index 8e83798ae..14d71ee58 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/index.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/index.vue @@ -331,6 +331,11 @@ this.loading = true getAction(this.url.list, query).then((res) => { if (res.success) { + if (res.result.current > 1 && res.result.records.length == 0) { + this.pageNo = 1 + this.getList() + return + } this.dataSource = res.result.records || [] this.total = res.result.total this.loading = false diff --git a/jero-web/src/views/documentManage/collection/index.vue b/jero-web/src/views/documentManage/collection/index.vue index ab4f0e675..9c27a5711 100644 --- a/jero-web/src/views/documentManage/collection/index.vue +++ b/jero-web/src/views/documentManage/collection/index.vue @@ -164,6 +164,11 @@ this.loading = true postAction(`collection/onlCgformCollection/page`, params).then(res => { if (res.success) { + if (res.result.current > 1 && res.result.records.length == 0) { + this.queryParams.pageNo = 1 + this.loadData() + return + } this.tableData = [...res.result.records] this.total = res.result.total this.loading = false diff --git a/jero-web/src/views/documentManage/subscribtion/index.vue b/jero-web/src/views/documentManage/subscribtion/index.vue index e0df9d449..3e45140b2 100644 --- a/jero-web/src/views/documentManage/subscribtion/index.vue +++ b/jero-web/src/views/documentManage/subscribtion/index.vue @@ -185,6 +185,11 @@ this.loading = true postAction(`subscribe/onlCgformSubscribe/page`, params).then(res => { if (res.success) { + if (res.result.current > 1 && res.result.records.length == 0) { + this.queryParams.pageNo = 1 + this.loadData() + return + } this.tableData = [...res.result.records] this.total = res.result.total this.loading = false diff --git a/jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue b/jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue index 1191b6f42..40d188a13 100644 --- a/jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue +++ b/jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue @@ -71,7 +71,7 @@ {{$t('selectedStandard')}} {{selectedRowKeysLeftRecord[0]?selectedRowKeysLeftRecord[0].serialNumber+' '+selectedRowKeysLeftRecord[0].fileName:$t('noComparisonDocumentSelected')}} @@ -357,6 +357,11 @@ this.loadingLeft = true getAction(this.url.list, query).then((res) => { if (res.success) { + if (res.result.current > 1 && res.result.records.length == 0) { + this.pageNoLeft = 1 + this.getListLeft() + return + } this.dataSourceLeft = res.result.records || [] this.totalLeft = res.result.total this.loadingLeft = false @@ -381,6 +386,11 @@ this.loadingRight = true getAction(this.url.list, query).then((res) => { if (res.success) { + if (res.result.current > 1 && res.result.records.length == 0) { + this.pageNoRight = 1 + this.getListRight() + return + } this.dataSourceRight = res.result.records || [] this.totalRight = res.result.total this.loadingRight = false diff --git a/jero-web/src/views/documentTools/documentComparison/index.vue b/jero-web/src/views/documentTools/documentComparison/index.vue index 64eaaeb48..93c6ef10e 100644 --- a/jero-web/src/views/documentTools/documentComparison/index.vue +++ b/jero-web/src/views/documentTools/documentComparison/index.vue @@ -258,6 +258,11 @@ this.loading = true getAction(this.url.list, query).then((res) => { if (res.success) { + if (res.result.current > 1 && res.result.records.length == 0) { + this.pageNo = 1 + this.getList() + return + } this.dataSource = res.result.records || [] this.total = res.result.total this.loading = false @@ -491,11 +496,11 @@ } ::v-deep .ant-table-row:first-child { - background: #fff!important; + background: #fff !important; opacity: 0.9; } ::v-deep .ant-table-body { - background: transparent!important; + background: transparent !important; } \ No newline at end of file diff --git a/jero-web/src/views/documentTools/documentTranslation/index.vue b/jero-web/src/views/documentTools/documentTranslation/index.vue index 5b1458226..2111503b6 100644 --- a/jero-web/src/views/documentTools/documentTranslation/index.vue +++ b/jero-web/src/views/documentTools/documentTranslation/index.vue @@ -276,6 +276,11 @@ this.loading = true getAction(this.url.list, query).then((res) => { if (res.success) { + if (res.result.current > 1 && res.result.records.length == 0) { + this.pageNo = 1 + this.getList() + return + } this.dataSource = res.result.records || [] this.total = res.result.total this.loading = false diff --git a/jero-web/src/views/documentTools/virtualList/index.vue b/jero-web/src/views/documentTools/virtualList/index.vue index 9df85be2d..3c4cbfda3 100644 --- a/jero-web/src/views/documentTools/virtualList/index.vue +++ b/jero-web/src/views/documentTools/virtualList/index.vue @@ -413,7 +413,7 @@ getAction(this.url.list, query).then((res) => { if (res.success) { if (res.result.current > 1 && res.result.records.length == 0) { - this.pageNo = res.result.current - 1 + this.pageNo = 1 this.getList() return } diff --git a/jero-web/src/views/parameter/ParameterTemplate/index.vue b/jero-web/src/views/parameter/ParameterTemplate/index.vue index 1d08acb9a..e29fd17b3 100644 --- a/jero-web/src/views/parameter/ParameterTemplate/index.vue +++ b/jero-web/src/views/parameter/ParameterTemplate/index.vue @@ -364,7 +364,7 @@ export default { getAction(this.url.list, query).then((res) => { if (res.success) { if (res.result.current > 1 && res.result.records.length == 0) { - this.pageNo = res.result.current - 1 + this.pageNo = 1 this.getList() return } diff --git a/jero-web/src/views/parameter/escalationlibrary/index.vue b/jero-web/src/views/parameter/escalationlibrary/index.vue index e039f52ea..dbb9e4a8a 100644 --- a/jero-web/src/views/parameter/escalationlibrary/index.vue +++ b/jero-web/src/views/parameter/escalationlibrary/index.vue @@ -236,7 +236,7 @@ getAction(this.url.list, query).then((res) => { if (res.success) { if (res.result.current > 1 && res.result.records.length == 0) { - this.pageNo = res.result.current - 1 + this.pageNo = 1 this.getList() return } diff --git a/jero-web/src/views/parameter/managementdetails/index.vue b/jero-web/src/views/parameter/managementdetails/index.vue index aa785af22..92c247e1b 100644 --- a/jero-web/src/views/parameter/managementdetails/index.vue +++ b/jero-web/src/views/parameter/managementdetails/index.vue @@ -363,7 +363,7 @@ export default { getAction(this.url.tableList, params).then((res) => { if (res.success) { if (res.result.current > 1 && res.result.records.length == 0) { - this.pageNo = res.result.current - 1 + this.pageNo = 1 this.getTableList() return } diff --git a/jero-web/src/views/parameter/parameterexport/index.vue b/jero-web/src/views/parameter/parameterexport/index.vue index da66a2fcd..dd2a91bbe 100644 --- a/jero-web/src/views/parameter/parameterexport/index.vue +++ b/jero-web/src/views/parameter/parameterexport/index.vue @@ -339,7 +339,7 @@ export default { getAction(this.url.list, query).then((res) => { if (res.success) { if (res.result.current > 1 && res.result.records.length == 0) { - this.pageNo = res.result.current - 1 + this.pageNo = 1 this.getList() return } diff --git a/jero-web/src/views/parameter/parameterlist/index.vue b/jero-web/src/views/parameter/parameterlist/index.vue index 61397d9ca..68c210b30 100644 --- a/jero-web/src/views/parameter/parameterlist/index.vue +++ b/jero-web/src/views/parameter/parameterlist/index.vue @@ -390,7 +390,7 @@ export default { getAction(this.url.list, query).then((res) => { if (res.success) { if (res.result.current > 1 && res.result.records.length == 0) { - this.pageNo = res.result.current - 1 + this.pageNo = 1 this.getList() return } diff --git a/jero-web/src/views/projectManagement/projectLibrary/index.vue b/jero-web/src/views/projectManagement/projectLibrary/index.vue index b314f466d..89c1b78a8 100644 --- a/jero-web/src/views/projectManagement/projectLibrary/index.vue +++ b/jero-web/src/views/projectManagement/projectLibrary/index.vue @@ -353,7 +353,7 @@ postAction(this.url.list, query).then((res) => { if (res.success) { if (res.result.current > 1 && res.result.records.length == 0) { - this.pageNo = res.result.current - 1 + this.pageNo = 1 this.getList() return } diff --git a/jero-web/src/views/projectManagement/projectNonConformance/index.vue b/jero-web/src/views/projectManagement/projectNonConformance/index.vue index a2e1e0a74..3c58f2543 100644 --- a/jero-web/src/views/projectManagement/projectNonConformance/index.vue +++ b/jero-web/src/views/projectManagement/projectNonConformance/index.vue @@ -342,6 +342,11 @@ this.loading = true getAction(this.url.page, query).then((res) => { if (res.success) { + if (res.result.current > 1 && res.result.records.length == 0) { + this.pageNo = 1 + this.getList() + return + } this.dataSource = res.result.records || [] this.total = res.result.total this.loading = false diff --git a/jero-web/src/views/regulationsKanban/index.vue b/jero-web/src/views/regulationsKanban/index.vue index 5112ee0ac..b7366a734 100644 --- a/jero-web/src/views/regulationsKanban/index.vue +++ b/jero-web/src/views/regulationsKanban/index.vue @@ -359,13 +359,11 @@ export default { postAction(this.url.list, query).then((res) => { if (res) { if (res.result.current > 1 && res.result.records.length == 0) { - this.pageNo = res.result.current - 1 + this.pageNo = 1 this.getList() return } - console.log(res.result) this.dataSource = res.result.records || [] - this.total = res.result.total this.loading = false } else { From a2646f80292819114587230573efbfe5a120c689 Mon Sep 17 00:00:00 2001 From: liyawei Date: Thu, 25 Aug 2022 14:50:31 +0800 Subject: [PATCH 14/19] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E5=BA=93-=E6=9F=A5=E7=9C=8B-=E5=AF=BC=E5=87=BA-=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E6=96=87=E4=BB=B6=E5=86=85=E5=AE=B9=E5=B9=B6=E9=87=8D?= =?UTF-8?q?=E5=91=BD=E5=90=8Dbug58358?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ParamsReportDetailEOServiceImpl.java | 227 +++++++++++++++--- 1 file changed, 188 insertions(+), 39 deletions(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java index 5ac86ab0a..85d6d0b5a 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java @@ -35,6 +35,7 @@ import com.jero.modules.project.util.WordUtil; import com.jero.modules.split.common.ReadExcel; import com.jero.modules.system.entity.SysDictItem; import com.jero.modules.system.service.ISysDictItemService; +import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.apache.poi.hssf.util.HSSFColor; @@ -762,21 +763,21 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl allParamsInfoList = queryForExportCustom(paramsReportDetailVO); - Map params = allParamsInfoList.get(0); - List> imgListAll = (List>) allParamsInfoList.get(1).get("imgListAll"); - - String templateUrl = ""; - ParamsExportTemplateEO paramsExportTemplateEO = paramsExportTemplateEOService.getById(paramsReportDetailVO.getExportTemplateId()); - List ossFiles = ossFileService.getFileInfosByConnectId(paramsExportTemplateEO.getFileConnectId()); - if (CollectionUtil.isNotEmpty(ossFiles)) { - templateUrl = ossFiles.get(0).getUrl(); - } - // 替换模板中的占位符 try { + // 查询导出数据 + List allParamsInfoList = queryForExportCustom(paramsReportDetailVO); + Map params = allParamsInfoList.get(0); + List> imgListAll = (List>) allParamsInfoList.get(1).get("imgListAll"); + + String templateUrl = ""; + ParamsExportTemplateEO paramsExportTemplateEO = paramsExportTemplateEOService.getById(paramsReportDetailVO.getExportTemplateId()); + List ossFiles = ossFileService.getFileInfosByConnectId(paramsExportTemplateEO.getFileConnectId()); + if (CollectionUtil.isNotEmpty(ossFiles)) { + templateUrl = ossFiles.get(0).getUrl(); + } + // 拿取模板 String repFileName = fileName.replaceAll("/","_"); wordOS = new FileOutputStream(fileNowPath + File.separator + repFileName); @@ -788,16 +789,36 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl> fileListAll = (List>) allParamsInfoList.get(2).get("fileListAll"); if (fileListAll != null && !fileListAll.isEmpty()) { - Map paramsAfterFilter = WordUtil.filterParams(wordMLPackage, params); + Map paramsAfterFilter = WordUtil.filterParams(wordMLPackage, params); // 过滤出需要导出的参数项 if (CollectionUtil.isNotEmpty(paramsAfterFilter)) { List nioNumberList = paramsAfterFilter.keySet().stream().collect(Collectors.toList()); List allRelevFileList = new ArrayList<>(); + // 判断文件是否重复 for (Map fileMap : fileListAll) { for (Map.Entry map : fileMap.entrySet()) { String key = (String) map.getKey(); List fileList = (List) map.getValue(); + if (nioNumberList.contains(key)) { - allRelevFileList.addAll(fileList); + String newFileName = isRepeat(allRelevFileList, fileList.get(0)); + if (!"".equals(newFileName) && !"old".equals(newFileName)) { // 文件名称重复 且文件内容不同 + String configDataStr = params.get(key); + if (StringUtils.isNotEmpty(configDataStr)) { + if (configDataStr.contains("#")) { + String newConfigDataStr = configDataStr.substring(0, configDataStr.lastIndexOf("#")) + newFileName; + params.put(key, newConfigDataStr); + } else { + params.put(key, newFileName); + } + } + + fileList.get(0).setFileName(newFileName); + allRelevFileList.addAll(fileList); + + } else if ("".equals(newFileName)) { // 文件名称不重复 + allRelevFileList.addAll(fileList); + + } } } } @@ -893,21 +914,21 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl allParamsInfoList = queryForExportCustom(paramsReportDetailVO); - HashMap params = (HashMap) allParamsInfoList.get(0); - List> imgListAll = (List>) allParamsInfoList.get(1).get("imgListAll"); - - String templateUrl = ""; - ParamsExportTemplateEO paramsExportTemplateEO = paramsExportTemplateEOService.getById(paramsReportDetailVO.getExportTemplateId()); - List ossFiles = ossFileService.getFileInfosByConnectId(paramsExportTemplateEO.getFileConnectId()); - if (CollectionUtil.isNotEmpty(ossFiles)) { - templateUrl = ossFiles.get(0).getUrl(); - } - // 替换模板中的占位符 try { + // 查询导出数据 + List allParamsInfoList = queryForExportCustom(paramsReportDetailVO); + HashMap params = (HashMap) allParamsInfoList.get(0); + List> imgListAll = (List>) allParamsInfoList.get(1).get("imgListAll"); + + String templateUrl = ""; + ParamsExportTemplateEO paramsExportTemplateEO = paramsExportTemplateEOService.getById(paramsReportDetailVO.getExportTemplateId()); + List ossFiles = ossFileService.getFileInfosByConnectId(paramsExportTemplateEO.getFileConnectId()); + if (CollectionUtil.isNotEmpty(ossFiles)) { + templateUrl = ossFiles.get(0).getUrl(); + } + // 拿取模板 String repFileName = fileName.replaceAll("/","_"); wordOS = new FileOutputStream(fileNowPath + File.separator + repFileName); @@ -931,7 +952,25 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl fileList = (List) map.getValue(); if (nioNumberList.contains(key)) { - allRelevFileList.addAll(fileList); + String newFileName = isRepeat(allRelevFileList, fileList.get(0)); + if (!"".equals(newFileName) && !"old".equals(newFileName)) { // 文件名称重复 且文件内容不同 + String configDataStr = params.get(key); + if (StringUtils.isNotEmpty(configDataStr)) { + if (configDataStr.contains("#")) { + String newConfigDataStr = configDataStr.substring(0, configDataStr.lastIndexOf("#")) + newFileName; + params.put(key, newConfigDataStr); + } else { + params.put(key, newFileName); + } + } + + fileList.get(0).setFileName(newFileName); + allRelevFileList.addAll(fileList); + + } else if ("".equals(newFileName)) { // 文件名称不重复 + allRelevFileList.addAll(fileList); + + } } } } @@ -1064,7 +1103,7 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl> queryForExportNormal(ParamsReportDetailVO paramsReportDetailVO) { + private List> queryForExportNormal(ParamsReportDetailVO paramsReportDetailVO) throws IOException { List idList = new ArrayList<>(); if (StringUtils.isNotEmpty(paramsReportDetailVO.getIds())) { idList = Arrays.asList(paramsReportDetailVO.getIds().split(",")); @@ -1074,6 +1113,7 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl paramsConfigEOList = paramsReportConfigEOService.queryList(paramsReportDetailVO.getParamsManifestId()); // 查询所有配置列 + List fileListAll = new ArrayList<>(); // 仅用于校验文件是否重复 // 查询配置列数据 for (Map record1 : dataList) { @@ -1086,7 +1126,7 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImplconfigIdList.contains(e.getId())).collect(Collectors.toList()); // 过滤出要导出的配置列 - paramsConfigEOList.forEach(paramsConfigEO -> { // 参数配置 + for (ParamsConfigEO paramsConfigEO : paramsConfigEOList) { // 参数配置 if (ControlTypeEnum.Title.getValue().equals(controlType)) { record1.put(paramsConfigEO.getId(), titleDefaultValue); @@ -1103,9 +1143,24 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl ossFileList = ossFileService.getFileInfosByConnectId(paramsConfigDataEO.getFileConnectId()); if (CollectionUtil.isNotEmpty(ossFileList)) { - configDataBuilder.append(ossFileList.get(0).getFileName()).append("#"); + // 不合并导出时 验证文件名是否相同，相同进一步验证文件内容是否相同，不同时重命名文件 + String fileName = ossFileList.get(0).getFileName(); + String newFileName = isRepeat(fileListAll, ossFileList.get(0)); + if (!"".equals(newFileName) && !"old".equals(newFileName)) { // 文件名称重复 且文件内容不同 + configDataBuilder.append(newFileName).append("#"); + ossFileList.get(0).setFileName(newFileName); + fileList.addAll(ossFileList); + fileListAll.addAll(ossFileList); + + } else if ("old".equals(newFileName)) { // 文件名称重复 且文件内容相同 + configDataBuilder.append(fileName).append("#"); + fileList.addAll(ossFileList); + }else { + configDataBuilder.append(fileName).append("#"); + fileList.addAll(ossFileList); + fileListAll.addAll(ossFileList); + } - fileList.addAll(ossFileList); } } @@ -1116,7 +1171,7 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl ossFileList = ossFileService.getFileInfosByConnectId(paramsReportConfigDataEO.getFileConnectId()); if (CollectionUtil.isNotEmpty(ossFileList)) { - fileNameList.add(ossFileList.get(0).getFileName()); + // 合并导出时 验证文件名是否相同，相同进一步验证文件内容是否形同，不同时重命名文件 + String fileName = ossFileList.get(0).getFileName(); + String newFileName = isRepeat(fileListAll, ossFileList.get(0)); + if (!"".equals(newFileName) && !"old".equals(newFileName)) { // 文件名称重复 且文件内容不同 + // 判断 新文件名是不是当前参数下 配置间的 重复 + int count = (int) fileList.stream().filter(e->newFileName.equals(e.getFileName())).count(); + if (count <= 0) { // 不是 （如果是，不做任何操作） + fileNameList.add(newFileName); + ossFileList.get(0).setFileName(newFileName); + fileList.addAll(ossFileList); + fileListAll.addAll(ossFileList); + } + + } else if ("old".equals(newFileName)) { // 文件名称重复 且文件内容相同 + + // 判断这种重复是不是当前参数下 配置间的 + int count = (int) fileList.stream().filter(e->fileName.equals(e.getFileName())).count(); + if (count <= 0) { // 不是 （如果是，不做任何操作） + fileNameList.add(fileName); + fileList.addAll(ossFileList); + fileListAll.addAll(ossFileList); + } + + }else { // 文件名称不重复 + fileNameList.add(fileName); + fileList.addAll(ossFileList); + fileListAll.addAll(ossFileList); + } - fileList.addAll(ossFileList); } } } @@ -1151,7 +1232,7 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl queryForExportCustom(ParamsReportDetailVO paramsReportDetailVO) { + private List queryForExportCustom(ParamsReportDetailVO paramsReportDetailVO) throws IOException { paramsReportDetailVO.setSeparator("*"); // 设置分隔符 List idList = new ArrayList<>(); @@ -1194,8 +1275,8 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl fileList = new ArrayList<>(); - List imgFileList = new ArrayList<>(); + List fileList = new ArrayList<>(); // 存放当前编号下的非图片文件 + List imgFileList = new ArrayList<>(); // 存放当前编号下的图片文件 // 合并配置数据 String configData = ""; @@ -1208,7 +1289,8 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl fileNameList = new ArrayList<>(); - for (ParamsReportConfigDataEO paramsReportConfigDataEO : paramsReportConfigDataEOS) { // 获取”导出文件夹“下的文件 + if (CollectionUtil.isNotEmpty(paramsReportConfigDataEOS)) { + ParamsReportConfigDataEO paramsReportConfigDataEO = paramsReportConfigDataEOS.get(0); // 获取”导出文件夹“下的文件 if (StringUtils.isNotEmpty(paramsReportConfigDataEO.getFileConnectId())) { List ossFileList = ossFileService.getFileInfosByConnectId(paramsReportConfigDataEO.getFileConnectId()); if (CollectionUtil.isNotEmpty(ossFileList)) { @@ -1561,6 +1643,73 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl fileList, OSSFile ossFile) throws IOException { + String fileName = ossFile.getFileName(); + String currentFileUrl = ossFile.getUrl(); + + List result = fileList.stream().filter(e-> fileName.equals(e.getFileName())).collect(Collectors.toList()); + if (result.size() > 0) { // 文件名重复 + String fileUrl = result.get(0).getUrl(); + if (!compareFileContent(currentFileUrl, fileUrl)) { // 文件内容不同 + List sameFileList = fileList.stream().filter(e-> compareFileName(fileName, e.getFileName())).collect(Collectors.toList()); + int count = sameFileList.size(); + if (count > 0) { + // 判断 和重命名的文件 内容是否相同 + for (OSSFile file : sameFileList) { + if (compareFileContent(currentFileUrl, file.getUrl())) { + return file.getFileName(); + } + } + // 遍历完 没相同的 再重命名 + String newFileName = fileName.substring(0, fileName.lastIndexOf(".")) + (count + 1) + fileName.substring(fileName.lastIndexOf(".")); + return newFileName; + + } else { + String newFileName = fileName.substring(0, fileName.lastIndexOf(".")) + (count + 1) + fileName.substring(fileName.lastIndexOf(".")); + return newFileName; + } + + } else { // 文件内容相同 + return "old"; + } + + } else { // 文件名不重复 + return ""; + } + } + + // 比较文件名，如 currentFileName： 文件.pdf ; fileName: 文件1.pdf + private boolean compareFileName(String currentFileName, String fileName) { + StringBuilder sb = new StringBuilder(); + sb.append(fileName.substring(0, fileName.lastIndexOf(".") - 1)); + sb.append(fileName.substring(fileName.lastIndexOf("."), fileName.length())); + if (currentFileName.equals(sb.toString())) { + return true; + } else { // 当 currentFileName = fileName 时 也返回false + return false; + } + } + /** * 实体对象转成Map * @param obj 实体对象 From 8e98b64e480c7922e27787c8376e5614513e9561 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Thu, 25 Aug 2022 15:11:20 +0800 Subject: [PATCH 15/19] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=B8=AD=E5=BF=83-?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E7=9F=A5=E8=AF=86=E5=BA=93=20=E6=8E=92?= =?UTF-8?q?=E5=BA=8F=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DocumentSearchServiceImpl.java | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java index 73e1c1aa0..841648c5c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java @@ -544,20 +544,21 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService { JSONObject jsonObjectThree = jeroElasticsearchTemplate.buildBoolQuery(null, null, queryMapJsonThree); queryMapJsonAll.add(jsonObjectThree); } + JSONObject sort = new JSONObject(); - Map score = new HashMap<>(); - Map score1 = new HashMap<>(); - score.put("order","desc"); - score1.put("_score",score); - sort.putAll(score1); - /*JSONObject sort = new JSONObject(); if(StringUtils.isEmpty(selectValue)){ Map createTime = new HashMap<>(); Map createTime1 = new HashMap<>(); createTime.put("order","desc"); createTime1.put("create_time",createTime); sort.putAll(createTime1); - }*/ + }else { + Map score = new HashMap<>(); + Map score1 = new HashMap<>(); + score.put("order","desc"); + score1.put("_score",score); + sort.putAll(score1); + } // Map mapSort = new HashMap<>(); // Map mapSortTemp = new HashMap<>(); @@ -1261,6 +1262,12 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService { createTime.put("order","desc"); createTime1.put("create_time",createTime); sort.putAll(createTime1); + }else { + Map score = new HashMap<>(); + Map score1 = new HashMap<>(); + score.put("order","desc"); + score1.put("_score",score); + sort.putAll(score1); } Integer pageNo = Integer.parseInt(map.get("pageNo").toString()); From 5784e4715a2669b52eceb88639bb95cf583c7d88 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 25 Aug 2022 16:51:57 +0800 Subject: [PATCH 16/19] =?UTF-8?q?=E6=B3=95=E8=A7=84=E9=A2=84=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/warn/service/LawsWarnService.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java index 9c43e54a2..302b9a27f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java @@ -144,10 +144,13 @@ public class LawsWarnService { String beforeTimeTwelve = beforeTime(12,new Date()); Date parseSix = sdf.parse(beforeTimeSix); Date parseTwelve = sdf.parse(beforeTimeTwelve); - if((newCarTimeDate.after(new Date()) && newCarTimeDate.before(parseSix)) || newCarTime.equals(beforeTimeSix)){ + if((newCarTimeDate.after(new Date()) && newCarTimeDate.before(parseSix)) + || newCarTime.equals(beforeTimeSix) + ||newCarTime.equals(sdf.format(new Date()))){ record.put("new_colour","red"); } - if((newCarTimeDate.after(parseSix) && newCarTimeDate.before(parseTwelve)) || newCarTime.equals(beforeTimeTwelve)){ + if((newCarTimeDate.after(parseSix) && newCarTimeDate.before(parseTwelve)) + || newCarTime.equals(beforeTimeTwelve)){ record.put("new_colour","yellow"); } } @@ -164,10 +167,13 @@ public class LawsWarnService { String beforeTimeTwelve = beforeTime(12,new Date()); Date parseSix = sdf.parse(beforeTimeSix); Date parseTwelve = sdf.parse(beforeTimeTwelve); - if((implementTimeDate.after(new Date()) && implementTimeDate.before(parseSix)) || implementTime.equals(beforeTimeSix)){ + if((implementTimeDate.after(new Date()) && implementTimeDate.before(parseSix)) + || implementTime.equals(beforeTimeSix) + || implementTime.equals(sdf.format(new Date()))){ record.put("implement_colour","red"); } - if((implementTimeDate.after(parseSix) && implementTimeDate.before(parseTwelve)) || implementTime.equals(beforeTimeTwelve)){ + if((implementTimeDate.after(parseSix) && implementTimeDate.before(parseTwelve)) + || implementTime.equals(beforeTimeTwelve)){ record.put("implement_colour","yellow"); } } From be6937657aaa16cad9259703c2ec969c69c37c40 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 25 Aug 2022 17:03:46 +0800 Subject: [PATCH 17/19] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93=E5=88=A0?= =?UTF-8?q?=E9=99=A4--=E5=90=8C=E6=AD=A5=E5=88=A0=E9=99=A4es=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BussDocumentLibraryEOServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index cc6186c08..7cc6ff0c9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -329,6 +329,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl Date: Thu, 25 Aug 2022 17:14:24 +0800 Subject: [PATCH 18/19] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/problemKnowledgeBaseView.vue | 6 +++--- .../views/projectManagement/components/ProjectDetails.vue | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue index 115f8692e..9295b5ed9 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue @@ -3,9 +3,9 @@
- - - + + + {{queryForm.title}}
diff --git a/jero-web/src/views/projectManagement/components/ProjectDetails.vue b/jero-web/src/views/projectManagement/components/ProjectDetails.vue index f1c4119a1..18212626b 100644 --- a/jero-web/src/views/projectManagement/components/ProjectDetails.vue +++ b/jero-web/src/views/projectManagement/components/ProjectDetails.vue @@ -107,7 +107,7 @@
-
{{item.name}}
+
{{item.name}}
{{item.time?item.time.slice(0,11): item.time}}
From 63ace4060bad1b557578c512463f7215f2a84385 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167@qq.com> Date: Thu, 25 Aug 2022 17:42:31 +0800 Subject: [PATCH 19/19] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/problemKnowledgeBaseAdd.vue | 4 +--- .../components/problemKnowledgeBaseList.vue | 10 +++++----- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue index 6047ff068..5c87ec0af 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue @@ -336,9 +336,7 @@ }) }, backClick() { - this.$router.push({ - path: '/problemknowledgeBase' - }) + this.$router.go(-1) } , showPermissionsChange(event, name) { diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue index 4e5f366ef..50ee8e69f 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue @@ -26,15 +26,15 @@
-
+
{{$t('classificationMaintenance')}}
-
+
{{$t('managePublishing')}}
-
+
{{$t('newlyAdded')}}
@@ -274,7 +274,7 @@ margin-top: 20px; } - .operator-text { + .operator-text-text-index { cursor: pointer; margin-right: 53px; font-size: 14px; @@ -283,7 +283,7 @@ display: inline-block; } - .operator-text:last-child { + .operator-text-text-index:last-child { margin-right: 13px; }