From dd1d6a3ac0cf2a2c959fe9ea9c5ee81d55fd16ad Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Tue, 10 Jan 2023 09:10:26 +0800 Subject: [PATCH 01/39] =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=94=B6=E9=9B=86?= =?UTF-8?q?=E6=B8=85=E5=8D=95=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=95=B0=E6=8D=AE=E9=A1=B9=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=93=E6=9E=84=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParamsCollectManifestEOServiceImpl.java | 23 +++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index e41696c0e..e68aeacb0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -326,6 +326,14 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl getConfigDataEOListByConfigIdAndCollectManifestId(String configId, String collectManifestId, List paramsConfigDataEOList) { + List configDataEOList = paramsConfigDataEOList.stream().filter(e-> configId.equals(e.getParamsConfigId()) && collectManifestId.equals(e.getParamsCollectManifestId())).collect(Collectors.toList()); + if (CollectionUtil.isNotEmpty(configDataEOList)) { + return configDataEOList; + } + return null; + } + /** * 列表查询 * @@ -479,13 +487,24 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl { // 参数配置 - Map configMap = new HashMap<>(); + /*Map configMap = new HashMap<>(); String paramsConfigId = paramsConfigEO.getId(); -// ParamsConfigDataEO paramsConfigDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId); // 参数配置数据 ParamsConfigDataEO paramsConfigDataEO = getConfigDataEOByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId, paramsConfigDataEOList); // 参数配置数据 List paramsConfigDataVOList = getConfigDataVOList(controlType, paramsConfigEO, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据 configMap.put("controlType", controlType); configMap.put("list", paramsConfigDataVOList); + manifestMap.put(paramsConfigEO.getId(), configMap);*/ + + Map paramsConfigDataVO = new HashMap<>(); + Map configMap = new HashMap<>(); + String paramsConfigId = paramsConfigEO.getId(); + List paramsConfigDatas = this.getConfigDataEOListByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId, paramsConfigDataEOList); // 参数配置数据 + for (ParamsConfigDataEO paramsConfigDataEO : paramsConfigDatas) { + List paramsConfigDataVOList = this.getConfigDataVOList(controlType, paramsConfigEO, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据 + paramsConfigDataVO.put(paramsConfigDataEO.getId(),paramsConfigDataVOList); + } + configMap.put("controlType", controlType); + configMap.put("paramsConfigData", paramsConfigDataVO); manifestMap.put(paramsConfigEO.getId(), configMap); configIdList.add(paramsConfigEO.getId()); From 6e104480f9918de26e847b396686c7cae8ba6d99 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Tue, 10 Jan 2023 10:18:14 +0800 Subject: [PATCH 02/39] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=94=B6=E9=9B=86=E6=B8=85=E5=8D=95=20=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E7=BB=93=E6=9E=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/CollectionType/index.vue | 66 +++++++++----- .../src/components/tableCollection/index.vue | 89 +++++++++++++------ .../components/uploadFileChangeDown/file.vue | 20 +++-- 3 files changed, 122 insertions(+), 53 deletions(-) diff --git a/jero-web/src/components/CollectionType/index.vue b/jero-web/src/components/CollectionType/index.vue index 0430379dd..f9b542c28 100644 --- a/jero-web/src/components/CollectionType/index.vue +++ b/jero-web/src/components/CollectionType/index.vue @@ -3,7 +3,7 @@
-
+
@@ -95,11 +95,14 @@ v-model="item.dataValue"/>
+
+ +
-
+
@@ -124,7 +127,7 @@
-
+
-
+
-
+
@@ -170,7 +173,7 @@
-
+
-
-
+
+ +
-
+
@@ -384,10 +388,16 @@
+
+ +
+
+ +
-
+
@@ -490,7 +500,7 @@
-
+
-
+
-
+
{ + for (const key in this.detailDate.paramsConfigData){ + this.detailDateList = this.detailDate.paramsConfigData[key] + } + this.detailDateList.forEach((item) => { if (item.type === 'pull_more' && !item.dataValue) { item.dataValue = [] } @@ -709,7 +722,7 @@ onInput(r) { let value = r.target.value r.target.value = value.replace(/[^\u4e00-\u9fa5]/g, '') - this.detailDate.list.forEach((item) => { + this.detailDateList.forEach((item) => { if (item.controlVerify == '2') { item.dataValue = r.target.value } @@ -731,7 +744,7 @@ // console.log('form',this.formInline) } - this.detailDate.list.forEach((item, index) => { + this.detailDateList.forEach((item, index) => { if (item.type === 'file') { item.dataValue = attIdList.join(',') } @@ -751,7 +764,13 @@ this.$refs.uploadFile.perentHandleFunc() } }) - } + }, + addconfig(){ + + }, + delconfig(){ + + }, }, watch: { detailDate(newold, oldold) { @@ -846,7 +865,14 @@ .add--number { width: 101%; } - + .addicon{ + display: inline-block; + margin-left: 5px; + } + .delicon{ + display: inline-block; + margin-left: 5px; + } .ant-input-disabled { color: rgba(0, 0, 0, 0.65); } diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index 18c5465eb..3c3fa209c 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -873,12 +873,20 @@ res.result.records.forEach((Obj) => { Object.keys(Obj).forEach((item) => { if (Obj[item] instanceof Object && Obj[item].controlType !== undefined) { - Obj[item].list.forEach((itemLi) => { - itemLi.isLock = 1 - if (itemLi.type === 'pull_more') { - itemLi.dataValue = itemLi.dataValue === null ? [] : itemLi.dataValue.split(',') - } - }) + for (const key in Obj[item].paramsConfigData){ + Obj[item].paramsConfigData[key].forEach((itemLi) => { + itemLi.isLock = 1 + if (itemLi.type === 'pull_more') { + itemLi.dataValue = itemLi.dataValue === null ? [] : itemLi.dataValue.split(',') + } + }) + } + // Obj[item].list.forEach((itemLi) => { + // itemLi.isLock = 1 + // if (itemLi.type === 'pull_more') { + // itemLi.dataValue = itemLi.dataValue === null ? [] : itemLi.dataValue.split(',') + // } + // }) } }) tt.push(Obj) @@ -887,11 +895,18 @@ res.result.records.forEach((Obj) => { Object.keys(Obj).forEach((item) => { if (Obj[item] instanceof Object && Obj[item].controlType !== undefined) { - Obj[item].list.forEach((itemLi) => { - if (itemLi.type === 'pull_more') { - itemLi.dataValue = itemLi.dataValue === null ? [] : itemLi.dataValue.split(',') - } - }) + for (const key in Obj[item].paramsConfigData){ + Obj[item].paramsConfigData[key].forEach((itemLi) => { + if (itemLi.type === 'pull_more') { + itemLi.dataValue = itemLi.dataValue === null ? [] : itemLi.dataValue.split(',') + } + }) + } + // Obj[item].list.forEach((itemLi) => { + // if (itemLi.type === 'pull_more') { + // itemLi.dataValue = itemLi.dataValue === null ? [] : itemLi.dataValue.split(',') + // } + // }) } }) tt.push(Obj) @@ -958,17 +973,30 @@ res.result.records.forEach((Obj) => { Object.keys(Obj).forEach((item) => { if (Obj[item] instanceof Object && Obj[item].controlType !== undefined) { - Obj[item].list.forEach((itemLi) => { - console.log(item) - if((this.currentPersonRole == 'homo' || this.currentPersonRole == 'admin') && item == 'referencesCol'){ - itemLi.isLock = 0 - }else{ - itemLi.isLock = 1 - } - if (itemLi.type === 'pull_more') { - itemLi.dataValue = !itemLi.dataValue ? [] : itemLi.dataValue.split(',') - } - }) + for (const key in Obj[item].paramsConfigData){ + Obj[item].paramsConfigData[key].forEach((itemLi) => { + console.log(item) + if((this.currentPersonRole == 'homo' || this.currentPersonRole == 'admin') && item == 'referencesCol'){ + itemLi.isLock = 0 + }else{ + itemLi.isLock = 1 + } + if (itemLi.type === 'pull_more') { + itemLi.dataValue = !itemLi.dataValue ? [] : itemLi.dataValue.split(',') + } + }) + } + // Obj[item].list.forEach((itemLi) => { + // console.log(item) + // if((this.currentPersonRole == 'homo' || this.currentPersonRole == 'admin') && item == 'referencesCol'){ + // itemLi.isLock = 0 + // }else{ + // itemLi.isLock = 1 + // } + // if (itemLi.type === 'pull_more') { + // itemLi.dataValue = !itemLi.dataValue ? [] : itemLi.dataValue.split(',') + // } + // }) } }) tt.push(Obj) @@ -977,11 +1005,18 @@ res.result.records.forEach((Obj) => { Object.keys(Obj).forEach((item) => { if (Obj[item] instanceof Object && Obj[item].controlType !== undefined) { - Obj[item].list.forEach((itemLi) => { - if (itemLi.type === 'pull_more') { - itemLi.dataValue = !itemLi.dataValue ? [] : itemLi.dataValue.split(',') - } - }) + for (const key in Obj[item].paramsConfigData){ + Obj[item].paramsConfigData[key].forEach((itemLi) => { + if (itemLi.type === 'pull_more') { + itemLi.dataValue = !itemLi.dataValue ? [] : itemLi.dataValue.split(',') + } + }) + } + // Obj[item].list.forEach((itemLi) => { + // if (itemLi.type === 'pull_more') { + // itemLi.dataValue = !itemLi.dataValue ? [] : itemLi.dataValue.split(',') + // } + // }) } }) tt.push(Obj) diff --git a/jero-web/src/components/uploadFileChangeDown/file.vue b/jero-web/src/components/uploadFileChangeDown/file.vue index 19b236668..a8f328bc0 100644 --- a/jero-web/src/components/uploadFileChangeDown/file.vue +++ b/jero-web/src/components/uploadFileChangeDown/file.vue @@ -73,12 +73,20 @@ import { mapGetters } from 'vuex' this.containerId = 'container-ty-' + new Date().getTime() }, mounted() { - this.detailDate.list.forEach((item) => { - if (item.type === 'file') { - this.template.templateId = item.templateId - this.template.templateName = item.templateName - } - }) + for (const key in this.detailDate.paramsConfigData){ + this.detailDate.paramsConfigData[key].forEach((item) => { + if (item.type === 'file') { + this.template.templateId = item.templateId + this.template.templateName = item.templateName + } + }) + } + // this.detailDate.list.forEach((item) => { + // if (item.type === 'file') { + // this.template.templateId = item.templateId + // this.template.templateName = item.templateName + // } + // }) let long = localStorage.getItem('language') this.cut = '' if (long && long == 'zh-cn') { From 3c27953350c6929522b205288b5e3d8301a72f78 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Tue, 10 Jan 2023 10:30:34 +0800 Subject: [PATCH 03/39] =?UTF-8?q?=E8=AE=A4=E8=AF=81=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/CollectionType/index.vue | 114 ++++++++++++++---- 1 file changed, 91 insertions(+), 23 deletions(-) diff --git a/jero-web/src/components/CollectionType/index.vue b/jero-web/src/components/CollectionType/index.vue index f9b542c28..c230085e5 100644 --- a/jero-web/src/components/CollectionType/index.vue +++ b/jero-web/src/components/CollectionType/index.vue @@ -4,7 +4,7 @@
-
+
@@ -95,15 +95,18 @@ v-model="item.dataValue"/>
-
- -
+
+
+ +
+
+
-
+
@@ -124,11 +127,17 @@
+
+ +
+
+ +
-
+
+
+ +
+
+ +
-
+
+
+ +
+
+ +
-
+
{{ (item.dataValue === 'null' || item.dataValue === '' || @@ -170,11 +191,17 @@
+
+ +
+
+ +
-
+
-
+
@@ -278,11 +305,16 @@
+
+ +
+
+ +
-
-
- +
-
+
@@ -489,7 +520,7 @@ v-model="item.dataValue"/>
-
+
{{ (item.dataValue === 'null' || item.dataValue === '' || @@ -497,11 +528,18 @@
+
+ +
+
+ +
+
-
+
-
+
{{ (item.dataValue === 'null' || item.dataValue === '' || @@ -521,11 +559,17 @@
+
+ +
+
+ +
-
+
-
+
{{ (item.dataValue === 'null' || item.dataValue === '' || @@ -545,11 +589,17 @@
+
+ +
+
+ +
-
+
-
+
@@ -652,7 +702,7 @@ v-model="item.dataValue"/>
-
+
{{ (item.dataValue === 'null' || item.dataValue === '' || @@ -660,6 +710,12 @@
+
+ +
+
+ +
{ + if (res.success) { + this.$refs.uploadFile.perentHandleFunc(res.result) + } else { + this.$refs.uploadFile.perentHandleFunc() + } + }) }, delconfig(){ @@ -868,10 +934,12 @@ .addicon{ display: inline-block; margin-left: 5px; + margin-top: 8px; } .delicon{ display: inline-block; margin-left: 5px; + margin-top: 8px; } .ant-input-disabled { color: rgba(0, 0, 0, 0.65); From e6c2350c394809cc4f1c86085269ff9638e4b93a Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Tue, 10 Jan 2023 11:02:46 +0800 Subject: [PATCH 04/39] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E9=85=8D=E7=BD=AE=E5=88=97=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../collect/service/impl/ParamsCollectManifestEOServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index e68aeacb0..9e36f1ab1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -505,6 +505,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl Date: Tue, 10 Jan 2023 11:16:08 +0800 Subject: [PATCH 05/39] =?UTF-8?q?=E8=AE=A4=E8=AF=81=20=E5=8A=A0=E5=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/CollectionType/index.vue | 24 ++++++++++++------- .../src/components/tableCollection/index.vue | 5 +++- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/jero-web/src/components/CollectionType/index.vue b/jero-web/src/components/CollectionType/index.vue index c230085e5..f447d50a2 100644 --- a/jero-web/src/components/CollectionType/index.vue +++ b/jero-web/src/components/CollectionType/index.vue @@ -735,6 +735,11 @@ default: {}, require: true }, + recordList: { + type: Object, + default: {}, + require: true + }, watermark: { type: String, default: '' @@ -753,6 +758,7 @@ uploadFileChangeDown }, mounted() { + console.log(this.recordList) for (const key in this.detailDate.paramsConfigData){ this.detailDateList = this.detailDate.paramsConfigData[key] } @@ -822,20 +828,22 @@ }) }, addconfig(){ - for (const key in this.detailDate.paramsConfigData){ - console.log(key) - let paramsConfigId = key - } - postAction('params/configData/add', { paramsCollectManifestId: this.$route.query.id , paramsConfigId :paramsConfigId }).then((res) => { + postAction('params/configData/add', { paramsCollectManifestId: this.recordList.id , paramsConfigId :this.detailDate.configId }).then((res) => { if (res.success) { - this.$refs.uploadFile.perentHandleFunc(res.result) + this.$emit('collectionForm') } else { - this.$refs.uploadFile.perentHandleFunc() } }) }, delconfig(){ - + for (const key in this.detailDate.paramsConfigData){ + deleteAction('params/configData/delete', { id :key }).then((res) => { + if (res.success) { + this.$emit('collectionForm') + } else { + } + }) + } }, }, watch: { diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index 3c3fa209c..b503f9aee 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -74,7 +74,7 @@ - +
@@ -716,6 +716,9 @@ this.pageNohistory = 1 this.visible = false }, + collectionForm(){ + this.getTableList() + }, getAndUserId(result) { let query = { paramsManifestId: this.$route.query.id, From c2034971af36ac01756fcbbb86c47c72264081bc Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Wed, 11 Jan 2023 11:29:18 +0800 Subject: [PATCH 06/39] =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E5=BC=82=E5=B8=B8=E5=A4=84?= =?UTF-8?q?=E7=90=86=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ParamsCollectManifestEOServiceImpl.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 9e36f1ab1..cb6d235fc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -499,9 +499,11 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl configMap = new HashMap<>(); String paramsConfigId = paramsConfigEO.getId(); List paramsConfigDatas = this.getConfigDataEOListByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId, paramsConfigDataEOList); // 参数配置数据 - for (ParamsConfigDataEO paramsConfigDataEO : paramsConfigDatas) { - List paramsConfigDataVOList = this.getConfigDataVOList(controlType, paramsConfigEO, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据 - paramsConfigDataVO.put(paramsConfigDataEO.getId(),paramsConfigDataVOList); + if(CollectionUtils.isNotEmpty(paramsConfigDatas)){ + for (ParamsConfigDataEO paramsConfigDataEO : paramsConfigDatas) { + List paramsConfigDataVOList = this.getConfigDataVOList(controlType, paramsConfigEO, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据 + paramsConfigDataVO.put(paramsConfigDataEO.getId(),paramsConfigDataVOList); + } } configMap.put("controlType", controlType); configMap.put("paramsConfigData", paramsConfigDataVO); From b20dd9c70bf6d5e77b151bc948db6c018c078200 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Thu, 12 Jan 2023 09:40:03 +0800 Subject: [PATCH 07/39] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=8E=A7=E4=BB=B6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/CollectionType/index.vue | 1309 +++++++++-------- .../src/components/tableCollection/index.vue | 13 +- 2 files changed, 699 insertions(+), 623 deletions(-) diff --git a/jero-web/src/components/CollectionType/index.vue b/jero-web/src/components/CollectionType/index.vue index f447d50a2..0196295af 100644 --- a/jero-web/src/components/CollectionType/index.vue +++ b/jero-web/src/components/CollectionType/index.vue @@ -4,719 +4,766 @@
-
- - - - - - - - - - - -
- +
+
+
+ + + + + + + + + + + +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+
- -
- +
+
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- +
+
-
- -
-
- -
-
- - - - - - - - - - - -
- +
+
+
+ + + + + + + + + + + +
+ +
+
+
+
+ +
+
+
-
- -
-
- -
-
- - +
+
+
+ + {{ item.label }} - - + + +
+
+
+ +
+
+ +
-
- -
-
- -
-
- - +
+
+
+ + {{ item.label }} - - + + +
+
+
+ +
+
+ +
-
- -
-
- -
+
-
- - {{ (item.dataValue === 'null' || item.dataValue === '' || - item.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}} - +
+
+
+ + {{ (itemval.dataValue === 'null' || itemval.dataValue === '' || + itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}} + +
+
+
+ +
+
+ +
-
- -
-
- -
-
- - +
+
+
+ + {{ itemin.label }} - - -
-
- - - - - - - - - - - -
- + + +
+
+ + + + + + + + + + + +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+
- -
- +
+
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- +
+
-
- -
-
- -
-
- - +
+
+
+ + {{ item.label }} - - -
-
- - - - - - - - - - - -
- + + +
+
+ + + + + + + + + + + +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+
- -
- +
+
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- +
+
-
- -
-
- -
+
-
- - - - - - - - - - - -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- +
+
+
+ + + + + + + + + + + +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+
+
+ + {{ (itemval.dataValue === 'null' || itemval.dataValue === '' || + itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}} + +
-
- - {{ (item.dataValue === 'null' || item.dataValue === '' || - item.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}} - +
+ +
+
+
-
-
- -
-
-
-
- - +
+
+
+ + {{ itemin.label }} - - + + +
+
+ + {{ (itemval.dataValue === 'null' || itemval.dataValue === '' || + itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}} + +
+
+
+ +
+
+ +
-
- - {{ (item.dataValue === 'null' || item.dataValue === '' || - item.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}} - -
-
-
- -
-
-
-
- - +
+
+
+ + {{ item.label }} - - + + +
+
+ + {{ (itemval.dataValue === 'null' || itemval.dataValue === '' || + itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}} + +
+
+
+ +
+
+ +
-
- - {{ (item.dataValue === 'null' || item.dataValue === '' || - item.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}} - -
-
-
- -
-
-
-
- - +
+
+
+ + {{ itemin.label }} - - + + +
+
+ + + + + + + + + + + +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+
+
+ + {{ (itemval.dataValue === 'null' || itemval.dataValue === '' || + itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}} + +
+
+
+ +
+
+ +
-
- - - - - - - - - - - -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
-
-
- - {{ (item.dataValue === 'null' || item.dataValue === '' || - item.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}} -
-
- -
-
- -
-
+
@@ -743,6 +790,11 @@ watermark: { type: String, default: '' + }, + columName:{ + type: Array, + default: [], + require: true } }, data() { @@ -758,9 +810,20 @@ uploadFileChangeDown }, mounted() { - console.log(this.recordList) - for (const key in this.detailDate.paramsConfigData){ - this.detailDateList = this.detailDate.paramsConfigData[key] + this.detailDateList =[] + let name=[] + this.columName.forEach(item=>{ + if(item.db_field_name&&item.db_field_name!=''){ + name.push(item.db_field_name) + } + }) + for (let key in this.recordList){ + if(name.toString().indexOf(key)>-1){ + if(this.recordList[key].paramsConfigData){ + this.detailDateList.push(this.recordList[key].paramsConfigData) + } + + } } this.detailDateList.forEach((item) => { if (item.type === 'pull_more' && !item.dataValue) { @@ -768,6 +831,7 @@ } // this.detailDatetransformation.push(item) }) + console.log(this.detailDateList,"oooooo") }, methods: { selectChange(val){ @@ -909,6 +973,11 @@ .add_flex { /*display: flex;*/ + display: flex; + flex-direction: column; + } + .iconRow,.valflex{ + display: flex; } /deep/ .box { @@ -941,7 +1010,7 @@ } .addicon{ display: inline-block; - margin-left: 5px; + //margin-left: -34px; margin-top: 8px; } .delicon{ diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index b503f9aee..7c907edf5 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -74,7 +74,7 @@ - +
@@ -779,7 +779,7 @@ align: 'left', ellipsis: true, sorter: res.sort, - width: 500 + width: 600 }) num++ this.content.push(res) @@ -787,6 +787,7 @@ customRender: 'detailClick', title: 'titleName' + num } + console.log( this.content," this.content this.content this.content this.content this.content") // 非配置列 } else { this.columns.push({ @@ -847,6 +848,7 @@ console.log(pagination, filters, sorter, 'iiiiiiiiiiiiiiiii') }, getTableListReset() { + this.formInline = {} this.queryParamQuery = {} let params = { @@ -875,9 +877,12 @@ if (this.currentPersonRole !== 'dre') { res.result.records.forEach((Obj) => { Object.keys(Obj).forEach((item) => { + if (Obj[item] instanceof Object && Obj[item].controlType !== undefined) { for (const key in Obj[item].paramsConfigData){ - Obj[item].paramsConfigData[key].forEach((itemLi) => { + Obj[item].paramsConfigData[key].forEach((itemLi) => + { + itemLi.isLock = 1 if (itemLi.type === 'pull_more') { itemLi.dataValue = itemLi.dataValue === null ? [] : itemLi.dataValue.split(',') @@ -972,6 +977,7 @@ // }) let tt = [] if (this.currentPersonRole !== 'dre') { + console.log(res.result.records, 'res.result.records') res.result.records.forEach((Obj) => { Object.keys(Obj).forEach((item) => { @@ -1005,6 +1011,7 @@ tt.push(Obj) }) } else { + res.result.records.forEach((Obj) => { Object.keys(Obj).forEach((item) => { if (Obj[item] instanceof Object && Obj[item].controlType !== undefined) { From 7fdf10c7fed2d193f6701f56a6f78015c2434351 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Thu, 12 Jan 2023 17:43:15 +0800 Subject: [PATCH 08/39] =?UTF-8?q?=E6=8E=A7=E4=BB=B6=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E5=BC=80=E5=8F=91-=E5=A1=AB=E5=86=99=E4=BA=BA=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=8F=A3=E5=A4=84=E7=90=86?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=BF=AE=E6=94=B9=E3=80=82=E5=A1=AB=E5=86=99?= =?UTF-8?q?=E4=BA=BA=E5=AF=BC=E5=85=A5=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParamsCollectManifestEOServiceImpl.java | 212 +++++++++++++++++- 1 file changed, 209 insertions(+), 3 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index cb6d235fc..a17add4ce 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -4092,12 +4092,54 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl paramsConfigIdList = paramsConfigEOList.stream().map(ParamsConfigEO::getId).collect(Collectors.toList()); List paramsConfigDataEOList = paramsConfigDataEOService.queryListByConfigIdList(paramsConfigIdList); // 查询所有配置数据 + List exportDataList = new ArrayList<>(); + // 配置列多行数据处理 + for (ParamsCollectManifestEO collectManifestEO : dataList) { + String id = collectManifestEO.getId(); + + Map> paramsConfigDataMap = paramsConfigDataEOList.stream().filter(configDataEO -> { + boolean flag = false; + if (StringUtils.equals(configDataEO.getParamsCollectManifestId(), id)) { + flag = true; + } + return flag; + }).collect(Collectors.groupingBy(configDataEO -> configDataEO.getParamsConfigId())); + + List> paramsConfigDataCountList = new ArrayList<>(); + + for (Map.Entry> map : paramsConfigDataMap.entrySet()) { + Map paramsConfigDataCountMap = new HashMap<>(); + paramsConfigDataCountMap.put("key",map.getKey()); + paramsConfigDataCountMap.put("paramsConfigDataCount",map.getValue().size()); + paramsConfigDataCountMap.put("value",map.getValue()); + paramsConfigDataCountList.add(paramsConfigDataCountMap); + } + + // 排序 配置数据总数倒序排序 + Collections.sort(paramsConfigDataCountList, new Comparator>() { + @Override + public int compare(Map o1, Map o2) { + return o2.get("paramsConfigDataCount").toString().compareTo(o1.get("paramsConfigDataCount").toString()); + } + }); + + // 获取出最多行的配置列。 + Map paramsConfigDataMaxCountMap = paramsConfigDataCountList.get(0); + String key = (String) paramsConfigDataMaxCountMap.get("key"); + List paramsConfigDataEOs = paramsConfigDataMap.get(key); + for (ParamsConfigDataEO paramsConfigDataEO : paramsConfigDataEOs) { + ParamsCollectManifestEO paramsCollectManifestEOTemp = new ParamsCollectManifestEO(); + BeanUtils.copyProperties(collectManifestEO,paramsCollectManifestEOTemp); + exportDataList.add(paramsCollectManifestEOTemp); + } + } + Map isMustMap = ParamsIsMustEnum.toMapForExport(cut); Map controlVerifyMap = ControlVerifyEnum.toMapForExport(cut); Map controlTypeMap = ControlTypeEnum.toMapForExport(cut); // 插入配置列和认证类别列数据 List> result = new ArrayList<>(); - for (ParamsCollectManifestEO collectManifestEO: dataList) { + /*for (ParamsCollectManifestEO collectManifestEO: exportDataList) { Map record1 = objectToMapDre(collectManifestEO); String controlType = (String) record1.get("control_type"); String controlVerify = (String) record1.get("control_verify"); @@ -4250,6 +4292,169 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl record1 = objectToMapDre(collectManifestEO); + String controlType = (String) record1.get("control_type"); + String controlVerify = (String) record1.get("control_verify"); + String isMust = (String) record1.get("is_must"); + String paramsCollectManifestId = (String) record1.get("id"); + String nioNumber = (String) record1.get("nio_number"); + + record1.put("is_must", isMustMap.get(isMust)); + record1.put("control_type", controlTypeMap.get(controlType)); + record1.put("control_verify", controlVerifyMap.get(controlVerify)); + + // 处理参考列，没引用过则不显示该列 + if (StringUtils.isNotEmpty(paramsManifestEO.getReferencesColName())) { + List referencesColList = Arrays.asList(collectManifestEO.getReferencesCol().split("#")); + StringBuilder referencesColBuilder = new StringBuilder(); + if (!" ".equals(referencesColList.get(0))) { + referencesColBuilder.append(referencesColList.get(0)).append("#"); + } + if (!" ".equals(referencesColList.get(1))) { + referencesColBuilder.append(referencesColList.get(1).replaceAll(",", "！")).append("#"); + } + if (!" ".equals(referencesColList.get(2))) { + List ossFileList = ossFileService.getFileInfosByConnectId(referencesColList.get(2)); + if (CollectionUtil.isNotEmpty(ossFileList)) { + referencesColBuilder.append(nioNumber).append("/").append(ossFileList.get(0).getFileName()).append("#"); + } + } + + String referencesCol = referencesColBuilder.toString(); + if (referencesCol.endsWith("#")) { + referencesCol = referencesCol.substring(0, referencesCol.lastIndexOf("#")); + } + record1.put("references_col", referencesCol); + + } else { + record1.remove("references_col"); + } + // 配置列 + if (CollectionUtil.isNotEmpty(paramsConfigEOList)) { + List fileList = new ArrayList<>(); + + paramsConfigEOList.forEach(paramsConfigEO -> { // 参数配置 + + String paramsConfigId = paramsConfigEO.getId(); + // 参数配置数据 + List paramsConfigDataEOS = paramsConfigDataEOList.stream().filter(e-> { + boolean flag = false; + // && StringUtils.equals(e.getId(),paramsConfigDataId) + if(paramsConfigId.equals(e.getParamsConfigId()) && paramsCollectManifestId.equals(e.getParamsCollectManifestId())){ + flag = true; + } + return flag; + }).collect(Collectors.toList()); + StringBuilder configDataBuilder = new StringBuilder(); // 重新组合配置数据 + if (CollectionUtil.isNotEmpty(paramsConfigDataEOS)) { + ParamsConfigDataEO paramsConfigDataEO = paramsConfigDataEOS.get(0); + + if (ControlTypeEnum.TEXT.getValue().equals(controlType)) { + if (StringUtils.isNotEmpty(paramsConfigDataEO.getTextData())) { + configDataBuilder.append(paramsConfigDataEO.getTextData()); + } + + } else if (ControlTypeEnum.PULL_SINGLE.getValue().equals(controlType) + || ControlTypeEnum.PULL_MORE.getValue().equals(controlType)) { + if (StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) { + configDataBuilder.append(paramsConfigDataEO.getPullData().replaceAll(",", "！")); + } + + } else if (ControlTypeEnum.FILE.getValue().equals(controlType)) { + if (StringUtils.isNotEmpty(paramsConfigDataEO.getFileConnectId())) { + List ossFileList = ossFileService.getFileInfosByConnectId(paramsConfigDataEO.getFileConnectId()); + if (CollectionUtil.isNotEmpty(ossFileList)) { + configDataBuilder.append(nioNumber).append("/").append(ossFileList.get(0).getFileName()); + + fileList.addAll(ossFileList); + } + + } + + } else if (ControlTypeEnum.TEXT_PULL_SINGLE.getValue().equals(controlType) + || ControlTypeEnum.TEXT_PULL_MORE.getValue().equals(controlType)) { + + if (StringUtils.isNotEmpty(paramsConfigDataEO.getTextData())) { + configDataBuilder.append(paramsConfigDataEO.getTextData()); + } + + configDataBuilder.append("#"); + + if (StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) { + configDataBuilder.append(paramsConfigDataEO.getPullData().replaceAll(",", "！")); + } + + } else if (ControlTypeEnum.TEXT_FILE.getValue().equals(controlType)) { + if (StringUtils.isNotEmpty(paramsConfigDataEO.getTextData())) { + configDataBuilder.append(paramsConfigDataEO.getTextData()); + } + + configDataBuilder.append("#"); + if (StringUtils.isNotEmpty(paramsConfigDataEO.getFileConnectId())) { + List ossFileList = ossFileService.getFileInfosByConnectId(paramsConfigDataEO.getFileConnectId()); + if (CollectionUtil.isNotEmpty(ossFileList)) { + configDataBuilder.append(nioNumber).append("/").append(ossFileList.get(0).getFileName()); + + fileList.addAll(ossFileList); + } + + } + + } else if (ControlTypeEnum.PULL_SINGLE_FILE.getValue().equals(controlType) + || ControlTypeEnum.PULL_MORE_FILE.getValue().equals(controlType)) { + if (StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) { + configDataBuilder.append(paramsConfigDataEO.getPullData().replaceAll(",", "！")); + } + + configDataBuilder.append("#"); + if (StringUtils.isNotEmpty(paramsConfigDataEO.getFileConnectId())) { + List ossFileList = ossFileService.getFileInfosByConnectId(paramsConfigDataEO.getFileConnectId()); + if (CollectionUtil.isNotEmpty(ossFileList)) { + configDataBuilder.append(nioNumber).append("/").append(ossFileList.get(0).getFileName()); + + fileList.addAll(ossFileList); + } + + } + + } else if (ControlTypeEnum.TEXT_PULL_SINGLE_FILE.getValue().equals(controlType)) { + if (StringUtils.isNotEmpty(paramsConfigDataEO.getTextData())) { + configDataBuilder.append(paramsConfigDataEO.getTextData()); + } + configDataBuilder.append("#"); + if (StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) { + configDataBuilder.append(paramsConfigDataEO.getPullData().replaceAll(",", "！")); + } + configDataBuilder.append("#"); + if (StringUtils.isNotEmpty(paramsConfigDataEO.getFileConnectId())) { + List ossFileList = ossFileService.getFileInfosByConnectId(paramsConfigDataEO.getFileConnectId()); + if (CollectionUtil.isNotEmpty(ossFileList)) { + configDataBuilder.append(nioNumber).append("/").append(ossFileList.get(0).getFileName()); + + fileList.addAll(ossFileList); + } + + } + + } + paramsConfigDataEOList.remove(paramsConfigDataEO); + } + + String configData = configDataBuilder.toString(); + if (StringUtils.isNotEmpty(configData) && "".equals(configData.replace("#", ""))) { + configData = configData.replace("#", ""); + } + + record1.put(paramsConfigEO.getId(), configData); + }); + + record1.put("fileList", fileList); + } + result.add(record1); } return result; @@ -4695,7 +4900,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl Date: Tue, 31 Jan 2023 11:56:22 +0800 Subject: [PATCH 09/39] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=94=B6=E9=9B=86=E5=A2=9E=E5=8A=A0=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/CollectionType/index.vue | 338 +++++++++--------- 1 file changed, 174 insertions(+), 164 deletions(-) diff --git a/jero-web/src/components/CollectionType/index.vue b/jero-web/src/components/CollectionType/index.vue index 0196295af..134966daa 100644 --- a/jero-web/src/components/CollectionType/index.vue +++ b/jero-web/src/components/CollectionType/index.vue @@ -2,10 +2,10 @@
-
-
-
-
+
+
+
@@ -97,21 +97,20 @@ v-model="itemval.dataValue"/>
-
-
- -
-
- -
+
+
+ +
+
+
-
-
-
-
+
+
+
@@ -132,21 +131,20 @@ v-model="itemval.dataValue"/>
-
-
- -
-
- -
+
+
+ +
+
+
-
-
-
-
+
+
+
-
-
- -
-
- -
+
+
+ +
+
+
-
-
-
-
+
+
+
-
-
- -
-
- -
+
+
+ +
+
+
-
-
-
-
-
+
+
+
@@ -209,21 +204,20 @@ itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}}
-
-
- -
-
- -
+
+
+ +
+
+
-
-
-
-
+
+
+
-
-
- -
-
- -
+
+
+ +
+
+
-
-
-
-
+
+
+
-
-
- -
-
- -
+
+
+ +
+
+
-
-
-
-
-
+
+
+
@@ -559,22 +550,21 @@ itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}}
-
-
+
-
+
-
-
-
-
-
+
+
+
+
-
-
- -
-
- -
+ +
+
+ +
+
+
-
-
-
-
+
+
+
+
-
-
- -
-
- -
+ +
+
+ +
+
+
-
-
-
-
+
+
+ +
+
-
-
- -
-
- -
+
+ +
+
+
+
{ - if(item.db_field_name&&item.db_field_name!=''){ - name.push(item.db_field_name) - } - }) - for (let key in this.recordList){ - if(name.toString().indexOf(key)>-1){ - if(this.recordList[key].paramsConfigData){ - this.detailDateList.push(this.recordList[key].paramsConfigData) - } - - } - } - this.detailDateList.forEach((item) => { - if (item.type === 'pull_more' && !item.dataValue) { - item.dataValue = [] - } + this.detailDateList = [] + let name = [] + console.log(this.detailDate) + // this.columName.forEach(item => { + // if (item.db_field_name && item.db_field_name != '') { + // name.push(item.db_field_name) + // } + // }) + // for (let key in this.recordList) { + // if (name.toString().indexOf(key) > -1) { + // if (this.recordList[key].paramsConfigData) { + // console.log(this.recordList[key].paramsConfigData) + // this.detailDateList = this.recordList[key].paramsConfigData + // } + // } + // } + this.detailDateList = this.detailDate.paramsConfigData + // this.detailDateList.forEach((item) => { + Object.keys(this.detailDateList).forEach(res => { + this.detailDateList[res].forEach(val => { + if (val.type === 'pull_more' && !val.dataValue) { + val.dataValue = [] + } + }) + // }) // this.detailDatetransformation.push(item) }) - console.log(this.detailDateList,"oooooo") + console.log(this.detailDateList, 'oooooo') }, methods: { - selectChange(val){ + selectChange(val) { this.$nextTick(() => { let element = document.querySelectorAll( - ".tableclassname .ant-table-expanded-row" - ); - let len = element.length / 2; + '.tableclassname .ant-table-expanded-row' + ) + let len = element.length / 2 for (let i = 0; i < len; i++) { - element[i + len].style.height = element[i].offsetHeight + "px"; + element[i + len].style.height = element[i].offsetHeight + 'px' } - }); + }) }, onInput(r) { let value = r.target.value @@ -891,24 +889,27 @@ } }) }, - addconfig(){ - postAction('params/configData/add', { paramsCollectManifestId: this.recordList.id , paramsConfigId :this.detailDate.configId }).then((res) => { + addconfig() { + postAction('params/configData/add', { + paramsCollectManifestId: this.recordList.id, + paramsConfigId: this.detailDate.configId + }).then((res) => { if (res.success) { this.$emit('collectionForm') } else { } }) }, - delconfig(){ - for (const key in this.detailDate.paramsConfigData){ - deleteAction('params/configData/delete', { id :key }).then((res) => { + delconfig() { + for (const key in this.detailDate.paramsConfigData) { + deleteAction('params/configData/delete', { id: key }).then((res) => { if (res.success) { this.$emit('collectionForm') } else { } }) } - }, + } }, watch: { detailDate(newold, oldold) { @@ -943,9 +944,11 @@ height: 38px !important; line-height: 38px !important; } - .ant-select-selection-selected-value{ - height:100%; + + .ant-select-selection-selected-value { + height: 100%; } + .selectWid .ant-select-selection__rendered { line-height: 36px !important; } @@ -956,12 +959,14 @@ height: calc(100% - 100px); overflow: auto; } -///deep/ .ant-select-allow-clear{ -// height: 30px; -//} - /deep/.ant-table-row{ - height:69px; + + ///deep/ .ant-select-allow-clear{ + // height: 30px; + //} + /deep/ .ant-table-row { + height: 69px; } + .text { margin-right: 10px; } @@ -976,7 +981,8 @@ display: flex; flex-direction: column; } - .iconRow,.valflex{ + + .iconRow, .valflex { display: flex; } @@ -1003,21 +1009,25 @@ width: calc(33.3% - 5px); margin-right: 5px; float: left; + display: flex; } .add--number { width: 101%; } - .addicon{ + + .addicon { display: inline-block; //margin-left: -34px; margin-top: 8px; } - .delicon{ + + .delicon { display: inline-block; margin-left: 5px; margin-top: 8px; } + .ant-input-disabled { color: rgba(0, 0, 0, 0.65); } From 5e5e98dbc243a34e8d80e54a565fdbdb5934d3bd Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Tue, 31 Jan 2023 14:17:11 +0800 Subject: [PATCH 10/39] =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=A1=B9=E6=94=B6?= =?UTF-8?q?=E9=9B=86=E6=B8=85=E5=8D=95-=E6=9F=A5=E8=AF=A2=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ParamsCollectManifestEOServiceImpl.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index a17add4ce..3f2009ee4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -504,6 +504,11 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl paramsConfigDataVOList = this.getConfigDataVOList(controlType, paramsConfigEO, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据 paramsConfigDataVO.put(paramsConfigDataEO.getId(),paramsConfigDataVOList); } + }else { + ParamsConfigDataEO paramsConfigDataEO = this.getConfigDataEOByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId, paramsConfigDataEOList); // 参数配置数据 + List paramsConfigDataVOList = this.getConfigDataVOList(controlType, paramsConfigEO, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据 + String key = UUID.randomUUID().toString().replaceAll("-",""); + paramsConfigDataVO.put(key,paramsConfigDataVOList); } configMap.put("controlType", controlType); configMap.put("paramsConfigData", paramsConfigDataVO); From 1c6325fc686e37652adbb90f6b42084f46567471 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Tue, 31 Jan 2023 14:59:44 +0800 Subject: [PATCH 11/39] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=94=B6=E9=9B=86=E5=A2=9E=E5=8A=A0=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/CollectionType/index.vue | 1252 +++++++++-------- .../src/components/tableCollection/index.vue | 8 +- .../ParameterItemCollectionList.vue | 399 +++--- 3 files changed, 867 insertions(+), 792 deletions(-) diff --git a/jero-web/src/components/CollectionType/index.vue b/jero-web/src/components/CollectionType/index.vue index 134966daa..3da63924b 100644 --- a/jero-web/src/components/CollectionType/index.vue +++ b/jero-web/src/components/CollectionType/index.vue @@ -6,102 +6,103 @@
-
- - - - - - - - - - - -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
+
+ + + + + + + + + + + +
+
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+
-
+
@@ -111,31 +112,32 @@
-
- - - - - - - - - - - -
- -
+
+ + + + + + + + + + + +
+
+
-
+
@@ -145,70 +147,75 @@
-
- - +
+ + {{ item.label }} - - -
+ + +
-
+
-
+
-
- - +
+ + {{ item.label }} - - -
+ + +
-
+
-
+
-
- - {{ (itemval.dataValue === 'null' || itemval.dataValue === '' || - itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}} - -
+
+ + {{ (itemval.dataValue === 'null' || itemval.dataValue === '' || + itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}} + +
-
+
@@ -218,114 +225,115 @@
-
- - +
+ + {{ itemin.label }} - - + + +
+
+ + + + + + + + + + + +
+
-
- - - - - - - - - - - -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
+ +
+
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+
-
+
@@ -335,114 +343,115 @@
-
- - +
+ + {{ item.label }} - - + + +
+
+ + + + + + + + + + + +
+
-
- - - - - - - - - - - -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
+ +
+
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+
-
+
@@ -452,109 +461,110 @@
-
- - - - - - - - - - - -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
+
+ + + + + + + + + + + +
+
-
- - {{ (itemval.dataValue === 'null' || itemval.dataValue === '' || - itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}} - + +
+
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+
+
+ + {{ (itemval.dataValue === 'null' || itemval.dataValue === '' || + itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}} + +
-
+
@@ -564,32 +574,33 @@
- -
- - + +
+ + {{ itemin.label }} - - -
-
- - {{ (itemval.dataValue === 'null' || itemval.dataValue === '' || - itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}} - -
- + + +
+
+ + {{ (itemval.dataValue === 'null' || itemval.dataValue === '' || + itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}} + +
+
-
+
@@ -599,32 +610,33 @@
- -
- - + +
+ + {{ item.label }} - - -
-
- - {{ (itemval.dataValue === 'null' || itemval.dataValue === '' || - itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}} - -
- + + +
+
+ + {{ (itemval.dataValue === 'null' || itemval.dataValue === '' || + itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}} + +
+
-
+
@@ -632,125 +644,126 @@
- +
- -
- - + +
+ + {{ itemin.label }} - - + + +
+
+ + + + + + + + + + + +
+
-
- - - - - - - - - - - -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
+ +
+
-
- - {{ (itemval.dataValue === 'null' || itemval.dataValue === '' || - itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}} - + +
+
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+
+
+ + {{ (itemval.dataValue === 'null' || itemval.dataValue === '' || + itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}} + +
-
+
@@ -795,7 +808,8 @@ formInline: {}, visible: false, detailDatetransformation: [], - detailDateList: [] + detailDateList: [], + paramsConfigData: {} } }, components: { @@ -803,6 +817,7 @@ }, mounted() { this.detailDateList = [] + this.paramsConfigData = this.detailDate.paramsConfigData let name = [] console.log(this.detailDate) // this.columName.forEach(item => { @@ -818,14 +833,14 @@ // } // } // } - this.detailDateList = this.detailDate.paramsConfigData + // this.detailDateList = this.detailDate.paramsConfigData // this.detailDateList.forEach((item) => { - Object.keys(this.detailDateList).forEach(res => { - this.detailDateList[res].forEach(val => { - if (val.type === 'pull_more' && !val.dataValue) { - val.dataValue = [] - } - }) + Object.keys(this.detailDate.paramsConfigData).forEach(res => { + this.detailDate.paramsConfigData[res].forEach(val => { + if (val.type === 'pull_more' && !val.dataValue) { + val.dataValue = [] + } + }) // }) // this.detailDatetransformation.push(item) }) @@ -889,26 +904,49 @@ } }) }, - addconfig() { - postAction('params/configData/add', { - paramsCollectManifestId: this.recordList.id, - paramsConfigId: this.detailDate.configId - }).then((res) => { - if (res.success) { - this.$emit('collectionForm') - } else { - } - }) + generateRandom() { + return Math.random().toString(32) }, - delconfig() { - for (const key in this.detailDate.paramsConfigData) { - deleteAction('params/configData/delete', { id: key }).then((res) => { - if (res.success) { - this.$emit('collectionForm') - } else { - } - }) + addconfig() { + let paramsConfigData = Object.keys(this.detailDate.paramsConfigData) + for (let i = 0; i < paramsConfigData.length; i++) { + if (i == paramsConfigData.length - 1) { + let name = paramsConfigData[i] + let generateRandom = this.generateRandom() + this.detailDate.paramsConfigData[generateRandom] = JSON.parse(JSON.stringify(this.detailDate.paramsConfigData[name])) + this.detailDate.paramsConfigData[generateRandom].forEach(res => { + if (res.type === 'pull_more') { + res.dataValue = [] + }else{ + res.dataValue = '' + } + }) + } } + this.detailDate.paramsConfigData = { ...this.detailDate.paramsConfigData } + this.$emit('consolidateData') + // postAction('params/configData/add', { + // paramsCollectManifestId: this.recordList.id, + // paramsConfigId: this.detailDate.configId + // }).then((res) => { + // if (res.success) { + // this.$emit('collectionForm') + // } else { + // } + // }) + }, + delconfig(item) { + delete this.detailDate.paramsConfigData[item] + this.detailDate.paramsConfigData = { ...this.detailDate.paramsConfigData } + this.$emit('consolidateData') + // for (const key in this.detailDate.paramsConfigData) { + // deleteAction('params/configData/delete', { id: key }).then((res) => { + // if (res.success) { + // this.$emit('collectionForm') + // } else { + // } + // }) + // } } }, watch: { diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index 7c907edf5..3a162c3e3 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -74,7 +74,9 @@ - +
@@ -719,6 +721,10 @@ collectionForm(){ this.getTableList() }, + consolidateData(){ + this.dataSource = [...this.dataSource] + console.log(this.dataSource) + }, getAndUserId(result) { let query = { paramsManifestId: this.$route.query.id, diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index 2c2aa64cd..96b5d9689 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -33,68 +33,68 @@ v-model="formInline.paramsName">
- - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + @@ -130,11 +130,11 @@ {{$t('addTo')}}
- - - - - + + + + +
@@ -161,25 +161,28 @@ {{$t('Updateparametercolumn')}}
-
+
{{$t('SynchronousReportLibrary')}}
- - - - + + + +
{{$t('BatchDelete')}}
-
+
{{$t('bringInTheProjectInterface')}}
-
+
{{$t('Adjustareasofresponsibility')}}
@@ -189,13 +192,15 @@ {{$t('Assignedby')}}
- -
+ +
...{{ $t('more') }}
-
+
{{$t('distributionAndCollection')}}
@@ -233,7 +238,8 @@
- +
- + {{$t('CompulsoryWithdrawal')}}
@@ -258,9 +264,9 @@
- + + @GetgetTableList='GetgetTableList' + @GetgetLoginUserType='GetgetLoginUserType' + @areaVisibleAssignedbyflaghomo='areaVisibleAssignedbyflaghomo' + @areaVisible='areaVisibleAssignedbyhomo = false'/> - - - + + + - - - - + + + + + @GetgetTableList='GetgetTableList' + @AdjustareasofresponAll='AdjustareasofresponAll'/> @@ -373,9 +380,9 @@ + :templateTitle='templatetitle' + :selectedRowKeyS='selectedRowKeys' :rowId='rowId' :version='version' :url='url' + :projectId='this.$route.query.parentId ? this.$route.query.parentId : this.$route.query.id'> @@ -444,7 +451,8 @@
{{ currentPersonRole =='homo'? $t('certifiedEngineer'): (currentPersonRole =='sdt'? - $t('engineeringInterfacePerson'): $t('completedBy')) }}{{jurisdiction === "homoQZTH"? $t('Datastateexcept') : $t('Datastatusis')}} + $t('engineeringInterfacePerson'): $t('completedBy')) }}{{jurisdiction === 'homoQZTH'? $t('Datastateexcept') + : $t('Datastatusis')}} '{{$t('CollectionInitiated')}}'、'{{$t('ReturnedPerson')}}'{{$t('or')}}'{{$t('alteration')}}' @@ -484,7 +492,7 @@

'{{$t('ReturnedEngineer')}}'

 - +

'{{$t('SynchronizedLibrary')}}'

{{$t('or')}}

'{{$t('CollectionInitiated')}}'

@@ -550,47 +558,47 @@ { value: '1', title: this.$t('CollectionInitiated'), - key:'1', + key: '1' }, { value: '2', title: this.$t('handledInterface'), - key:'2', + key: '2' }, { value: '3', title: this.$t('ReturnedPerson'), - key:'3', + key: '3' }, { value: '4', title: this.$t('completed'), - key:'4', + key: '4' }, { value: '5', title: this.$t('Filledreturn'), - key:'5', + key: '5' }, { value: '6', title: this.$t('Submitted'), - key:'6', + key: '6' }, { value: '7', title: this.$t('ReturnedEngineer'), - key:'7', + key: '7' }, { value: '8', title: this.$t('SynchronizedLibrary'), - key:'8', + key: '8' }, { value: '9', title: this.$t('alteration'), - key:'9', + key: '9' } ] return { @@ -682,12 +690,12 @@ value: 'dre', text: this.$t('dre'), dictCode: 'dre'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框 - }, + } ], selectedRowKeys: [], textLoading: false, formInline: {}, - queryParamQuery:{}, + queryParamQuery: {}, url: { tableHeader: 'params/collectManifest/getHeader', tableList: 'params/collectManifest/list', @@ -704,7 +712,7 @@ configureareaVisible: false, // 配置的彈框 pageNo: 1, pageSize: 10, - rolename:'', + rolename: '', total: 0, selectedRowKeysArray: '', templatetitle: '', @@ -721,9 +729,9 @@ areaVisibleAssignedby: false, // 分配填写人弹框 areaVisibleAssignedbyhomo: false, // 认证分配填写人弹框 areaVisibleTaskCutOffTime: false, // 截至时间弹框 - OneclickCollection:false, - parametercolumn:false, - Adjustareasofrespon:false, + OneclickCollection: false, + parametercolumn: false, + Adjustareasofrespon: false, areaVisiblereferenceparameter: false, // 引用参数弹框 areaVisibsynchronous: false, // 同步上报库弹框 visibleoperationFailed: false, // 数据失败的弹框 @@ -768,7 +776,7 @@ mounted() { this.GetgetLoginUserType() console.log(this.currentPersonRole) - if(this.$route.query.type == '1'){ + if (this.$route.query.type == '1') { this.handleOkRoleSwitching() } setTimeout(() => { @@ -806,9 +814,9 @@ }) }, handleOkRoleSwitching() { - if(this.$route.query.type == '1'){ + if (this.$route.query.type == '1') { let query = { - userType:this.formInlineRoleSwitching.roleSwitchingCode ? this.formInlineRoleSwitching.roleSwitchingCode : this.$route.query.userType, + userType: this.formInlineRoleSwitching.roleSwitchingCode ? this.formInlineRoleSwitching.roleSwitchingCode : this.$route.query.userType, paramsManifestId: this.$route.query.id, projectId: this.$route.query.projectId, userId: this.userInfo().id @@ -820,8 +828,8 @@ this.visibleRoleSwitching = false this.confirmLoadingRoleSwitching = false localStorage.setItem('currentPersonRole', JSON.stringify(this.formInlineRoleSwitching.roleSwitchingCode ? this.formInlineRoleSwitching.roleSwitchingCode : this.$route.query.userType)) - this.RoleType.forEach((item,index) => { - if(item.value == this.currentPersonRole){ + this.RoleType.forEach((item, index) => { + if (item.value == this.currentPersonRole) { this.rolename = item.label } }) @@ -831,7 +839,7 @@ this.$message.warning(this.$t('operationFailed')) } }) - }else { + } else { this.$refs.ruleFormRoleSwitching.validate(valid => { if (valid) { let query = { @@ -848,8 +856,8 @@ this.visibleRoleSwitching = false this.confirmLoadingRoleSwitching = false localStorage.setItem('currentPersonRole', JSON.stringify(this.formInlineRoleSwitching.roleSwitchingCode)) - this.RoleType.forEach((item,index) => { - if(item.value == this.currentPersonRole){ + this.RoleType.forEach((item, index) => { + if (item.value == this.currentPersonRole) { this.rolename = item.label } }) @@ -865,7 +873,7 @@ }, roleSwitchingClick() { this.visibleRoleSwitching = true - this.$nextTick(()=>{ + this.$nextTick(() => { this.formInlineRoleSwitching.roleSwitchingCode = this.currentPersonRole this.$refs.ruleFormRoleSwitching.clearValidate() setTimeout(() => { @@ -881,7 +889,7 @@ GetgetTableList() { this.$refs.CollectionTabel.getTableList(this.queryParamQuery) }, - GetgetHeader(){ + GetgetHeader() { this.$refs.CollectionTabel.getHeader() }, // 错误数据的弹框 @@ -980,7 +988,7 @@ } }, //导出 - handleExport(){ + handleExport() { this.$message.success(this.$t('Intheexport')) let long = localStorage.getItem('language') this.cut = '' @@ -992,16 +1000,16 @@ let query = { paramsManifestId: this.paramsManifest.id, paramsTemplateId: this.$route.query.paramsTemplateId, - paramsTemplatePublishVersion:1, + paramsTemplatePublishVersion: 1, cut: this.cut, userTypes: this.currentPersonRole, - exportName:this.$route.query.projectName + '(' + this.$route.query.title + ')' + exportName: this.$route.query.projectName + '(' + this.$route.query.title + ')' } let name = this.$route.query.projectName + '(' + this.$route.query.title + ')' + '.zip' - downloadFile('/params/collectManifest/exportAll', name , query , this.selectClear) + downloadFile('/params/collectManifest/exportAll', name, query, this.selectClear) }, //填写人导出 - handleExportDre(){ + handleExportDre() { let long = localStorage.getItem('language') this.cut = '' if (long && long === 'zh-cn') { @@ -1016,17 +1024,17 @@ ...this.formInline, ...this.queryParamQuery, ids: this.selectedRowKeys.join(','), - exportName:this.$route.query.projectName + '(' + this.$route.query.title + ')' + exportName: this.$route.query.projectName + '(' + this.$route.query.title + ')' } let name = this.$route.query.projectName + '(' + this.$route.query.title + ')' + '.zip' - downloadFile('/params/collectManifest/exportDre', name , query , this.selectClear) + downloadFile('/params/collectManifest/exportDre', name, query, this.selectClear) }, - getList(){ + getList() { this.$refs.CollectionTabel.getTableList(this.queryParamQuery) }, - iVisible(val,num) { + iVisible(val, num) { this.importsVisible = val - if (num == 1){ + if (num == 1) { eventBUs.$emit('searchGetData') } }, @@ -1044,7 +1052,7 @@ this.queryParamQuery = sqp this.$refs.CollectionTabel.pageNo = 1 // this.$refs.CollectionTabel.getTableList(this.queryParamQuery) - eventBUs.$emit('getTableList',this.queryParamQuery) + eventBUs.$emit('getTableList', this.queryParamQuery) }, // 认证工程师 批量删除 权限 // 仅仅状态为 待发起收集 工程接口人退回 变更 可以批量删除 @@ -1247,8 +1255,8 @@ this.currentPersonRole = currentPersonRole || userType || val[0].value } this.RoleType = val - this.RoleType.forEach((item,index) => { - if(item.value == this.currentPersonRole){ + this.RoleType.forEach((item, index) => { + if (item.value == this.currentPersonRole) { this.rolename = item.label } }) @@ -1363,18 +1371,18 @@ }) }, // 调整责任领域 - AdjustareasofresponsibilityClick(){ - if(this.selectedRowKeysValue.length == 0){ + AdjustareasofresponsibilityClick() { + if (this.selectedRowKeysValue.length == 0) { this.$message.warning(this.$t('selectLeastOne')) - }else{ + } else { this.Adjustareasofrespon = true } }, // 下发收集的权限 distributionAndCollectionJurisdiction() { - if(this.selectedRowKeysValue.length == 0){ + if (this.selectedRowKeysValue.length == 0) { this.$message.warning(this.$t('selectLeastOne')) - }else{ + } else { this.$refs.areaVisibleTaskCutOffTime.searchData() } // let homodistributionAndCollection = this.homodistributionAndCollection() @@ -1392,7 +1400,7 @@ // 一键下发收集 defOneclickCollection() { this.$refs.OneclickCollection.searchData() - // this.OneclickCollection = true + // this.OneclickCollection = true }, // 引用参数列 Referenceparametercolumn() { @@ -1404,8 +1412,8 @@ let referencesCol = [] let postDate = [] let colunmnFlag = '' - data.forEach((item,index) => { - if(!item.referencesCol){ + data.forEach((item, index) => { + if (!item.referencesCol) { this.colunmnFlag = true } referencesCol.push({ @@ -1413,7 +1421,7 @@ id: item.id }) }) - if(this.colunmnFlag){ + if (this.colunmnFlag) { this.$message.warning(this.$t('columnfirst')) return } @@ -1446,9 +1454,9 @@ postAction('/params/collectManifest/updateReferencesCol', query).then((res) => { if (res.success) { this.GetgetTableList() - this.$message.success(this.$t('OperationSuccessful')) - } else { - this.$message.warning(this.$t('operationFailed')) + this.$message.success(this.$t('OperationSuccessful')) + } else { + this.$message.warning(this.$t('operationFailed')) } }) }, @@ -1540,43 +1548,63 @@ let selectedRowKeysValue = [] data.forEach(res => { if (res.state == 'To be filled' || res.state == '待填写' || res.state == '认证工程师退回' || - res.state == 'Rejected by homo engineer') { + res.state == 'Rejected by homo engineer') { selectedRowKeysValue.push(res) } }) console.log(selectedRowKeysValue) - for (let i = 0; i < selectedRowKeysValue.length; i++) { - let postDateobj = {} - let itemIn = Object.keys(selectedRowKeysValue[i]) - for (let j = 0; j < itemIn.length; j++) { - if (itemIn[j] !== 'sdt' && selectedRowKeysValue[i][itemIn[j]].list) { - if (selectedRowKeysValue[i][itemIn[j]] instanceof Object && !(selectedRowKeysValue[i][itemIn[j]] instanceof Array)) { - postDateobj[itemIn[j]] = selectedRowKeysValue[i][itemIn[j]] - for (let k = 0; k < selectedRowKeysValue[i][itemIn[j]].list.length; k++) { - if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'pull_more') { - selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.join(',') - } - if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'text' && selectedRowKeysValue[i][itemIn[j]].list[k].dataValue !== null) { - selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.toString() + // for (let i = 0; i < selectedRowKeysValue.length; i++) { + // let postDateobj = {} + // let itemIn = Object.keys(selectedRowKeysValue[i]) + // for (let j = 0; j < itemIn.length; j++) { + // if (itemIn[j] !== 'sdt' && selectedRowKeysValue[i][itemIn[j]].list) { + // if (selectedRowKeysValue[i][itemIn[j]] instanceof Object && !(selectedRowKeysValue[i][itemIn[j]] instanceof Array)) { + // postDateobj[itemIn[j]] = selectedRowKeysValue[i][itemIn[j]] + // for (let k = 0; k < selectedRowKeysValue[i][itemIn[j]].list.length; k++) { + // if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'pull_more') { + // selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.join(',') + // } + // if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'text' && selectedRowKeysValue[i][itemIn[j]].list[k].dataValue !== null) { + // selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.toString() + // } + // } + // } + // } + // } + // postDateobj.id = selectedRowKeysValue[i].id + // delete postDateobj.referencesCol + // postDate.push(postDateobj) + // } + // console.log(postDate) + if (selectedRowKeysValue && selectedRowKeysValue.length > 0) { + if (num && num == 1) { + this.textLoading = true + } + let configDataList = [] + for (let i = 0; i < selectedRowKeysValue.length; i++) { + configDataList.push({ + id:selectedRowKeysValue[i].id + }) + if (selectedRowKeysValue[i].configIds && selectedRowKeysValue[i].configIds.length > 0) { + for (let j = 0; j < selectedRowKeysValue[i].configIds.length; j++) { + let keyIndex = Object.keys(selectedRowKeysValue[i]) + for (let k = 0; k < keyIndex.length; k++) { + if (keyIndex[k] == selectedRowKeysValue[i].configIds[j]) { + let keyName = keyIndex[k] + configDataList[i][keyName] = selectedRowKeysValue[i][keyName] } } } } } - postDateobj.id = selectedRowKeysValue[i].id - delete postDateobj.referencesCol - postDate.push(postDateobj) - } - console.log(postDate) - let configDataList = { configDataList: postDate } - if (selectedRowKeysValue && selectedRowKeysValue.length > 0) { - if (num && num == 1) { - this.textLoading = true - } + // return let query = { - ...configDataList, + // ...configDataList, + configDataList: configDataList, paramsManifestId: this.paramsManifest.id } + console.log(query) + return postAction('/params/collectManifest/save', query).then((res) => { if (res.success) { if (num && num == 1) { @@ -1670,7 +1698,8 @@ _array.push(item.id) }) let _this = this - let param = { ids: _array.join(','), + let param = { + ids: _array.join(','), currentPersonRole: this.currentPersonRole, paramsManifestId: this.$route.query.id } @@ -1728,9 +1757,9 @@ let _this = this let param = { ids: _array.join(',') } let url = '' - if(this.currentPersonRole == 'homo'){ + if (this.currentPersonRole == 'homo') { url = '/jero-boot/params/collectManifest/mandatoryWithdraw' - }else{ + } else { url = '/jero-boot/params/collectManifest/withdraw' } this.$confirm({ @@ -1774,8 +1803,8 @@ }, // 分配填写人 assignedBy() { - let sdtJurisdictionAssigned = this.sdtJurisdictionAssigned() - // 工程接口人 + let sdtJurisdictionAssigned = this.sdtJurisdictionAssigned() + // 工程接口人 if (sdtJurisdictionAssigned == 1) { this.areaVisibleAssignedby = true } else if (sdtJurisdictionAssigned == 0) { @@ -1817,10 +1846,10 @@ areaVisibleTaskCutOffTimeflag(val) { this.$refs.CollectionTabel.getTableList(this.queryParamQuery) }, - areaVisibleTaskCutOffTimeAll(val){ + areaVisibleTaskCutOffTimeAll(val) { this.$refs.CollectionTabel.getTableList(this.queryParamQuery) }, - AdjustareasofresponAll(val){ + AdjustareasofresponAll(val) { console.log(val) this.Adjustareasofrespon = val this.$refs.CollectionTabel.getTableList(this.queryParamQuery) @@ -1868,7 +1897,7 @@ handleDel() { let param = { ids: this.selectedRowKeysArray, - paramsManifestId:this.$route.query.id + paramsManifestId: this.$route.query.id } if (this.selectedRowKeys.length > 0) { let _this = this @@ -1977,6 +2006,7 @@ cursor: pointer; border-radius: 4px; } + .operator-text-title { cursor: pointer; margin-right: 22px; @@ -2122,12 +2152,13 @@ } } } - .text-wraning{ + + .text-wraning { word-break: break-word; } \ No newline at end of file From 05bd11ae93c07c0663b12d9cf02f32b15a20504f Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Tue, 31 Jan 2023 15:14:01 +0800 Subject: [PATCH 12/39] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=94=B6=E9=9B=86=E5=A2=9E=E5=8A=A0=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/CollectionType/index.vue | 43 ++++++++++--------- .../ParameterItemCollectionList.vue | 2 - 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/jero-web/src/components/CollectionType/index.vue b/jero-web/src/components/CollectionType/index.vue index 3da63924b..8b9e1a7ac 100644 --- a/jero-web/src/components/CollectionType/index.vue +++ b/jero-web/src/components/CollectionType/index.vue @@ -98,10 +98,10 @@
-
+
-
@@ -133,10 +133,10 @@
-
+
-
@@ -160,10 +160,10 @@
-
+
-
@@ -188,10 +188,10 @@
-
+
-
@@ -211,10 +211,10 @@
-
+
-
@@ -329,10 +329,10 @@
-
+
-
@@ -447,10 +447,10 @@
-
+
-
@@ -560,10 +560,10 @@
-
+
-
@@ -596,10 +596,10 @@
-
+
-
@@ -632,7 +632,7 @@
-
+
-
+
-
diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index 96b5d9689..db75d0d11 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -1603,8 +1603,6 @@ configDataList: configDataList, paramsManifestId: this.paramsManifest.id } - console.log(query) - return postAction('/params/collectManifest/save', query).then((res) => { if (res.success) { if (num && num == 1) { From b7254cc1e31134e6ec059f55a507e29c71bcd40b Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Tue, 31 Jan 2023 16:04:39 +0800 Subject: [PATCH 13/39] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=94=B6=E9=9B=86=E5=A2=9E=E5=8A=A0=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/ParameterItemCollectionList.vue | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index db75d0d11..3a73d4781 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -1583,7 +1583,7 @@ let configDataList = [] for (let i = 0; i < selectedRowKeysValue.length; i++) { configDataList.push({ - id:selectedRowKeysValue[i].id + id: selectedRowKeysValue[i].id }) if (selectedRowKeysValue[i].configIds && selectedRowKeysValue[i].configIds.length > 0) { for (let j = 0; j < selectedRowKeysValue[i].configIds.length; j++) { @@ -1598,6 +1598,22 @@ } } // return + if (configDataList && configDataList.length > 0){ + configDataList.forEach(res => { + Object.keys(res).forEach(val => { + if (res[val] && res[val].paramsConfigData) { + let paramsConfigData = res[val].paramsConfigData + Object.keys(paramsConfigData).forEach(ol => { + paramsConfigData[ol].forEach(item => { + if (item.type == 'pull_more') { + item.dataValue = item.dataValue.join(',') + } + }) + }) + } + }) + }) + } let query = { // ...configDataList, configDataList: configDataList, From ec3127722d339136c0b724c9626bde521b75c6cd Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Tue, 31 Jan 2023 17:09:56 +0800 Subject: [PATCH 14/39] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=94=B6=E9=9B=86=E5=A2=9E=E5=8A=A0=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/CollectionType/index.vue | 32 +++++++++++-------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/jero-web/src/components/CollectionType/index.vue b/jero-web/src/components/CollectionType/index.vue index 8b9e1a7ac..55598352a 100644 --- a/jero-web/src/components/CollectionType/index.vue +++ b/jero-web/src/components/CollectionType/index.vue @@ -205,7 +205,7 @@ style="display: inline-block" class='valflex'>
+ @click="clickButtonToUpload(item,itemval,index1)"> {{ (itemval.dataValue === 'null' || itemval.dataValue === '' || itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}} @@ -554,7 +554,7 @@
+ @click="clickButtonToUpload(item,itemval,index1)"> {{ (itemval.dataValue === 'null' || itemval.dataValue === '' || itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}} @@ -589,7 +589,7 @@
+ @click="clickButtonToUpload(item,itemval,index1)"> {{ (itemval.dataValue === 'null' || itemval.dataValue === '' || itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}} @@ -625,7 +625,7 @@
+ @click="clickButtonToUpload(item,itemval,index1)"> {{ (itemval.dataValue === 'null' || itemval.dataValue === '' || itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}} @@ -753,7 +753,7 @@
+ @click="clickButtonToUpload(item,itemval,index1)"> {{ (itemval.dataValue === 'null' || itemval.dataValue === '' || itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}} @@ -810,7 +810,10 @@ visible: false, detailDatetransformation: [], detailDateList: [], - paramsConfigData: {} + paramsConfigData: {}, + fileNameOne:'', + fileNameTwo:'', + fileIndex:'', } }, components: { @@ -884,14 +887,17 @@ // console.log('form',this.formInline) } - this.detailDateList.forEach((item, index) => { - if (item.type === 'file') { - item.dataValue = attIdList.join(',') - } - }) + this.detailDate.paramsConfigData[this.fileNameOne][this.fileIndex].dataValue = attIdList.join(',') + // this.detailDateList.forEach((item, index) => { + // if (item.type === 'file') { + // item.dataValue = attIdList.join(',') + // } + // }) }, - clickButtonToUpload(item) { - if (item.isLock == '1') { + clickButtonToUpload(name,item,index) { + this.fileNameOne = name + this.fileIndex = index + if (item.isLock && item.isLock == '1') { this.$refs.uploadFile.disabled = true } else { this.$refs.uploadFile.disabled = false From 74498f2ed3d398f67ecdb4aa145a6b126320dba9 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Tue, 31 Jan 2023 17:37:53 +0800 Subject: [PATCH 15/39] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=94=B6=E9=9B=86=E5=A2=9E=E5=8A=A0=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/ParameterItemCollectionList.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index 3a73d4781..3d4512aaf 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -1603,7 +1603,8 @@ Object.keys(res).forEach(val => { if (res[val] && res[val].paramsConfigData) { let paramsConfigData = res[val].paramsConfigData - Object.keys(paramsConfigData).forEach(ol => { + Object.keys(paramsConfigData).forEach((ol,index) => { + paramsConfigData[ol][0].orderNum = index paramsConfigData[ol].forEach(item => { if (item.type == 'pull_more') { item.dataValue = item.dataValue.join(',') @@ -1613,7 +1614,9 @@ } }) }) + } + console.log(configDataList) let query = { // ...configDataList, configDataList: configDataList, From fb388ffa9060e732e52a5686e69307fc9054cc59 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Tue, 31 Jan 2023 18:02:18 +0800 Subject: [PATCH 16/39] =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=94=B6=E9=9B=86?= =?UTF-8?q?=E6=B8=85=E5=8D=95-=E6=8E=A7=E4=BB=B6=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E6=94=B9=E9=80=A0-=E4=BF=9D=E5=AD=98=E3=80=81=E6=9A=82?= =?UTF-8?q?=E5=AD=98=E6=96=B9=E6=B3=95=E4=BF=AE=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_2nd_period.sql | 4 + .../collect/entity/ParamsConfigDataEO.java | 2 + .../ParamsCollectManifestEOServiceImpl.java | 119 ++++++++++-------- 3 files changed, 76 insertions(+), 49 deletions(-) diff --git a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql index b298be65c..83fe49ee9 100644 --- a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql +++ b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql @@ -159,3 +159,7 @@ ALTER TABLE `laws_weilai`.`params_report_detail` -- 更新拆分详情列 展示顺序不在列表头展示sql 2022-12-30 已同步生产环境 UPDATE `laws_weilai`.`onl_cgform_field` SET `is_show_list` = 0 WHERE `id` = '1529373706885799937' + +-- 参数配置数据表，增加排序号字段sql 2023-1-31 未同步生产环境 +ALTER TABLE `laws_weilai`.`params_config_data` + ADD COLUMN `order_num` int(10) NULL COMMENT '排序号' AFTER `params_collect_manifest_id`; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsConfigDataEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsConfigDataEO.java index 7754c385d..43f9a7ea9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsConfigDataEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsConfigDataEO.java @@ -88,4 +88,6 @@ public class ParamsConfigDataEO implements Serializable { @ApiModelProperty(value = "参数收集清单id") private String paramsCollectManifestId; + /**排序号**/ + private Integer orderNum; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 3f2009ee4..7f56bc94c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -93,6 +93,7 @@ import java.lang.reflect.Modifier; import java.nio.file.Files; import java.nio.file.Paths; import java.nio.file.StandardOpenOption; +import java.text.Collator; import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -500,6 +501,16 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl paramsConfigDatas = this.getConfigDataEOListByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId, paramsConfigDataEOList); // 参数配置数据 if(CollectionUtils.isNotEmpty(paramsConfigDatas)){ + // 匿名比较器排序 + Collections.sort(paramsConfigDatas, new Comparator() { + @Override + public int compare(ParamsConfigDataEO p1, ParamsConfigDataEO p2) { + if(p2.getOrderNum() == null || p1.getOrderNum() == null){ + return 0; + } + return p1.getOrderNum().compareTo(p2.getOrderNum()); + } + }); for (ParamsConfigDataEO paramsConfigDataEO : paramsConfigDatas) { List paramsConfigDataVOList = this.getConfigDataVOList(controlType, paramsConfigEO, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据 paramsConfigDataVO.put(paramsConfigDataEO.getId(),paramsConfigDataVOList); @@ -1364,9 +1375,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl> configDataList, String paramsManifestId) { List newConfigDataEOList = new ArrayList<>(); - List paramsConfigEOList = paramsConfigEOService.queryList(paramsManifestId); // 查询配置列 - List paramsConfigIdList = paramsConfigEOList.stream().map(ParamsConfigEO::getId).collect(Collectors.toList()); - List paramsConfigDataEOList = paramsConfigDataEOService.queryListByConfigIdList(paramsConfigIdList); // 查询所有配置数据 + List paramsCollectManifestIdList = new ArrayList<>(); // 处理数据 for (Map map : configDataList) { @@ -1374,7 +1383,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl entry : map.entrySet()) { - ParamsConfigDataEO paramsConfigDataEO = new ParamsConfigDataEO(); + if ("id".equals(entry.getKey())) { continue; } @@ -1383,70 +1392,82 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl paramsConfigDataMap = (Map) entry.getValue(); // 无法转ParamsConfigDataVO（遍历会出现该异常 ： LinkedHashMap cannot be cast to ParamsConfigDataVO） - List> paramsConfigDataVOList = (List>) paramsConfigDataMap.get("list"); + // List> paramsConfigDataVOList = (List>) paramsConfigDataMap.get("list"); + Map paramsConfigDataVOMap = (Map) paramsConfigDataMap.get("paramsConfigData"); - // 判断是新增还是修改 -// ParamsConfigDataEO oldConfigDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(paramsConfigEOId, paramsCollectManifestId); - ParamsConfigDataEO oldConfigDataEO = getConfigDataEOByConfigIdAndCollectManifestId(paramsConfigEOId, paramsCollectManifestId,paramsConfigDataEOList); - if (ObjectUtil.isNotEmpty(oldConfigDataEO)) { - paramsConfigDataEO.setId(oldConfigDataEO.getId()); + for (Map.Entry configDataMap : paramsConfigDataVOMap.entrySet()) { + List> paramsConfigDataVOList = (List>)configDataMap.getValue(); + Integer orderNum = (Integer) paramsConfigDataVOList.get(0).get("orderNum"); + if (CollectionUtil.isNotEmpty(paramsConfigDataVOList)) { + ParamsConfigDataEO paramsConfigDataEO = new ParamsConfigDataEO(); - } - paramsConfigDataEO.setParamsCollectManifestId(paramsCollectManifestId); - paramsConfigDataEO.setParamsConfigId(paramsConfigEOId); - if (CollectionUtil.isNotEmpty(paramsConfigDataVOList)) { - for (Map paramsConfigDataVO : paramsConfigDataVOList) { - String type = (String) paramsConfigDataVO.get("type"); - String dataValue = (String) paramsConfigDataVO.get("dataValue"); + for (Map paramsConfigDataVO : paramsConfigDataVOList) { - if (type.equals(ConfigDataTypeEnum.TEXT.getValue())) { - paramsConfigDataEO.setTextData(dataValue); + String type = (String) paramsConfigDataVO.get("type"); + String dataValue = (String) paramsConfigDataVO.get("dataValue"); - } else if (type.equals(ConfigDataTypeEnum.PULL.getValue()) - || type.equals(ConfigDataTypeEnum.PULL_MORE.getValue())) { - paramsConfigDataEO.setPullData(dataValue); + if (type.equals(ConfigDataTypeEnum.TEXT.getValue())) { + paramsConfigDataEO.setTextData(dataValue); - } else if (type.equals(ConfigDataTypeEnum.FILE.getValue())) { - if (StringUtils.isNotEmpty(dataValue) && dataValue.contains(",")) { // 新加多个文件 - // 处理文件connectId - String[] fileIdList = dataValue.split(","); - String connectId = UUID.randomUUID().toString().replace("-", ""); - List updateFileList = new ArrayList<>(); - for (int i = 0; i < fileIdList.length; i++) { - OSSFile ossFile = new OSSFile(); - ossFile.setId(fileIdList[i]); - ossFile.setConnectId(connectId); - updateFileList.add(ossFile); - } - ossFileService.updateBatchById(updateFileList); - dataValue = connectId; - } else if (StringUtils.isNotEmpty(dataValue) && !dataValue.contains(",")) { - List ossFiles = ossFileService.getFileInfosByConnectId(dataValue); - if(CollectionUtil.isEmpty(ossFiles)){ // 新加了一个文件 + } else if (type.equals(ConfigDataTypeEnum.PULL.getValue()) + || type.equals(ConfigDataTypeEnum.PULL_MORE.getValue())) { + paramsConfigDataEO.setPullData(dataValue); + + } else if (type.equals(ConfigDataTypeEnum.FILE.getValue())) { + if (StringUtils.isNotEmpty(dataValue) && dataValue.contains(",")) { // 新加多个文件 + // 处理文件connectId + String[] fileIdList = dataValue.split(","); String connectId = UUID.randomUUID().toString().replace("-", ""); - //修改文件表关联信息connect_id - List oSSFileList = new ArrayList<>(); - for (String fileId : dataValue.split(",")) { + List updateFileList = new ArrayList<>(); + for (int i = 0; i < fileIdList.length; i++) { OSSFile ossFile = new OSSFile(); - ossFile.setId(fileId); + ossFile.setId(fileIdList[i]); ossFile.setConnectId(connectId); - oSSFileList.add(ossFile); + updateFileList.add(ossFile); } - ossFileService.updateFileInfo(oSSFileList); + ossFileService.updateBatchById(updateFileList); dataValue = connectId; + } else if (StringUtils.isNotEmpty(dataValue) && !dataValue.contains(",")) { + List ossFiles = ossFileService.getFileInfosByConnectId(dataValue); + if(CollectionUtil.isEmpty(ossFiles)){ // 新加了一个文件 + String connectId = UUID.randomUUID().toString().replace("-", ""); + //修改文件表关联信息connect_id + List oSSFileList = new ArrayList<>(); + for (String fileId : dataValue.split(",")) { + OSSFile ossFile = new OSSFile(); + ossFile.setId(fileId); + ossFile.setConnectId(connectId); + oSSFileList.add(ossFile); + } + ossFileService.updateFileInfo(oSSFileList); + dataValue = connectId; + } } - } - paramsConfigDataEO.setFileConnectId(dataValue); + paramsConfigDataEO.setFileConnectId(dataValue); + } } + + paramsConfigDataEO.setParamsCollectManifestId(paramsCollectManifestId); + paramsConfigDataEO.setParamsConfigId(paramsConfigEOId); + paramsConfigDataEO.setOrderNum(orderNum); + + newConfigDataEOList.add(paramsConfigDataEO); } } - newConfigDataEOList.add(paramsConfigDataEO); } + + paramsCollectManifestIdList.add(paramsCollectManifestId); + } + + if(CollectionUtils.isNotEmpty(paramsCollectManifestIdList)){ + QueryWrapper configDataRemoveWrap = new QueryWrapper<>(); + configDataRemoveWrap.lambda().in(ParamsConfigDataEO::getParamsCollectManifestId,paramsCollectManifestIdList); + this.paramsConfigDataEOService.remove(configDataRemoveWrap); } // 批量更新 - return paramsConfigDataEOService.saveOrUpdateBatch(newConfigDataEOList); + return paramsConfigDataEOService.saveBatch(newConfigDataEOList); } /** From 068f6d2929dbebb495a30c9697efcde3d7200c88 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Wed, 1 Feb 2023 10:32:20 +0800 Subject: [PATCH 17/39] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=94=B6=E9=9B=86=E5=A2=9E=E5=8A=A0=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/CollectionType/index.vue | 118 ++++++++++++------ .../ParameterItemCollectionList.vue | 113 +++++++++++++---- 2 files changed, 164 insertions(+), 67 deletions(-) diff --git a/jero-web/src/components/CollectionType/index.vue b/jero-web/src/components/CollectionType/index.vue index 55598352a..761d5a4e7 100644 --- a/jero-web/src/components/CollectionType/index.vue +++ b/jero-web/src/components/CollectionType/index.vue @@ -6,7 +6,7 @@
-
+
@@ -98,7 +98,8 @@
-
+
-
+
@@ -133,7 +134,8 @@
-
+
-
+
-
+
-
+ style="display: inline-block;" class='valflex' + :class="{'multiple':itemval.type==='pull_more'?true:false}"> +
-
+
-
+
{{ (itemval.dataValue === 'null' || itemval.dataValue === '' || @@ -211,7 +216,8 @@
-
+
-
+
-
+
@@ -329,7 +335,8 @@
-
+
-
+ style="display: inline-block" + :class="{'multiple':itemval.type==='pull_more'?true:false}" + class='valflex'> +
-
+
@@ -447,7 +456,8 @@
-
+
-
+
@@ -552,7 +562,7 @@ v-model="itemval.dataValue"/>
-
+
{{ (itemval.dataValue === 'null' || itemval.dataValue === '' || @@ -560,7 +570,8 @@
-
+
-
+
-
+
{{ (itemval.dataValue === 'null' || itemval.dataValue === '' || @@ -596,7 +607,8 @@
-
+
+ style="display: inline-block" + :class="{'multiple':itemval.type==='pull_more'?true:false}" + class='valflex'> -
+
-
+
{{ (itemval.dataValue === 'null' || itemval.dataValue === '' || @@ -632,7 +646,8 @@
-
+
-
+
-
+
@@ -751,7 +766,7 @@ v-model="itemval.dataValue"/>
-
+
{{ (itemval.dataValue === 'null' || itemval.dataValue === '' || @@ -811,9 +826,9 @@ detailDatetransformation: [], detailDateList: [], paramsConfigData: {}, - fileNameOne:'', - fileNameTwo:'', - fileIndex:'', + fileNameOne: '', + fileNameTwo: '', + fileIndex: '' } }, components: { @@ -894,7 +909,7 @@ // } // }) }, - clickButtonToUpload(name,item,index) { + clickButtonToUpload(name, item, index) { this.fileNameOne = name this.fileIndex = index if (item.isLock && item.isLock == '1') { @@ -924,7 +939,7 @@ this.detailDate.paramsConfigData[generateRandom].forEach(res => { if (res.type === 'pull_more') { res.dataValue = [] - }else{ + } else { res.dataValue = '' } }) @@ -999,6 +1014,10 @@ } diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index 3d4512aaf..c60d39fc0 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -1552,7 +1552,6 @@ selectedRowKeysValue.push(res) } }) - console.log(selectedRowKeysValue) // for (let i = 0; i < selectedRowKeysValue.length; i++) { // let postDateobj = {} // let itemIn = Object.keys(selectedRowKeysValue[i]) @@ -1598,12 +1597,12 @@ } } // return - if (configDataList && configDataList.length > 0){ + if (configDataList && configDataList.length > 0) { configDataList.forEach(res => { Object.keys(res).forEach(val => { if (res[val] && res[val].paramsConfigData) { let paramsConfigData = res[val].paramsConfigData - Object.keys(paramsConfigData).forEach((ol,index) => { + Object.keys(paramsConfigData).forEach((ol, index) => { paramsConfigData[ol][0].orderNum = index paramsConfigData[ol].forEach(item => { if (item.type == 'pull_more') { @@ -1614,9 +1613,7 @@ } }) }) - } - console.log(configDataList) let query = { // ...configDataList, configDataList: configDataList, @@ -1651,34 +1648,92 @@ let _this = this let postDate = [] let selectedRowKeysValue = JSON.parse(JSON.stringify(this.selectedRowKeysValue)) + // for (let i = 0; i < selectedRowKeysValue.length; i++) { + // let postDateobj = {} + // let itemIn = Object.keys(selectedRowKeysValue[i]) + // for (let j = 0; j < itemIn.length; j++) { + // if (itemIn[j] !== 'sdt' && selectedRowKeysValue[i][itemIn[j]].list) { + // if (selectedRowKeysValue[i][itemIn[j]] instanceof Object && !(selectedRowKeysValue[i][itemIn[j]] instanceof Array)) { + // postDateobj[itemIn[j]] = selectedRowKeysValue[i][itemIn[j]] + // for (let k = 0; k < selectedRowKeysValue[i][itemIn[j]].list.length; k++) { + // if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'pull_more') { + // selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.join(',') + // } + // if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'text' && selectedRowKeysValue[i][itemIn[j]].list[k].dataValue !== null) { + // selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.toString() + // } + // if (!selectedRowKeysValue[i][itemIn[j]].list[k].dataValue && selectedRowKeysValue[i][itemIn[j]].list[k].isMust == '1' + // && selectedRowKeysValue[i][itemIn[j]].list[k].isLock == '0') { + // this.$message.warning(selectedRowKeysValue[i].nioNumber + ',' + this.$t('requiredParametersEmpty')) + // return + // } + // } + // } + // } + // } + // postDateobj.id = selectedRowKeysValue[i].id + // postDate.push(postDateobj) + // } + let configDataList = [] for (let i = 0; i < selectedRowKeysValue.length; i++) { - let postDateobj = {} - let itemIn = Object.keys(selectedRowKeysValue[i]) - for (let j = 0; j < itemIn.length; j++) { - if (itemIn[j] !== 'sdt' && selectedRowKeysValue[i][itemIn[j]].list) { - if (selectedRowKeysValue[i][itemIn[j]] instanceof Object && !(selectedRowKeysValue[i][itemIn[j]] instanceof Array)) { - postDateobj[itemIn[j]] = selectedRowKeysValue[i][itemIn[j]] - for (let k = 0; k < selectedRowKeysValue[i][itemIn[j]].list.length; k++) { - if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'pull_more') { - selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.join(',') - } - if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'text' && selectedRowKeysValue[i][itemIn[j]].list[k].dataValue !== null) { - selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.toString() - } - if (!selectedRowKeysValue[i][itemIn[j]].list[k].dataValue && selectedRowKeysValue[i][itemIn[j]].list[k].isMust == '1' - && selectedRowKeysValue[i][itemIn[j]].list[k].isLock == '0') { - this.$message.warning(selectedRowKeysValue[i].nioNumber + ',' + this.$t('requiredParametersEmpty')) - return + configDataList.push({ + id: selectedRowKeysValue[i].id + }) + if (selectedRowKeysValue[i].configIds && selectedRowKeysValue[i].configIds.length > 0) { + for (let j = 0; j < selectedRowKeysValue[i].configIds.length; j++) { + let keyIndex = Object.keys(selectedRowKeysValue[i]) + for (let k = 0; k < keyIndex.length; k++) { + if (keyIndex[k] == selectedRowKeysValue[i].configIds[j]) { + let keyName = keyIndex[k] + configDataList[i][keyName] = selectedRowKeysValue[i][keyName] + } + } + } + } + } + // return + if (configDataList && configDataList.length > 0) { + for (let i = 0; i < configDataList.length; i++) { + let res = Object.keys(configDataList[i]) + for (let j = 0; j < res.length; j++) { + let key = res[j] + if (configDataList[i][key] && configDataList[i][key].paramsConfigData) { + let paramsConfigData = configDataList[i][key].paramsConfigData + let paramsConfigDataQuery = Object.keys(paramsConfigData) + for (let k = 0; k < paramsConfigDataQuery.length; k++) { + let keyName = paramsConfigDataQuery[k] + paramsConfigData[keyName][0].orderNum = k + let keyNameOne = paramsConfigData[keyName] + for (let l = 0; l < keyNameOne.length; l++) { + if (keyNameOne[l].type == 'pull_more') { + keyNameOne[l].dataValue = keyNameOne[l].dataValue.join(',') + } + if (!keyNameOne[l].dataValue && keyNameOne[l].isMust == '1' && keyNameOne[l].isLock == '0') { + this.$message.warning(selectedRowKeysValue[i].nioNumber + ',' + this.$t('requiredParametersEmpty')) + return + } } } } } } - postDateobj.id = selectedRowKeysValue[i].id - postDate.push(postDateobj) + // configDataList.forEach(res => { + // Object.keys(res).forEach(val => { + // if (res[val] && res[val].paramsConfigData) { + // let paramsConfigData = res[val].paramsConfigData + // Object.keys(paramsConfigData).forEach((ol, index) => { + // paramsConfigData[ol][0].orderNum = index + // paramsConfigData[ol].forEach(item => { + // if (item.type == 'pull_more') { + // item.dataValue = item.dataValue.join(',') + // } + // }) + // }) + // } + // }) + // }) } - - let configDataList = { configDataList: postDate } + // let configDataList = { configDataList: postDate } if (this.selectedRowKeys.length == 0) { this.$message.warning(this.$t('selectLeastOne')) } else { @@ -1686,7 +1741,11 @@ this.$confirm({ content: _this.$t('Areyousureparameteritems'), onOk() { - postAction(_this.url.add, configDataList).then((res) => { + let query = { + configDataList: configDataList, + paramsManifestId: this.paramsManifest.id + } + postAction(_this.url.add, query).then((res) => { if (res.success) { _this.$message.success(_this.$t('OperationSuccessful')) _this.GetgetTableList() From 53c16e9bf0a6d0bb521f980ad496859987c992da Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Wed, 1 Feb 2023 11:11:52 +0800 Subject: [PATCH 18/39] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=94=B6=E9=9B=86=E5=A2=9E=E5=8A=A0=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/ParameterItemCollectionList.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index c60d39fc0..6bd1aaa9f 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -1743,7 +1743,7 @@ onOk() { let query = { configDataList: configDataList, - paramsManifestId: this.paramsManifest.id + paramsManifestId: _this.paramsManifest.id } postAction(_this.url.add, query).then((res) => { if (res.success) { From 7e606d48f55edc85d0ae68a5f36da8989097b8f6 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Wed, 1 Feb 2023 16:12:21 +0800 Subject: [PATCH 19/39] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=94=B6=E9=9B=86=E5=A2=9E=E5=8A=A0=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/CollectionType/index.vue | 57 ++++++++++++++----- .../src/components/tableCollection/index.vue | 1 + .../ParameterItemCollectionList.vue | 4 +- 3 files changed, 46 insertions(+), 16 deletions(-) diff --git a/jero-web/src/components/CollectionType/index.vue b/jero-web/src/components/CollectionType/index.vue index 761d5a4e7..289fbc3d9 100644 --- a/jero-web/src/components/CollectionType/index.vue +++ b/jero-web/src/components/CollectionType/index.vue @@ -98,14 +98,16 @@
+
+ v-if="Object.keys(detailDate.paramsConfigData).length > 1">
+
@@ -134,14 +136,16 @@
+
+ v-if="Object.keys(detailDate.paramsConfigData).length > 1">
+
@@ -162,14 +166,16 @@
+
+ v-if="Object.keys(detailDate.paramsConfigData).length > 1">
+
@@ -192,14 +198,16 @@
+
+ v-if="Object.keys(detailDate.paramsConfigData).length > 1">
+
@@ -216,14 +224,16 @@
+
+ v-if="Object.keys(detailDate.paramsConfigData).length > 1">
+
@@ -335,14 +345,16 @@
+
+ v-if="Object.keys(detailDate.paramsConfigData).length > 1">
+
@@ -456,14 +468,16 @@
+
+ v-if="Object.keys(detailDate.paramsConfigData).length > 1">
+
@@ -570,14 +584,16 @@
+
+ v-if="Object.keys(detailDate.paramsConfigData).length > 1">
+
@@ -607,14 +623,16 @@
+
+ v-if="Object.keys(detailDate.paramsConfigData).length > 1">
+
@@ -646,14 +664,16 @@
+
+ v-if="Object.keys(detailDate.paramsConfigData).length > 1">
+
@@ -774,14 +794,17 @@
-
+ +
+ v-if="Object.keys(detailDate.paramsConfigData).length > 1">
+ +
@@ -816,6 +839,10 @@ type: Array, default: [], require: true + }, + currentPersonRole: { + type: String, + default: '' } }, data() { @@ -839,6 +866,7 @@ this.paramsConfigData = this.detailDate.paramsConfigData let name = [] console.log(this.detailDate) + console.log(this.currentPersonRole) // this.columName.forEach(item => { // if (item.db_field_name && item.db_field_name != '') { // name.push(item.db_field_name) @@ -1091,12 +1119,13 @@ display: inline-block; //margin-left: -34px; margin-top: 8px; + margin-right: 5px; cursor: pointer; } .delicon { display: inline-block; - margin-left: 5px; + /*margin-left: 5px;*/ margin-top: 8px; cursor: pointer; } diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index 3a162c3e3..b26dfdece 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -75,6 +75,7 @@ diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index 6bd1aaa9f..99fd6d070 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -1408,10 +1408,10 @@ }, Updateparametercolumn() { let data = JSON.parse(JSON.stringify(this.$refs.CollectionTabel.dataSource)) - console.log(data) let referencesCol = [] let postDate = [] let colunmnFlag = '' + this.colunmnFlag = false data.forEach((item, index) => { if (!item.referencesCol) { this.colunmnFlag = true @@ -1433,7 +1433,7 @@ if (referencesCol[i][itemIn[j]] instanceof Object && !(referencesCol[i][itemIn[j]] instanceof Array)) { postDateobj[itemIn[j]] = referencesCol[i][itemIn[j]] for (let k = 0; k < referencesCol[i][itemIn[j]].list.length; k++) { - if (referencesCol[i][itemIn[j]].list[k].type == 'pull_more') { + if (referencesCol[i][itemIn[j]].list[k].type == 'pull_more' && referencesCol[i][itemIn[j]].list[k].dataValue instanceof Array) { referencesCol[i][itemIn[j]].list[k].dataValue = referencesCol[i][itemIn[j]].list[k].dataValue.join(',') } if (referencesCol[i][itemIn[j]].list[k].type == 'text' && referencesCol[i][itemIn[j]].list[k].dataValue !== null) { From b583789649db7a080c3b3a5375dd0cb0418a7b5b Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Wed, 1 Feb 2023 18:22:13 +0800 Subject: [PATCH 20/39] =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E6=94=B6=E9=9B=86-=E6=8E=A7=E4=BB=B6=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E6=94=B9=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_2nd_period.sql | 4 + .../service/IParamsConfigDataEOService.java | 9 + .../ParamsCollectManifestEOServiceImpl.java | 383 +++++++++++------- .../impl/ParamsConfigDataEOServiceImpl.java | 15 + .../impl/ParamsManifestEOServiceImpl.java | 33 +- 5 files changed, 273 insertions(+), 171 deletions(-) diff --git a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql index 83fe49ee9..4381f981e 100644 --- a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql +++ b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql @@ -163,3 +163,7 @@ UPDATE `laws_weilai`.`onl_cgform_field` SET `is_show_list` = 0 WHERE `id` = '152 -- 参数配置数据表，增加排序号字段sql 2023-1-31 未同步生产环境 ALTER TABLE `laws_weilai`.`params_config_data` ADD COLUMN `order_num` int(10) NULL COMMENT '排序号' AFTER `params_collect_manifest_id`; + +-- 上报库参数配置数据表，增加排序号字段sql 2023-2-1 未同步生产环境 +ALTER TABLE `laws_weilai`.`params_report_config_data` + ADD COLUMN `order_num` int(10) NULL COMMENT '排序号' AFTER `params_collect_manifest_id`; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigDataEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigDataEOService.java index ed9ffbd67..1a5ac490f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigDataEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigDataEOService.java @@ -56,6 +56,15 @@ public interface IParamsConfigDataEOService extends IService */ ParamsConfigDataEO queryByConfigIdAndCollectManifestId(String paramsConfigId, String paramsCollectManifestId); + /** + * 通过id查询 + * + * @param paramsConfigId + * @param paramsCollectManifestId + * @return + */ + List queryListByConfigIdAndCollectManifestId(String paramsConfigId, String paramsCollectManifestId); + /** * 列表查询 * diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 7f56bc94c..c6dec5747 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -1250,7 +1250,6 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl entry : map.entrySet()) { - ParamsConfigDataEO paramsConfigDataEO = new ParamsConfigDataEO(); if ("id".equals(entry.getKey())) { continue; } @@ -1259,100 +1258,122 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl paramsConfigDataMap = (Map) entry.getValue(); // 无法转ParamsConfigDataVO（遍历会出现该异常 ： LinkedHashMap cannot be cast to ParamsConfigDataVO） - List> paramsConfigDataVOList = (List>) paramsConfigDataMap.get("list"); +// List> paramsConfigDataVOList = (List>) paramsConfigDataMap.get("list"); + Map paramsConfigDataVOMap = (Map) paramsConfigDataMap.get("paramsConfigData"); // 判断是新增还是修改 - ParamsConfigDataEO oldConfigDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(paramsConfigEOId, paramsCollectManifestId); - if (ObjectUtil.isNotEmpty(oldConfigDataEO)) { - paramsConfigDataEO.setId(oldConfigDataEO.getId()); + // ParamsConfigDataEO oldConfigDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(paramsConfigEOId, paramsCollectManifestId); + List oldConfigDataEOList = this.paramsConfigDataEOService.queryListByConfigIdAndCollectManifestId(paramsConfigEOId, paramsCollectManifestId); - } - paramsConfigDataEO.setParamsCollectManifestId(paramsCollectManifestId); - paramsConfigDataEO.setParamsConfigId(paramsConfigEOId); ParamsConfigEO paramsConfigEO = this.paramsConfigEOService.queryById(paramsConfigEOId); if(Objects.isNull(paramsConfigEO)){ continue; } - if (CollectionUtil.isNotEmpty(paramsConfigDataVOList)) { - boolean appendFlag = false; // 拼接标识 - for (Map paramsConfigDataVO : paramsConfigDataVOList) { - String dataValue = (String) paramsConfigDataVO.get("dataValue"); - // 只要其中有一个值就可以进行拼接 - if(StringUtils.isNotEmpty(dataValue)){ - appendFlag = true; - break; - } - } - if(appendFlag){ - logCnContentSb.append(paramsConfigEO.getConfigName()).append("为"); - logEnContentSb.append(" configuration ").append(paramsConfigEO.getConfigName()).append(" as "); - } - for (Map paramsConfigDataVO : paramsConfigDataVOList) { - String type = (String) paramsConfigDataVO.get("type"); - String dataValue = (String) paramsConfigDataVO.get("dataValue"); - if (type.equals(ConfigDataTypeEnum.TEXT.getValue())) { - paramsConfigDataEO.setTextData(dataValue); - if (StringUtils.isNotEmpty(dataValue)) { - logCnContentSb.append("\"").append(dataValue).append("\""); - logEnContentSb.append("\"").append(dataValue).append("\""); - } + // 拼接历史记录信息 + for (Map.Entry configDataMap : paramsConfigDataVOMap.entrySet()) { + List> paramsConfigDataVOList = (List>)configDataMap.getValue(); - } else if (type.equals(ConfigDataTypeEnum.PULL.getValue()) - || type.equals(ConfigDataTypeEnum.PULL_MORE.getValue())) { - paramsConfigDataEO.setPullData(dataValue); - if (StringUtils.isNotEmpty(dataValue)) { - logCnContentSb.append("\"").append(dataValue).append("\""); - logEnContentSb.append("\"").append(dataValue).append("\""); - } + if (CollectionUtil.isNotEmpty(paramsConfigDataVOList)) { - } else if (type.equals(ConfigDataTypeEnum.FILE.getValue())) { - if (StringUtils.isNotEmpty(dataValue) && dataValue.contains(",")) { // 新加多个文件 - // 处理文件connectId - String[] fileIdList = dataValue.split(","); - String connectId = UUID.randomUUID().toString().replace("-", ""); - List updateFileList = new ArrayList<>(); - for (int i = 0; i < fileIdList.length; i++) { - OSSFile ossFile = new OSSFile(); - ossFile.setId(fileIdList[i]); - ossFile.setConnectId(connectId); - updateFileList.add(ossFile); + ParamsConfigDataEO paramsConfigDataEO = new ParamsConfigDataEO(); + if(CollectionUtils.isNotEmpty(oldConfigDataEOList)){ + List oldConfigDataEOs = oldConfigDataEOList.stream().filter(configData -> { + boolean flag = false; + if (StringUtils.equals(configDataMap.getKey(), configData.getId())) { + flag = true; } - ossFileService.updateBatchById(updateFileList); - dataValue = connectId; - } else if (StringUtils.isNotEmpty(dataValue) && !dataValue.contains(",")) { - List ossFiles = ossFileService.getFileInfosByConnectId(dataValue); - if(CollectionUtil.isEmpty(ossFiles)){ // 新加了一个文件 + return flag; + }).collect(Collectors.toList()); + + if(CollectionUtils.isNotEmpty(oldConfigDataEOs)){ + paramsConfigDataEO.setId(oldConfigDataEOs.get(0).getId()); + } + } + + paramsConfigDataEO.setParamsCollectManifestId(paramsCollectManifestId); + paramsConfigDataEO.setParamsConfigId(paramsConfigEOId); + + boolean appendFlag = false; // 拼接标识 + for (Map paramsConfigDataVO : paramsConfigDataVOList) { + String dataValue = (String) paramsConfigDataVO.get("dataValue"); + // 只要其中有一个值就可以进行拼接 + if(StringUtils.isNotEmpty(dataValue)){ + appendFlag = true; + break; + } + } + if(appendFlag){ + logCnContentSb.append(paramsConfigEO.getConfigName()).append("为"); + logEnContentSb.append(" configuration ").append(paramsConfigEO.getConfigName()).append(" as "); + } + for (Map paramsConfigDataVO : paramsConfigDataVOList) { + String type = (String) paramsConfigDataVO.get("type"); + String dataValue = (String) paramsConfigDataVO.get("dataValue"); + + if (type.equals(ConfigDataTypeEnum.TEXT.getValue())) { + paramsConfigDataEO.setTextData(dataValue); + if (StringUtils.isNotEmpty(dataValue)) { + logCnContentSb.append("\"").append(dataValue).append("\""); + logEnContentSb.append("\"").append(dataValue).append("\""); + } + + } else if (type.equals(ConfigDataTypeEnum.PULL.getValue()) + || type.equals(ConfigDataTypeEnum.PULL_MORE.getValue())) { + paramsConfigDataEO.setPullData(dataValue); + if (StringUtils.isNotEmpty(dataValue)) { + logCnContentSb.append("\"").append(dataValue).append("\""); + logEnContentSb.append("\"").append(dataValue).append("\""); + } + + } else if (type.equals(ConfigDataTypeEnum.FILE.getValue())) { + if (StringUtils.isNotEmpty(dataValue) && dataValue.contains(",")) { // 新加多个文件 + // 处理文件connectId + String[] fileIdList = dataValue.split(","); String connectId = UUID.randomUUID().toString().replace("-", ""); - //修改文件表关联信息connect_id - List oSSFileList = new ArrayList<>(); - for (String fileId : dataValue.split(",")) { + List updateFileList = new ArrayList<>(); + for (int i = 0; i < fileIdList.length; i++) { OSSFile ossFile = new OSSFile(); - ossFile.setId(fileId); + ossFile.setId(fileIdList[i]); ossFile.setConnectId(connectId); - oSSFileList.add(ossFile); + updateFileList.add(ossFile); } - ossFileService.updateFileInfo(oSSFileList); + ossFileService.updateBatchById(updateFileList); dataValue = connectId; + } else if (StringUtils.isNotEmpty(dataValue) && !dataValue.contains(",")) { + List ossFiles = ossFileService.getFileInfosByConnectId(dataValue); + if(CollectionUtil.isEmpty(ossFiles)){ // 新加了一个文件 + String connectId = UUID.randomUUID().toString().replace("-", ""); + //修改文件表关联信息connect_id + List oSSFileList = new ArrayList<>(); + for (String fileId : dataValue.split(",")) { + OSSFile ossFile = new OSSFile(); + ossFile.setId(fileId); + ossFile.setConnectId(connectId); + oSSFileList.add(ossFile); + } + ossFileService.updateFileInfo(oSSFileList); + dataValue = connectId; + } + } + paramsConfigDataEO.setFileConnectId(dataValue); + + List fileInfos = ossFileService.getFileInfos(dataValue); + String fileNames = fileInfos.stream().map(OSSFile::getFileName).distinct().collect(Collectors.joining(",")); + if (StringUtils.isNotEmpty(fileNames)) { + logCnContentSb.append("\"").append(fileNames).append("\""); + logEnContentSb.append("\"").append(fileNames).append("\""); } } - paramsConfigDataEO.setFileConnectId(dataValue); - - List fileInfos = ossFileService.getFileInfos(dataValue); - String fileNames = fileInfos.stream().map(OSSFile::getFileName).distinct().collect(Collectors.joining(",")); - if (StringUtils.isNotEmpty(fileNames)) { - logCnContentSb.append("\"").append(fileNames).append("\""); - logEnContentSb.append("\"").append(fileNames).append("\""); - } + newConfigDataEOList.add(paramsConfigDataEO); } - } - if(appendFlag){ - logCnContentSb.append("，"); - logEnContentSb.append(" and "); + if(appendFlag){ + logCnContentSb.append("，"); + logEnContentSb.append(" and "); + } } } - newConfigDataEOList.add(paramsConfigDataEO); } ParamsCollectManifestLogEO paramsCollectManifestLogEO = new ParamsCollectManifestLogEO(); @@ -1818,35 +1839,37 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl configDataEOList = this.paramsConfigDataEOService.queryListByConfigIdAndCollectManifestId(configEO.getId(), paramsCollectManifestEO.getId()); + for (ParamsConfigDataEO configDataEO : configDataEOList) { + if(StringUtils.isNotEmpty(configDataEO.getPullData()) || StringUtils.isNotEmpty(configDataEO.getTextData()) || StringUtils.isNotEmpty(configDataEO.getFileConnectId())){ + logCnContentSb.append(configEO.getConfigName()); + logCnContentSb.append(" 的"); - if(StringUtils.isNotEmpty(configDataEO.getPullData()) || StringUtils.isNotEmpty(configDataEO.getTextData()) || StringUtils.isNotEmpty(configDataEO.getFileConnectId())){ - logCnContentSb.append(configEO.getConfigName()); - logCnContentSb.append(" 的"); - - if(StringUtils.isNotEmpty(configDataEO.getPullData())){ - logCnContentSb.append("\"" +configDataEO.getPullData()+ "\""); - logEnContentSb.append("\"" +configDataEO.getPullData()+ "\""); - } - if(StringUtils.isNotEmpty(configDataEO.getTextData())){ - logCnContentSb.append("\"" +configDataEO.getTextData()+ "\""); - logEnContentSb.append("\"" +configDataEO.getTextData()+ "\""); - } - if(StringUtils.isNotEmpty(configDataEO.getFileConnectId())){ - List fileInfos = ossFileService.getFileInfos(configDataEO.getFileConnectId()); - String fileNames = fileInfos.stream().map(OSSFile::getFileName).distinct().collect(Collectors.joining(",")); - if (StringUtils.isNotEmpty(fileNames)) { - logCnContentSb.append("\"" +fileNames+ "\""); - logEnContentSb.append("\"" +fileNames+ "\""); + if(StringUtils.isNotEmpty(configDataEO.getPullData())){ + logCnContentSb.append("\"" +configDataEO.getPullData()+ "\""); + logEnContentSb.append("\"" +configDataEO.getPullData()+ "\""); + } + if(StringUtils.isNotEmpty(configDataEO.getTextData())){ + logCnContentSb.append("\"" +configDataEO.getTextData()+ "\""); + logEnContentSb.append("\"" +configDataEO.getTextData()+ "\""); + } + if(StringUtils.isNotEmpty(configDataEO.getFileConnectId())){ + List fileInfos = ossFileService.getFileInfos(configDataEO.getFileConnectId()); + String fileNames = fileInfos.stream().map(OSSFile::getFileName).distinct().collect(Collectors.joining(",")); + if (StringUtils.isNotEmpty(fileNames)) { + logCnContentSb.append("\"" +fileNames+ "\""); + logEnContentSb.append("\"" +fileNames+ "\""); + } } - } - logEnContentSb.append(" of configuration " +configEO.getConfigName()+ ""); + logEnContentSb.append(" of configuration " +configEO.getConfigName()+ ""); - // 如果配置有两条或两条以上，并且不是最后一次循环 - if(paramsConfigEOList.size() > 1 && paramsConfigLenth != paramsConfigEOList.size()){ - logCnContentSb.append("，"); - logEnContentSb.append(" and "); + // 如果配置有两条或两条以上，并且不是最后一次循环 + if(paramsConfigEOList.size() > 1 && paramsConfigLenth != paramsConfigEOList.size()){ + logCnContentSb.append("，"); + logEnContentSb.append(" and "); + } } } @@ -2754,45 +2777,89 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl updateConfigDataEOList = new ArrayList<>(); List addConfigDataEOList = new ArrayList<>(); for (int i=0; i sourceConfigDataEOList = this.paramsConfigDataEOService.queryListByConfigIdAndCollectManifestId(sourceConfigId, paramsCollectManifestIdStr[i]); + if(CollectionUtils.isNotEmpty(sourceConfigDataEOList)){ + for (ParamsConfigDataEO sourceConfigDataEO : sourceConfigDataEOList) { + if (ObjectUtil.isNotEmpty(sourceConfigDataEO)) { + for (int j = 0; j < targetConfigIdStr.length; j++) { + // 根据配置id、参数清单id，将被引用参数列的数据删掉，重新加 + QueryWrapper targetConfigDataRemoveWrap = new QueryWrapper<>(); + targetConfigDataRemoveWrap.lambda().eq(ParamsConfigDataEO::getParamsConfigId,targetConfigIdStr[j]); + targetConfigDataRemoveWrap.lambda().eq(ParamsConfigDataEO::getParamsCollectManifestId,paramsCollectManifestIdStr[i]); + this.paramsConfigDataEOService.remove(targetConfigDataRemoveWrap); + + ParamsConfigDataEO targetConfigDataEO = new ParamsConfigDataEO(); + BeanUtils.copyProperties(sourceConfigDataEO,targetConfigDataEO); + targetConfigDataEO.setId(null); + targetConfigDataEO.setParamsConfigId(targetConfigIdStr[j]); + targetConfigDataEO.setParamsCollectManifestId(paramsCollectManifestIdStr[i]); + addConfigDataEOList.add(targetConfigDataEO); + + /* ParamsConfigDataEO targetConfigDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(targetConfigIdStr[j], paramsCollectManifestIdStr[i]); + List targetConfigDataEOList = this.paramsConfigDataEOService.queryListByConfigIdAndCollectManifestId(targetConfigIdStr[j], paramsCollectManifestIdStr[i]); + if(CollectionUtils.isNotEmpty(targetConfigDataEOList)){ + for (ParamsConfigDataEO targetConfigDataEO : targetConfigDataEOList) { + if (ObjectUtil.isNotEmpty(targetConfigDataEO)) { + ParamsConfigDataEO updateConfigDataEO = new ParamsConfigDataEO(); + updateConfigDataEO.setId(targetConfigDataEO.getId()); + updateConfigDataEO.setTextData(sourceConfigDataEO.getTextData()); + updateConfigDataEO.setPullData(sourceConfigDataEO.getPullData()); + updateConfigDataEO.setFileConnectId(sourceConfigDataEO.getFileConnectId()); + updateConfigDataEOList.add(updateConfigDataEO); + } else { + ParamsConfigDataEO addConfigDataEO = new ParamsConfigDataEO(); + addConfigDataEO.setParamsConfigId(targetConfigIdStr[j]); + addConfigDataEO.setParamsCollectManifestId(paramsCollectManifestIdStr[i]); + addConfigDataEO.setTextData(sourceConfigDataEO.getTextData()); + addConfigDataEO.setPullData(sourceConfigDataEO.getPullData()); + addConfigDataEO.setFileConnectId(sourceConfigDataEO.getFileConnectId()); + addConfigDataEOList.add(addConfigDataEO); + } + } + } + if (ObjectUtil.isNotEmpty(targetConfigDataEO)) { + ParamsConfigDataEO updateConfigDataEO = new ParamsConfigDataEO(); + updateConfigDataEO.setId(targetConfigDataEO.getId()); + updateConfigDataEO.setTextData(sourceConfigDataEO.getTextData()); + updateConfigDataEO.setPullData(sourceConfigDataEO.getPullData()); + updateConfigDataEO.setFileConnectId(sourceConfigDataEO.getFileConnectId()); + updateConfigDataEOList.add(updateConfigDataEO); + } else { + ParamsConfigDataEO addConfigDataEO = new ParamsConfigDataEO(); + addConfigDataEO.setParamsConfigId(targetConfigIdStr[j]); + addConfigDataEO.setParamsCollectManifestId(paramsCollectManifestIdStr[i]); + addConfigDataEO.setTextData(sourceConfigDataEO.getTextData()); + addConfigDataEO.setPullData(sourceConfigDataEO.getPullData()); + addConfigDataEO.setFileConnectId(sourceConfigDataEO.getFileConnectId()); + addConfigDataEOList.add(addConfigDataEO); + }*/ + } } } } else { // 清空引用到的配置的数据 for (int j = 0; j < targetConfigIdStr.length; j++) { - ParamsConfigDataEO targetConfigDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(targetConfigIdStr[j], paramsCollectManifestIdStr[i]); - if (ObjectUtil.isNotEmpty(targetConfigDataEO)) { - ParamsConfigDataEO updateConfigDataEO = new ParamsConfigDataEO(); - updateConfigDataEO.setId(targetConfigDataEO.getId()); - updateConfigDataEO.setTextData(null); - updateConfigDataEO.setPullData(null); - updateConfigDataEO.setFileConnectId(null); - updateConfigDataEOList.add(updateConfigDataEO); + // ParamsConfigDataEO targetConfigDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(targetConfigIdStr[j], paramsCollectManifestIdStr[i]); + List targetConfigDataEOList = this.paramsConfigDataEOService.queryListByConfigIdAndCollectManifestId(targetConfigIdStr[j], paramsCollectManifestIdStr[i]); + if(CollectionUtils.isNotEmpty(targetConfigDataEOList)){ + for (ParamsConfigDataEO targetConfigDataEO : targetConfigDataEOList) { + if (ObjectUtil.isNotEmpty(targetConfigDataEO)) { + ParamsConfigDataEO updateConfigDataEO = new ParamsConfigDataEO(); + updateConfigDataEO.setId(targetConfigDataEO.getId()); + updateConfigDataEO.setTextData(null); + updateConfigDataEO.setPullData(null); + updateConfigDataEO.setFileConnectId(null); + updateConfigDataEOList.add(updateConfigDataEO); + } + } } } } } paramsConfigDataEOService.saveBatch(addConfigDataEOList); - paramsConfigDataEOService.updateBatchById(updateConfigDataEOList); +// paramsConfigDataEOService.updateBatchById(updateConfigDataEOList); return true; } @@ -2865,42 +2932,44 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl configDataEOList = this.paramsConfigDataEOService.queryListByConfigIdAndCollectManifestId(configEO.getId(), collectManifestEO.getId()); + for (ParamsConfigDataEO configDataEO : configDataEOList) { + ParamsReportConfigDataEO addReportConfigDataEO = new ParamsReportConfigDataEO(); + BeanUtils.copyProperties(configDataEO, addReportConfigDataEO); + addReportConfigDataEO.setId(UUID.randomUUID().toString().replace("-","")); + addReportConfigDataEO.setParamsConfigId(configIdMap.get(configEO.getId())); + addReportConfigDataEO.setParamsCollectManifestId(reportDetailId); + addReportConfigDataEOList.add(addReportConfigDataEO); - ParamsReportConfigDataEO addReportConfigDataEO = new ParamsReportConfigDataEO(); - BeanUtils.copyProperties(configDataEO, addReportConfigDataEO); - addReportConfigDataEO.setId(UUID.randomUUID().toString().replace("-","")); - addReportConfigDataEO.setParamsConfigId(configIdMap.get(configEO.getId())); - addReportConfigDataEO.setParamsCollectManifestId(reportDetailId); - addReportConfigDataEOList.add(addReportConfigDataEO); + if(StringUtils.isNotEmpty(configDataEO.getPullData()) || StringUtils.isNotEmpty(configDataEO.getTextData()) || StringUtils.isNotEmpty(configDataEO.getFileConnectId())){ + logCnContentSb.append(configEO.getConfigName()); + logCnContentSb.append(" 的"); - if(StringUtils.isNotEmpty(configDataEO.getPullData()) || StringUtils.isNotEmpty(configDataEO.getTextData()) || StringUtils.isNotEmpty(configDataEO.getFileConnectId())){ - logCnContentSb.append(configEO.getConfigName()); - logCnContentSb.append(" 的"); - - if(StringUtils.isNotEmpty(configDataEO.getPullData())){ - logCnContentSb.append("\"" +configDataEO.getPullData()+ "\""); - logEnContentSb.append("\"" +configDataEO.getPullData()+ "\""); - } - if(StringUtils.isNotEmpty(configDataEO.getTextData())){ - logCnContentSb.append("\"" +configDataEO.getTextData()+ "\""); - logEnContentSb.append("\"" +configDataEO.getTextData()+ "\""); - } - if(StringUtils.isNotEmpty(configDataEO.getFileConnectId())){ - List fileInfos = ossFileService.getFileInfos(configDataEO.getFileConnectId()); - String fileNames = fileInfos.stream().map(OSSFile::getFileName).distinct().collect(Collectors.joining(",")); - if (StringUtils.isNotEmpty(fileNames)) { - logCnContentSb.append("\"" +fileNames+ "\""); - logEnContentSb.append("\"" +fileNames+ "\""); + if(StringUtils.isNotEmpty(configDataEO.getPullData())){ + logCnContentSb.append("\"" +configDataEO.getPullData()+ "\""); + logEnContentSb.append("\"" +configDataEO.getPullData()+ "\""); + } + if(StringUtils.isNotEmpty(configDataEO.getTextData())){ + logCnContentSb.append("\"" +configDataEO.getTextData()+ "\""); + logEnContentSb.append("\"" +configDataEO.getTextData()+ "\""); + } + if(StringUtils.isNotEmpty(configDataEO.getFileConnectId())){ + List fileInfos = ossFileService.getFileInfos(configDataEO.getFileConnectId()); + String fileNames = fileInfos.stream().map(OSSFile::getFileName).distinct().collect(Collectors.joining(",")); + if (StringUtils.isNotEmpty(fileNames)) { + logCnContentSb.append("\"" +fileNames+ "\""); + logEnContentSb.append("\"" +fileNames+ "\""); + } } - } - logEnContentSb.append("of configuration " +configEO.getConfigName()+ ""); + logEnContentSb.append("of configuration " +configEO.getConfigName()+ ""); - // 如果配置有两条或两条以上，并且不是最后一次循环 - if(paramsConfigEOList.size() > 1 && paramsConfigLenth != paramsConfigEOList.size()){ - logCnContentSb.append("，"); - logEnContentSb.append(" and "); + // 如果配置有两条或两条以上，并且不是最后一次循环 + if(paramsConfigEOList.size() > 1 && paramsConfigLenth != paramsConfigEOList.size()){ + logCnContentSb.append("，"); + logEnContentSb.append(" and "); + } } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataEOServiceImpl.java index a25a7e355..2766ceeac 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataEOServiceImpl.java @@ -99,6 +99,21 @@ public class ParamsConfigDataEOServiceImpl extends ServiceImpl queryListByConfigIdAndCollectManifestId(String paramsConfigId, String paramsCollectManifestId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(ParamsConfigDataEO::getParamsConfigId, paramsConfigId); + queryWrapper.eq(ParamsConfigDataEO::getParamsCollectManifestId, paramsCollectManifestId); + return this.list(queryWrapper); + } + /** * 列表查询 * diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java index 49f65e2d7..f50b53ad1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java @@ -43,6 +43,7 @@ import com.jero.modules.system.enums.DicCodeEnum; import com.jero.modules.system.mapper.SysDictMapper; import com.jero.modules.system.service.ISysDictService; import com.jero.modules.system.service.ISysUserService; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -700,23 +701,27 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl configDataEOList = this.paramsConfigDataEOService.queryListByConfigIdAndCollectManifestId(configEO.getId(), collectManifestEO.getId()); + if(CollectionUtils.isNotEmpty(configDataEOList)){ + for (ParamsConfigDataEO configDataEO : configDataEOList) { + ParamsConfigDataEO addConfigDataEO = new ParamsConfigDataEO(); + if (ObjectUtil.isNotEmpty(configDataEO)) { + BeanUtils.copyProperties(configDataEO, addConfigDataEO); - addConfigDataEO.setId(null); - addConfigDataEO.setCreateBy(null); - addConfigDataEO.setCreateTime(null); - addConfigDataEO.setUpdateBy(null); - addConfigDataEO.setUpdateTime(null); - addConfigDataEO.setSysOrgCode(null); - addConfigDataEO.setParamsConfigId(configIdMap.get(configEO.getId())); - addConfigDataEO.setParamsCollectManifestId(addCollectManifestId); - addConfigDataEOList.add(addConfigDataEO); + addConfigDataEO.setId(null); + addConfigDataEO.setCreateBy(null); + addConfigDataEO.setCreateTime(null); + addConfigDataEO.setUpdateBy(null); + addConfigDataEO.setUpdateTime(null); + addConfigDataEO.setSysOrgCode(null); + addConfigDataEO.setParamsConfigId(configIdMap.get(configEO.getId())); + addConfigDataEO.setParamsCollectManifestId(addCollectManifestId); + addConfigDataEOList.add(addConfigDataEO); + } + } } - } } From cac1a2f40ccc82bb2668f66c4fa83f7ce461f7ae Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Thu, 2 Feb 2023 10:53:27 +0800 Subject: [PATCH 21/39] =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E6=94=B6=E9=9B=86-=E6=8E=A7=E4=BB=B6=E6=A0=A1=E9=AA=8C-?= =?UTF-8?q?=E5=BC=95=E7=94=A8=E5=8F=82=E8=80=83=E5=88=97=E5=A4=9A=E8=A1=8C?= =?UTF-8?q?=E3=80=81=E5=B1=95=E7=A4=BA=E5=BC=95=E7=94=A8=E5=8F=82=E8=80=83?= =?UTF-8?q?=E5=88=97=E5=A4=9A=E8=A1=8C=E6=95=B0=E6=8D=AE=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParamsCollectManifestEOServiceImpl.java | 42 ++++++++++++++----- 1 file changed, 31 insertions(+), 11 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index c6dec5747..1d517db7e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -472,16 +472,31 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl referencesColMap = new HashMap<>(); + Map referencesColConfigDataVOMap = new HashMap<>(); String referencesCol = collectManifestEO.getReferencesCol(); if (StringUtils.isNotBlank(referencesCol)) { - List referencesColVOList = getReferencesColList(controlType, referencesCol, collectManifestEO, userTypes); // 重新组合配置数据 + String[] referencesColArr = referencesCol.split("
"); + for (String col : referencesColArr) { + List referencesColVOList = getReferencesColList(controlType, col, collectManifestEO, userTypes); // 重新组合配置数据 + String key = UUID.randomUUID().toString().replaceAll("-",""); + referencesColConfigDataVOMap.put(key,referencesColVOList); + } + + referencesColMap.put("controlType", controlType); - referencesColMap.put("list", referencesColVOList); + referencesColMap.put("paramsConfigData", referencesColConfigDataVOMap); + + //referencesColMap.put("list", referencesColVOList); manifestMap.put("referencesCol", referencesColMap); } else { List referencesColVOList = getReferencesColList(controlType, " # # #", collectManifestEO, userTypes); // 重新组合配置数据 referencesColMap.put("controlType", controlType); - referencesColMap.put("list", referencesColVOList); + + String key = UUID.randomUUID().toString().replaceAll("-",""); + referencesColConfigDataVOMap.put(key,referencesColVOList); + referencesColMap.put("paramsConfigData", referencesColConfigDataVOMap); + + //referencesColMap.put("list", referencesColVOList); manifestMap.put("referencesCol", referencesColMap); } } @@ -5798,14 +5813,18 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl + if(StringUtils.isNotEmpty(referencesColBuilder.toString())){ + referencesColBuilder.append("
"); + } if (StringUtils.isNotEmpty(paramsReportConfigDataEO.getTextData())) { referencesColBuilder.append(paramsReportConfigDataEO.getTextData()).append("#"); } else { @@ -5824,19 +5843,20 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl manifestUpdateWrap = new LambdaUpdateWrapper<>(); From b182f01d4997d3692f06bf733df637965cfada1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Thu, 2 Feb 2023 11:41:34 +0800 Subject: [PATCH 22/39] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=B6=E9=9B=86?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E7=9A=84=E6=9B=B4=E6=96=B0=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E5=88=97=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParameterItemCollectionList.vue | 53 ++++++++++++------- 1 file changed, 35 insertions(+), 18 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index 99fd6d070..0ee1295f7 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -1425,30 +1425,47 @@ this.$message.warning(this.$t('columnfirst')) return } + console.log(referencesCol) + // for (let i = 0; i < referencesCol.length; i++) { + // let postDateobj = {} + // let itemIn = Object.keys(referencesCol[i]) + // for (let j = 0; j < itemIn.length; j++) { + // if (itemIn[j] !== 'sdt' && referencesCol[i][itemIn[j]].list) { + // if (referencesCol[i][itemIn[j]] instanceof Object && !(referencesCol[i][itemIn[j]] instanceof Array)) { + // postDateobj[itemIn[j]] = referencesCol[i][itemIn[j]] + // for (let k = 0; k < referencesCol[i][itemIn[j]].list.length; k++) { + // if (referencesCol[i][itemIn[j]].list[k].type == 'pull_more' && referencesCol[i][itemIn[j]].list[k].dataValue instanceof Array) { + // referencesCol[i][itemIn[j]].list[k].dataValue = referencesCol[i][itemIn[j]].list[k].dataValue.join(',') + // } + // if (referencesCol[i][itemIn[j]].list[k].type == 'text' && referencesCol[i][itemIn[j]].list[k].dataValue !== null) { + // referencesCol[i][itemIn[j]].list[k].dataValue = referencesCol[i][itemIn[j]].list[k].dataValue.toString() + // } + // } + // } + // } + // } + // postDateobj.id = referencesCol[i].id + // postDate.push(postDateobj) + // } + let configDataList = [] for (let i = 0; i < referencesCol.length; i++) { - let postDateobj = {} - let itemIn = Object.keys(referencesCol[i]) - for (let j = 0; j < itemIn.length; j++) { - if (itemIn[j] !== 'sdt' && referencesCol[i][itemIn[j]].list) { - if (referencesCol[i][itemIn[j]] instanceof Object && !(referencesCol[i][itemIn[j]] instanceof Array)) { - postDateobj[itemIn[j]] = referencesCol[i][itemIn[j]] - for (let k = 0; k < referencesCol[i][itemIn[j]].list.length; k++) { - if (referencesCol[i][itemIn[j]].list[k].type == 'pull_more' && referencesCol[i][itemIn[j]].list[k].dataValue instanceof Array) { - referencesCol[i][itemIn[j]].list[k].dataValue = referencesCol[i][itemIn[j]].list[k].dataValue.join(',') - } - if (referencesCol[i][itemIn[j]].list[k].type == 'text' && referencesCol[i][itemIn[j]].list[k].dataValue !== null) { - referencesCol[i][itemIn[j]].list[k].dataValue = referencesCol[i][itemIn[j]].list[k].dataValue.toString() - } - } + configDataList.push({ + id: referencesCol[i].id + }) + let key = Object.keys(referencesCol[i].referencesCol.paramsConfigData) + let value = referencesCol[i].referencesCol.paramsConfigData + for (let j = 0; j < key.length; j++) { + let keyName = key[j] + for (let k = 0; k < value[keyName].length; k++) { + if (value[keyName][k].type == 'pull_more') { + value[keyName][k].dataValue = value[keyName][k].dataValue.join(',') } } + configDataList[i][keyName] = value[keyName] } - postDateobj.id = referencesCol[i].id - postDate.push(postDateobj) } - let configDataList = { configDataList: postDate } let query = { - ...configDataList, + configDataList: configDataList, paramsManifestId: this.paramsManifest.id } postAction('/params/collectManifest/updateReferencesCol', query).then((res) => { From e981308fae81130581ebf668d8c6da258f892be8 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Thu, 2 Feb 2023 16:10:15 +0800 Subject: [PATCH 23/39] =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E6=94=B6=E9=9B=86-=E6=8E=A7=E4=BB=B6=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9-=E5=8F=82=E8=80=83=E5=88=97=E6=A0=87?= =?UTF-8?q?=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../collect/service/impl/ParamsCollectManifestEOServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 1d517db7e..b9dd5fc5a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -472,6 +472,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl referencesColMap = new HashMap<>(); + referencesColMap.put("referencesColFlag",true); Map referencesColConfigDataVOMap = new HashMap<>(); String referencesCol = collectManifestEO.getReferencesCol(); if (StringUtils.isNotBlank(referencesCol)) { From 5f5c8b497594d531a2b05f3920e8b9d9c5d665e9 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Thu, 2 Feb 2023 16:12:37 +0800 Subject: [PATCH 24/39] update --- .../ParamsCollectManifestEOServiceImpl.java | 33 +++++++++++-------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index b9dd5fc5a..8f14f2d67 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -4419,7 +4419,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl referencesColList = Arrays.asList(collectManifestEO.getReferencesCol().split("#")); StringBuilder referencesColBuilder = new StringBuilder(); if (!" ".equals(referencesColList.get(0))) { @@ -5893,19 +5893,27 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl map : configDataList) { String paramsCollectManifestId = (String) map.get("id"); + StringBuilder referncesColBuilder = new StringBuilder(); + // 添加配置数据 for (Map.Entry entry : map.entrySet()) { - StringBuilder referncesColBuilder = new StringBuilder(); + if ("id".equals(entry.getKey())) { continue; } // 取值 - Map paramsConfigDataMap = (Map) entry.getValue(); - String controlType = (String) paramsConfigDataMap.get("controlType"); +// Map paramsConfigDataMap = (Map) entry.getValue(); +// String controlType = (String) paramsConfigDataMap.get("controlType"); // 无法转ParamsConfigDataVO（遍历会出现该异常 ： LinkedHashMap cannot be cast to ParamsConfigDataVO） - List> paramsConfigDataVOList = (List>) paramsConfigDataMap.get("list"); + List> paramsConfigDataVOList = (List>) entry.getValue(); if (CollectionUtil.isNotEmpty(paramsConfigDataVOList)) { + + // 如果拼接不为空 则是匹配到了多个 拼接换行符
+ if(StringUtils.isNotEmpty(referncesColBuilder.toString())){ + referncesColBuilder.append("
"); + } + // TEXT List> textList = paramsConfigDataVOList.stream() .filter(e->e.get("type").equals(ConfigDataTypeEnum.TEXT.getValue())).collect(Collectors.toList()); @@ -5980,16 +5988,15 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl Date: Thu, 2 Feb 2023 16:54:14 +0800 Subject: [PATCH 25/39] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=B6=E9=9B=86?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E7=9A=84=E6=9B=B4=E6=96=B0=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E5=88=97=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/CollectionType/index.vue | 33 ++++++++++++------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/jero-web/src/components/CollectionType/index.vue b/jero-web/src/components/CollectionType/index.vue index 289fbc3d9..4490903c3 100644 --- a/jero-web/src/components/CollectionType/index.vue +++ b/jero-web/src/components/CollectionType/index.vue @@ -98,7 +98,8 @@
- +
@@ -136,7 +137,8 @@
- +
@@ -166,7 +168,8 @@
- +
@@ -198,7 +201,8 @@
- +
@@ -224,7 +228,8 @@
- +
@@ -345,7 +350,8 @@
- +
@@ -468,7 +474,8 @@
- +
@@ -584,7 +591,8 @@
- +
@@ -623,7 +631,8 @@
- +
@@ -664,7 +673,8 @@
- +
@@ -794,7 +804,8 @@
- +
From 60876d9a0d9e73f822db91e2d81e2ec5dc745a06 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Thu, 2 Feb 2023 17:22:56 +0800 Subject: [PATCH 26/39] =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E6=94=B6=E9=9B=86-=E6=8E=A7=E4=BB=B6=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9-=E5=A1=AB=E5=86=99=E4=BA=BA=E5=AF=BC?= =?UTF-8?q?=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ParamsCollectManifestEOServiceImpl.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 8f14f2d67..7e56e0906 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -3666,6 +3666,12 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl nowFileList = FileUnZip.readFileByFilename(unzipfilepath, importDto.getFileConnectId(), null, null, null, null, null); @@ -5376,7 +5382,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl 0) { From 941ada66eface370269115bc5c769099c0f4ccbe Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Fri, 3 Feb 2023 09:26:08 +0800 Subject: [PATCH 27/39] =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E5=BA=93=E7=AE=A1?= =?UTF-8?q?=E7=90=86-=E5=8F=82=E6=95=B0=E9=A1=B9=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E9=A1=B5-=E8=BF=94=E5=9B=9E=E6=95=B0=E6=8D=AE=E7=BB=93?= =?UTF-8?q?=E6=9E=84=E4=BF=AE=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IParamsReportConfigDataEOService.java | 2 ++ .../ParamsReportConfigDataEOServiceImpl.java | 15 ++++++++++ .../impl/ParamsReportDetailEOServiceImpl.java | 28 ++++++++++++++++++- 3 files changed, 44 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigDataEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigDataEOService.java index e4b308c54..94b9c8c6c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigDataEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigDataEOService.java @@ -22,6 +22,8 @@ public interface IParamsReportConfigDataEOService extends IService queryListByConfigIdAndCollectManifestId(String paramsConfigId, String paramsCollectManifestId); + List queryByConfigIdListAndCollectManifestId(List paramsConfigIdList, String paramsCollectManifestId); /** diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigDataEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigDataEOServiceImpl.java index 5396e71ab..5f4e4e796 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigDataEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigDataEOServiceImpl.java @@ -35,6 +35,21 @@ public class ParamsReportConfigDataEOServiceImpl extends ServiceImpl queryListByConfigIdAndCollectManifestId(String paramsConfigId, String paramsCollectManifestId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(ParamsReportConfigDataEO::getParamsConfigId, paramsConfigId); + queryWrapper.eq(ParamsReportConfigDataEO::getParamsCollectManifestId, paramsCollectManifestId); + return this.list(queryWrapper); + } + @Override public List queryByConfigIdListAndCollectManifestId(List paramsConfigIdList, String paramsCollectManifestId) { return baseMapper.selectByConfigIdListAndCollectManifestId(paramsConfigIdList, paramsCollectManifestId); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java index 15d3aac78..858d70b32 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java @@ -198,12 +198,38 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl { // 参数配置 - Map configMap = new HashMap<>(); + /*Map configMap = new HashMap<>(); String paramsConfigId = paramsConfigEO.getId(); ParamsReportConfigDataEO paramsConfigDataEO = paramsReportConfigDataEOService.queryByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId); // 参数配置数据 List paramsConfigDataVOList = getConfigDataVOList(controlType, paramsConfigEO, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据 configMap.put("controlType", controlType); configMap.put("list", paramsConfigDataVOList); + manifestMap.put(paramsConfigEO.getId(), configMap);*/ + + Map paramsConfigDataVO = new HashMap<>(); + Map configMap = new HashMap<>(); + + String paramsConfigId = paramsConfigEO.getId(); + List paramsConfigDataEOList = this.paramsReportConfigDataEOService.queryListByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId); // 参数配置数据 + if(CollectionUtils.isNotEmpty(paramsConfigDataEOList)){ + // 匿名比较器排序 + Collections.sort(paramsConfigDataEOList, new Comparator() { + @Override + public int compare(ParamsReportConfigDataEO p1, ParamsReportConfigDataEO p2) { + if(p2.getOrderNum() == null || p1.getOrderNum() == null){ + return 0; + } + return p1.getOrderNum().compareTo(p2.getOrderNum()); + } + }); + for (ParamsReportConfigDataEO paramsConfigDataEO : paramsConfigDataEOList) { + List paramsConfigDataVOList = this.getConfigDataVOList(controlType, paramsConfigEO, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据 + paramsConfigDataVO.put(paramsConfigDataEO.getId(),paramsConfigDataVOList); + } + } + + configMap.put("paramsConfigData", paramsConfigDataVO); + configMap.put("controlType", controlType); manifestMap.put(paramsConfigEO.getId(), configMap); configIdList.add(paramsConfigEO.getId()); From c6fcaaf7737647de8cfe85d37bf945aefbc0b57d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Fri, 3 Feb 2023 10:21:34 +0800 Subject: [PATCH 28/39] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=B6=E9=9B=86?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E7=9A=84=E6=9B=B4=E6=96=B0=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E5=88=97=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CollectionTypeDisabled/index.vue | 1329 ++++++++++------- .../src/components/tableCollection/index1.vue | 96 +- .../parameter/managementdetails/index.vue | 77 +- 3 files changed, 918 insertions(+), 584 deletions(-) diff --git a/jero-web/src/components/CollectionTypeDisabled/index.vue b/jero-web/src/components/CollectionTypeDisabled/index.vue index 7711a94c6..8528fa48d 100644 --- a/jero-web/src/components/CollectionTypeDisabled/index.vue +++ b/jero-web/src/components/CollectionTypeDisabled/index.vue @@ -2,604 +2,739 @@
-
-
-
- - - - - - - - - - - -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- +
+
+
+
+ + + + + + + + + + + +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+
+ +
+
+ +
-
-
-
- - - - - - - - - - - -
- +
+
+
+
+ + + + + + + + + + + +
+ +
+
+ +
+
+ +
-
-
-
- - +
+
+
+
+ + {{ item.label }} - - + + +
+
+
+ +
+
+
-
-
-
- - +
+
+
+
+ + {{ item.label }} - - + + +
+
+
+ +
+
+
-
-
-
- - {{ (item.dataValue === 'null' || item.dataValue === '' || - item.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}} - +
+
+
+
+ + {{ (itemval.dataValue === 'null' || itemval.dataValue === '' || + itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}} + +
+
+
+ +
+
+
-
-
-
- - +
+
+
+
+ + {{ itemin.label }} - - + + +
+
+ + + + + + + + + + + +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+
-
- - - - - - - - - - - -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
+
+ +
+
+
-
-
-
- - - - - - - - - - - -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
-
-
- - +
+
+
+
+ + {{ item.label }} - - + + +
+
+ + + + + + + + + + + +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+
+
+
+ +
+
+
-
-
-
- - - - - - - - - - - -
- +
+
+
+
+ + + + + + + + + + + +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- +
+ + {{ (itemval.dataValue === 'null' || itemval.dataValue === '' || + itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}} +
-
- - {{ (item.dataValue === 'null' || item.dataValue === '' || - item.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}} - +
+ +
+
+
-
-
-
- - +
+
+
+ +
+ + {{ itemin.label }} - - + + +
+
+ + {{ (itemval.dataValue === 'null' || itemval.dataValue === '' || + itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}} + +
+
-
- - {{ (item.dataValue === 'null' || item.dataValue === '' || - item.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}} - +
+ +
+
+
-
-
-
- - +
+
+
+ +
+ + {{ item.label }} - - + + +
+
+ + {{ (itemval.dataValue === 'null' || itemval.dataValue === '' || + itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}} + +
+
-
- - {{ (item.dataValue === 'null' || item.dataValue === '' || - item.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}} - +
+ +
+
+
-
-
-
- - +
+
+ +
+ +
+ + {{ itemin.label }} - - -
-
- - - - - - - - - - - -
- + +
- -
- +
+ + + + + + + + + + + +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- +
+ + {{ (itemval.dataValue === 'null' || itemval.dataValue === '' || + itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}} +
-
- - {{ (item.dataValue === 'null' || item.dataValue === '' || - item.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}} - +
+ +
+
+
@@ -627,17 +762,30 @@ isLock: '0', formInline: {}, visible: false, - detailDatetransformation: [] + detailDatetransformation: [], + fileNameOne: '', + fileNameTwo: '', + fileIndex: '' } }, components: { uploadFileChangeDown }, mounted() { - this.detailDate.list.forEach((item) => { - if (item.type === 'pull_more') { - console.log(item.dataValue) - } + // this.detailDate.list.forEach((item) => { + // if (item.type === 'pull_more') { + // console.log(item.dataValue) + // } + // // this.detailDatetransformation.push(item) + // }) + this.paramsConfigData = this.detailDate.paramsConfigData + Object.keys(this.detailDate.paramsConfigData).forEach(res => { + this.detailDate.paramsConfigData[res].forEach(val => { + if (val.type === 'pull_more' && !val.dataValue) { + val.dataValue = [] + } + }) + // }) // this.detailDatetransformation.push(item) }) }, @@ -668,14 +816,16 @@ // console.log('form',this.formInline) } - this.detailDate.list.forEach((item, index) => { - if (item.type === 'file') { - item.dataValue = attIdList.join(',') - } - }) - this.$emit('update:detailDate', this.detailDate); + this.detailDate.paramsConfigData[this.fileNameOne][this.fileIndex].dataValue = attIdList.join(',') + // this.detailDateList.forEach((item, index) => { + // if (item.type === 'file') { + // item.dataValue = attIdList.join(',') + // } + // }) }, - clickButtonToUpload(item) { + clickButtonToUpload(name, item, index) { + this.fileNameOne = name + this.fileIndex = index // if (item.isLock == '1') { // this.$refs.uploadFile.disabled = true // } else { @@ -689,6 +839,50 @@ this.$refs.uploadFile.perentHandleFunc() } }) + }, + generateRandom() { + return Math.random().toString(32) + }, + addconfig() { + let paramsConfigData = Object.keys(this.detailDate.paramsConfigData) + for (let i = 0; i < paramsConfigData.length; i++) { + if (i == paramsConfigData.length - 1) { + let name = paramsConfigData[i] + let generateRandom = this.generateRandom() + this.detailDate.paramsConfigData[generateRandom] = JSON.parse(JSON.stringify(this.detailDate.paramsConfigData[name])) + this.detailDate.paramsConfigData[generateRandom].forEach(res => { + if (res.type === 'pull_more') { + res.dataValue = [] + } else { + res.dataValue = '' + } + }) + } + } + this.detailDate.paramsConfigData = { ...this.detailDate.paramsConfigData } + this.$emit('consolidateData') + // postAction('params/configData/add', { + // paramsCollectManifestId: this.recordList.id, + // paramsConfigId: this.detailDate.configId + // }).then((res) => { + // if (res.success) { + // this.$emit('collectionForm') + // } else { + // } + // }) + }, + delconfig(item) { + delete this.detailDate.paramsConfigData[item] + this.detailDate.paramsConfigData = { ...this.detailDate.paramsConfigData } + this.$emit('consolidateData') + // for (const key in this.detailDate.paramsConfigData) { + // deleteAction('params/configData/delete', { id: key }).then((res) => { + // if (res.success) { + // this.$emit('collectionForm') + // } else { + // } + // }) + // } } }, watch: { @@ -725,17 +919,32 @@ line-height: 38px !important; } + .ant-select-selection-selected-value { + height: 100%; + } + .selectWid .ant-select-selection__rendered { line-height: 36px !important; } + diff --git a/jero-web/src/components/tableCollection/index1.vue b/jero-web/src/components/tableCollection/index1.vue index 5484a236d..71777e9d4 100644 --- a/jero-web/src/components/tableCollection/index1.vue +++ b/jero-web/src/components/tableCollection/index1.vue @@ -58,7 +58,7 @@ - +
@@ -293,6 +293,7 @@ detailDateList: [], selectedRowKeys: [], selectedRowrowValue: [], + description:'', dataSource: [], pageNo: 1, pageSize: 100, @@ -653,13 +654,24 @@ if (this.currentPersonRole !== 'dre') { res.result.records.forEach((Obj) => { Object.keys(Obj).forEach((item) => { + if (Obj[item] instanceof Object && Obj[item].controlType !== undefined) { - Obj[item].list.forEach((itemLi) => { - itemLi.isLock = 1 - if (itemLi.type === 'pull_more') { - itemLi.dataValue = itemLi.dataValue === null ? [] : itemLi.dataValue.split(',') - } - }) + for (const key in Obj[item].paramsConfigData){ + Obj[item].paramsConfigData[key].forEach((itemLi) => + { + + itemLi.isLock = 1 + if (itemLi.type === 'pull_more') { + itemLi.dataValue = itemLi.dataValue === null ? [] : itemLi.dataValue.split(',') + } + }) + } + // Obj[item].list.forEach((itemLi) => { + // itemLi.isLock = 1 + // if (itemLi.type === 'pull_more') { + // itemLi.dataValue = itemLi.dataValue === null ? [] : itemLi.dataValue.split(',') + // } + // }) } }) tt.push(Obj) @@ -668,11 +680,18 @@ res.result.records.forEach((Obj) => { Object.keys(Obj).forEach((item) => { if (Obj[item] instanceof Object && Obj[item].controlType !== undefined) { - Obj[item].list.forEach((itemLi) => { - if (itemLi.type === 'pull_more') { - itemLi.dataValue = itemLi.dataValue === null ? [] : itemLi.dataValue.split(',') - } - }) + for (const key in Obj[item].paramsConfigData){ + Obj[item].paramsConfigData[key].forEach((itemLi) => { + if (itemLi.type === 'pull_more') { + itemLi.dataValue = itemLi.dataValue === null ? [] : itemLi.dataValue.split(',') + } + }) + } + // Obj[item].list.forEach((itemLi) => { + // if (itemLi.type === 'pull_more') { + // itemLi.dataValue = itemLi.dataValue === null ? [] : itemLi.dataValue.split(',') + // } + // }) } }) tt.push(Obj) @@ -693,6 +712,9 @@ cancleoperationFailed() { this.selectedRowKeys = [] }, + consolidateData(){ + this.dataSource = [...this.dataSource] + }, getTableList(currentPersonRole) { console.log(this.url.tableList) let paramsManifestid @@ -734,28 +756,56 @@ // }) let tt = [] if (this.currentPersonRole !== 'dre') { + + console.log(res.result.records, 'res.result.records') res.result.records.forEach((Obj) => { Object.keys(Obj).forEach((item) => { if (Obj[item] instanceof Object && Obj[item].controlType !== undefined) { - Obj[item].list.forEach((itemLi) => { - itemLi.isLock = 1 - if (itemLi.type === 'pull_more') { - itemLi.dataValue = itemLi.dataValue === null ? [] : itemLi.dataValue.split(',') - } - }) + for (const key in Obj[item].paramsConfigData){ + Obj[item].paramsConfigData[key].forEach((itemLi) => { + console.log(item) + if((this.currentPersonRole == 'homo' || this.currentPersonRole == 'admin') && item == 'referencesCol'){ + itemLi.isLock = 0 + }else{ + itemLi.isLock = 1 + } + if (itemLi.type === 'pull_more') { + itemLi.dataValue = !itemLi.dataValue ? [] : itemLi.dataValue.split(',') + } + }) + } + // Obj[item].list.forEach((itemLi) => { + // console.log(item) + // if((this.currentPersonRole == 'homo' || this.currentPersonRole == 'admin') && item == 'referencesCol'){ + // itemLi.isLock = 0 + // }else{ + // itemLi.isLock = 1 + // } + // if (itemLi.type === 'pull_more') { + // itemLi.dataValue = !itemLi.dataValue ? [] : itemLi.dataValue.split(',') + // } + // }) } }) tt.push(Obj) }) } else { + res.result.records.forEach((Obj) => { Object.keys(Obj).forEach((item) => { if (Obj[item] instanceof Object && Obj[item].controlType !== undefined) { - Obj[item].list.forEach((itemLi) => { - if (itemLi.type === 'pull_more') { - itemLi.dataValue = itemLi.dataValue === null ? [] : itemLi.dataValue.split(',') - } - }) + for (const key in Obj[item].paramsConfigData){ + Obj[item].paramsConfigData[key].forEach((itemLi) => { + if (itemLi.type === 'pull_more') { + itemLi.dataValue = !itemLi.dataValue ? [] : itemLi.dataValue.split(',') + } + }) + } + // Obj[item].list.forEach((itemLi) => { + // if (itemLi.type === 'pull_more') { + // itemLi.dataValue = !itemLi.dataValue ? [] : itemLi.dataValue.split(',') + // } + // }) } }) tt.push(Obj) diff --git a/jero-web/src/views/parameter/managementdetails/index.vue b/jero-web/src/views/parameter/managementdetails/index.vue index f9b4518ec..66d960461 100644 --- a/jero-web/src/views/parameter/managementdetails/index.vue +++ b/jero-web/src/views/parameter/managementdetails/index.vue @@ -316,34 +316,69 @@ data.forEach(res => { selectedRowKeysValue.push(res) }) - console.log(selectedRowKeysValue) - for (let i = 0; i < selectedRowKeysValue.length; i++) { - let postDateobj = {} - let itemIn = Object.keys(selectedRowKeysValue[i]) - for (let j = 0; j < itemIn.length; j++) { - if (itemIn[j] !== 'sdt' && selectedRowKeysValue[i][itemIn[j]].list) { - if (selectedRowKeysValue[i][itemIn[j]] instanceof Object && !(selectedRowKeysValue[i][itemIn[j]] instanceof Array)) { - postDateobj[itemIn[j]] = selectedRowKeysValue[i][itemIn[j]] - for (let k = 0; k < selectedRowKeysValue[i][itemIn[j]].list.length; k++) { - if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'pull_more' && selectedRowKeysValue[i][itemIn[j]].list[k].dataValue !== null && selectedRowKeysValue[i][itemIn[j]].list[k].dataValue instanceof Array) { - selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.join(',') - } - if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'text' && selectedRowKeysValue[i][itemIn[j]].list[k].dataValue !== null) { - selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.toString() + // console.log(selectedRowKeysValue) + // for (let i = 0; i < selectedRowKeysValue.length; i++) { + // let postDateobj = {} + // let itemIn = Object.keys(selectedRowKeysValue[i]) + // for (let j = 0; j < itemIn.length; j++) { + // if (itemIn[j] !== 'sdt' && selectedRowKeysValue[i][itemIn[j]].list) { + // if (selectedRowKeysValue[i][itemIn[j]] instanceof Object && !(selectedRowKeysValue[i][itemIn[j]] instanceof Array)) { + // postDateobj[itemIn[j]] = selectedRowKeysValue[i][itemIn[j]] + // for (let k = 0; k < selectedRowKeysValue[i][itemIn[j]].list.length; k++) { + // if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'pull_more' && selectedRowKeysValue[i][itemIn[j]].list[k].dataValue !== null && selectedRowKeysValue[i][itemIn[j]].list[k].dataValue instanceof Array) { + // selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.join(',') + // } + // if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'text' && selectedRowKeysValue[i][itemIn[j]].list[k].dataValue !== null) { + // selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.toString() + // } + // } + // } + // } + // } + // postDateobj.id = selectedRowKeysValue[i].id + // postDateobj.remarks = selectedRowKeysValue[i].remarks + // postDate.push(postDateobj) + // } + // let configDataList = { configDataList: postDate } + if (selectedRowKeysValue && selectedRowKeysValue.length > 0) { + let configDataList = [] + for (let i = 0; i < selectedRowKeysValue.length; i++) { + configDataList.push({ + id: selectedRowKeysValue[i].id + }) + if (selectedRowKeysValue[i].configIds && selectedRowKeysValue[i].configIds.length > 0) { + for (let j = 0; j < selectedRowKeysValue[i].configIds.length; j++) { + let keyIndex = Object.keys(selectedRowKeysValue[i]) + for (let k = 0; k < keyIndex.length; k++) { + if (keyIndex[k] == selectedRowKeysValue[i].configIds[j]) { + let keyName = keyIndex[k] + configDataList[i][keyName] = selectedRowKeysValue[i][keyName] } } } } } - postDateobj.id = selectedRowKeysValue[i].id - postDateobj.remarks = selectedRowKeysValue[i].remarks - postDate.push(postDateobj) - } - let configDataList = { configDataList: postDate } - if (selectedRowKeysValue && selectedRowKeysValue.length > 0) { + // return + if (configDataList && configDataList.length > 0) { + configDataList.forEach(res => { + Object.keys(res).forEach(val => { + if (res[val] && res[val].paramsConfigData) { + let paramsConfigData = res[val].paramsConfigData + Object.keys(paramsConfigData).forEach((ol, index) => { + paramsConfigData[ol][0].orderNum = index + paramsConfigData[ol].forEach(item => { + if (item.type == 'pull_more') { + item.dataValue = item.dataValue.join(',') + } + }) + }) + } + }) + }) + } this.textLoading = true let query = { - ...configDataList, + configDataList: configDataList, paramsManifestId: this.$route.query.id } postAction('/report/detail/save', query).then((res) => { From 137c94fc1e8601a5d953da2a7ae945aa1930f676 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Fri, 3 Feb 2023 13:47:40 +0800 Subject: [PATCH 29/39] =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E5=BA=93=E7=AE=A1?= =?UTF-8?q?=E7=90=86-=E5=8F=82=E6=95=B0=E9=A1=B9=E6=9F=A5=E7=9C=8B-?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ParamsReportDetailEOServiceImpl.java | 308 +++++++++++------- 1 file changed, 188 insertions(+), 120 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java index 858d70b32..8f3f5b766 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java @@ -1766,133 +1766,201 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl paramsReportConfigDataMap = (Map) entry.getValue(); // 无法转ParamsConfigDataVO（遍历会出现该异常 ： LinkedHashMap cannot be cast to ParamsConfigDataVO） - List> configDataVOList = (List>) paramsReportConfigDataMap.get("list"); + // List> configDataVOList = (List>) paramsReportConfigDataMap.get("list"); + + Map paramsConfigDataVOMap = (Map) paramsReportConfigDataMap.get("paramsConfigData"); + + for (Map.Entry paramsConfigDataMap : paramsConfigDataVOMap.entrySet()) { + String configDataId = paramsConfigDataMap.getKey(); + List> configDataVOList = (List>) paramsConfigDataMap.getValue(); + + if (CollectionUtil.isNotEmpty(configDataVOList)) { + Integer orderNum = (Integer) configDataVOList.get(0).get("orderNum"); + + ParamsReportConfigDataEO paramsReportConfigDataEO = new ParamsReportConfigDataEO(); + paramsReportConfigDataEO.setOrderNum(orderNum); + for (Map paramsConfigDataVO : configDataVOList) { + String type = (String) paramsConfigDataVO.get("type"); + String dataValue = (String) paramsConfigDataVO.get("dataValue"); + + // 判断是新增还是修改 + ParamsConfigDataEO oldConfigDataEO = getConfigDataEOByConfigIdAndCollectManifestId(paramsReportConfigEOId, paramsCollectManifestId, paramsReportConfigDataEOList,configDataId); + if (ObjectUtil.isNotEmpty(oldConfigDataEO)) { + paramsReportConfigDataEO.setId(oldConfigDataEO.getId()); + + if (type.equals(ConfigDataTypeEnum.TEXT.getValue())) { + // paramsReportConfigDataEO.setTextData(dataValue); + if (StringUtils.isEmpty(oldConfigDataEO.getTextData()) && StringUtils.isNotEmpty(dataValue)) { + logCnContent.append("\"").append("空").append("\"").append("改为").append("\"").append(dataValue).append("\"").append("，"); + logEnContent.append(" from ").append("\"").append("Null").append("\"").append(" to ").append("\"").append(dataValue).append("\"").append(", "); + + changeFlag = true; + } else if (StringUtils.isNotEmpty(oldConfigDataEO.getTextData()) && StringUtils.isEmpty(dataValue)) { + logCnContent.append("\"").append(oldConfigDataEO.getTextData()).append("\"").append("改为").append("\"").append("空").append("\"").append("，"); + logEnContent.append(" from ").append("\"").append(oldConfigDataEO.getTextData()).append("\"").append(" to ").append("\"").append("Null").append("\"").append(", "); + + changeFlag = true; + } else if (StringUtils.isNotEmpty(oldConfigDataEO.getTextData()) && StringUtils.isNotEmpty(dataValue) && !oldConfigDataEO.getTextData().equals(dataValue)) { + logCnContent.append("\"").append(oldConfigDataEO.getTextData()).append("\"").append("改为").append("\"").append(dataValue).append("\"").append("，"); + logEnContent.append(" from ").append("\"").append(oldConfigDataEO.getTextData()).append("\"").append(" to ").append("\"").append(dataValue).append("\"").append(", "); + + changeFlag = true; + } + + } else if (type.equals(ConfigDataTypeEnum.PULL.getValue()) + || type.equals(ConfigDataTypeEnum.PULL_MORE.getValue())) { + // paramsReportConfigDataEO.setPullData(dataValue); + + if (StringUtils.isEmpty(oldConfigDataEO.getPullData()) && StringUtils.isNotEmpty(dataValue)) { + logCnContent.append("\"").append("空").append("\"").append("改为").append("\"").append(dataValue).append("\"").append("，"); + logEnContent.append(" from ").append("\"").append("Null").append("\"").append(" to ").append("\"").append(dataValue).append("\"").append(", "); + + changeFlag = true; + } else if (StringUtils.isNotEmpty(oldConfigDataEO.getPullData()) && StringUtils.isEmpty(dataValue)) { + logCnContent.append("\"").append(oldConfigDataEO.getPullData()).append("\"").append("改为").append("\"").append("空").append("\"").append("，"); + logEnContent.append(" from ").append("\"").append(oldConfigDataEO.getPullData()).append("\"").append(" to ").append("\"").append("Null").append("\"").append(", "); + + changeFlag = true; + } else if (StringUtils.isNotEmpty(oldConfigDataEO.getPullData()) && StringUtils.isNotEmpty(dataValue) && !oldConfigDataEO.getPullData().equals(dataValue)) { + logCnContent.append("\"").append(oldConfigDataEO.getPullData()).append("\"").append("改为").append("\"").append(dataValue).append("\"").append("，"); + logEnContent.append(" from ").append("\"").append(oldConfigDataEO.getPullData()).append("\"").append(" to ").append("\"").append(dataValue).append("\"").append(", "); + + changeFlag = true; + } + + } else if (type.equals(ConfigDataTypeEnum.FILE.getValue())) { + String newFileNames = ""; + if (StringUtils.isNotEmpty(dataValue) && dataValue.contains(",")) { // 新加多个文件. 目前没用到这段代码 + // 处理文件connectId + String[] fileIdList = dataValue.split(","); + List ossFiles = ossFileService.getFileInfosByConnectId(fileIdList[0]); + if(CollectionUtil.isEmpty(ossFiles)) { // 新加了一个文件 + String connectId = UUID.randomUUID().toString().replace("-", ""); + List updateFileList = new ArrayList<>(); + for (int i = 0; i < fileIdList.length; i++) { + OSSFile ossFile = new OSSFile(); + ossFile.setId(fileIdList[i]); + ossFile.setConnectId(connectId); + updateFileList.add(ossFile); + } + ossFileService.updateBatchById(updateFileList); + dataValue = connectId; + newFileNames = ossFileService.getFileInfosByConnectId(connectId).stream().map(OSSFile::getFileName).collect(Collectors.joining(",")); + } + } else if (StringUtils.isNotEmpty(dataValue) && !dataValue.contains(",")) { + List ossFiles = ossFileService.getFileInfosByConnectId(dataValue); + if(CollectionUtil.isEmpty(ossFiles)){ // 新加了一个文件 + String connectId = UUID.randomUUID().toString().replace("-", ""); + //修改文件表关联信息connect_id + List oSSFileList = new ArrayList<>(); + for (String fileId : dataValue.split(",")) { + OSSFile ossFile = new OSSFile(); + ossFile.setId(fileId); + ossFile.setConnectId(connectId); + oSSFileList.add(ossFile); + } + ossFileService.updateFileInfo(oSSFileList); + dataValue = connectId; + newFileNames = ossFileService.getFileInfosByConnectId(connectId).stream().map(OSSFile::getFileName).collect(Collectors.joining(",")); + } + } + // paramsReportConfigDataEO.setFileConnectId(dataValue); + if (StringUtils.isEmpty(oldConfigDataEO.getFileConnectId()) && StringUtils.isNotEmpty(dataValue)) { + logCnContent.append("\"").append("空").append("\"").append("改为").append("\"").append(newFileNames).append("\"").append("，"); + logEnContent.append(" from ").append("\"").append("Null").append("\"").append(" to ").append("\"").append(newFileNames).append("\"").append(", "); + + changeFlag = true; + } else if (StringUtils.isNotEmpty(oldConfigDataEO.getFileConnectId()) && StringUtils.isEmpty(dataValue)) { + String oldFileNames = ossFileService.getFileInfosByConnectId(oldConfigDataEO.getFileConnectId()).stream().map(OSSFile::getFileName).collect(Collectors.joining(",")); + logCnContent.append("\"").append(oldFileNames).append("\"").append("改为").append("\"").append("空").append("\"").append("，"); + logEnContent.append(" from ").append("\"").append(oldFileNames).append("\"").append(" to ").append("\"").append("Null").append("\"").append(", "); + + changeFlag = true; + } else if (StringUtils.isNotEmpty(oldConfigDataEO.getFileConnectId()) && StringUtils.isNotEmpty(dataValue)) { + String oldFileNames = ossFileService.getFileInfosByConnectId(oldConfigDataEO.getFileConnectId()).stream().map(OSSFile::getFileName).collect(Collectors.joining(",")); + if (!oldConfigDataEO.getFileConnectId().equals(dataValue)) { + logCnContent.append("\"").append(oldFileNames).append("\"").append("改为").append("\"").append(newFileNames).append("\"").append("，"); + logEnContent.append(" from ").append("\"").append(oldFileNames).append("\"").append(" to ").append("\"").append(newFileNames).append("\"").append(", "); + + changeFlag = true; + } + + } + + } + } + + + + if (type.equals(ConfigDataTypeEnum.TEXT.getValue())) { + + paramsReportConfigDataEO.setTextData(dataValue); + } else if (type.equals(ConfigDataTypeEnum.PULL.getValue()) + || type.equals(ConfigDataTypeEnum.PULL_MORE.getValue())) { + + paramsReportConfigDataEO.setPullData(dataValue); + } else if (type.equals(ConfigDataTypeEnum.FILE.getValue())) { + String newFileNames = ""; + if (StringUtils.isNotEmpty(dataValue) && dataValue.contains(",")) { // 新加多个文件. 目前没用到这段代码 + // 处理文件connectId + String[] fileIdList = dataValue.split(","); + List ossFiles = ossFileService.getFileInfosByConnectId(fileIdList[0]); + if(CollectionUtil.isEmpty(ossFiles)) { // 新加了一个文件 + String connectId = UUID.randomUUID().toString().replace("-", ""); + List updateFileList = new ArrayList<>(); + for (int i = 0; i < fileIdList.length; i++) { + OSSFile ossFile = new OSSFile(); + ossFile.setId(fileIdList[i]); + ossFile.setConnectId(connectId); + updateFileList.add(ossFile); + } + ossFileService.updateBatchById(updateFileList); + dataValue = connectId; + newFileNames = ossFileService.getFileInfosByConnectId(connectId).stream().map(OSSFile::getFileName).collect(Collectors.joining(",")); + } + } else if (StringUtils.isNotEmpty(dataValue) && !dataValue.contains(",")) { + List ossFiles = ossFileService.getFileInfosByConnectId(dataValue); + if(CollectionUtil.isEmpty(ossFiles)){ // 新加了一个文件 + String connectId = UUID.randomUUID().toString().replace("-", ""); + //修改文件表关联信息connect_id + List oSSFileList = new ArrayList<>(); + for (String fileId : dataValue.split(",")) { + OSSFile ossFile = new OSSFile(); + ossFile.setId(fileId); + ossFile.setConnectId(connectId); + oSSFileList.add(ossFile); + } + ossFileService.updateFileInfo(oSSFileList); + dataValue = connectId; + newFileNames = ossFileService.getFileInfosByConnectId(connectId).stream().map(OSSFile::getFileName).collect(Collectors.joining(",")); + } + } + paramsReportConfigDataEO.setFileConnectId(dataValue); + } + } + + QueryWrapper removeConfigDataWrap = new QueryWrapper<>(); + removeConfigDataWrap.lambda().eq(ParamsReportConfigDataEO::getParamsConfigId,paramsReportConfigEOId); + removeConfigDataWrap.lambda().eq(ParamsReportConfigDataEO::getParamsCollectManifestId,paramsCollectManifestId); + this.paramsReportConfigDataEOService.remove(removeConfigDataWrap); + + paramsReportConfigDataEO.setParamsCollectManifestId(paramsCollectManifestId); + paramsReportConfigDataEO.setParamsConfigId(paramsReportConfigEOId); + + newConfigDataEOList.add(paramsReportConfigDataEO); + } - // 判断是新增还是修改 - ParamsConfigDataEO oldConfigDataEO = getConfigDataEOByConfigIdAndCollectManifestId(paramsReportConfigEOId, paramsCollectManifestId, paramsReportConfigDataEOList); - if (ObjectUtil.isNotEmpty(oldConfigDataEO)) { - paramsReportConfigDataEO.setId(oldConfigDataEO.getId()); } + + logCnContent.append(paramsReportConfigEO.getConfigName()).append("的"); logEnContent.append(paramsReportConfigEO.getConfigName()); - paramsReportConfigDataEO.setParamsCollectManifestId(paramsCollectManifestId); - paramsReportConfigDataEO.setParamsConfigId(paramsReportConfigEOId); - if (CollectionUtil.isNotEmpty(configDataVOList)) { - for (Map paramsConfigDataVO : configDataVOList) { - String type = (String) paramsConfigDataVO.get("type"); - String dataValue = (String) paramsConfigDataVO.get("dataValue"); - - if (type.equals(ConfigDataTypeEnum.TEXT.getValue())) { - paramsReportConfigDataEO.setTextData(dataValue); - if (StringUtils.isEmpty(oldConfigDataEO.getTextData()) && StringUtils.isNotEmpty(dataValue)) { - logCnContent.append("\"").append("空").append("\"").append("改为").append("\"").append(dataValue).append("\"").append("，"); - logEnContent.append(" from ").append("\"").append("Null").append("\"").append(" to ").append("\"").append(dataValue).append("\"").append(", "); - - changeFlag = true; - } else if (StringUtils.isNotEmpty(oldConfigDataEO.getTextData()) && StringUtils.isEmpty(dataValue)) { - logCnContent.append("\"").append(oldConfigDataEO.getTextData()).append("\"").append("改为").append("\"").append("空").append("\"").append("，"); - logEnContent.append(" from ").append("\"").append(oldConfigDataEO.getTextData()).append("\"").append(" to ").append("\"").append("Null").append("\"").append(", "); - - changeFlag = true; - } else if (StringUtils.isNotEmpty(oldConfigDataEO.getTextData()) && StringUtils.isNotEmpty(dataValue) && !oldConfigDataEO.getTextData().equals(dataValue)) { - logCnContent.append("\"").append(oldConfigDataEO.getTextData()).append("\"").append("改为").append("\"").append(dataValue).append("\"").append("，"); - logEnContent.append(" from ").append("\"").append(oldConfigDataEO.getTextData()).append("\"").append(" to ").append("\"").append(dataValue).append("\"").append(", "); - - changeFlag = true; - } - - } else if (type.equals(ConfigDataTypeEnum.PULL.getValue()) - || type.equals(ConfigDataTypeEnum.PULL_MORE.getValue())) { - paramsReportConfigDataEO.setPullData(dataValue); - - if (StringUtils.isEmpty(oldConfigDataEO.getPullData()) && StringUtils.isNotEmpty(dataValue)) { - logCnContent.append("\"").append("空").append("\"").append("改为").append("\"").append(dataValue).append("\"").append("，"); - logEnContent.append(" from ").append("\"").append("Null").append("\"").append(" to ").append("\"").append(dataValue).append("\"").append(", "); - - changeFlag = true; - } else if (StringUtils.isNotEmpty(oldConfigDataEO.getPullData()) && StringUtils.isEmpty(dataValue)) { - logCnContent.append("\"").append(oldConfigDataEO.getPullData()).append("\"").append("改为").append("\"").append("空").append("\"").append("，"); - logEnContent.append(" from ").append("\"").append(oldConfigDataEO.getPullData()).append("\"").append(" to ").append("\"").append("Null").append("\"").append(", "); - - changeFlag = true; - } else if (StringUtils.isNotEmpty(oldConfigDataEO.getPullData()) && StringUtils.isNotEmpty(dataValue) && !oldConfigDataEO.getPullData().equals(dataValue)) { - logCnContent.append("\"").append(oldConfigDataEO.getPullData()).append("\"").append("改为").append("\"").append(dataValue).append("\"").append("，"); - logEnContent.append(" from ").append("\"").append(oldConfigDataEO.getPullData()).append("\"").append(" to ").append("\"").append(dataValue).append("\"").append(", "); - - changeFlag = true; - } - - } else if (type.equals(ConfigDataTypeEnum.FILE.getValue())) { - String newFileNames = ""; - if (StringUtils.isNotEmpty(dataValue) && dataValue.contains(",")) { // 新加多个文件. 目前没用到这段代码 - // 处理文件connectId - String[] fileIdList = dataValue.split(","); - List ossFiles = ossFileService.getFileInfosByConnectId(fileIdList[0]); - if(CollectionUtil.isEmpty(ossFiles)) { // 新加了一个文件 - String connectId = UUID.randomUUID().toString().replace("-", ""); - List updateFileList = new ArrayList<>(); - for (int i = 0; i < fileIdList.length; i++) { - OSSFile ossFile = new OSSFile(); - ossFile.setId(fileIdList[i]); - ossFile.setConnectId(connectId); - updateFileList.add(ossFile); - } - ossFileService.updateBatchById(updateFileList); - dataValue = connectId; - newFileNames = ossFileService.getFileInfosByConnectId(connectId).stream().map(OSSFile::getFileName).collect(Collectors.joining(",")); - } - } else if (StringUtils.isNotEmpty(dataValue) && !dataValue.contains(",")) { - List ossFiles = ossFileService.getFileInfosByConnectId(dataValue); - if(CollectionUtil.isEmpty(ossFiles)){ // 新加了一个文件 - String connectId = UUID.randomUUID().toString().replace("-", ""); - //修改文件表关联信息connect_id - List oSSFileList = new ArrayList<>(); - for (String fileId : dataValue.split(",")) { - OSSFile ossFile = new OSSFile(); - ossFile.setId(fileId); - ossFile.setConnectId(connectId); - oSSFileList.add(ossFile); - } - ossFileService.updateFileInfo(oSSFileList); - dataValue = connectId; - newFileNames = ossFileService.getFileInfosByConnectId(connectId).stream().map(OSSFile::getFileName).collect(Collectors.joining(",")); - } - } - paramsReportConfigDataEO.setFileConnectId(dataValue); - if (StringUtils.isEmpty(oldConfigDataEO.getFileConnectId()) && StringUtils.isNotEmpty(dataValue)) { - logCnContent.append("\"").append("空").append("\"").append("改为").append("\"").append(newFileNames).append("\"").append("，"); - logEnContent.append(" from ").append("\"").append("Null").append("\"").append(" to ").append("\"").append(newFileNames).append("\"").append(", "); - - changeFlag = true; - } else if (StringUtils.isNotEmpty(oldConfigDataEO.getFileConnectId()) && StringUtils.isEmpty(dataValue)) { - String oldFileNames = ossFileService.getFileInfosByConnectId(oldConfigDataEO.getFileConnectId()).stream().map(OSSFile::getFileName).collect(Collectors.joining(",")); - logCnContent.append("\"").append(oldFileNames).append("\"").append("改为").append("\"").append("空").append("\"").append("，"); - logEnContent.append(" from ").append("\"").append(oldFileNames).append("\"").append(" to ").append("\"").append("Null").append("\"").append(", "); - - changeFlag = true; - } else if (StringUtils.isNotEmpty(oldConfigDataEO.getFileConnectId()) && StringUtils.isNotEmpty(dataValue)) { - String oldFileNames = ossFileService.getFileInfosByConnectId(oldConfigDataEO.getFileConnectId()).stream().map(OSSFile::getFileName).collect(Collectors.joining(",")); - if (!oldConfigDataEO.getFileConnectId().equals(dataValue)) { - logCnContent.append("\"").append(oldFileNames).append("\"").append("改为").append("\"").append(newFileNames).append("\"").append("，"); - logEnContent.append(" from ").append("\"").append(oldFileNames).append("\"").append(" to ").append("\"").append(newFileNames).append("\"").append(", "); - - changeFlag = true; - } - - } - - } - } - } - newConfigDataEOList.add(paramsReportConfigDataEO); - } ParamsReportDetailLogEO insertLogEO = new ParamsReportDetailLogEO(); /*if (logCnContent.toString().endsWith("，")) { @@ -1928,13 +1996,13 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl paramsReportConfigDataEOList) { + private ParamsReportConfigDataEO getConfigDataEOByConfigIdAndCollectManifestId(String configId, String collectManifestId, List paramsReportConfigDataEOList,String configDataId) { List configDataEOList = paramsReportConfigDataEOList.stream() - .filter(e-> configId.equals(e.getParamsConfigId()) && collectManifestId.equals(e.getParamsCollectManifestId())) + .filter(e-> configId.equals(e.getParamsConfigId()) && collectManifestId.equals(e.getParamsCollectManifestId()) && StringUtils.equals(configDataId,e.getId())) .collect(Collectors.toList()); if (CollectionUtil.isNotEmpty(configDataEOList)) { return configDataEOList.get(0); From f168d73c3805de3300d74ca27fb34811caa08c5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Fri, 3 Feb 2023 14:25:48 +0800 Subject: [PATCH 30/39] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=B6=E9=9B=86?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E7=9A=84=E6=9B=B4=E6=96=B0=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E5=88=97=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../managementdetails/commponts/conventionalmodle.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue b/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue index d6adc03d0..af8c5105a 100644 --- a/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue +++ b/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue @@ -78,7 +78,8 @@
- + +
From 51945f28c071ce1f33ded2cfa5db2b1c6e77b3e6 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Fri, 3 Feb 2023 15:28:48 +0800 Subject: [PATCH 31/39] =?UTF-8?q?=EF=BC=88=E6=8E=A7=E4=BB=B6=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=EF=BC=89=E4=B8=8A=E6=8A=A5=E5=BA=93=E7=AE=A1=E7=90=86?= =?UTF-8?q?-=E5=8F=82=E6=95=B0=E6=9F=A5=E7=9C=8B-=E5=B8=B8=E8=A7=84?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E4=BF=AE=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParamsReportConfigDataEOServiceImpl.java | 1 + .../impl/ParamsReportDetailEOServiceImpl.java | 148 +++++++++--------- 2 files changed, 76 insertions(+), 73 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigDataEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigDataEOServiceImpl.java index 5f4e4e796..7168c6649 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigDataEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigDataEOServiceImpl.java @@ -47,6 +47,7 @@ public class ParamsReportConfigDataEOServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(ParamsReportConfigDataEO::getParamsConfigId, paramsConfigId); queryWrapper.eq(ParamsReportConfigDataEO::getParamsCollectManifestId, paramsCollectManifestId); + queryWrapper.orderByDesc(ParamsReportConfigDataEO::getOrderNum); return this.list(queryWrapper); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java index 8f3f5b766..933c0e462 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java @@ -1311,42 +1311,57 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl ossFileList = ossFileService.getFileInfosByConnectId(paramsConfigDataEO.getFileConnectId()); - if (CollectionUtil.isNotEmpty(ossFileList)) { - // 不合并导出时 验证文件名是否相同，相同进一步验证文件内容是否相同，不同时重命名文件 - 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); + String paramsConfigId = paramsConfigEO.getId(); + List paramsConfigDataEOList = this.paramsReportConfigDataEOService.queryListByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId); // 参数配置数据 + StringBuilder configDataBuilder = new StringBuilder(); // 重新组合配置数据 + if(CollectionUtils.isNotEmpty(paramsConfigDataEOList)){ + for (ParamsReportConfigDataEO paramsConfigDataEO : paramsConfigDataEOList) { + + StringBuilder configDataBuilderTemp = new StringBuilder(); // 重新组合配置数据 + + if (StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) { + configDataBuilderTemp.append(paramsConfigDataEO.getPullData()).append("#"); + } + if (StringUtils.isNotEmpty(paramsConfigDataEO.getTextData())) { + configDataBuilderTemp.append(paramsConfigDataEO.getTextData()).append("#"); + } + if (StringUtils.isNotEmpty(paramsConfigDataEO.getFileConnectId())) { + List ossFileList = ossFileService.getFileInfosByConnectId(paramsConfigDataEO.getFileConnectId()); + if (CollectionUtil.isNotEmpty(ossFileList)) { + // 不合并导出时 验证文件名是否相同，相同进一步验证文件内容是否相同，不同时重命名文件 + String fileName = ossFileList.get(0).getFileName(); + String newFileName = isRepeat(fileListAll, ossFileList.get(0)); + if (!"".equals(newFileName) && !"old".equals(newFileName)) { // 文件名称重复 且文件内容不同 + configDataBuilderTemp.append(newFileName).append("#"); + ossFileList.get(0).setFileName(newFileName); + fileList.addAll(ossFileList); + fileListAll.addAll(ossFileList); + + } else if ("old".equals(newFileName)) { // 文件名称重复 且文件内容相同 + configDataBuilderTemp.append(fileName).append("#"); + fileList.addAll(ossFileList); + } else { + configDataBuilderTemp.append(fileName).append("#"); + fileList.addAll(ossFileList); + fileListAll.addAll(ossFileList); + } + } } + String configData = configDataBuilderTemp.toString(); + if (configData.contains("#")) { + configData = configData.substring(0, configData.lastIndexOf("#")); + } + + configDataBuilder.append(configData).append(paramsReportDetailVO.getSeparator()); } } + String configData = configDataBuilder.toString(); - if (configData.contains("#")) { - configData = configData.substring(0, configData.lastIndexOf("#")); + if (configData.contains(paramsReportDetailVO.getSeparator())) { + configData = configData.substring(0, configData.lastIndexOf(paramsReportDetailVO.getSeparator())); } record1.put(paramsConfigEO.getId(), configData); @@ -1360,66 +1375,53 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl paramsReportConfigDataEOS = paramsReportConfigDataEOService.queryByConfigIdListAndCollectManifestId(configIdList, paramsCollectManifestId); - String textDatas = paramsReportConfigDataEOS.stream().filter(e -> StringUtils.isNotEmpty(e.getTextData())) - .map(ParamsReportConfigDataEO::getTextData).distinct().collect(Collectors.joining(paramsReportDetailVO.getSeparator())); + StringBuilder configDataBuilder = new StringBuilder(); // 重新组合配置数据 - String pullDatas = paramsReportConfigDataEOS.stream().filter(e -> StringUtils.isNotEmpty(e.getPullData())) - .map(ParamsReportConfigDataEO::getPullData).distinct().collect(Collectors.joining(paramsReportDetailVO.getSeparator())); + for (ParamsReportConfigDataEO paramsConfigDataEO : paramsReportConfigDataEOS) { + StringBuilder configDataBuilderTemp = new StringBuilder(); // 重新组合配置数据 - List fileNameList = new ArrayList<>(); - for(ParamsReportConfigDataEO paramsReportConfigDataEO : paramsReportConfigDataEOS) { - if (StringUtils.isNotEmpty(paramsReportConfigDataEO.getFileConnectId())) { - List ossFileList = ossFileService.getFileInfosByConnectId(paramsReportConfigDataEO.getFileConnectId()); + if (StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) { + configDataBuilderTemp.append(paramsConfigDataEO.getPullData()).append("#"); + } + if (StringUtils.isNotEmpty(paramsConfigDataEO.getTextData())) { + configDataBuilderTemp.append(paramsConfigDataEO.getTextData()).append("#"); + } + if (StringUtils.isNotEmpty(paramsConfigDataEO.getFileConnectId())) { + List ossFileList = ossFileService.getFileInfosByConnectId(paramsConfigDataEO.getFileConnectId()); if (CollectionUtil.isNotEmpty(ossFileList)) { - // 合并导出时 验证文件名是否相同，相同进一步验证文件内容是否形同，不同时重命名文件 + // 不合并导出时 验证文件名是否相同，相同进一步验证文件内容是否相同，不同时重命名文件 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); - } + configDataBuilderTemp.append(newFileName).append("#"); + 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); + configDataBuilderTemp.append(fileName).append("#"); + fileList.addAll(ossFileList); + } else { + configDataBuilderTemp.append(fileName).append("#"); fileList.addAll(ossFileList); fileListAll.addAll(ossFileList); } - } } + + configData = configDataBuilderTemp.toString(); + if (configData.contains("#")) { + configData = configData.substring(0, configData.lastIndexOf("#")); + } + + configDataBuilder.append(configData).append(paramsReportDetailVO.getSeparator()); } - StringBuilder configDataBuilder = new StringBuilder(); // 重新组合配置数据 - if (StringUtils.isNotEmpty(pullDatas)) { - configDataBuilder.append(pullDatas).append("#"); + String configDataStr = configDataBuilder.toString(); + if (configDataStr.contains(paramsReportDetailVO.getSeparator())) { + configDataStr = configDataStr.substring(0, configDataStr.lastIndexOf(paramsReportDetailVO.getSeparator())); } - if (StringUtils.isNotEmpty(textDatas)) { - configDataBuilder.append(textDatas).append("#"); - } - if (CollectionUtil.isNotEmpty(fileNameList)) { -// fileNameList = fileNameList.stream().distinct().collect(Collectors.toList()); - configDataBuilder.append(StringUtils.join(fileNameList, paramsReportDetailVO.getSeparator())).append("#"); - } - configData = configDataBuilder.toString(); - if (configData.contains("#")) { - configData = configData.substring(0, configData.lastIndexOf("#")); - } - record1.put("params_value", configData); + record1.put("params_value", configDataStr); } } From 438464c01dc3d616dbe374c5c75de78ef7fe25bc Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Mon, 6 Feb 2023 09:26:48 +0800 Subject: [PATCH 32/39] =?UTF-8?q?=E6=8E=A7=E4=BB=B6=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BF=AE=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ParamsReportDetailEOServiceImpl.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java index 933c0e462..d4566d813 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java @@ -1467,6 +1467,18 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl paramsReportConfigDataEOS = paramsReportConfigDataEOService.queryByConfigIdListAndCollectManifestId(configIdList, paramsCollectManifestId); + // 匿名比较器排序 + Collections.sort(paramsReportConfigDataEOS, new Comparator() { + @Override + public int compare(ParamsReportConfigDataEO p1, ParamsReportConfigDataEO p2) { + if(p2.getOrderNum() == null || p1.getOrderNum() == null){ + return 0; + } + // 倒序 + return p2.getOrderNum().compareTo(p1.getOrderNum()); + } + }); + String textDatas = paramsReportConfigDataEOS.stream().filter(e->StringUtils.isNotEmpty(e.getTextData())) .map(ParamsReportConfigDataEO::getTextData).distinct().collect(Collectors.joining(paramsReportDetailVO.getSeparator())); // 整合文本数据 From eaaa6d1caf406c1fcc19865a1001feea1a7f207d Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Thu, 16 Feb 2023 11:01:19 +0800 Subject: [PATCH 33/39] =?UTF-8?q?=E6=9A=82=E6=97=B6=E6=8E=92=E9=99=A4-?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=A1=B9=E6=94=B6=E9=9B=86=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E6=9A=82=E5=AD=98=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=AE=8C=E6=AF=95=E5=90=8E=E5=88=A0=E6=8E=89?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/jero/config/shiro/ShiroConfig.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java index bbd70a8f2..37517205a 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java @@ -160,6 +160,9 @@ public class ShiroConfig { // 项目权限表 工作流处理数据接口排除 filterChainDefinitionMap.put("/project/projectUserPermission/setPermission", "anon"); + // 参数项收集清单-暂存接口（暂时排除，接口测试完毕后删掉） + filterChainDefinitionMap.put("/params/collectManifest/save", "anon"); + filterChainDefinitionMap.put("/lark/larkEventSubscriptionConfig", "anon"); //飞书调用接口，事件订阅配置。 filterChainDefinitionMap.put("/lark/larkCardMessageConfig", "anon"); //飞书调用接口，卡片消息配置。 filterChainDefinitionMap.put("/sys/user/querySysUserListByIdList", "anon"); // 工作流根据用户idList获取用户信息接口 From 9a24ca90df42c56bab2d80f9ccd1ba14633e4940 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Thu, 16 Feb 2023 11:28:13 +0800 Subject: [PATCH 34/39] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=8F=A3=EF=BC=8C?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ParamsInfoEOController.java | 68 ++++++++++++++++++- 1 file changed, 67 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java index a90866929..9a8b4b983 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java @@ -10,6 +10,7 @@ import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.constant.enums.CutEnum; import com.jero.common.system.base.controller.JeroController; +import com.jero.modules.cert.template.entity.CertCategoryParamsInfoEO; import com.jero.modules.cert.template.entity.ParamsInfoEO; import com.jero.modules.cert.template.service.IParamsInfoEOService; import com.jero.modules.cert.template.service.IParamsInfoPublishEOService; @@ -26,6 +27,7 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; @@ -47,7 +49,7 @@ public class ParamsInfoEOController extends JeroController autoAddTestData(@RequestBody JSONObject json) { + //TODO 测试接口 + String certCategory = json.getString("certCategory"); + String certCategoryType = json.getString("certCategoryType"); // gg、3c、yy、hb + String controlType = json.getString("controlType"); + String controlVerify = json.getString("controlVerify"); + String cut = json.getString("cut"); + String dutyTerritory = json.getString("dutyTerritory"); + String isMust = json.getString("isMust"); + String nioNumber = json.getString("nioNumber"); + String paramsBatch = json.getString("paramsBatch"); + String paramsName = json.getString("paramsName"); + String paramsTemplateId = json.getString("paramsTemplateId"); + if (StringUtils.isEmpty(certCategory)) { + return Result.error("认证类别不能为空！"); + } + boolean isSuccess = false; + + Integer startIndex = json.getInteger("startIndex"); + Integer endIndex = json.getInteger("endIndex"); + for (Integer i = 0; i < endIndex; i++) { + ParamsInfoEO paramsInfoEO = new ParamsInfoEO(); + paramsInfoEO.setNioNumber(nioNumber + "-" + String.format("%04d",startIndex + i)); + paramsInfoEO.setParamsName(paramsName + "-" + String.format("%04d",startIndex + i) + "名称"); + paramsInfoEO.setCertCategory(certCategory); + paramsInfoEO.setControlType(controlType); + paramsInfoEO.setControlVerify(controlVerify); + paramsInfoEO.setCut(cut); + paramsInfoEO.setDutyTerritory(dutyTerritory); + paramsInfoEO.setIsMust(isMust); + paramsInfoEO.setParamsBatch(paramsBatch); + paramsInfoEO.setParamsTemplateId(paramsTemplateId); + + List certCategoryParamsInfoEOList = new ArrayList<>(); + CertCategoryParamsInfoEO certCategoryParamsInfoEO = new CertCategoryParamsInfoEO(); + certCategoryParamsInfoEO.setCertCategory(certCategory); + certCategoryParamsInfoEO.setParamsName(paramsName + "-" + String.format("%04d",startIndex + i) + "-" + certCategoryType + "-" + "name"); + certCategoryParamsInfoEO.setParamsNumber(nioNumber + "-" + String.format("%04d",startIndex + i) + "-" + certCategoryType); + certCategoryParamsInfoEOList.add(certCategoryParamsInfoEO); + paramsInfoEO.setCertCategoryParamsInfoEOList(certCategoryParamsInfoEOList); + + isSuccess = paramsInfoEOService.add(paramsInfoEO); + + if(!isSuccess){ + break; + } + } + + + + if (isSuccess) { + return Result.OK("添加成功！"); + } else { + return Result.error("添加失败！"); + } + } } From 38eb9645a41dbe27eeeb1318d1bd68e0e22cd396 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Thu, 16 Feb 2023 17:21:10 +0800 Subject: [PATCH 35/39] update --- .../src/main/java/com/jero/config/shiro/ShiroConfig.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java index 37517205a..bbd70a8f2 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java @@ -160,9 +160,6 @@ public class ShiroConfig { // 项目权限表 工作流处理数据接口排除 filterChainDefinitionMap.put("/project/projectUserPermission/setPermission", "anon"); - // 参数项收集清单-暂存接口（暂时排除，接口测试完毕后删掉） - filterChainDefinitionMap.put("/params/collectManifest/save", "anon"); - filterChainDefinitionMap.put("/lark/larkEventSubscriptionConfig", "anon"); //飞书调用接口，事件订阅配置。 filterChainDefinitionMap.put("/lark/larkCardMessageConfig", "anon"); //飞书调用接口，卡片消息配置。 filterChainDefinitionMap.put("/sys/user/querySysUserListByIdList", "anon"); // 工作流根据用户idList获取用户信息接口 From e475b4e33626c70cd6d0c7e3e66f019193648d2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Thu, 23 Feb 2023 21:09:25 +0800 Subject: [PATCH 36/39] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=A8=A1=E7=89=88=E6=8E=A7=E4=BB=B6=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ParamsCollectManifestEOServiceImpl.java | 16 +++++++++------- .../cert/template/entity/ParamsInfoEO.java | 2 +- .../cert/template/enums/ControlTypeEnum.java | 6 +++--- jero-web/src/common/lang/en-us.js | 6 +++--- jero-web/src/common/lang/zh-cn.js | 6 +++--- 5 files changed, 19 insertions(+), 17 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 7e56e0906..e62bd50c6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -4241,13 +4241,15 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl paramsConfigDataMaxCountMap = paramsConfigDataCountList.get(0); - String key = (String) paramsConfigDataMaxCountMap.get("key"); - List paramsConfigDataEOs = paramsConfigDataMap.get(key); - for (ParamsConfigDataEO paramsConfigDataEO : paramsConfigDataEOs) { - ParamsCollectManifestEO paramsCollectManifestEOTemp = new ParamsCollectManifestEO(); - BeanUtils.copyProperties(collectManifestEO,paramsCollectManifestEOTemp); - exportDataList.add(paramsCollectManifestEOTemp); + if(!paramsConfigDataCountList.isEmpty()){ + Map paramsConfigDataMaxCountMap = paramsConfigDataCountList.get(0); + String key = (String) paramsConfigDataMaxCountMap.get("key"); + List paramsConfigDataEOs = paramsConfigDataMap.get(key); + for (ParamsConfigDataEO paramsConfigDataEO : paramsConfigDataEOs) { + ParamsCollectManifestEO paramsCollectManifestEOTemp = new ParamsCollectManifestEO(); + BeanUtils.copyProperties(collectManifestEO,paramsCollectManifestEOTemp); + exportDataList.add(paramsCollectManifestEOTemp); + } } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java index 1df1f9a2e..a185ae58e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java @@ -106,7 +106,7 @@ public class ParamsInfoEO implements Serializable { private String certCategory; /**控件类型*/ - @Excel(name = "*控件类型", width = 15, replace = {"文本_1","下拉单选_2","下拉多选_3","附件_4","文本+下拉单选_5","文本+下拉多选_6","文本+附件_7","下拉单选+附件_8","下拉多选+附件_9","文本+下拉单选+附件_10","标题_11"}) + @Excel(name = "*控件类型", width = 15, replace = {"文本_1","下拉单选_2","下拉多选_3","附件_4","下拉单选+文本_5","下拉多选+文本_6","文本+附件_7","下拉单选+附件_8","下拉多选+附件_9","下拉单选+文本+附件_10","标题_11"}) @ApiModelProperty(value = "控件类型") private String controlType; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/enums/ControlTypeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/enums/ControlTypeEnum.java index a6948d07d..ea56ae250 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/enums/ControlTypeEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/enums/ControlTypeEnum.java @@ -15,12 +15,12 @@ public enum ControlTypeEnum { PULL_SINGLE("下拉单选","Pull single","2"), PULL_MORE("下拉多选","Pull more","3"), FILE("附件","File","4"), - TEXT_PULL_SINGLE("文本+下拉单选","Text+Pull single","5"), - TEXT_PULL_MORE("文本+下拉多选","Text+Pull more","6"), + TEXT_PULL_SINGLE("下拉单选+文本","Pull single+Text","5"), + TEXT_PULL_MORE("下拉多选+文本","Pull more+Text","6"), TEXT_FILE("文本+附件","Text+File","7"), PULL_SINGLE_FILE("下拉单选+附件","Pull single+File","8"), PULL_MORE_FILE("下拉多选+附件","Pull more+File","9"), - TEXT_PULL_SINGLE_FILE("文本+下拉单选+附件","Text+Pull single+File","10"), + TEXT_PULL_SINGLE_FILE("下拉单选+文本+附件","Pull single+Text+File","10"), Title("标题","Title","11"); String name; diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index b57ccfc50..6ad918748 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1080,12 +1080,12 @@ module.exports = { NDropdownradio: 'Pull single', NDropdownmultipleselection: 'Pull more', Nenclosure: 'File', - Atext: 'Text+Pull single', - Btext: 'Text+Pull more', + Atext: 'Pull single+Text', + Btext: 'Pull more+Text', Ctext: 'Text+File', Dtext: 'Pull single+File', Etext: 'Pull more+File', - Ftext: 'Text+Pull single+File', + Ftext: 'Pull single+Text+File', Gtext: 'Title', Nnothing: 'Null', Nchinese: 'Chinese', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 3f62cbed7..4d6af1485 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1091,12 +1091,12 @@ module.exports = { NDropdownradio: '下拉单选', NDropdownmultipleselection: '下拉多选', Nenclosure: '附件', - Atext: '文本+下拉单选', - Btext: '文本+下拉多选', + Atext: '下拉单选+文本', + Btext: '下拉多选+文本', Ctext: '文本+附件', Dtext: '下拉单选+附件', Etext: '下拉多选+附件', - Ftext: '文本+下拉单选+附件', + Ftext: '下拉单选+文本+附件', Gtext: '标题', Nnothing: '无', Nchinese: '中文', From 14b91ada5ccf8e5c7fc677da3e8dea53afb189fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Fri, 24 Feb 2023 09:16:11 +0800 Subject: [PATCH 37/39] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=95=B0=E9=87=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ParamsCollectManifestEOServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index e62bd50c6..49809b092 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -4250,6 +4250,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl Date: Fri, 24 Feb 2023 09:16:49 +0800 Subject: [PATCH 38/39] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=95=B0=E9=87=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml b/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml index 7f35fb03c..edb47ec3f 100644 --- a/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml +++ b/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml @@ -130,7 +130,7 @@ spring: connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000 datasource: master: - url: jdbc:mysql://121.36.69.172:3307/laws_weilai?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&useSSL=false + url: jdbc:mysql://121.36.69.172:3307/laws_weilai_230223?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&useSSL=false username: root password: hzwlsoft.com driver-class-name: com.mysql.cj.jdbc.Driver From 5041fbc37e765082c5253dec74be44de1d583730 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Fri, 24 Feb 2023 09:18:00 +0800 Subject: [PATCH 39/39] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=95=B0=E9=87=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml b/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml index edb47ec3f..7f35fb03c 100644 --- a/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml +++ b/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml @@ -130,7 +130,7 @@ spring: connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000 datasource: master: - url: jdbc:mysql://121.36.69.172:3307/laws_weilai_230223?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&useSSL=false + url: jdbc:mysql://121.36.69.172:3307/laws_weilai?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&useSSL=false username: root password: hzwlsoft.com driver-class-name: com.mysql.cj.jdbc.Driver