From dd1d6a3ac0cf2a2c959fe9ea9c5ee81d55fd16ad Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Tue, 10 Jan 2023 09:10:26 +0800 Subject: [PATCH 001/645] =?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 002/645] =?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 003/645] =?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 004/645] =?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 005/645] =?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 006/645] =?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 007/645] =?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 008/645] =?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 009/645] =?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 010/645] =?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 011/645] =?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 012/645] =?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 013/645] =?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 014/645] =?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 015/645] =?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 016/645] =?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 017/645] =?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 018/645] =?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 019/645] =?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 020/645] =?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 021/645] =?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 022/645] =?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 023/645] =?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 024/645] 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 025/645] =?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 026/645] =?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 027/645] =?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 028/645] =?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 029/645] =?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 030/645] =?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 031/645] =?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 032/645] =?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 033/645] =?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 034/645] =?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 035/645] 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 3081582e905c7bd273d2882d60015a78426003ba Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Wed, 22 Feb 2023 15:27:22 +0800 Subject: [PATCH 036/645] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93-=E5=88=86?= =?UTF-8?q?=E9=98=B6=E6=AE=B5=E5=AE=9E=E6=96=BD=E8=AF=A6=E6=83=85=E5=BC=80?= =?UTF-8?q?=E5=8F=91=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 | 22 +++ ...asedImplementationDetailsEOController.java | 170 ++++++++++++++++++ .../entity/PhasedImplementationDetailsEO.java | 89 +++++++++ .../enums/ImplementationTypeEnum.java | 53 ++++++ .../PhasedImplementationDetailsEOMapper.java | 17 ++ .../PhasedImplementationDetailsEOMapper.xml | 17 ++ ...IPhasedImplementationDetailsEOService.java | 61 +++++++ ...sedImplementationDetailsEOServiceImpl.java | 89 +++++++++ 8 files changed, 518 insertions(+) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/PhasedImplementationDetailsEOController.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/PhasedImplementationDetailsEO.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/enums/ImplementationTypeEnum.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/mapper/PhasedImplementationDetailsEOMapper.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/mapper/xml/PhasedImplementationDetailsEOMapper.xml create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IPhasedImplementationDetailsEOService.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/PhasedImplementationDetailsEOServiceImpl.java diff --git a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql index 2c10b0303..3d73e6dfa 100644 --- a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql +++ b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql @@ -201,3 +201,25 @@ ADD COLUMN `msg_content_info_cn` text NULL COMMENT '消息内容（中文）' AF -- 上报库-参数项查看页表头 责任领域更新为展示列表sql 2023-02-17 未同步生产环境 UPDATE `laws_weilai`.`onl_cgform_field` SET `is_show_list` = 1 WHERE `id` = 'c31d68e204960c073b1fb8126a443492'; + +-- 文档库-分阶段实施详情表 2023-02-22 未同步生产环境 +CREATE TABLE `phased_implementation_details` ( + `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建日期', + `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人', + `update_time` datetime NULL DEFAULT NULL COMMENT '更新日期', + `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门', + `buss_document_library_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文档库id', + `stand_number_or_clause` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '法规编号/条款', + `implementation_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '实施类型', + `implementation_date` datetime NULL DEFAULT NULL COMMENT '实施日期', + `remarks` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '文档库-分阶段实施详情表' ROW_FORMAT = Dynamic; + +-- 标签内容管理 新增实施类型标签（在产车/新车形） 2023-02-22 未同步生产环境 +INSERT INTO `laws_weilai`.`sys_dict` (`id`, `dict_name`, `dict_code`, `description`, `del_flag`, `create_by`, `create_time`, `update_by`, `update_time`, `type`, `dict_en_name`, `is_tag_dict`, `is_read_only`, `attribute_type`, `order_num`) VALUES ('1628227874969300994', '实施类型', 'shi2_shi1_lei4_xing2', '文档库-分阶段实施详情-实施类型', 0, 'admin', '2023-02-22 10:59:11', NULL, NULL, NULL, NULL, 1, 0, '1', 1); +INSERT INTO `laws_weilai`.`sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('1628228171473039361', '1628227874969300994', '在产车', '34e90bd6a000471bbdcd0ff325898740', NULL, 1, 1, 'admin', '2023-02-22 11:00:22', NULL, NULL, 1, NULL, NULL, '0', 'Car in production'); +INSERT INTO `laws_weilai`.`sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('1628228101830815745', '1628227874969300994', '新车型', '2148610ff06641849106321531656bfc', NULL, 2, 1, 'admin', '2023-02-22 11:00:05', 'admin', '2023-02-22 11:00:27', 1, NULL, NULL, '0', 'New car model'); + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/PhasedImplementationDetailsEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/PhasedImplementationDetailsEOController.java new file mode 100644 index 000000000..15590eb72 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/PhasedImplementationDetailsEOController.java @@ -0,0 +1,170 @@ +package com.jero.modules.document.controller; + +import java.util.Arrays; +import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import com.jero.common.api.vo.Result; +import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.document.entity.PhasedImplementationDetailsEO; +import com.jero.modules.document.service.IPhasedImplementationDetailsEOService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; +import com.jero.common.system.base.controller.JeroController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.jero.common.aspect.annotation.AutoLog; + + + /** + * @Description: 文档库-分阶段实施详情表 + * @Author: jero-boot + * @Date: 2023-02-22 + * @Version: V1.0 + */ +@Api(tags="文档库-分阶段实施详情表") +@RestController +@RequestMapping("/document/phasedImplementationDetailsEO") +@Slf4j +public class PhasedImplementationDetailsEOController extends JeroController { + @Autowired + private IPhasedImplementationDetailsEOService phasedImplementationDetailsEOService; + + /** + * 分页列表查询 + * + * @param phasedImplementationDetailsEO + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "文档库-分阶段实施详情表-分页列表查询") + @ApiOperation(value="文档库-分阶段实施详情表-分页列表查询", notes="文档库-分阶段实施详情表-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(PhasedImplementationDetailsEO phasedImplementationDetailsEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(phasedImplementationDetailsEO, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = phasedImplementationDetailsEOService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "文档库-分阶段实施详情表-列表查询") + @ApiOperation(value="文档库-分阶段实施详情表-列表查询", notes="文档库-分阶段实施详情表-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = phasedImplementationDetailsEOService.queryList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param phasedImplementationDetailsEO + * @return + */ + @AutoLog(value = "文档库-分阶段实施详情表-添加") + @ApiOperation(value="文档库-分阶段实施详情表-添加", notes="文档库-分阶段实施详情表-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody PhasedImplementationDetailsEO phasedImplementationDetailsEO) { + phasedImplementationDetailsEOService.add(phasedImplementationDetailsEO); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param phasedImplementationDetailsEO + * @return + */ + @AutoLog(value = "文档库-分阶段实施详情表-编辑") + @ApiOperation(value="文档库-分阶段实施详情表-编辑", notes="文档库-分阶段实施详情表-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody PhasedImplementationDetailsEO phasedImplementationDetailsEO) { + phasedImplementationDetailsEOService.editById(phasedImplementationDetailsEO); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "文档库-分阶段实施详情表-通过id删除") + @ApiOperation(value="文档库-分阶段实施详情表-通过id删除", notes="文档库-分阶段实施详情表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + phasedImplementationDetailsEOService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "文档库-分阶段实施详情表-批量删除") + @ApiOperation(value="文档库-分阶段实施详情表-批量删除", notes="文档库-分阶段实施详情表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.phasedImplementationDetailsEOService.deleteByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "文档库-分阶段实施详情表-通过id查询") + @ApiOperation(value="文档库-分阶段实施详情表-通过id查询", notes="文档库-分阶段实施详情表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + PhasedImplementationDetailsEO phasedImplementationDetailsEO = phasedImplementationDetailsEOService.queryById(id); + if(phasedImplementationDetailsEO==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(phasedImplementationDetailsEO); + } + + /** + * 导出excel + * + * @param request + * @param phasedImplementationDetailsEO + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, PhasedImplementationDetailsEO phasedImplementationDetailsEO) { + return super.exportXls(request, phasedImplementationDetailsEO, PhasedImplementationDetailsEO.class, "文档库-分阶段实施详情表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, PhasedImplementationDetailsEO.class); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/PhasedImplementationDetailsEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/PhasedImplementationDetailsEO.java new file mode 100644 index 000000000..f21131815 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/PhasedImplementationDetailsEO.java @@ -0,0 +1,89 @@ +package com.jero.modules.document.entity; + +import java.io.Serializable; +import java.util.Date; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + + +/** + * @Description: 文档库-分阶段实施详情表 + * @Author: jero-boot + * @Date: 2023-02-22 + * @Version: V1.0 + */ +@Data +@TableName("phased_implementation_details") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="phased_implementation_details对象", description="文档库-分阶段实施详情表") +public class PhasedImplementationDetailsEO implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private String sysOrgCode; + + /**文档库id*/ + @Excel(name = "文档库id", width = 15) + @ApiModelProperty(value = "文档库id") + private String bussDocumentLibraryId; + + /**法规编号/条款*/ + @Excel(name = "法规编号/条款", width = 15) + @ApiModelProperty(value = "法规编号/条款") + private String standNumberOrClause; + + /**实施类型*/ + @Excel(name = "实施类型", width = 15) + @ApiModelProperty(value = "实施类型") + private String implementationType; + + /**实施日期*/ + @Excel(name = "实施日期", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "实施日期") + private Date implementationDate; + + /**备注*/ + @Excel(name = "备注", width = 15) + @ApiModelProperty(value = "备注") + private String remarks; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/enums/ImplementationTypeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/enums/ImplementationTypeEnum.java new file mode 100644 index 000000000..312566ecb --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/enums/ImplementationTypeEnum.java @@ -0,0 +1,53 @@ +package com.jero.modules.document.enums; + +/** + * 实施类型枚举类 + */ +public enum ImplementationTypeEnum { + CAR_IN_PRODUCTION("1628228171473039361","在产车","Car in production","34e90bd6a000471bbdcd0ff325898740"), + NEW_CAR_MODEL("1628228101830815745","新车型","New car model","2148610ff06641849106321531656bfc"); + + String id; + String nameCn; + String nameEn; + String itemValue; + + private ImplementationTypeEnum(String id,String nameCn, String nameEn,String itemValue) { + this.id = id; + this.nameCn = nameCn; + this.nameEn = nameEn; + this.itemValue = itemValue; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getNameCn() { + return nameCn; + } + + public void setNameCn(String nameCn) { + this.nameCn = nameCn; + } + + public String getNameEn() { + return nameEn; + } + + public void setNameEn(String nameEn) { + this.nameEn = nameEn; + } + + public String getItemValue() { + return itemValue; + } + + public void setItemValue(String itemValue) { + this.itemValue = itemValue; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/mapper/PhasedImplementationDetailsEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/mapper/PhasedImplementationDetailsEOMapper.java new file mode 100644 index 000000000..60326ee70 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/mapper/PhasedImplementationDetailsEOMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.document.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.document.entity.PhasedImplementationDetailsEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 文档库-分阶段实施详情表 + * @Author: jero-boot + * @Date: 2023-02-22 + * @Version: V1.0 + */ +public interface PhasedImplementationDetailsEOMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/mapper/xml/PhasedImplementationDetailsEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/mapper/xml/PhasedImplementationDetailsEOMapper.xml new file mode 100644 index 000000000..9cc5e6f8a --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/mapper/xml/PhasedImplementationDetailsEOMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IPhasedImplementationDetailsEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IPhasedImplementationDetailsEOService.java new file mode 100644 index 000000000..78b3347f1 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IPhasedImplementationDetailsEOService.java @@ -0,0 +1,61 @@ +package com.jero.modules.document.service; + +import com.jero.modules.document.entity.PhasedImplementationDetailsEO; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 文档库-分阶段实施详情表 + * @Author: jero-boot + * @Date: 2023-02-22 + * @Version: V1.0 + */ +public interface IPhasedImplementationDetailsEOService extends IService { + + /** + * 保存 + * + * @param phasedImplementationDetailsEO + * @return + */ + void add(PhasedImplementationDetailsEO phasedImplementationDetailsEO); + + /** + * 更新 + * + * @param phasedImplementationDetailsEO + * @return + */ + void editById(PhasedImplementationDetailsEO phasedImplementationDetailsEO); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + PhasedImplementationDetailsEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/PhasedImplementationDetailsEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/PhasedImplementationDetailsEOServiceImpl.java new file mode 100644 index 000000000..38a33e780 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/PhasedImplementationDetailsEOServiceImpl.java @@ -0,0 +1,89 @@ +package com.jero.modules.document.service.impl; + +import com.jero.modules.document.entity.PhasedImplementationDetailsEO; +import com.jero.modules.document.mapper.PhasedImplementationDetailsEOMapper; +import com.jero.modules.document.service.IPhasedImplementationDetailsEOService; +import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Date; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 文档库-分阶段实施详情表 + * @Author: jero-boot + * @Date: 2023-02-22 + * @Version: V1.0 + */ +@Service +public class PhasedImplementationDetailsEOServiceImpl extends ServiceImpl implements IPhasedImplementationDetailsEOService { + + /** + * 保存 + * + * @param phasedImplementationDetailsEO + * @return + */ + @Override + public void add(PhasedImplementationDetailsEO phasedImplementationDetailsEO) { + Date now = new Date(); + phasedImplementationDetailsEO.setCreateTime(now); + phasedImplementationDetailsEO.setUpdateTime(now); + save(phasedImplementationDetailsEO); + } + + /** + * 更新 + * + * @param phasedImplementationDetailsEO + * @return + */ + @Override + public void editById(PhasedImplementationDetailsEO phasedImplementationDetailsEO) { + Date now = new Date(); + phasedImplementationDetailsEO.setUpdateTime(now); + saveOrUpdate(phasedImplementationDetailsEO); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public PhasedImplementationDetailsEO queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } +} From a93292d7d54320acad0ac9f44bf8af1661a4c736 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Thu, 23 Feb 2023 15:29:20 +0800 Subject: [PATCH 037/645] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93-=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E3=80=81=E5=B8=A6=E6=96=87=E4=BB=B6=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=88=86=E9=98=B6=E6=AE=B5=E5=AE=9E=E6=96=BD=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=BC=80=E5=8F=91=E3=80=82=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BussDocumentLibraryEOServiceImpl.java | 73 ++++++++++++++++++- 1 file changed, 71 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index 58ce204a7..e2e621b0b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -31,11 +31,13 @@ import com.jero.modules.collection.entity.OnlCgformCollection; import com.jero.modules.collection.service.IOnlCgformCollectionService; import com.jero.modules.document.entity.BussDocumentLibraryEO; import com.jero.modules.document.entity.OSSFileForDocumentLibrary; +import com.jero.modules.document.entity.PhasedImplementationDetailsEO; import com.jero.modules.document.enums.FieldTypeEnum; import com.jero.modules.document.enums.LawsStateEnum; import com.jero.modules.document.enums.SearchEnum; import com.jero.modules.document.mapper.BussDocumentLibraryEOMapper; import com.jero.modules.document.service.IBussDocumentLibraryEOService; +import com.jero.modules.document.service.IPhasedImplementationDetailsEOService; import com.jero.modules.document.utils.ReadPdfUtil; import com.jero.modules.document.utils.ReadWordUtil; import com.jero.modules.document.vo.QueryConditionVO; @@ -188,6 +190,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl !FieldTypeEnum.FILE.getValue().equals(e.getFieldShowType())).collect(Collectors.toList()); @@ -4790,6 +4802,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl sysDictItems = sysDictItemServiceImpl.selectItemsAll(); //文件字段 @@ -4800,13 +4813,60 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl connectIdList = new ArrayList<>(); + List idList = datas.stream().map(data -> (String) data.get("id")).distinct().collect(Collectors.toList()); + + List phasedImplDetailsEOList = null; + if(CollectionUtils.isNotEmpty(idList)){ + QueryWrapper phasedImplDetailsQueryWrap = new QueryWrapper<>(); + phasedImplDetailsQueryWrap.lambda().in(PhasedImplementationDetailsEO::getBussDocumentLibraryId,idList); + phasedImplDetailsEOList = this.phasedImplementationDetailsEOService.list(phasedImplDetailsQueryWrap); + } + for (Map data : datas) { + StringBuilder phasedImplDetailsSb = new StringBuilder(); + String id = (String) data.get("id"); + for (OnlCgformField onlCgformField : fileFieldList) { String value = StringUtils.valueOf(data.get(onlCgformField.getDbFieldName())); if (StringUtils.isNotBlank(value)) { connectIdList.add(value); } } + + if(CollectionUtils.isNotEmpty(phasedImplDetailsEOList)){ + List phasedImplDetailsEOListTemp = phasedImplDetailsEOList.stream().filter(phased -> { + boolean flag = false; + if(StringUtils.equals(id,phased.getBussDocumentLibraryId())){ + flag = true; + } + return flag; + }).collect(Collectors.toList()); + + if(CollectionUtils.isNotEmpty(phasedImplDetailsEOListTemp)){ + for (PhasedImplementationDetailsEO detailsEO : phasedImplDetailsEOListTemp) { + StringBuilder phasedImplDetailsSbTemp = new StringBuilder(); + if(StringUtils.isNotEmpty(phasedImplDetailsSb.toString())){ + phasedImplDetailsSb.append("#"); + } + if(StringUtils.isNotEmpty(detailsEO.getStandNumberOrClause())){ + phasedImplDetailsSbTemp.append(detailsEO.getStandNumberOrClause()).append(""); + } + if(StringUtils.isNotEmpty(detailsEO.getImplementationType())){ + phasedImplDetailsSbTemp.append(detailsEO.getImplementationType()).append(""); + } + if(detailsEO.getImplementationDate()!=null){ + phasedImplDetailsSbTemp.append(DateUtils.formatTime(detailsEO.getImplementationDate())).append(""); + } + if(StringUtils.isNotEmpty(detailsEO.getRemarks())){ + phasedImplDetailsSbTemp.append(detailsEO.getRemarks()).append(""); + } + if(StringUtils.isNotEmpty(phasedImplDetailsSbTemp.toString())){ + phasedImplDetailsSb.append(phasedImplDetailsSbTemp.toString().substring(0,phasedImplDetailsSbTemp.toString().length()-3)); + } + } + } + } + data.put("phasedImplDetails",phasedImplDetailsSb.toString()); } //所有的文件信息 List fileInfos = new ArrayList<>(); @@ -4856,7 +4916,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl Date: Thu, 23 Feb 2023 16:38:10 +0800 Subject: [PATCH 038/645] =?UTF-8?q?=E5=88=86=E9=98=B6=E6=AE=B5=E5=AE=9E?= =?UTF-8?q?=E6=96=BD=E8=AF=A6=E6=83=85=E7=9B=B8=E5=85=B3=E5=BC=80=E5=8F=91?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...IPhasedImplementationDetailsEOService.java | 2 + .../BussDocumentLibraryEOServiceImpl.java | 42 ++++++++++++++++++- ...sedImplementationDetailsEOServiceImpl.java | 22 ++++++++++ 3 files changed, 65 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IPhasedImplementationDetailsEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IPhasedImplementationDetailsEOService.java index 78b3347f1..a4f651c07 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IPhasedImplementationDetailsEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IPhasedImplementationDetailsEOService.java @@ -58,4 +58,6 @@ public interface IPhasedImplementationDetailsEOService extends IService queryList(); + + boolean insertBatch(List phasedImplDetailsEOList); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index e2e621b0b..689eb6cb0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -897,6 +897,13 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl phasedImplDetailsQueryWrap = new QueryWrapper<>(); + phasedImplDetailsQueryWrap.lambda().eq(PhasedImplementationDetailsEO::getBussDocumentLibraryId,id); + List phasedImplementationDetailsEOList = this.phasedImplementationDetailsEOService.list(phasedImplDetailsQueryWrap); + dataList.get(0).put("phasedImplementationDetailsEOList",phasedImplementationDetailsEOList); + return dataList; } // public List> getDocumentInfoById(String id, String cut) { @@ -1935,6 +1942,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl phasedImplementationDetailsEOS = this.insertBatchPhasedImplementationDetailsInfo(map); + String replaceStandard = StringUtils.valueOf(map.get("replace_standard")); if (StringUtils.isNotBlank(replaceStandard)) { //新增时如果填写代替标准,需要向填写的代替标准的负责人发消息 @@ -1943,7 +1953,6 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl phasedImplDetailsEOList = this.insertBatchPhasedImplementationDetailsInfo(map); + //通过id查询数据 List> dataList = bussDocumentLibraryEOMapper.selectMapsAll(id); if(dataList.size() != 0){ @@ -6701,4 +6714,31 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl insertBatchPhasedImplementationDetailsInfo(Map map){ + String id = (String) map.get("id"); + + List phasedImplDetailsEOList = new ArrayList<>(); + if(map.containsKey("phasedImplementationDetailsEOList")){ + PhasedImplementationDetailsEO phasedImplDetailsEO = null; + JSONArray phasedImplDetailsEOJsonArr = JSONObject.parseArray(JSONObject.toJSONString(map.get("phasedImplementationDetailsEOList"))); + for (Object phasedImplDetailsEOJson : phasedImplDetailsEOJsonArr) { + phasedImplDetailsEO = JSONObject.parseObject(JSONObject.toJSONString(phasedImplDetailsEOJson),PhasedImplementationDetailsEO.class); + phasedImplDetailsEO.setBussDocumentLibraryId(id); + phasedImplDetailsEOList.add(phasedImplDetailsEO); + } + + boolean insertPhasedBatchFlag = this.phasedImplementationDetailsEOService.insertBatch(phasedImplDetailsEOList); + if(!insertPhasedBatchFlag){ + throw new JeroBootException("添加分阶段实施详情信息失败！"); + } + } + + return phasedImplDetailsEOList; + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/PhasedImplementationDetailsEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/PhasedImplementationDetailsEOServiceImpl.java index 38a33e780..c7ffc5b28 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/PhasedImplementationDetailsEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/PhasedImplementationDetailsEOServiceImpl.java @@ -1,8 +1,10 @@ package com.jero.modules.document.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.jero.modules.document.entity.PhasedImplementationDetailsEO; import com.jero.modules.document.mapper.PhasedImplementationDetailsEOMapper; import com.jero.modules.document.service.IPhasedImplementationDetailsEOService; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; import java.util.List; import java.util.Date; @@ -86,4 +88,24 @@ public class PhasedImplementationDetailsEOServiceImpl extends ServiceImpl queryList() { return list(); } + + @Override + public boolean insertBatch(List phasedImplDetailsEOList) { + boolean flag = true; + if(CollectionUtils.isNotEmpty(phasedImplDetailsEOList)){ + try { + String bussDocumentLibraryId = phasedImplDetailsEOList.get(0).getBussDocumentLibraryId(); + QueryWrapper deleteWrap = new QueryWrapper<>(); + deleteWrap.lambda().eq(PhasedImplementationDetailsEO::getBussDocumentLibraryId,bussDocumentLibraryId); + this.baseMapper.delete(deleteWrap); + + this.saveBatch(phasedImplDetailsEOList); + }catch (Exception ex){ + flag = false; + ex.printStackTrace(); + log.error("批量添加分阶段实施详情信息失败：" + ex.getMessage()); + } + } + return flag; + } } From 2ba13f1c4d7dc61752e1d759c01bde72d8ae3055 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Thu, 23 Feb 2023 18:03:40 +0800 Subject: [PATCH 039/645] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93-=E5=88=86?= =?UTF-8?q?=E9=98=B6=E6=AE=B5=E5=AE=9E=E6=96=BD=E8=AF=A6=E6=83=85=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E5=BC=80=E5=8F=91=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 | 2 ++ .../document/entity/PhasedImplementationDetailsEO.java | 4 ++++ .../service/impl/BussDocumentLibraryEOServiceImpl.java | 6 ++++++ 3 files changed, 12 insertions(+) diff --git a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql index 3d73e6dfa..3cfae8b3a 100644 --- a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql +++ b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql @@ -223,3 +223,5 @@ INSERT INTO `laws_weilai`.`sys_dict` (`id`, `dict_name`, `dict_code`, `descripti INSERT INTO `laws_weilai`.`sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('1628228171473039361', '1628227874969300994', '在产车', '34e90bd6a000471bbdcd0ff325898740', NULL, 1, 1, 'admin', '2023-02-22 11:00:22', NULL, NULL, 1, NULL, NULL, '0', 'Car in production'); INSERT INTO `laws_weilai`.`sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('1628228101830815745', '1628227874969300994', '新车型', '2148610ff06641849106321531656bfc', NULL, 2, 1, 'admin', '2023-02-22 11:00:05', 'admin', '2023-02-22 11:00:27', 1, NULL, NULL, '0', 'New car model'); +-- 文档库-分阶段实施详情表-增加排序号字段 2023-02-23 未同步生产环境 +ALTER TABLE `phased_implementation_details` ADD COLUMN `order_num` int(10) NULL COMMENT '排序号' AFTER `remarks`; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/PhasedImplementationDetailsEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/PhasedImplementationDetailsEO.java index f21131815..977e144f3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/PhasedImplementationDetailsEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/PhasedImplementationDetailsEO.java @@ -86,4 +86,8 @@ public class PhasedImplementationDetailsEO implements Serializable { @ApiModelProperty(value = "备注") private String remarks; + /**排序号*/ + @Excel(name = "排序号", width = 15) + @ApiModelProperty(value = "排序号") + private Integer orderNum; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index 689eb6cb0..d9e7635dc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -1737,6 +1737,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl entry : map.entrySet()) { String key = entry.getKey(); + if(StringUtils.equals(key,"phasedImplementationDetailsEOList")){ + continue; + } Object value = entry.getValue(); //es全文新增数据(数据转换) esFullText(cut, fieldList, categoryList, dictItemList, mapList, sbCn,sbEn, entry); @@ -6727,10 +6730,13 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl Date: Thu, 23 Feb 2023 21:09:25 +0800 Subject: [PATCH 040/645] =?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 041/645] =?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 042/645] =?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 043/645] =?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 From bea4b63e12ec2961b5084a6bf40c3142ad7425ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Fri, 24 Feb 2023 14:22:44 +0800 Subject: [PATCH 044/645] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93-=E5=88=86?= =?UTF-8?q?=E9=98=B6=E6=AE=B5=E5=AE=9E=E6=96=BD=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 4 + jero-web/src/common/lang/zh-cn.js | 4 + .../src/components/dict/JDictSelectTag.vue | 2 +- .../src/components/libraryAddForm/index.vue | 280 +++++++++++++++++- .../library/docDetail/index.vue | 98 +++++- .../views/documentManage/library/index.vue | 3 +- 6 files changed, 384 insertions(+), 7 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index e2f58b10f..cca62c859 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -123,8 +123,12 @@ module.exports = { MergeAll: 'Merge All', TreeOperation: 'Tree Operation', essentialInformation: 'General Information', + DetailsPhasedImplementation: 'Details of the phased implementation', + Statutenumberclause: 'Statute number/clause', OrganizationName: 'Organization Name', EnterOrganizationDepartment: 'Please enter organization / department name', + Typeofimplementation: 'Type of implementation', + ImplementationDate: 'Implementation date', SuperiorDepartment: 'Superior Department', enterOrganizationCode: 'Please enter organization code', nothing: 'Nothing', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index ed71ce96b..345917f36 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -125,6 +125,10 @@ module.exports = { MergeAll: '合并所有', TreeOperation: '树操作', essentialInformation: '基本信息', + DetailsPhasedImplementation: '分阶段实施详情', + Statutenumberclause: '法规编号/条款', + Typeofimplementation: '实施类型', + ImplementationDate: '实施时间', OrganizationName: '机构名称', EnterOrganizationDepartment: '请输入机构/部门名称', SuperiorDepartment: '上级部门', diff --git a/jero-web/src/components/dict/JDictSelectTag.vue b/jero-web/src/components/dict/JDictSelectTag.vue index 6362c6bc7..b73e30232 100644 --- a/jero-web/src/components/dict/JDictSelectTag.vue +++ b/jero-web/src/components/dict/JDictSelectTag.vue @@ -109,7 +109,7 @@ } }) if (this.triggerChange) { - this.$emit('change', val) + this.$emit('change', val,content) } else { this.$emit('input', val) this.$emit('changeQuery', content, this.db_field_name) diff --git a/jero-web/src/components/libraryAddForm/index.vue b/jero-web/src/components/libraryAddForm/index.vue index 86cd81291..a075581f9 100644 --- a/jero-web/src/components/libraryAddForm/index.vue +++ b/jero-web/src/components/libraryAddForm/index.vue @@ -225,11 +225,184 @@
+
+ +
+
+ {{$t('DetailsPhasedImplementation')}} +
+ + {{ $t('newlyAdded') }} + + + + + {{$t('edit')}} + + + {{$t("deleteLib")}} + + + +
+ + + + +
+
+ {{$t('Statutenumberclause')}} +
+ + + +
+ + +
+
+ {{$t('Typeofimplementation')}} +
+ + + +
+ + +
+
+ {{$t('ImplementationDate')}} +
+ + + + +
+ + +
+
+ {{$t('remarks')}} +
+ + + +
+ + + + + + + + + +
+
+ {{$t('Statutenumberclause')}} +
+ + + +
+ + +
+
+ {{$t('Typeofimplementation')}} +
+ + + +
+ + +
+
+ {{$t('ImplementationDate')}} +
+ + + + +
+ + +
+
+ {{$t('remarks')}} +
+ + + +
+ + + + + @@ -266,7 +439,12 @@ }, data() { return { + tablevisibleGrad: false, + visibleGrad: false, + loading: false, formInline: {}, + tabledataGrad: {}, + dataGradto: [], isFormInline: false, rules: {}, labelCol: { @@ -296,13 +474,80 @@ text: this.$t('relatedInformation'), content: [] } - ] + ], + columnsGrading: [ + { + title: this.$t('Statutenumberclause'), + dataIndex: 'standNumberOrClause', + align: 'left', + ellipsis: true, + width: 160 + }, + { + title: this.$t('Typeofimplementation'), + dataIndex: 'implementationTypeText', + align: 'left', + ellipsis: true, + width: 100 + }, + { + title: this.$t('ImplementationDate'), + dataIndex: 'implementationDate', + align: 'left', + ellipsis: true, + width: 150 + }, + { + title: this.$t('remarks'), + dataIndex: 'remarks', + align: 'left', + ellipsis: true, + width: 254 + }, + { + title: this.$t('operation'), + align: 'left', + fixed: 'right', + width: 180, + scopedSlots: { customRender: 'Gradoperation' } + } + ], + dataGrad: [], } }, mounted() { }, methods: { + tablehandleCancel(){ + this.tablevisibleGrad = false + console.log(this.tabledataGrad) + this.dataGradto[this.tabledataIndex] = this.tabledataGrad + this.dataGradto= [... this.dataGradto] + }, + deleteLib(val,index) { + let _this = this + this.$confirm({ + content: _this.$t('ConfirmDelete'), + onOk() { + _this.dataGradto.splice(index,1) + _this.dataGradto = [..._this.dataGradto] + } + }) + }, + newlyAdded(){ + this.tabledataGrad = {} + this.visibleGrad = true + }, + handeredit(result,index){ + this.tablevisibleGrad = true + this.tabledataIndex = index + this.tabledataGrad = JSON.parse(JSON.stringify(result)) + }, + handleCancel(){ + this.dataGradto.push(this.tabledataGrad) + this.visibleGrad = false + }, disabledDate(current) { return current && current < moment().subtract(1, 'day') }, @@ -314,6 +559,7 @@ this.formInline = { ...this.formInline } }, sumber() { + // this.postTable() this.$refs.ruleForm.validate(valid => { if (valid) { this.confirmLoading = true @@ -329,6 +575,7 @@ formInline[res] = formInline[res].join(',') } }) + formInline.phasedImplementationDetailsEOList = this.dataGradto postAction(url, formInline).then((res) => { if (res.success) { this.confirmLoading = false @@ -361,6 +608,13 @@ dateChange(item) { this.formInline[item.db_field_name] = this.formInline[item.db_field_name] ? moment(this.formInline[item.db_field_name]).format('YYYY-MM-DD') : '' }, + dateChangeOne(item) { + this.tabledataGrad.implementationDate = this.tabledataGrad.implementationDate ? moment(this.tabledataGrad.implementationDate).format('YYYY-MM-DD') : '' + console.log(this.tabledataGrad.implementationDate) + }, + implementationTypeChange(val){ + this.tabledataGrad.implementationTypeText = val + }, onChange(item) { let dateOne = moment(this.formInline[item][0]).format('YYYY-MM-DD') let dateTwo = moment(this.formInline[item][1]).format('YYYY-MM-DD') @@ -479,18 +733,33 @@ } }) }, + postTable(){ + let params = this.dataGradto + postAction(this.url.getDocumentInfo, params).then((res) => { + if (res.success) { + this.$message.success(this.$t('OperationSuccessful')) + } + }) + }, edit(item) { this.type = 'edit' + this.loading = true this.getForm(() => { getAction(this.url.getDocumentInfo, { id: item.id }).then((res) => { if (res.success) { this.formInline = res.result[0] + this.dataGrad = res.result[0].phasedImplementationDetailsEOList + this.dataGradto = this.dataGrad + this.loading = false + } else { + this.loading = false } }) }) }, add() { this.formInline = {} + this.dataGrad = [] this.type = 'add' this.getForm() }, @@ -642,4 +911,13 @@ line-height: 6px; color: #fff; } + + .table { + margin-top: 5px; + } + + .page { + text-align: right; + margin-top: 20px; + } \ No newline at end of file diff --git a/jero-web/src/views/documentManage/library/docDetail/index.vue b/jero-web/src/views/documentManage/library/docDetail/index.vue index b923275cb..fa7898358 100644 --- a/jero-web/src/views/documentManage/library/docDetail/index.vue +++ b/jero-web/src/views/documentManage/library/docDetail/index.vue @@ -162,9 +162,34 @@
+
+
+
+ {{$t('DetailsPhasedImplementation')}} +
+ + +
+ +
+
+
-
{ + if (res.success) { + this.dataGrad = res.result.records + this.tabletotal=res.result.total + this.loading = false + } else { + this.dataGrad = [] + this.loading = false + } + }) + }, clickButtonToUpload(item) { this.loading = true this.visibleFile = true @@ -518,11 +595,20 @@ this.pageNo = page this.bussLogList() }, + onTableChange(page, pageSize) { + this.tablepageNo = page + this.getPage() + }, SizeChange(page, pageSize) { this.pageNo = 1 this.pageSize = pageSize this.bussLogList() }, + tableSizeChange(page, pageSize) { + this.tablepageNo = 1 + this.tablepageSize = pageSize + this.getPage() + }, DocumentSplitting() { let serial_number = '' if (this.detailList.length > 0) { @@ -835,6 +921,10 @@ //} /deep/ .ant-table-placeholder{ - margin-top: 8px !important; + margin-top: 0px !important; + } + + .text { + margin-right: 10px } \ No newline at end of file diff --git a/jero-web/src/views/documentManage/library/index.vue b/jero-web/src/views/documentManage/library/index.vue index d261d2fa8..da37839a2 100644 --- a/jero-web/src/views/documentManage/library/index.vue +++ b/jero-web/src/views/documentManage/library/index.vue @@ -127,7 +127,8 @@ deleteBatch: 'document/bussDocumentLibraryEO/deleteBatch', //删除 pullMessage: 'document/bussDocumentLibraryEO/pullMessage',//推送 importZipUrl: '/document/bussDocumentLibraryEO/importZip',//导入 - verifyBind: '/document/bussDocumentLibraryEO/verifyBind' //验证当前的数据是否可以删除 + verifyBind: '/document/bussDocumentLibraryEO/verifyBind', //验证当前的数据是否可以删除 + getPage : '/document/phasedImplementationDetailsEO/page' }, idList: [] } From cccd85d6dacd884869fc68921146c6483a94a8db Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Fri, 24 Feb 2023 15:12:19 +0800 Subject: [PATCH 045/645] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93-=E9=98=B6?= =?UTF-8?q?=E6=AE=B5=E5=AE=9E=E6=96=BD=E8=AF=A6=E6=83=85=E5=BC=80=E5=8F=91?= =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...asedImplementationDetailsEOController.java | 4 +- .../entity/PhasedImplementationDetailsEO.java | 5 +++ ...IPhasedImplementationDetailsEOService.java | 2 + .../BussDocumentLibraryEOServiceImpl.java | 7 ++- ...sedImplementationDetailsEOServiceImpl.java | 44 +++++++++++++++++++ 5 files changed, 59 insertions(+), 3 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/PhasedImplementationDetailsEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/PhasedImplementationDetailsEOController.java index 15590eb72..db40d261a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/PhasedImplementationDetailsEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/PhasedImplementationDetailsEOController.java @@ -35,7 +35,7 @@ import com.jero.common.aspect.annotation.AutoLog; public class PhasedImplementationDetailsEOController extends JeroController { @Autowired private IPhasedImplementationDetailsEOService phasedImplementationDetailsEOService; - + /** * 分页列表查询 * @@ -51,10 +51,12 @@ public class PhasedImplementationDetailsEOController extends JeroController queryPageList(PhasedImplementationDetailsEO phasedImplementationDetailsEO, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + @RequestParam(name="cut", defaultValue="cn") String cut, HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(phasedImplementationDetailsEO, req.getParameterMap()); Page page = new Page(pageNo, pageSize); IPage pageList = phasedImplementationDetailsEOService.page(page, queryWrapper); + this.phasedImplementationDetailsEOService.disposeData(pageList.getRecords(),cut); return Result.OK(pageList); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/PhasedImplementationDetailsEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/PhasedImplementationDetailsEO.java index 977e144f3..64aeb6b15 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/PhasedImplementationDetailsEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/PhasedImplementationDetailsEO.java @@ -4,6 +4,7 @@ import java.io.Serializable; import java.util.Date; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -74,6 +75,10 @@ public class PhasedImplementationDetailsEO implements Serializable { @ApiModelProperty(value = "实施类型") private String implementationType; + /**实施类型展示文本**/ + @TableField(exist = false) + private String implementationTypeText; + /**实施日期*/ @Excel(name = "实施日期", width = 15, format = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IPhasedImplementationDetailsEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IPhasedImplementationDetailsEOService.java index a4f651c07..7a878ca3e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IPhasedImplementationDetailsEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IPhasedImplementationDetailsEOService.java @@ -60,4 +60,6 @@ public interface IPhasedImplementationDetailsEOService extends IService queryList(); boolean insertBatch(List phasedImplDetailsEOList); + + void disposeData(List datas, String cut); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index d9e7635dc..44bf75694 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -902,6 +902,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl phasedImplDetailsQueryWrap = new QueryWrapper<>(); phasedImplDetailsQueryWrap.lambda().eq(PhasedImplementationDetailsEO::getBussDocumentLibraryId,id); List phasedImplementationDetailsEOList = this.phasedImplementationDetailsEOService.list(phasedImplDetailsQueryWrap); + this.phasedImplementationDetailsEOService.disposeData(phasedImplementationDetailsEOList,cut); dataList.get(0).put("phasedImplementationDetailsEOList",phasedImplementationDetailsEOList); return dataList; @@ -2331,8 +2332,6 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl phasedImplDetailsEOList = this.insertBatchPhasedImplementationDetailsInfo(map); //通过id查询数据 List> dataList = bussDocumentLibraryEOMapper.selectMapsAll(id); @@ -2643,6 +2642,10 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl phasedImplDetailsEOList = this.insertBatchPhasedImplementationDetailsInfo(map); + map.put("module_type", "文档库"); map.put("module_type_flag", ModuleTypeFlagEnum.DOCUMENT_LIBRARY.getValue()); map.put("create_time", new Date()); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/PhasedImplementationDetailsEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/PhasedImplementationDetailsEOServiceImpl.java index c7ffc5b28..f3da21a6a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/PhasedImplementationDetailsEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/PhasedImplementationDetailsEOServiceImpl.java @@ -1,13 +1,20 @@ package com.jero.modules.document.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.jero.common.constant.enums.CutEnum; import com.jero.modules.document.entity.PhasedImplementationDetailsEO; +import com.jero.modules.document.enums.ImplementationTypeEnum; import com.jero.modules.document.mapper.PhasedImplementationDetailsEOMapper; import com.jero.modules.document.service.IPhasedImplementationDetailsEOService; +import me.zhyd.oauth.utils.StringUtils; import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; + +import java.util.Arrays; import java.util.List; import java.util.Date; +import java.util.stream.Collectors; + import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** @@ -108,4 +115,41 @@ public class PhasedImplementationDetailsEOServiceImpl extends ServiceImpl datas, String cut) { + if(CollectionUtils.isNotEmpty(datas)){ + for (PhasedImplementationDetailsEO data : datas) { + String implementationType = data.getImplementationType(); + if(StringUtils.isNotEmpty(implementationType)){ + String[] implementationTypeArr = implementationType.split(","); + ImplementationTypeEnum[] implementationTypeEnums = ImplementationTypeEnum.values(); + + String implementationTypeText = ""; + if(org.apache.commons.lang3.StringUtils.equals(cut, CutEnum.CN.getValue())){ + implementationTypeText = Arrays.stream(implementationTypeEnums).filter(implementationTypeEnum -> { + boolean flag = false; + for (String type : implementationTypeArr) { + if (org.apache.commons.lang3.StringUtils.equals(type, implementationTypeEnum.getItemValue())) { + flag = true; + } + } + return flag; + }).map(ImplementationTypeEnum::getNameCn).collect(Collectors.joining(",")); + }else { + implementationTypeText = Arrays.stream(implementationTypeEnums).filter(implementationTypeEnum -> { + boolean flag = false; + for (String type : implementationTypeArr) { + if (org.apache.commons.lang3.StringUtils.equals(type, implementationTypeEnum.getItemValue())) { + flag = true; + } + } + return flag; + }).map(ImplementationTypeEnum::getNameEn).collect(Collectors.joining(",")); + } + data.setImplementationTypeText(implementationTypeText); + } + } + } + } } From f71ae60908fa86042ca41982c37c9ccef1edbe00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Fri, 24 Feb 2023 15:30:39 +0800 Subject: [PATCH 046/645] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93-=E5=88=86?= =?UTF-8?q?=E9=98=B6=E6=AE=B5=E5=AE=9E=E6=96=BD=E8=AF=A6=E6=83=85-?= =?UTF-8?q?=E5=AE=9E=E6=96=BD=E7=B1=BB=E5=9E=8B(=E5=A4=9A=E9=80=89)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/libraryAddForm/index.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jero-web/src/components/libraryAddForm/index.vue b/jero-web/src/components/libraryAddForm/index.vue index a075581f9..fbb84fbc9 100644 --- a/jero-web/src/components/libraryAddForm/index.vue +++ b/jero-web/src/components/libraryAddForm/index.vue @@ -285,7 +285,7 @@ {{$t('Typeofimplementation')}}
- {{$t('Typeofimplementation')}}
- Date: Mon, 27 Feb 2023 14:30:58 +0800 Subject: [PATCH 047/645] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93-=E5=88=86?= =?UTF-8?q?=E9=98=B6=E6=AE=B5=E5=AE=9E=E6=96=BD=E8=AF=A6=E6=83=85-?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=A1=A8=E5=8D=95=E9=AA=8C=E8=AF=81=E8=A7=84?= =?UTF-8?q?=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/libraryAddForm/index.vue | 62 +++++++++++++------ 1 file changed, 44 insertions(+), 18 deletions(-) diff --git a/jero-web/src/components/libraryAddForm/index.vue b/jero-web/src/components/libraryAddForm/index.vue index fbb84fbc9..4fed77af8 100644 --- a/jero-web/src/components/libraryAddForm/index.vue +++ b/jero-web/src/components/libraryAddForm/index.vue @@ -258,7 +258,6 @@
- +
{{$t('Statutenumberclause')}}
- + @@ -313,7 +313,7 @@
{{$t('remarks')}}
- + @@ -325,13 +325,12 @@ {{ $t('cancel') }} - + {{ $t('determine') }} - +
{{$t('Statutenumberclause')}}
- + @@ -386,7 +386,7 @@
{{$t('remarks')}}
- + @@ -398,7 +398,7 @@ {{ $t('cancel') }} - + {{ $t('determine') }} @@ -447,6 +447,24 @@ dataGradto: [], isFormInline: false, rules: {}, + tablerules: { + standNumberOrClause: [ + { + // required: true, + max: 10, + message: this.$t('Statutenumberclause') + this.$t('cannotExceed') + 10 + this.$t('Characters'), + trigger: 'blur' + } + ], + remarks: [ + { + // required: true, + max: 1000, + message: this.$t('remarks') + this.$t('cannotExceed') + 1000 + this.$t('Characters'), + trigger: 'blur' + } + ] + }, labelCol: { xs: { span: 24 }, sm: { span: 6 } @@ -519,11 +537,15 @@ }, methods: { - tablehandleCancel(){ - this.tablevisibleGrad = false - console.log(this.tabledataGrad) - this.dataGradto[this.tabledataIndex] = this.tabledataGrad - this.dataGradto= [... this.dataGradto] + tablehandleSubmit(){ + this.$refs.tableruleFormedit.validate((valid) => { + if(valid){ + this.tablevisibleGrad = false + console.log(this.tabledataGrad) + this.dataGradto[this.tabledataIndex] = this.tabledataGrad + this.dataGradto= [... this.dataGradto] + } + }) }, deleteLib(val,index) { let _this = this @@ -544,9 +566,13 @@ this.tabledataIndex = index this.tabledataGrad = JSON.parse(JSON.stringify(result)) }, - handleCancel(){ - this.dataGradto.push(this.tabledataGrad) - this.visibleGrad = false + handleSubmit(){ + this.$refs.tableruleForm.validate(valid => { + if (valid){ + this.dataGradto.push(this.tabledataGrad) + this.visibleGrad = false + } + }) }, disabledDate(current) { return current && current < moment().subtract(1, 'day') From 5d9acebca78d583e833cde98d5f8c5190d41016b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Mon, 27 Feb 2023 14:35:09 +0800 Subject: [PATCH 048/645] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93-=E5=88=86?= =?UTF-8?q?=E9=98=B6=E6=AE=B5=E5=AE=9E=E6=96=BD=E8=AF=A6=E6=83=85-?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=A1=A8=E5=8D=95=E9=AA=8C=E8=AF=81=E8=A7=84?= =?UTF-8?q?=E5=88=99(=E4=BF=AE=E6=AD=A3)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/libraryAddForm/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/components/libraryAddForm/index.vue b/jero-web/src/components/libraryAddForm/index.vue index 4fed77af8..2f3f5c3d5 100644 --- a/jero-web/src/components/libraryAddForm/index.vue +++ b/jero-web/src/components/libraryAddForm/index.vue @@ -451,8 +451,8 @@ standNumberOrClause: [ { // required: true, - max: 10, - message: this.$t('Statutenumberclause') + this.$t('cannotExceed') + 10 + this.$t('Characters'), + max: 200, + message: this.$t('Statutenumberclause') + this.$t('cannotExceed') + 200 + this.$t('Characters'), trigger: 'blur' } ], From ea7f2c17c9e748b6dae129715e7afdfce689d091 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Mon, 27 Feb 2023 17:56:12 +0800 Subject: [PATCH 049/645] =?UTF-8?q?=E5=88=86=E9=98=B6=E6=AE=B5=E5=AE=9E?= =?UTF-8?q?=E6=96=BD=E8=AF=A6=E6=83=85-=E6=96=87=E6=A1=A3=E5=BA=93?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=94=AF=E6=8C=81=E5=88=86=E9=98=B6=E6=AE=B5?= =?UTF-8?q?=E8=AF=A6=E6=83=85=EF=BC=8C=E6=96=87=E6=A1=A3=E5=BA=93=E3=80=81?= =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95=E6=A3=80=E7=B4=A2=E5=AE=9E?= =?UTF-8?q?=E6=96=BD=E6=97=B6=E9=97=B4=E4=BF=AE=E6=94=B9=EF=BC=8C=E8=99=9A?= =?UTF-8?q?=E6=8B=9F=E6=B8=85=E5=8D=95=E5=88=97=E8=A1=A8=E5=A4=84=E7=90=86?= =?UTF-8?q?=E5=88=86=E9=98=B6=E6=AE=B5=E5=AE=9E=E6=96=BD=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jero/common/util/DateUtils.java | 24 + .../BussDocumentLibraryEOServiceImpl.java | 744 ++++++++++-------- .../impl/DummyInventoryInfoEOServiceImpl.java | 116 +++ .../components/virtualListDetails.vue | 90 ++- 4 files changed, 651 insertions(+), 323 deletions(-) diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/DateUtils.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/DateUtils.java index d58aa1d68..d3c878a23 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/DateUtils.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/DateUtils.java @@ -1,5 +1,6 @@ package com.jero.common.util; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.util.StringUtils; import java.beans.PropertyEditorSupport; @@ -8,6 +9,7 @@ import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; +import java.util.stream.Collectors; /** * 类描述：时间操作定义类 @@ -614,6 +616,28 @@ public class DateUtils extends PropertyEditorSupport { return 0; } + /** + * 日期数据转换字符串 + * @param dateList + * @return + */ + public static String formatDateList(List dateList) { + StringBuilder strSb = new StringBuilder(); + + if(CollectionUtils.isNotEmpty(dateList)){ + dateList = dateList.stream().distinct().sorted().collect(Collectors.toList()); + for (Date date : dateList) { + strSb.append(date_sdf.get().format(date)).append(","); + } + } + + String result = ""; + if(!StringUtils.isEmpty(strSb.toString())){ + result = strSb.substring(0,strSb.length()-1); + } + return result; + } + /** * String类型 转换为Date, 如果参数长度为10 转换格式”yyyy-MM-dd“ 如果参数长度为19 转换格式”yyyy-MM-dd * HH:mm:ss“ * @param text String类型的时间值 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index 44bf75694..d4dcac1fd 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -33,6 +33,7 @@ import com.jero.modules.document.entity.BussDocumentLibraryEO; import com.jero.modules.document.entity.OSSFileForDocumentLibrary; import com.jero.modules.document.entity.PhasedImplementationDetailsEO; import com.jero.modules.document.enums.FieldTypeEnum; +import com.jero.modules.document.enums.ImplementationTypeEnum; import com.jero.modules.document.enums.LawsStateEnum; import com.jero.modules.document.enums.SearchEnum; import com.jero.modules.document.mapper.BussDocumentLibraryEOMapper; @@ -794,6 +795,12 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl fieldListTemp = fieldList.stream().filter(e -> onlCgformAreaTemp.getId().equals(e.getShowArea())).collect(Collectors.toList()); + OnlCgformField phasedOnlCgformField = new OnlCgformField(); + phasedOnlCgformField.setId(UUID.randomUUID().toString().replace("-", "")); + phasedOnlCgformField.setDbFieldTxt("分阶段实施详情"); + phasedOnlCgformField.setDbFieldEnName("Details of the phased implementation"); + phasedOnlCgformField.setDbFieldName("phasedImplDetails"); + fieldListTemp.add(phasedOnlCgformField); for (OnlCgformField onlCgformField : fieldListTemp) { String dictId = onlCgformField.getDictId(); List sysCategoryTreeVOList = new ArrayList<>(); @@ -4233,12 +4240,36 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl= '" + value.split(",")[0] + "'" - + " and " + "date_format(" + key + ",'%Y-%m-%d') <= '" + value.split(",")[1] + "'"); - } else { - conditionSb.append(" and " + "date_format(" + key + ",'%Y-%m-%d') = '" + value + "'"); + // 如果是查询实施日期,需要单独处理一下，刚加的分阶段实施详情需求 + if(StringUtils.equals("xin1_che1_xing2_shi2_shi1_ri4_qi1",key) || StringUtils.equals("implement_time",key)){ + //日期(区分单日期还时间范围) + if (value.contains(",")) { + conditionSb.append(" and ("); + conditionSb.append(" ("); + conditionSb.append("date_format(" + key + ",'%Y-%m-%d') >= '" + value.split(",")[0] + "'" + + " and " + "date_format(" + key + ",'%Y-%m-%d') <= '" + value.split(",")[1] + "'"); + conditionSb.append(" )"); + conditionSb.append(" or id in ("); + conditionSb.append("select buss_document_library_id from phased_implementation_details"); + conditionSb.append(" where implementation_date >= '" + value.split(",")[0] + "' and implementation_date <= '" + value.split(",")[1] + "'"); + if(StringUtils.equals("xin1_che1_xing2_shi2_shi1_ri4_qi1",key)){ + conditionSb.append(" and implementation_type like concat(concat('%','" + ImplementationTypeEnum.NEW_CAR_MODEL.getItemValue() + "'),'%')"); + }else if(StringUtils.equals("implement_time",key)){ + conditionSb.append(" and implementation_type like concat(concat('%','" + ImplementationTypeEnum.CAR_IN_PRODUCTION.getItemValue() + "'),'%')"); + } + conditionSb.append(" )"); + conditionSb.append(" )"); + } else { + conditionSb.append(" and " + "date_format(" + key + ",'%Y-%m-%d') = '" + value + "'"); + } + }else { + //日期(区分单日期还时间范围) + if (value.contains(",")) { + conditionSb.append(" and " + "date_format(" + key + ",'%Y-%m-%d') >= '" + value.split(",")[0] + "'" + + " and " + "date_format(" + key + ",'%Y-%m-%d') <= '" + value.split(",")[1] + "'"); + } else { + conditionSb.append(" and " + "date_format(" + key + ",'%Y-%m-%d') = '" + value + "'"); + } } } else if (FieldTypeEnum.PERSON.getValue().equals(fieldType)) { //输入框 LIKE CONCAT("%", '/%', "%") ESCAPE '/' @@ -5209,6 +5240,14 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl list = new LinkedList<>(); list.add(title); list.add(sbTwo.toString()); @@ -5888,327 +5927,415 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl map : fieldList) { - String fieldNameCn = (String) map.get("db_field_txt");//中文名称 - String fieldName = (String) map.get("db_field_name");//字段名 - String mustInput = (String) map.get("field_must_input");//是否必填 - String dbLength = map.get("db_length").toString();//字段长度 - String fieldShowType = (String) map.get("field_show_type");//字段类型 + // 如果是分阶段实施字段，单独处理，如果是其它字段，按照原有逻辑处理 + if(StringUtils.equals(key,"分阶段实施详情") || StringUtils.equals(key,"Details of the phased implementation")){ + if(StringUtils.isNotEmpty(value)){ + List phasedImplementationDetailsEOList = new ArrayList<>(); + List phasedImplDetailsList = Arrays.asList(value.split("#")); + for (String phasedImplDetails : phasedImplDetailsList) { + PhasedImplementationDetailsEO phasedImplementationDetailsEO = new PhasedImplementationDetailsEO(); + String[] phasedImplDetailsArr = phasedImplDetails.split("

"); + if(phasedImplDetailsArr.length >= 1){ + String standNumberOrClause = phasedImplDetailsArr[0]; + if (StringUtils.isNotBlank(standNumberOrClause) && standNumberOrClause.length() > 100) { + if(CutEnum.CN.getValue().equals(cut)){ + errorMsg += "分阶段实施详情-法规编号/条款不能超过" + 100 + "个字符, "; + }else{ + errorMsg += "Details of the phased implementation standNumberOrClause Can not be more than " + 100 + " char, "; + } + countError++; + }else { + phasedImplementationDetailsEO.setStandNumberOrClause(standNumberOrClause); + } + } + if(phasedImplDetailsArr.length >= 2){ + String implementationTypeName = phasedImplDetailsArr[1]; + if(StringUtils.isNotEmpty(implementationTypeName)){ + String[] implementationTypeNameArr = implementationTypeName.split(","); + ImplementationTypeEnum[] implementationTypeEnums = ImplementationTypeEnum.values(); + List implementationTypeList = Arrays.stream(implementationTypeEnums).filter(implementationTypeEnum -> { + boolean flag = false; + for (String type : implementationTypeNameArr) { + if(StringUtils.equals(type,implementationTypeEnum.getNameCn()) || StringUtils.equals(type,implementationTypeEnum.getNameEn())){ + flag = true; + } + } + return flag; + }).map(ImplementationTypeEnum::getItemValue).collect(Collectors.toList()); - if (key.equals(fieldNameCn)) { - field = fieldName; - //验证字段是否必填,长度,下拉框和树形的值是否匹配 - if (FieldTypeEnum.TREE.getValue().equals(fieldShowType)) { - //树形 - //判断是否必填 - if (IsMustEnum.YES.getValue().equals(mustInput) && StringUtils.isBlank(value)) { - if(CutEnum.CN.getValue().equals(cut)){ - errorMsg += key + "为必填项,不能为空, "; - }else{ - errorMsg += key + " This parameter is mandatory and cannot be empty, "; - } - countError++; - } - //判断长度 - if (StringUtils.isNotBlank(value) && value.length() > Long.parseLong(dbLength)) { - if(CutEnum.CN.getValue().equals(cut)){ - errorMsg += key + "不能超过" + dbLength + "个字符, "; - }else{ - errorMsg += key + " Can not be more than " + dbLength + " char, "; - } - countError++; - } - //判断数据是否匹配 - if (StringUtils.isNotBlank(value)) { - for (String valueTemp : value.split(",")) { - if (!treeNameList.contains(valueTemp)) { + if(implementationTypeNameArr.length != implementationTypeList.size()){ if(CutEnum.CN.getValue().equals(cut)){ - errorMsg += key + "中的" + valueTemp + "与数据字典不匹配, "; + errorMsg += "分阶段实施详情-实施类型填写有误，填写值为'新车型 或 在产车', "; }else{ - errorMsg += key +" "+ valueTemp + " Does not match the data dictionary, "; + errorMsg += "Details of the phased implementation implementationType The value is set to 'New car model or Car in production', "; } countError++; + }else { + phasedImplementationDetailsEO.setImplementationType(implementationTypeList.stream().collect(Collectors.joining(","))); } } } - String valueId = ""; - //文字转ID - if (StringUtils.isNotBlank(value)) { - for (String valueTemp : value.split(",")) { - if (treeNameList.contains(valueTemp)) { - List collect = new ArrayList<>(); - if(CutEnum.CN.getValue().equals(cut)){ - collect = categoryList.stream().filter(e -> e.getName().equals(valueTemp)).collect(Collectors.toList()); - }else{ - collect = categoryList.stream().filter(e -> e.getEnName().equals(valueTemp)).collect(Collectors.toList()); - } - valueId += collect.get(0).getId()+","; - } + if(phasedImplDetailsArr.length >= 3){ + Date implementationDate = null; + try { + implementationDate = DateUtils.parseDate(phasedImplDetailsArr[2], "yyyy-MM-dd"); + } catch (ParseException e) { + e.printStackTrace(); } - if(StringUtils.isNotBlank(valueId)){ - value = valueId.substring(0, valueId.length() - 1); - } - } - - } else if (FieldTypeEnum.TEXT_STRING.getValue().equals(fieldShowType)) { - //输入框 - //判断是否必填 - if (IsMustEnum.YES.getValue().equals(mustInput) && StringUtils.isBlank(value)) { - if(CutEnum.CN.getValue().equals(cut)){ - errorMsg += key + "为必填项,不能为空, "; - }else{ - errorMsg += key + " This parameter is mandatory and cannot be empty, "; - } - countError++; - } - //判断长度 - if (StringUtils.isNotBlank(value) && value.length() > Long.parseLong(dbLength)) { - if(CutEnum.CN.getValue().equals(cut)){ - errorMsg += key + "不能超过" + dbLength + "个字符, "; - }else{ - errorMsg += key + " Can not be more than" + dbLength + "char, "; - } - countError++; - } - - } else if (FieldTypeEnum.TEXT_NUMBER.getValue().equals(fieldShowType)) { - //正则判断仅能为 负号（-），小数点（.）和数字 - - - } else if (FieldTypeEnum.PULL_SINGLE.getValue().equals(fieldShowType)) { - //下拉单选 - //判断是否必填 - if (IsMustEnum.YES.getValue().equals(mustInput) && StringUtils.isBlank(value)) { - if(CutEnum.CN.getValue().equals(cut)){ - errorMsg += key + "为必填项,不能为空, "; - }else{ - errorMsg += key + " This parameter is mandatory and cannot be empty, "; - } - countError++; - } - //判断长度 - if (StringUtils.isNotBlank(value) && value.length() > Long.parseLong(dbLength)) { - if(CutEnum.CN.getValue().equals(cut)){ - errorMsg += key + "不能超过" + dbLength + "个字符, "; - }else{ - errorMsg += key + " Can not be more than" + dbLength + " char, "; - } - countError++; - } - //判断是否是单选 - if (StringUtils.isNotBlank(value) && value.contains(",")) { - if(CutEnum.CN.getValue().equals(cut)){ - errorMsg += key + "为单选项, "; - }else{ - errorMsg += key + " Is multiple choice, "; - } - - countError++; - } - //判断数据是否匹配 - if (StringUtils.isNotBlank(value)) { - if (!itemNameList.contains(value)) { + if(implementationDate == null){ if(CutEnum.CN.getValue().equals(cut)){ - errorMsg += key + "中的" + value + "与数据字典不匹配, "; + errorMsg += "分阶段实施详情-实施日期格式错误，正确格式为'yyyy-MM-dd', "; }else{ - errorMsg += key + " " + value + " Does not match the data dictionary, "; + errorMsg += "Details of the phased implementation implementationDate format is incorrect. The correct format is 'yyyy-MM-dd', "; + } + countError++; + }else { + phasedImplementationDetailsEO.setImplementationDate(implementationDate); + } + } + if(phasedImplDetailsArr.length >= 4){ + String remarks = phasedImplDetailsArr[3]; + if (StringUtils.isNotBlank(remarks) && remarks.length() > 1000) { + if(CutEnum.CN.getValue().equals(cut)){ + errorMsg += "分阶段实施详情-备注不能超过" + 1000 + "个字符, "; + }else{ + errorMsg += "Details of the phased implementation ramarks Can not be more than " + 1000 + " char, "; + } + countError++; + }else { + phasedImplementationDetailsEO.setRemarks(remarks); + } + } + phasedImplementationDetailsEOList.add(phasedImplementationDetailsEO); + } + + mapResult.put("phasedImplementationDetailsEOList",phasedImplementationDetailsEOList); + } + }else { + for (Map map : fieldList) { + String fieldNameCn = (String) map.get("db_field_txt");//中文名称 + String fieldName = (String) map.get("db_field_name");//字段名 + if(StringUtils.equals(fieldName,"phasedImplDetails")){ + continue; + } + String mustInput = (String) map.get("field_must_input");//是否必填 + String dbLength = map.get("db_length").toString();//字段长度 + String fieldShowType = (String) map.get("field_show_type");//字段类型 + + if (key.equals(fieldNameCn)) { + field = fieldName; + //验证字段是否必填,长度,下拉框和树形的值是否匹配 + if (FieldTypeEnum.TREE.getValue().equals(fieldShowType)) { + //树形 + //判断是否必填 + if (IsMustEnum.YES.getValue().equals(mustInput) && StringUtils.isBlank(value)) { + if(CutEnum.CN.getValue().equals(cut)){ + errorMsg += key + "为必填项,不能为空, "; + }else{ + errorMsg += key + " This parameter is mandatory and cannot be empty, "; } countError++; } - } - //文字转数据字典编码 - if (itemNameList.contains(value)) { - String finalValue = value; - List collect = new ArrayList<>(); - if(CutEnum.CN.getValue().equals(cut)){ - collect = dictItemList.stream().filter(e -> StringUtils.isNotBlank(e.getItemText()) && e.getItemText().equals(finalValue)).collect(Collectors.toList()); - }else{ - collect = dictItemList.stream().filter(e -> StringUtils.isNotBlank(e.getEnName()) && e.getEnName().equals(finalValue)).collect(Collectors.toList()); - } - if (collect.size() != 0) { - value = collect.get(0).getItemValue(); - } - } - } else if (FieldTypeEnum.PULL_MORE.getValue().equals(fieldShowType)) { - //判断是否必填 - if (IsMustEnum.YES.getValue().equals(mustInput) && StringUtils.isBlank(value)) { - if(CutEnum.CN.getValue().equals(cut)){ - errorMsg += key + "为必填项,不能为空, "; - }else{ - errorMsg += key + " This parameter is mandatory and cannot be empty, "; - } - countError++; - } - //判断长度 - if (StringUtils.isNotBlank(value) && value.length() > Long.parseLong(dbLength)) { - if(CutEnum.CN.getValue().equals(cut)){ - errorMsg += key + "不能超过" + dbLength + "个字符, "; - }else{ - errorMsg += key + " Can not be more than" + dbLength + " char, "; - } - countError++; - } - //下拉多选 - if (StringUtils.isNotBlank(value)) { - for (String valueTemp : value.split(",")) { - if (!itemNameList.contains(valueTemp)) { - if(CutEnum.CN.getValue().equals(cut)){ - errorMsg += key + "中的" + valueTemp + "与数据字典不匹配, "; - }else{ - errorMsg += key +" "+ valueTemp + " Does not match the data dictionary, "; - } - countError++; + //判断长度 + if (StringUtils.isNotBlank(value) && value.length() > Long.parseLong(dbLength)) { + if(CutEnum.CN.getValue().equals(cut)){ + errorMsg += key + "不能超过" + dbLength + "个字符, "; + }else{ + errorMsg += key + " Can not be more than " + dbLength + " char, "; } + countError++; } - } - - String valueId = ""; - //文字转数据字典id - if (StringUtils.isNotBlank(value)) { - for (String valueTemp : value.split(",")) { - if (itemNameList.contains(valueTemp)) { - List collect = new ArrayList<>(); - if(CutEnum.CN.getValue().equals(cut)){ - collect = dictItemList.stream().filter(e -> StringUtils.isNotBlank(e.getItemText()) && e.getItemText().equals(valueTemp)).collect(Collectors.toList()); - }else{ - collect = dictItemList.stream().filter(e -> StringUtils.isNotBlank(e.getEnName()) && e.getEnName().equals(valueTemp)).collect(Collectors.toList()); - } - - valueId += collect.get(0).getItemValue() + ","; - } - } - if (StringUtils.isNotBlank(valueId)) { - value = valueId.substring(0, valueId.length() - 1); - } - } - - - } else if (FieldTypeEnum.DATE_SINGLE.getValue().equals(fieldShowType)) { - value = value.replaceAll("/","-"); - //单选日期 - //判断是否必填 - if (IsMustEnum.YES.getValue().equals(mustInput) && StringUtils.isBlank(value)) { - if(CutEnum.CN.getValue().equals(cut)){ - errorMsg += key + "为必填项,不能为空, "; - }else{ - errorMsg += key + " This parameter is mandatory and cannot be empty, "; - } - countError++; - } - //a判断是否是单日期选择 - if (StringUtils.isNotBlank(value) && value.contains(",")) { - if(CutEnum.CN.getValue().equals(cut)){ - errorMsg += key + "为单日期选项, "; - }else{ - errorMsg += key + " Is single date option, "; - } - countError++; - } - //判断格式是否正确 - if (!DateUtils.isValidDate((String) value)) { - if(CutEnum.CN.getValue().equals(cut)){ - errorMsg += key + "格式不正确, 正确格式如:yyyy/m/d、yyyy-MM-dd、yyyy年MM月dd日, "; - }else{ - errorMsg += key + " Incorrect format correct format is:yyyy/m/d、yyyy-MM-dd、yyyy年MM月dd日, "; - } - countError++; - } - - } else if (FieldTypeEnum.DATE_SINGLE.getValue().equals(fieldShowType)) { - //多选日期 - //判断是否必填 - if (IsMustEnum.YES.getValue().equals(mustInput) && StringUtils.isBlank(value)) { - if(CutEnum.CN.getValue().equals(cut)){ - errorMsg += key + "为必填项,不能为空, "; - }else{ - errorMsg += key + " This parameter is mandatory and cannot be empty, "; - } - countError++; - } - //判断格式是否正确 - if (!DateUtils.isValidDate((String) value)) { - if(CutEnum.CN.getValue().equals(cut)){ - errorMsg += key + "格式不正确, 正确格式如:yyyy/m/d、yyyy-MM-dd、yyyy年MM月dd日, "; - }else{ - errorMsg += key + " Incorrect format correct format is:yyyy/m/d、yyyy-MM-dd、yyyy年MM月dd日, "; - } - countError++; - } - - - } else if (FieldTypeEnum.FILE.getValue().equals(fieldShowType)) { - //文件 - //判断是否必填 - if (IsMustEnum.YES.getValue().equals(mustInput) && StringUtils.isBlank(value)) { - if(CutEnum.CN.getValue().equals(cut)){ - errorMsg += key + "为必填项,不能为空, "; - }else{ - errorMsg += key + " This parameter is mandatory and cannot be empty, "; - } - countError++; - } - //判断长度 - if (StringUtils.isNotBlank(value) && value.length() > Long.parseLong(dbLength)) { - if(CutEnum.CN.getValue().equals(cut)){ - errorMsg += key + "不能超过" + dbLength + "个字符, "; - }else{ - errorMsg += key + " Can not be more than " + dbLength + " char, "; - } - countError++; - } - if (StringUtils.isNotBlank(value)) { - StringBuilder sb = new StringBuilder(); - for (String fileName : value.split(",")) { - List nowFileList = FileUnZip.readFileByFilename(zipEntryName, fileName,cut,errorMsg,null,key,key); - if (nowFileList.size() == 0) { - if(CutEnum.CN.getValue().equals(cut)){ - errorMsg += key + " 压缩包中没有" + fileName + "文件, "; - }else{ - errorMsg += key + " Not in the zip package" + fileName + "file, "; - } - countError++; - } else { - try { - FileInputStream input = new FileInputStream(nowFileList.get(0)); - MultipartFile multipartFile = - new MockMultipartFile(nowFileList.get(0).getName(), nowFileList.get(0).getName(), "text/plain", input); - //文件存入文件表 - OSSFile ossFile = iOSSFileService.uploadLocalOfCos(multipartFile, "", null,null); - if (ObjectUtils.isNotEmpty(ossFile)) { - sb.append(ossFile.getId() + ","); + //判断数据是否匹配 + if (StringUtils.isNotBlank(value)) { + for (String valueTemp : value.split(",")) { + if (!treeNameList.contains(valueTemp)) { + if(CutEnum.CN.getValue().equals(cut)){ + errorMsg += key + "中的" + valueTemp + "与数据字典不匹配, "; + }else{ + errorMsg += key +" "+ valueTemp + " Does not match the data dictionary, "; } - } catch (IOException e) { - e.printStackTrace(); + countError++; } } } - if (StringUtils.isNotBlank(sb)) { - String substring = sb.substring(0, sb.length() - 1); - value = substring; + String valueId = ""; + //文字转ID + if (StringUtils.isNotBlank(value)) { + for (String valueTemp : value.split(",")) { + if (treeNameList.contains(valueTemp)) { + List collect = new ArrayList<>(); + if(CutEnum.CN.getValue().equals(cut)){ + collect = categoryList.stream().filter(e -> e.getName().equals(valueTemp)).collect(Collectors.toList()); + }else{ + collect = categoryList.stream().filter(e -> e.getEnName().equals(valueTemp)).collect(Collectors.toList()); + } + valueId += collect.get(0).getId()+","; + } + } + if(StringUtils.isNotBlank(valueId)){ + value = valueId.substring(0, valueId.length() - 1); + } } - } - } else if (FieldTypeEnum.STANDARD.getValue().equals(fieldShowType)) { - //标准选择 - //判断是否必填 - if (IsMustEnum.YES.getValue().equals(mustInput) && StringUtils.isBlank(value)) { - if(CutEnum.CN.getValue().equals(cut)){ - errorMsg += key + "为必填项,不能为空, "; - }else{ - errorMsg += key + " This parameter is mandatory and cannot be empty, "; + } else if (FieldTypeEnum.TEXT_STRING.getValue().equals(fieldShowType)) { + //输入框 + //判断是否必填 + if (IsMustEnum.YES.getValue().equals(mustInput) && StringUtils.isBlank(value)) { + if(CutEnum.CN.getValue().equals(cut)){ + errorMsg += key + "为必填项,不能为空, "; + }else{ + errorMsg += key + " This parameter is mandatory and cannot be empty, "; + } + countError++; } - countError++; - } - //判断长度 - if (StringUtils.isNotBlank(value) && value.length() > Long.parseLong(dbLength)) { - if(CutEnum.CN.getValue().equals(cut)){ - errorMsg += key + "不能超过" + dbLength + "个字符, "; - }else{ - errorMsg += key + " Can not be more than " + dbLength + " char, "; + //判断长度 + if (StringUtils.isNotBlank(value) && value.length() > Long.parseLong(dbLength)) { + if(CutEnum.CN.getValue().equals(cut)){ + errorMsg += key + "不能超过" + dbLength + "个字符, "; + }else{ + errorMsg += key + " Can not be more than" + dbLength + "char, "; + } + countError++; } - countError++; - } - //判断库中是否存在,如果存在则存id,如果不存在则存输入的值 + + } else if (FieldTypeEnum.TEXT_NUMBER.getValue().equals(fieldShowType)) { + //正则判断仅能为 负号（-），小数点（.）和数字 + + + } else if (FieldTypeEnum.PULL_SINGLE.getValue().equals(fieldShowType)) { + //下拉单选 + //判断是否必填 + if (IsMustEnum.YES.getValue().equals(mustInput) && StringUtils.isBlank(value)) { + if(CutEnum.CN.getValue().equals(cut)){ + errorMsg += key + "为必填项,不能为空, "; + }else{ + errorMsg += key + " This parameter is mandatory and cannot be empty, "; + } + countError++; + } + //判断长度 + if (StringUtils.isNotBlank(value) && value.length() > Long.parseLong(dbLength)) { + if(CutEnum.CN.getValue().equals(cut)){ + errorMsg += key + "不能超过" + dbLength + "个字符, "; + }else{ + errorMsg += key + " Can not be more than" + dbLength + " char, "; + } + countError++; + } + //判断是否是单选 + if (StringUtils.isNotBlank(value) && value.contains(",")) { + if(CutEnum.CN.getValue().equals(cut)){ + errorMsg += key + "为单选项, "; + }else{ + errorMsg += key + " Is multiple choice, "; + } + + countError++; + } + //判断数据是否匹配 + if (StringUtils.isNotBlank(value)) { + if (!itemNameList.contains(value)) { + if(CutEnum.CN.getValue().equals(cut)){ + errorMsg += key + "中的" + value + "与数据字典不匹配, "; + }else{ + errorMsg += key + " " + value + " Does not match the data dictionary, "; + } + countError++; + } + } + //文字转数据字典编码 + if (itemNameList.contains(value)) { + String finalValue = value; + List collect = new ArrayList<>(); + if(CutEnum.CN.getValue().equals(cut)){ + collect = dictItemList.stream().filter(e -> StringUtils.isNotBlank(e.getItemText()) && e.getItemText().equals(finalValue)).collect(Collectors.toList()); + }else{ + collect = dictItemList.stream().filter(e -> StringUtils.isNotBlank(e.getEnName()) && e.getEnName().equals(finalValue)).collect(Collectors.toList()); + } + if (collect.size() != 0) { + value = collect.get(0).getItemValue(); + } + } + } else if (FieldTypeEnum.PULL_MORE.getValue().equals(fieldShowType)) { + //判断是否必填 + if (IsMustEnum.YES.getValue().equals(mustInput) && StringUtils.isBlank(value)) { + if(CutEnum.CN.getValue().equals(cut)){ + errorMsg += key + "为必填项,不能为空, "; + }else{ + errorMsg += key + " This parameter is mandatory and cannot be empty, "; + } + countError++; + } + //判断长度 + if (StringUtils.isNotBlank(value) && value.length() > Long.parseLong(dbLength)) { + if(CutEnum.CN.getValue().equals(cut)){ + errorMsg += key + "不能超过" + dbLength + "个字符, "; + }else{ + errorMsg += key + " Can not be more than" + dbLength + " char, "; + } + countError++; + } + //下拉多选 + if (StringUtils.isNotBlank(value)) { + for (String valueTemp : value.split(",")) { + if (!itemNameList.contains(valueTemp)) { + if(CutEnum.CN.getValue().equals(cut)){ + errorMsg += key + "中的" + valueTemp + "与数据字典不匹配, "; + }else{ + errorMsg += key +" "+ valueTemp + " Does not match the data dictionary, "; + } + countError++; + } + } + } + + String valueId = ""; + //文字转数据字典id + if (StringUtils.isNotBlank(value)) { + for (String valueTemp : value.split(",")) { + if (itemNameList.contains(valueTemp)) { + List collect = new ArrayList<>(); + if(CutEnum.CN.getValue().equals(cut)){ + collect = dictItemList.stream().filter(e -> StringUtils.isNotBlank(e.getItemText()) && e.getItemText().equals(valueTemp)).collect(Collectors.toList()); + }else{ + collect = dictItemList.stream().filter(e -> StringUtils.isNotBlank(e.getEnName()) && e.getEnName().equals(valueTemp)).collect(Collectors.toList()); + } + + valueId += collect.get(0).getItemValue() + ","; + } + } + if (StringUtils.isNotBlank(valueId)) { + value = valueId.substring(0, valueId.length() - 1); + } + } + + + } else if (FieldTypeEnum.DATE_SINGLE.getValue().equals(fieldShowType)) { + value = value.replaceAll("/","-"); + //单选日期 + //判断是否必填 + if (IsMustEnum.YES.getValue().equals(mustInput) && StringUtils.isBlank(value)) { + if(CutEnum.CN.getValue().equals(cut)){ + errorMsg += key + "为必填项,不能为空, "; + }else{ + errorMsg += key + " This parameter is mandatory and cannot be empty, "; + } + countError++; + } + //a判断是否是单日期选择 + if (StringUtils.isNotBlank(value) && value.contains(",")) { + if(CutEnum.CN.getValue().equals(cut)){ + errorMsg += key + "为单日期选项, "; + }else{ + errorMsg += key + " Is single date option, "; + } + countError++; + } + //判断格式是否正确 + if (!DateUtils.isValidDate((String) value)) { + if(CutEnum.CN.getValue().equals(cut)){ + errorMsg += key + "格式不正确, 正确格式如:yyyy/m/d、yyyy-MM-dd、yyyy年MM月dd日, "; + }else{ + errorMsg += key + " Incorrect format correct format is:yyyy/m/d、yyyy-MM-dd、yyyy年MM月dd日, "; + } + countError++; + } + + } else if (FieldTypeEnum.DATE_SINGLE.getValue().equals(fieldShowType)) { + //多选日期 + //判断是否必填 + if (IsMustEnum.YES.getValue().equals(mustInput) && StringUtils.isBlank(value)) { + if(CutEnum.CN.getValue().equals(cut)){ + errorMsg += key + "为必填项,不能为空, "; + }else{ + errorMsg += key + " This parameter is mandatory and cannot be empty, "; + } + countError++; + } + //判断格式是否正确 + if (!DateUtils.isValidDate((String) value)) { + if(CutEnum.CN.getValue().equals(cut)){ + errorMsg += key + "格式不正确, 正确格式如:yyyy/m/d、yyyy-MM-dd、yyyy年MM月dd日, "; + }else{ + errorMsg += key + " Incorrect format correct format is:yyyy/m/d、yyyy-MM-dd、yyyy年MM月dd日, "; + } + countError++; + } + + + } else if (FieldTypeEnum.FILE.getValue().equals(fieldShowType)) { + //文件 + //判断是否必填 + if (IsMustEnum.YES.getValue().equals(mustInput) && StringUtils.isBlank(value)) { + if(CutEnum.CN.getValue().equals(cut)){ + errorMsg += key + "为必填项,不能为空, "; + }else{ + errorMsg += key + " This parameter is mandatory and cannot be empty, "; + } + countError++; + } + //判断长度 + if (StringUtils.isNotBlank(value) && value.length() > Long.parseLong(dbLength)) { + if(CutEnum.CN.getValue().equals(cut)){ + errorMsg += key + "不能超过" + dbLength + "个字符, "; + }else{ + errorMsg += key + " Can not be more than " + dbLength + " char, "; + } + countError++; + } + if (StringUtils.isNotBlank(value)) { + StringBuilder sb = new StringBuilder(); + for (String fileName : value.split(",")) { + List nowFileList = FileUnZip.readFileByFilename(zipEntryName, fileName,cut,errorMsg,null,key,key); + if (nowFileList.size() == 0) { + if(CutEnum.CN.getValue().equals(cut)){ + errorMsg += key + " 压缩包中没有" + fileName + "文件, "; + }else{ + errorMsg += key + " Not in the zip package" + fileName + "file, "; + } + countError++; + } else { + try { + FileInputStream input = new FileInputStream(nowFileList.get(0)); + MultipartFile multipartFile = + new MockMultipartFile(nowFileList.get(0).getName(), nowFileList.get(0).getName(), "text/plain", input); + //文件存入文件表 + OSSFile ossFile = iOSSFileService.uploadLocalOfCos(multipartFile, "", null,null); + if (ObjectUtils.isNotEmpty(ossFile)) { + sb.append(ossFile.getId() + ","); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + } + if (StringUtils.isNotBlank(sb)) { + String substring = sb.substring(0, sb.length() - 1); + value = substring; + } + } + + } else if (FieldTypeEnum.STANDARD.getValue().equals(fieldShowType)) { + //标准选择 + //判断是否必填 + if (IsMustEnum.YES.getValue().equals(mustInput) && StringUtils.isBlank(value)) { + if(CutEnum.CN.getValue().equals(cut)){ + errorMsg += key + "为必填项,不能为空, "; + }else{ + errorMsg += key + " This parameter is mandatory and cannot be empty, "; + } + countError++; + } + //判断长度 + if (StringUtils.isNotBlank(value) && value.length() > Long.parseLong(dbLength)) { + if(CutEnum.CN.getValue().equals(cut)){ + errorMsg += key + "不能超过" + dbLength + "个字符, "; + }else{ + errorMsg += key + " Can not be more than " + dbLength + " char, "; + } + countError++; + } + //判断库中是否存在,如果存在则存id,如果不存在则存输入的值 // List> listBySerialNumber = getListBySerialNumber(value); // String serialNumberStr = ""; // StringBuilder sb = new StringBuilder(); @@ -6231,14 +6358,15 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl 0) { -// msgList.add(errorMsg); -// } - mapResult.put(field, value); +// if (countError > 0) { +// msgList.add(errorMsg); +// } + mapResult.put(field, value); + } } if (countError > 0) { if(errorMsg.endsWith(", ")){ diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java index be56b93b6..17d3a7ad7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java @@ -16,8 +16,11 @@ import com.jero.common.system.vo.LoginUser; import com.jero.common.util.DateUtils; import com.jero.common.util.oss.CosBootUtil; import com.jero.modules.document.entity.BussDocumentLibraryEO; +import com.jero.modules.document.entity.PhasedImplementationDetailsEO; +import com.jero.modules.document.enums.ImplementationTypeEnum; import com.jero.modules.document.enums.LawsStateEnum; import com.jero.modules.document.service.IBussDocumentLibraryEOService; +import com.jero.modules.document.service.IPhasedImplementationDetailsEOService; import com.jero.modules.dummy.entity.DummyInventoryBaseEO; import com.jero.modules.dummy.entity.DummyInventoryInfoEO; import com.jero.modules.dummy.entity.DummyInventoryInfoEOEn; @@ -98,6 +101,8 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl getPageInfo(DummyInventoryInfoEO dummyInventoryInfoEO,HttpServletRequest req) { @@ -401,6 +406,52 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl phasedDetailsQueryWrap = new QueryWrapper<>(); + phasedDetailsQueryWrap.lambda().like(PhasedImplementationDetailsEO::getImplementationType,ImplementationTypeEnum.CAR_IN_PRODUCTION.getItemValue()); + phasedDetailsQueryWrap.lambda().ge(PhasedImplementationDetailsEO::getImplementationDate,implementTimeArr[0]); + phasedDetailsQueryWrap.lambda().le(PhasedImplementationDetailsEO::getImplementationDate,implementTimeArr[1]); + List bussDocumentLibraryIdList = this.phasedImplementationDetailsEOService.list(phasedDetailsQueryWrap) + .stream().map(PhasedImplementationDetailsEO::getBussDocumentLibraryId).collect(Collectors.toList()); + + queryWrapper.and(query -> { + query.and(q -> { + q.lambda().ge(DummyInventoryInfoEO::getImplementTime,implementTimeArr[0]); + q.lambda().le(DummyInventoryInfoEO::getImplementTime,implementTimeArr[1]); + }); + + if(CollectionUtils.isNotEmpty(bussDocumentLibraryIdList)){ + query.or(q -> { + q.lambda().in(DummyInventoryInfoEO::getBussDocumentLibraryId,bussDocumentLibraryIdList); + }); + } + }); + } + if(StringUtils.isNotEmpty(dummyInventoryInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1String())){ + String[] newCarTimeArr = dummyInventoryInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1String().split(","); + + QueryWrapper phasedDetailsQueryWrap = new QueryWrapper<>(); + phasedDetailsQueryWrap.lambda().like(PhasedImplementationDetailsEO::getImplementationType,ImplementationTypeEnum.NEW_CAR_MODEL.getItemValue()); + phasedDetailsQueryWrap.lambda().ge(PhasedImplementationDetailsEO::getImplementationDate,newCarTimeArr[0]); + phasedDetailsQueryWrap.lambda().le(PhasedImplementationDetailsEO::getImplementationDate,newCarTimeArr[1]); + List bussDocumentLibraryIdList = this.phasedImplementationDetailsEOService.list(phasedDetailsQueryWrap) + .stream().map(PhasedImplementationDetailsEO::getBussDocumentLibraryId).collect(Collectors.toList()); + + queryWrapper.and(query -> { + query.and(q -> { + q.lambda().ge(DummyInventoryInfoEO::getXin1Che1Xing2Shi2Shi1Ri4Qi1,newCarTimeArr[0]); + q.lambda().le(DummyInventoryInfoEO::getXin1Che1Xing2Shi2Shi1Ri4Qi1,newCarTimeArr[1]); + }); + if(CollectionUtils.isNotEmpty(bussDocumentLibraryIdList)){ + query.or(q -> { + q.lambda().in(DummyInventoryInfoEO::getBussDocumentLibraryId,bussDocumentLibraryIdList); + }); + } + }); + } + List dummyInventoryInfoEOList = this.list(queryWrapper); log.info("一阶段消耗时间：" + (System.currentTimeMillis() - startTime)); //数据字典 @@ -412,6 +463,9 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl datas, String cut) { + if(CollectionUtils.isNotEmpty(datas)){ + List bussDocumentLibraryIdList = datas.stream().map(DummyInventoryInfoEO::getBussDocumentLibraryId).distinct().collect(Collectors.toList()); + QueryWrapper phasedDetailsQueryWrap = new QueryWrapper<>(); + phasedDetailsQueryWrap.lambda().in(PhasedImplementationDetailsEO::getBussDocumentLibraryId,bussDocumentLibraryIdList); + List phasedDetailsList = this.phasedImplementationDetailsEOService.list(phasedDetailsQueryWrap); + + // 新车型分阶段实施数据信息 + List newCarModelPhasedDetailsList = phasedDetailsList.stream().filter(phasedDetails -> { + boolean flag = false; + if(StringUtils.contains(phasedDetails.getImplementationType(), ImplementationTypeEnum.NEW_CAR_MODEL.getItemValue())){ + flag = true; + } + return flag; + }).collect(Collectors.toList()); + + // 在产车分阶段实施数据信息 + List carInProductionPhasedDetailsList = phasedDetailsList.stream().filter(phasedDetails -> { + boolean flag = false; + if(StringUtils.contains(phasedDetails.getImplementationType(), ImplementationTypeEnum.CAR_IN_PRODUCTION.getItemValue())){ + flag = true; + } + return flag; + }).collect(Collectors.toList()); + + for (DummyInventoryInfoEO data : datas) { + // 处理新车型实施日期展示 + List newCarModelDateList = newCarModelPhasedDetailsList.stream().filter(phasedDetails -> { + boolean flag = false; + if (StringUtils.equals(phasedDetails.getBussDocumentLibraryId(), data.getBussDocumentLibraryId())) { + flag = true; + } + return flag; + }).map(PhasedImplementationDetailsEO::getImplementationDate).collect(Collectors.toList()); + if(data.getXin1Che1Xing2Shi2Shi1Ri4Qi1() != null){ + newCarModelDateList.add(data.getXin1Che1Xing2Shi2Shi1Ri4Qi1()); + } + String newCarModelDateStr = DateUtils.formatDateList(newCarModelDateList); + data.setXin1Che1Xing2Shi2Shi1Ri4Qi1String(newCarModelDateStr); + + // 处理在产车实施日期展示 + List carInProductionDateList = carInProductionPhasedDetailsList.stream().filter(phasedDetails -> { + boolean flag = false; + if (StringUtils.equals(phasedDetails.getBussDocumentLibraryId(), data.getBussDocumentLibraryId())) { + flag = true; + } + return flag; + }).map(PhasedImplementationDetailsEO::getImplementationDate).collect(Collectors.toList()); + if(data.getImplementTime() != null){ + carInProductionDateList.add(data.getImplementTime()); + } + String carInProductionDateStr = DateUtils.formatDateList(carInProductionDateList); + data.setImplementTimeString(carInProductionDateStr); + } + } + } + private List hearSort(String orderBy, String orderByField, List dummyInventoryInfoEOList) { if(ObjectUtils.isNotEmpty(orderByField)){ Collator comparator = Collator.getInstance(Locale.CHINESE); diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue index 507e800ba..afcddbf77 100644 --- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue +++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue @@ -72,6 +72,26 @@ v-model="queryParam.subtitle">

+ {{$t('query')}} {{$t('reset')}} + + {{ !toggleSearchStatus ? $t('open') : $t('away') }} + + @@ -328,6 +352,7 @@ title: '维护虚拟清单', queryParam: {}, components: {}, + toggleSearchStatus: false, visibleFile: false, transferList: false, orderBy: '1', @@ -439,14 +464,16 @@ title: this.$t('ImplementationDate'), align: 'left', width: 200, - dataIndex: 'xin1Che1Xing2Shi2Shi1Ri4Qi1', + dataIndex: 'xin1Che1Xing2Shi2Shi1Ri4Qi1String', + scopedSlots: { customRender: 'titleName' }, ellipsis: true }, { title: this.$t('vehicleInProductionDate'), align: 'left', width: 220, - dataIndex: 'implementTime', + dataIndex: 'implementTimeString', + scopedSlots: { customRender: 'titleName' }, ellipsis: true }, { @@ -981,7 +1008,7 @@ name: this.$t('ImplementationDate'), headFieldCn:'标准实施日期', headFieldEn:'New Type Execution Date', - field: 'xin1Che1Xing2Shi2Shi1Ri4Qi1', + field: 'xin1Che1Xing2Shi2Shi1Ri4Qi1String', key: 9, moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单', }, @@ -990,7 +1017,7 @@ name: this.$t('vehicleInProductionDate'), headFieldCn:'在产车实施日期', headFieldEn:'New Vehicle Execution Date', - field: 'implementTime', + field: 'implementTimeString', key: 10, moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单', }, @@ -1271,16 +1298,16 @@ text: this.$t('implementationCategory'), dictCode: 'implement_type'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框 }, - { - type: 'date', - value: 'xin1Che1Xing2Shi2Shi1Ri4Qi1', - text: this.$t('ImplementationDate') - }, - { - type: 'date', - value: 'implementTime', - text: this.$t('vehicleInProductionDate') - }, + // { + // type: 'date', + // value: 'xin1Che1Xing2Shi2Shi1Ri4Qi1', + // text: this.$t('ImplementationDate') + // }, + // { + // type: 'date', + // value: 'implementTime', + // text: this.$t('vehicleInProductionDate') + // }, { type: 'string', value: 'wvtaId', @@ -1363,9 +1390,9 @@ this.getList() }, searchReset() { + this.queryParam = {} this.$refs.globalAdvancedQueryRef.resetLine() this.$refs.globalAdvancedQueryRef.emitCallback() - this.queryParam = {} this.getList() }, //模板下载 @@ -1451,6 +1478,9 @@ } this.getList() }, + handleToggleSearch() { + this.toggleSearchStatus = !this.toggleSearchStatus + }, getHeader(){ getAction('head/headCustomEO/list', { moduleFlag: this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单' @@ -1482,6 +1512,14 @@ item.scopedSlots = { customRender: 'titleName' } + }else if(item.title == '在产车实施日期'){ + item.scopedSlots = { + customRender: 'titleName' + } + }else if(item.title == '标准实施日期'){ + item.scopedSlots = { + customRender: 'titleName' + } } else if(item.title == '清单确认状态' || item.title == '任务确认状态' || item.title == '认证级别' || item.title == 'WVTA ID' || item.title == '责任领域' || item.title == '法规工程师' || item.title == '认证工程师' || item.title == '工程接口人'){ @@ -1516,6 +1554,12 @@ }) }, getList() { + if(this.queryParam.xin1Che1Xing2Shi2Shi1Ri4Qi1String && this.queryParam.xin1Che1Xing2Shi2Shi1Ri4Qi1String instanceof Array){ + this.queryParam.xin1Che1Xing2Shi2Shi1Ri4Qi1String = this.queryParam.xin1Che1Xing2Shi2Shi1Ri4Qi1String.join(',') + } + if(this.queryParam.implementTimeString && this.queryParam.implementTimeString instanceof Array){ + this.queryParam.implementTimeString = this.queryParam.implementTimeString.join(',') + } let query = { ...this.queryParam, ...this.queryParamQuery, @@ -1564,6 +1608,22 @@ onChange(){ this.selectedValue = this.checkedList }, + onChangedatet(values){ + let StartTime = values[0].format('YYYY-MM-DD') + let EndTime = values[1].format('YYYY-MM-DD') + let array = [] + array.push(StartTime,EndTime) + console.log(array) + this.queryParam.xin1Che1Xing2Shi2Shi1Ri4Qi1String = array + }, + onChangedate(values){ + let StartTime = values[0].format('YYYY-MM-DD') + let EndTime = values[1].format('YYYY-MM-DD') + let array = [] + array.push(StartTime,EndTime) + console.log(array) + this.queryParam.implementTimeString = array + }, getcustomize(){ this.customizevisible = true }, From f5a416378de13133668ce68e3b680b6b5656e8c7 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Tue, 28 Feb 2023 17:55:40 +0800 Subject: [PATCH 050/645] =?UTF-8?q?=E5=88=86=E9=98=B6=E6=AE=B5=E5=AE=9E?= =?UTF-8?q?=E6=96=BD-=E6=B3=95=E8=A7=84=E9=A2=84=E8=AD=A6=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=B1=95=E7=A4=BA=E9=80=BB=E8=BE=91=EF=BC=8C=E5=A4=84?= =?UTF-8?q?=E7=90=86=E6=96=87=E6=A1=A3=E5=BA=93=E6=8F=92=E5=85=A5ES?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=80=BB=E8=BE=91=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BussDocumentLibraryEOServiceImpl.java | 108 +++++++++++++++--- .../modules/warn/service/LawsWarnService.java | 86 ++++++++++++++ 2 files changed, 180 insertions(+), 14 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index d4dcac1fd..e2c1e9bdd 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -1735,9 +1735,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl> fileTextList = new ArrayList<>(); List oSSFileAll = new ArrayList<>(); Map stringObjectMap = new HashMap<>(); @@ -1750,7 +1748,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl entry : map.entrySet()) { + //es全文新增数据(数据转换) + esFullText(cut, fieldList, categoryList, dictItemList, mapList, sbCn,sbEn, entry); + } + + // 将用户选择、输入的在产车实施日期、新车型实施日期恢复 + map.put("implement_time",implement_time); + map.put("xin1_che1_xing2_shi2_shi1_ri4_qi1",xin1_che1_xing2_shi2_shi1_ri4_qi1); + //多文件es List fileIdList = oSSFileAll.stream().map(OSSFile::getId).collect(Collectors.toList()); @@ -1953,9 +1972,6 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl phasedImplementationDetailsEOS = this.insertBatchPhasedImplementationDetailsInfo(map); - String replaceStandard = StringUtils.valueOf(map.get("replace_standard")); if (StringUtils.isNotBlank(replaceStandard)) { //新增时如果填写代替标准,需要向填写的代替标准的负责人发消息 @@ -2462,14 +2478,12 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl oSSFileAll = new ArrayList<>(); - StringBuilder sbCn = new StringBuilder(); - StringBuilder sbEn = new StringBuilder(); Map stringObjectMap = new HashMap<>(); for (Map.Entry entry : mapNew.entrySet()) { String key = entry.getKey(); Object value = entry.getValue(); //es全文新增数据(数据转换) - esFullText(cut, fieldList, categoryList, dictItemList, listMap, sbCn,sbEn, entry); + // esFullText(cut, fieldList, categoryList, dictItemList, listMap, sbCn,sbEn, entry); if (ObjectUtils.isNotEmpty(value)) { //处理修改人和修改时间 @@ -2535,6 +2549,24 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl ossFileList = fileSort(fieldFileList, fileInfos, stringObjectMap); + // 将用户选择、输入的新车型实施日期、在产车实施日期备份出来。如果不处理的话，插入ES时会报 解析失败 错误。 + String implement_time = (String) map.get("implement_time"); + String xin1_che1_xing2_shi2_shi1_ri4_qi1 = (String) map.get("xin1_che1_xing2_shi2_shi1_ri4_qi1"); + + // 批量添加分阶段实施明细信息 + this.insertBatchPhasedImplementationDetailsInfo(map); + + StringBuilder sbCn = new StringBuilder(); + StringBuilder sbEn = new StringBuilder(); + for (Map.Entry entry : map.entrySet()) { + //es全文新增数据(数据转换) + esFullText(cut, fieldList, categoryList, dictItemList, listMap, sbCn,sbEn, entry); + } + + // 将用户选择、输入的在产车实施日期、新车型实施日期恢复 + map.put("implement_time",implement_time); + map.put("xin1_che1_xing2_shi2_shi1_ri4_qi1",xin1_che1_xing2_shi2_shi1_ri4_qi1); + List> mapListTempCn = new ArrayList<>(); List> mapListTempEn = new ArrayList<>(); String fileTextAll = ""; @@ -2650,8 +2682,6 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl phasedImplDetailsEOList = this.insertBatchPhasedImplementationDetailsInfo(map); map.put("module_type", "文档库"); map.put("module_type_flag", ModuleTypeFlagEnum.DOCUMENT_LIBRARY.getValue()); @@ -4870,6 +4900,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl phasedImplDetailsQueryWrap = new QueryWrapper<>(); phasedImplDetailsQueryWrap.lambda().in(PhasedImplementationDetailsEO::getBussDocumentLibraryId,idList); phasedImplDetailsEOList = this.phasedImplementationDetailsEOService.list(phasedImplDetailsQueryWrap); + this.phasedImplementationDetailsEOService.disposeData(phasedImplDetailsEOList,cut); } for (Map data : datas) { @@ -4901,8 +4932,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl"); } - if(StringUtils.isNotEmpty(detailsEO.getImplementationType())){ - phasedImplDetailsSbTemp.append(detailsEO.getImplementationType()).append(""); + if(StringUtils.isNotEmpty(detailsEO.getImplementationTypeText())){ + phasedImplDetailsSbTemp.append(detailsEO.getImplementationTypeText()).append(""); } if(detailsEO.getImplementationDate()!=null){ phasedImplDetailsSbTemp.append(DateUtils.formatTime(detailsEO.getImplementationDate())).append(""); @@ -6874,6 +6905,55 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl newCarModelDateList = phasedImplDetailsEOList.stream().filter(phasedDetails -> { + boolean flag = false; + if (StringUtils.contains(phasedDetails.getImplementationType(), ImplementationTypeEnum.NEW_CAR_MODEL.getItemValue())) { + flag = true; + } + return flag; + }).map(PhasedImplementationDetailsEO::getImplementationDate).collect(Collectors.toList()); + + Date newCarModelDate = null; + try { + if (StringUtils.isNotEmpty((String) map.get("xin1_che1_xing2_shi2_shi1_ri4_qi1"))) { + newCarModelDate = DateUtils.parseDate((String) map.get("xin1_che1_xing2_shi2_shi1_ri4_qi1"), "yyyy-MM-dd"); + } + } catch (ParseException e) { + e.printStackTrace(); + } + if(newCarModelDate != null){ + newCarModelDateList.add(newCarModelDate); + } + + String newCarModelDateStr = DateUtils.formatDateList(newCarModelDateList); + map.put("xin1_che1_xing2_shi2_shi1_ri4_qi1",newCarModelDateStr); + + // 处理在产车实施日期 + List carInProductionDateList = phasedImplDetailsEOList.stream().filter(phasedDetails -> { + boolean flag = false; + if (StringUtils.contains(phasedDetails.getImplementationType(), ImplementationTypeEnum.CAR_IN_PRODUCTION.getItemValue())) { + flag = true; + } + return flag; + }).map(PhasedImplementationDetailsEO::getImplementationDate).collect(Collectors.toList()); + + Date carInProductionDateDate = null; + try { + if (StringUtils.isNotEmpty((String) map.get("implement_time"))) { + carInProductionDateDate = DateUtils.parseDate((String) map.get("implement_time"), "yyyy-MM-dd"); + } + } catch (ParseException e) { + e.printStackTrace(); + } + if(carInProductionDateDate != null){ + carInProductionDateList.add(carInProductionDateDate); + } + + String carInProductionDateStr = DateUtils.formatDateList(carInProductionDateList); + map.put("implement_time",carInProductionDateStr); } return phasedImplDetailsEOList; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java index 527eb8527..de4f64d82 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java @@ -1,5 +1,6 @@ package com.jero.modules.warn.service; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.constant.enums.CutEnum; @@ -7,11 +8,16 @@ import com.jero.common.constant.enums.MessageTypeEnum; import com.jero.common.constant.enums.ModuleEnum; import com.jero.common.exception.JeroBootException; import com.jero.common.system.vo.LoginUser; +import com.jero.common.util.DateUtils; import com.jero.generater.modules.online.cgform.entity.OnlCgformField; import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl; +import com.jero.modules.document.entity.PhasedImplementationDetailsEO; import com.jero.modules.document.enums.FieldTypeEnum; +import com.jero.modules.document.enums.ImplementationTypeEnum; import com.jero.modules.document.mapper.BussDocumentLibraryEOMapper; +import com.jero.modules.document.service.IPhasedImplementationDetailsEOService; import com.jero.modules.document.service.impl.BussDocumentLibraryEOServiceImpl; +import com.jero.modules.dummy.entity.DummyInventoryInfoEO; import com.jero.modules.feishu.service.IFeishuService; import com.jero.modules.feishu.vo.FeishuMsgVo; import com.jero.modules.system.entity.SysAnnouncement; @@ -24,6 +30,7 @@ import com.jero.modules.system.service.ISysUserService; import com.jero.modules.system.service.impl.SysCategoryServiceImpl; import com.jero.modules.system.service.impl.SysDictItemServiceImpl; import com.jero.modules.system.util.StringUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.poi.ss.usermodel.CellStyle; import org.apache.poi.ss.usermodel.HorizontalAlignment; @@ -82,6 +89,8 @@ public class LawsWarnService { private ISysAnnouncementService sysAnnouncementService; @Resource private IFeishuService iFeishuService; + @Autowired + private IPhasedImplementationDetailsEOService phasedImplementationDetailsEOService; public IPage getInfoPage(Map parameter) { String cut = (String) parameter.get("cut");//中英文切换标识 @@ -183,8 +192,85 @@ public class LawsWarnService { } } } + + this.disposeData(records,cut); + return infoPage; } + + private void disposeData(List datas, String cut) { + if(CollectionUtils.isNotEmpty(datas)){ + List bussDocumentLibraryIdList = datas.stream().map(data -> (String) data.get("id")).distinct().collect(Collectors.toList()); + QueryWrapper phasedDetailsQueryWrap = new QueryWrapper<>(); + phasedDetailsQueryWrap.lambda().in(PhasedImplementationDetailsEO::getBussDocumentLibraryId,bussDocumentLibraryIdList); + List phasedDetailsList = this.phasedImplementationDetailsEOService.list(phasedDetailsQueryWrap); + + // 新车型分阶段实施数据信息 + List newCarModelPhasedDetailsList = phasedDetailsList.stream().filter(phasedDetails -> { + boolean flag = false; + if(org.apache.commons.lang3.StringUtils.contains(phasedDetails.getImplementationType(), ImplementationTypeEnum.NEW_CAR_MODEL.getItemValue())){ + flag = true; + } + return flag; + }).collect(Collectors.toList()); + + // 在产车分阶段实施数据信息 + List carInProductionPhasedDetailsList = phasedDetailsList.stream().filter(phasedDetails -> { + boolean flag = false; + if(org.apache.commons.lang3.StringUtils.contains(phasedDetails.getImplementationType(), ImplementationTypeEnum.CAR_IN_PRODUCTION.getItemValue())){ + flag = true; + } + return flag; + }).collect(Collectors.toList()); + + for (Map data : datas) { + String bussDocumentLibraryId = (String) data.get("id"); + + // 处理新车型实施日期展示 + List newCarModelDateList = newCarModelPhasedDetailsList.stream().filter(phasedDetails -> { + boolean flag = false; + if (org.apache.commons.lang3.StringUtils.equals(phasedDetails.getBussDocumentLibraryId(), bussDocumentLibraryId)) { + flag = true; + } + return flag; + }).map(PhasedImplementationDetailsEO::getImplementationDate).collect(Collectors.toList()); + + + Date newCarModelDate = null; + try { + newCarModelDate = DateUtils.parseDate((String) data.get("xin1_che1_xing2_shi2_shi1_ri4_qi1"), "yyyy-MM-dd"); + } catch (ParseException e) { + e.printStackTrace(); + } + if(newCarModelDate != null){ + newCarModelDateList.add(newCarModelDate); + } + String newCarModelDateStr = DateUtils.formatDateList(newCarModelDateList); + data.put("xin1_che1_xing2_shi2_shi1_ri4_qi1",newCarModelDateStr); + + // 处理在产车实施日期展示 + List carInProductionDateList = carInProductionPhasedDetailsList.stream().filter(phasedDetails -> { + boolean flag = false; + if (org.apache.commons.lang3.StringUtils.equals(phasedDetails.getBussDocumentLibraryId(), bussDocumentLibraryId)) { + flag = true; + } + return flag; + }).map(PhasedImplementationDetailsEO::getImplementationDate).collect(Collectors.toList()); + Date implementTime = null; + try { + implementTime = DateUtils.parseDate((String) data.get("implement_time"), "yyyy-MM-dd"); + } catch (ParseException e) { + e.printStackTrace(); + } + if(implementTime != null){ + carInProductionDateList.add(implementTime); + } + String carInProductionDateStr = DateUtils.formatDateList(carInProductionDateList); + data.put("implement_time",carInProductionDateStr); + } + } + } + private String beforeTime (int month, Date date){ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); Calendar calendarBefore = Calendar.getInstance(); From bcedfaa854379756d149cf0da89c8acacda3c4dd Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Thu, 2 Mar 2023 17:52:24 +0800 Subject: [PATCH 051/645] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E8=99=9A=E6=8B=9F?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E5=9F=BA=E7=A1=80=E3=80=81=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95=E6=98=8E=E7=BB=86=E5=BC=80?= =?UTF-8?q?=E5=8F=91=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AuthDummyInventoryBaseEOController.java | 180 ++++++++++++++++ .../AuthDummyInventoryInfoEOController.java | 187 +++++++++++++++++ .../entity/AuthDummyInventoryBaseEO.java | 79 +++++++ .../entity/AuthDummyInventoryInfoEO.java | 116 +++++++++++ .../AuthDummyInventoryBaseEOMapper.java | 17 ++ .../AuthDummyInventoryInfoEOMapper.java | 17 ++ .../xml/AuthDummyInventoryBaseEOMapper.xml | 15 ++ .../xml/AuthDummyInventoryInfoEOMapper.xml | 21 ++ .../IAuthDummyInventoryBaseEOService.java | 77 +++++++ .../IAuthDummyInventoryInfoEOService.java | 77 +++++++ .../AuthDummyInventoryBaseEOServiceImpl.java | 152 ++++++++++++++ .../AuthDummyInventoryInfoEOServiceImpl.java | 193 ++++++++++++++++++ 12 files changed, 1131 insertions(+) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/controller/AuthDummyInventoryBaseEOController.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/controller/AuthDummyInventoryInfoEOController.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryBaseEO.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/mapper/AuthDummyInventoryBaseEOMapper.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/mapper/AuthDummyInventoryInfoEOMapper.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/mapper/xml/AuthDummyInventoryBaseEOMapper.xml create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/mapper/xml/AuthDummyInventoryInfoEOMapper.xml create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/IAuthDummyInventoryBaseEOService.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/IAuthDummyInventoryInfoEOService.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryBaseEOServiceImpl.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/controller/AuthDummyInventoryBaseEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/controller/AuthDummyInventoryBaseEOController.java new file mode 100644 index 000000000..1d8fa12e2 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/controller/AuthDummyInventoryBaseEOController.java @@ -0,0 +1,180 @@ +package com.jero.modules.authDummy.controller; + +import java.util.Arrays; +import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.alibaba.fastjson.JSONObject; +import com.jero.common.api.vo.Result; +import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.authDummy.entity.AuthDummyInventoryBaseEO; +import com.jero.modules.authDummy.service.IAuthDummyInventoryBaseEOService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; +import com.jero.common.system.base.controller.JeroController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.jero.common.aspect.annotation.AutoLog; + + + /** + * @Description: 认证虚拟清单基础表 + * @Author: jero-boot + * @Date: 2023-03-02 + * @Version: V1.0 + */ +@Api(tags="认证虚拟清单基础表") +@RestController +@RequestMapping("/authDummy/authDummyInventoryBaseEO") +@Slf4j +public class AuthDummyInventoryBaseEOController extends JeroController { + @Autowired + private IAuthDummyInventoryBaseEOService authDummyInventoryBaseEOService; + + /** + * 分页列表查询 + * + * @param authDummyInventoryBaseEO + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "认证虚拟清单基础表-分页列表查询") + @ApiOperation(value="认证虚拟清单基础表-分页列表查询", notes="认证虚拟清单基础表-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(AuthDummyInventoryBaseEO authDummyInventoryBaseEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + @RequestParam(name="cut", defaultValue="cn") String cut, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(authDummyInventoryBaseEO, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = authDummyInventoryBaseEOService.page(page, queryWrapper); + this.authDummyInventoryBaseEOService.disposeData(page.getRecords(),cut); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "认证虚拟清单基础表-列表查询") + @ApiOperation(value="认证虚拟清单基础表-列表查询", notes="认证虚拟清单基础表-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = authDummyInventoryBaseEOService.queryList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param authDummyInventoryBaseEO + * @return + */ + @AutoLog(value = "认证虚拟清单基础表-添加") + @ApiOperation(value="认证虚拟清单基础表-添加", notes="认证虚拟清单基础表-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody AuthDummyInventoryBaseEO authDummyInventoryBaseEO) { + authDummyInventoryBaseEOService.add(authDummyInventoryBaseEO); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param authDummyInventoryBaseEO + * @return + */ + @AutoLog(value = "认证虚拟清单基础表-编辑") + @ApiOperation(value="认证虚拟清单基础表-编辑", notes="认证虚拟清单基础表-编辑") + @PostMapping(value = "/edit") + public Result edit(@Validated @RequestBody AuthDummyInventoryBaseEO authDummyInventoryBaseEO) { + authDummyInventoryBaseEOService.editById(authDummyInventoryBaseEO); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "认证虚拟清单基础表-通过id删除") + @ApiOperation(value="认证虚拟清单基础表-通过id删除", notes="认证虚拟清单基础表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + authDummyInventoryBaseEOService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "认证虚拟清单基础表-批量删除") + @ApiOperation(value="认证虚拟清单基础表-批量删除", notes="认证虚拟清单基础表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.authDummyInventoryBaseEOService.deleteByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "认证虚拟清单基础表-通过id查询") + @ApiOperation(value="认证虚拟清单基础表-通过id查询", notes="认证虚拟清单基础表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + AuthDummyInventoryBaseEO authDummyInventoryBaseEO = authDummyInventoryBaseEOService.queryById(id); + if(authDummyInventoryBaseEO==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(authDummyInventoryBaseEO); + } + + /** + * 导出excel + * + * @param request + * @param authDummyInventoryBaseEO + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, AuthDummyInventoryBaseEO authDummyInventoryBaseEO) { + return super.exportXls(request, authDummyInventoryBaseEO, AuthDummyInventoryBaseEO.class, "认证虚拟清单基础表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, AuthDummyInventoryBaseEO.class); + } + + @AutoLog(value = "认证虚拟清单基础表-批量发布或撤回") + @ApiOperation(value="认证虚拟清单基础表-批量发布或撤回", notes="认证虚拟清单基础表-批量发布或撤回") + @PostMapping(value = "/batchIssueOrWithdraw") + public Result batchIssueOrWithdraw(@RequestBody JSONObject json) { + return this.authDummyInventoryBaseEOService.batchIssueOrWithdraw(json); + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/controller/AuthDummyInventoryInfoEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/controller/AuthDummyInventoryInfoEOController.java new file mode 100644 index 000000000..e92df32f1 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/controller/AuthDummyInventoryInfoEOController.java @@ -0,0 +1,187 @@ +package com.jero.modules.authDummy.controller; + +import java.util.Arrays; +import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import com.jero.common.api.vo.Result; +import com.jero.common.constant.enums.CutEnum; +import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.authDummy.entity.AuthDummyInventoryInfoEO; +import com.jero.modules.authDummy.service.IAuthDummyInventoryInfoEOService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; +import com.jero.common.system.base.controller.JeroController; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.jero.common.aspect.annotation.AutoLog; + + + /** + * @Description: 认证虚拟清单详情表 + * @Author: jero-boot + * @Date: 2023-03-02 + * @Version: V1.0 + */ +@Api(tags="认证虚拟清单详情表") +@RestController +@RequestMapping("/authDummy/authDummyInventoryInfoEO") +@Slf4j +public class AuthDummyInventoryInfoEOController extends JeroController { + @Autowired + private IAuthDummyInventoryInfoEOService authDummyInventoryInfoEOService; + + /** + * 分页列表查询 + * + * @param authDummyInventoryInfoEO + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "认证虚拟清单详情表-分页列表查询") + @ApiOperation(value="认证虚拟清单详情表-分页列表查询", notes="认证虚拟清单详情表-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(AuthDummyInventoryInfoEO authDummyInventoryInfoEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(authDummyInventoryInfoEO, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = authDummyInventoryInfoEOService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "认证虚拟清单详情表-列表查询") + @ApiOperation(value="认证虚拟清单详情表-列表查询", notes="认证虚拟清单详情表-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = authDummyInventoryInfoEOService.queryList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param authDummyInventoryInfoEO + * @return + */ + @AutoLog(value = "认证虚拟清单详情表-添加") + @ApiOperation(value="认证虚拟清单详情表-添加", notes="认证虚拟清单详情表-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody AuthDummyInventoryInfoEO authDummyInventoryInfoEO) { + authDummyInventoryInfoEOService.add(authDummyInventoryInfoEO); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param authDummyInventoryInfoEO + * @return + */ + @AutoLog(value = "认证虚拟清单详情表-编辑") + @ApiOperation(value="认证虚拟清单详情表-编辑", notes="认证虚拟清单详情表-编辑") + @PostMapping(value = "/edit") + public Result edit(@Validated @RequestBody AuthDummyInventoryInfoEO authDummyInventoryInfoEO) { + authDummyInventoryInfoEOService.editById(authDummyInventoryInfoEO); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "认证虚拟清单详情表-通过id删除") + @ApiOperation(value="认证虚拟清单详情表-通过id删除", notes="认证虚拟清单详情表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + authDummyInventoryInfoEOService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "认证虚拟清单详情表-批量删除") + @ApiOperation(value="认证虚拟清单详情表-批量删除", notes="认证虚拟清单详情表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.authDummyInventoryInfoEOService.deleteByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "认证虚拟清单详情表-通过id查询") + @ApiOperation(value="认证虚拟清单详情表-通过id查询", notes="认证虚拟清单详情表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + AuthDummyInventoryInfoEO authDummyInventoryInfoEO = authDummyInventoryInfoEOService.queryById(id); + if(authDummyInventoryInfoEO==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(authDummyInventoryInfoEO); + } + + /** + * 导出excel + * + * @param request + * @param authDummyInventoryInfoEO + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, AuthDummyInventoryInfoEO authDummyInventoryInfoEO) { + return super.exportXls(request, authDummyInventoryInfoEO, AuthDummyInventoryInfoEO.class, "认证虚拟清单详情表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, AuthDummyInventoryInfoEO.class); + } + + + @AutoLog(value = "认证虚拟清单详情表-复制") + @ApiOperation(value="认证虚拟清单详情表-复制", notes="认证虚拟清单详情表-复制") + @GetMapping(value = "/copyInfoByIds") + public Result copyInfoByIds(@RequestParam(name="ids",required=true) String ids, + @RequestParam(name="cut",required=true) String cut) { + return this.authDummyInventoryInfoEOService.copyInfoByIds(ids,cut); + } + + @AutoLog(value = "认证虚拟清单详情表-批量设置") + @ApiOperation(value="认证虚拟清单详情表-批量设置", notes="认证虚拟清单详情表-批量设置") + @PostMapping(value = "/setBatch") + public Result setBatch(@RequestBody AuthDummyInventoryInfoEO authDummyInventoryInfoEO) { + return this.authDummyInventoryInfoEOService.setBatch(authDummyInventoryInfoEO); + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryBaseEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryBaseEO.java new file mode 100644 index 000000000..f838b2828 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryBaseEO.java @@ -0,0 +1,79 @@ +package com.jero.modules.authDummy.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + + +/** + * @Description: 认证虚拟清单基础表 + * @Author: jero-boot + * @Date: 2023-03-02 + * @Version: V1.0 + */ +@Data +@TableName("auth_dummy_inventory_base") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="auth_dummy_inventory_base对象", description="认证虚拟清单基础表") +public class AuthDummyInventoryBaseEO implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private java.lang.String sysOrgCode; + + /**虚拟清单名称*/ + @Excel(name = "虚拟清单名称", width = 15) + @ApiModelProperty(value = "虚拟清单名称") + private java.lang.String name; + + /**使用说明*/ + @Excel(name = "使用说明", width = 15) + @ApiModelProperty(value = "使用说明") + private java.lang.String useExplain; + + /**状态*/ + @Excel(name = "状态", width = 15) + @ApiModelProperty(value = "状态") + private java.lang.String state; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java new file mode 100644 index 000000000..8bbc125f1 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java @@ -0,0 +1,116 @@ +package com.jero.modules.authDummy.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + + +/** + * @Description: 认证虚拟清单详情表 + * @Author: jero-boot + * @Date: 2023-03-02 + * @Version: V1.0 + */ +@Data +@TableName("auth_dummy_inventory_info") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="auth_dummy_inventory_info对象", description="认证虚拟清单详情表") +public class AuthDummyInventoryInfoEO implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private java.lang.String sysOrgCode; + + /**类别*/ + @Excel(name = "类别", width = 15) + @ApiModelProperty(value = "类别") + private java.lang.String category; + + /**检验项目*/ + @Excel(name = "检验项目", width = 15) + @ApiModelProperty(value = "检验项目") + private java.lang.String inspectionItem; + + /**配置项*/ + @Excel(name = "配置项", width = 15) + @ApiModelProperty(value = "配置项") + private java.lang.String configItem; + + /**WVTA ID*/ + @Excel(name = "WVTA ID", width = 15) + @ApiModelProperty(value = "WVTA ID") + private java.lang.String wvtaId; + + /**标准编号*/ + @Excel(name = "标准编号", width = 15) + @ApiModelProperty(value = "标准编号") + private java.lang.String serialNumber; + + /**责任领域*/ + @Excel(name = "责任领域", width = 15) + @ApiModelProperty(value = "责任领域") + private java.lang.String dutyTerritory; + + /**交付物*/ + @Excel(name = "交付物", width = 15) + @ApiModelProperty(value = "交付物") + private java.lang.String deliverable; + + /**文档库id*/ + @Excel(name = "文档库id", width = 15) + @ApiModelProperty(value = "文档库id") + private java.lang.String bussDocumentLibraryId; + + /**认证虚拟清单基础表id*/ + @Excel(name = "认证虚拟清单基础表id", width = 15) + @ApiModelProperty(value = "认证虚拟清单基础表id") + private java.lang.String authDummyInventoryBaseId; + + + @TableField(exist = false) + private String cut; + + @TableField(exist = false) + private String ids; +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/mapper/AuthDummyInventoryBaseEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/mapper/AuthDummyInventoryBaseEOMapper.java new file mode 100644 index 000000000..a5e53cce1 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/mapper/AuthDummyInventoryBaseEOMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.authDummy.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.authDummy.entity.AuthDummyInventoryBaseEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 认证虚拟清单基础表 + * @Author: jero-boot + * @Date: 2023-03-02 + * @Version: V1.0 + */ +public interface AuthDummyInventoryBaseEOMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/mapper/AuthDummyInventoryInfoEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/mapper/AuthDummyInventoryInfoEOMapper.java new file mode 100644 index 000000000..156072cb8 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/mapper/AuthDummyInventoryInfoEOMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.authDummy.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.authDummy.entity.AuthDummyInventoryInfoEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 认证虚拟清单详情表 + * @Author: jero-boot + * @Date: 2023-03-02 + * @Version: V1.0 + */ +public interface AuthDummyInventoryInfoEOMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/mapper/xml/AuthDummyInventoryBaseEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/mapper/xml/AuthDummyInventoryBaseEOMapper.xml new file mode 100644 index 000000000..86049a63f --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/mapper/xml/AuthDummyInventoryBaseEOMapper.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/mapper/xml/AuthDummyInventoryInfoEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/mapper/xml/AuthDummyInventoryInfoEOMapper.xml new file mode 100644 index 000000000..f9e8d3f9e --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/mapper/xml/AuthDummyInventoryInfoEOMapper.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/IAuthDummyInventoryBaseEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/IAuthDummyInventoryBaseEOService.java new file mode 100644 index 000000000..0880349c3 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/IAuthDummyInventoryBaseEOService.java @@ -0,0 +1,77 @@ +package com.jero.modules.authDummy.service; + +import com.alibaba.fastjson.JSONObject; +import com.jero.common.api.vo.Result; +import com.jero.modules.authDummy.entity.AuthDummyInventoryBaseEO; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 认证虚拟清单基础表 + * @Author: jero-boot + * @Date: 2023-03-02 + * @Version: V1.0 + */ +public interface IAuthDummyInventoryBaseEOService extends IService { + + /** + * 保存 + * + * @param authDummyInventoryBaseEO + * @return + */ + void add(AuthDummyInventoryBaseEO authDummyInventoryBaseEO); + + /** + * 更新 + * + * @param authDummyInventoryBaseEO + * @return + */ + void editById(AuthDummyInventoryBaseEO authDummyInventoryBaseEO); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + AuthDummyInventoryBaseEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); + + /** + * 发布或撤回 + * @param json + * @return + */ + Result batchIssueOrWithdraw(JSONObject json); + + /** + * 处理数据 + * @param datas + * @param cut + */ + void disposeData(List datas, String cut); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/IAuthDummyInventoryInfoEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/IAuthDummyInventoryInfoEOService.java new file mode 100644 index 000000000..1869864d4 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/IAuthDummyInventoryInfoEOService.java @@ -0,0 +1,77 @@ +package com.jero.modules.authDummy.service; + +import com.jero.common.api.vo.Result; +import com.jero.modules.authDummy.entity.AuthDummyInventoryInfoEO; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 认证虚拟清单详情表 + * @Author: jero-boot + * @Date: 2023-03-02 + * @Version: V1.0 + */ +public interface IAuthDummyInventoryInfoEOService extends IService { + + /** + * 保存 + * + * @param authDummyInventoryInfoEO + * @return + */ + void add(AuthDummyInventoryInfoEO authDummyInventoryInfoEO); + + /** + * 更新 + * + * @param authDummyInventoryInfoEO + * @return + */ + void editById(AuthDummyInventoryInfoEO authDummyInventoryInfoEO); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + AuthDummyInventoryInfoEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); + + /** + * 复制 + * @param ids + * @param cut + * @return + */ + Result copyInfoByIds(String ids, String cut); + + /** + * 批量设置 + * @param authDummyInventoryInfoEO + * @return + */ + Result setBatch(AuthDummyInventoryInfoEO authDummyInventoryInfoEO); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryBaseEOServiceImpl.java new file mode 100644 index 000000000..ce04ea584 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryBaseEOServiceImpl.java @@ -0,0 +1,152 @@ +package com.jero.modules.authDummy.service.impl; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.jero.common.api.vo.Result; +import com.jero.common.constant.enums.CutEnum; +import com.jero.common.exception.JeroBootException; +import com.jero.common.system.vo.LoginUser; +import com.jero.modules.authDummy.entity.AuthDummyInventoryBaseEO; +import com.jero.modules.authDummy.mapper.AuthDummyInventoryBaseEOMapper; +import com.jero.modules.authDummy.service.IAuthDummyInventoryBaseEOService; +import com.jero.modules.dummy.enums.InventoryStateEnum; +import me.zhyd.oauth.utils.StringUtils; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.shiro.SecurityUtils; +import org.springframework.stereotype.Service; + +import java.util.Arrays; +import java.util.List; +import java.util.Date; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +/** + * @Description: 认证虚拟清单基础表 + * @Author: jero-boot + * @Date: 2023-03-02 + * @Version: V1.0 + */ +@Service +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) +public class AuthDummyInventoryBaseEOServiceImpl extends ServiceImpl implements IAuthDummyInventoryBaseEOService { + + /** + * 保存 + * + * @param authDummyInventoryBaseEO + * @return + */ + @Override + public void add(AuthDummyInventoryBaseEO authDummyInventoryBaseEO) { + Date now = new Date(); + authDummyInventoryBaseEO.setCreateTime(now); + authDummyInventoryBaseEO.setUpdateTime(now); + save(authDummyInventoryBaseEO); + } + + /** + * 更新 + * + * @param authDummyInventoryBaseEO + * @return + */ + @Override + public void editById(AuthDummyInventoryBaseEO authDummyInventoryBaseEO) { + Date now = new Date(); + authDummyInventoryBaseEO.setUpdateTime(now); + saveOrUpdate(authDummyInventoryBaseEO); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public AuthDummyInventoryBaseEO queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } + + @Override + public Result batchIssueOrWithdraw(JSONObject json) { + String cut = json.getString("cut"); + String state = json.getString("state"); + String ids = json.getString("ids"); + if(StringUtils.isEmpty(ids)){ + throw new JeroBootException("至少选择一条数据进行操作！"); + } + + LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + + List idList = Arrays.asList(ids.split(",")); + + LambdaUpdateWrapper authDummyUpdateWrap = new LambdaUpdateWrapper<>(); + authDummyUpdateWrap.set(AuthDummyInventoryBaseEO::getState,state); + + if(InventoryStateEnum.ISSUE.getValue().equals(state)){ + authDummyUpdateWrap.set(AuthDummyInventoryBaseEO::getUpdateBy,currentUser.getUsername()); + authDummyUpdateWrap.set(AuthDummyInventoryBaseEO::getUpdateTime,new Date()); + } + + authDummyUpdateWrap.in(AuthDummyInventoryBaseEO::getId,idList); + this.update(authDummyUpdateWrap); + + if(InventoryStateEnum.ISSUE.getValue().equals(state)) { + if (CutEnum.CN.getValue().equals(cut)) { + return Result.OK().success("发布成功"); + } else { + return Result.OK().success("Release success!"); + } + }else { + if (CutEnum.CN.getValue().equals(cut)) { + return Result.OK().success("撤回成功"); + } else { + return Result.OK().success("Withdrawal succeeded!"); + } + } + } + + @Override + public void disposeData(List datas, String cut) { + if(CollectionUtils.isNotEmpty(datas)){ + for (AuthDummyInventoryBaseEO data : datas) { + // TODO 处理数据，对接时再详细处理。 + } + } + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java new file mode 100644 index 000000000..8c852548d --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java @@ -0,0 +1,193 @@ +package com.jero.modules.authDummy.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.jero.common.api.vo.Result; +import com.jero.common.constant.enums.CutEnum; +import com.jero.common.exception.JeroBootException; +import com.jero.modules.authDummy.entity.AuthDummyInventoryBaseEO; +import com.jero.modules.authDummy.entity.AuthDummyInventoryInfoEO; +import com.jero.modules.authDummy.mapper.AuthDummyInventoryInfoEOMapper; +import com.jero.modules.authDummy.service.IAuthDummyInventoryBaseEOService; +import com.jero.modules.authDummy.service.IAuthDummyInventoryInfoEOService; +import com.jero.modules.dummy.entity.DummyInventoryInfoEO; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.*; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.ObjectUtils; + +/** + * @Description: 认证虚拟清单详情表 + * @Author: jero-boot + * @Date: 2023-03-02 + * @Version: V1.0 + */ +@Service +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) +public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl implements IAuthDummyInventoryInfoEOService { + + @Autowired + private IAuthDummyInventoryBaseEOService authDummyInventoryBaseEOService; + + /** + * 保存 + * + * @param authDummyInventoryInfoEO + * @return + */ + @Override + public void add(AuthDummyInventoryInfoEO authDummyInventoryInfoEO) { + Date now = new Date(); + authDummyInventoryInfoEO.setCreateTime(now); + authDummyInventoryInfoEO.setUpdateTime(now); + save(authDummyInventoryInfoEO); + } + + /** + * 更新 + * + * @param authDummyInventoryInfoEO + * @return + */ + @Override + public void editById(AuthDummyInventoryInfoEO authDummyInventoryInfoEO) { + Date now = new Date(); + authDummyInventoryInfoEO.setUpdateTime(now); + saveOrUpdate(authDummyInventoryInfoEO); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public AuthDummyInventoryInfoEO queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } + + @Override + public Result copyInfoByIds(String ids, String cut) { + String resultMsg = ""; + try { + if(StringUtils.isNotBlank(ids)){ + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(AuthDummyInventoryInfoEO::getId,Arrays.asList(ids.split(","))); + List authDummyInventoryInfoEOList = this.list(wrapper); + for (AuthDummyInventoryInfoEO authDummyInventoryInfoEO : authDummyInventoryInfoEOList) { + authDummyInventoryInfoEO.setId(UUID.randomUUID().toString().replace("-", "")); + } + this.saveBatch(authDummyInventoryInfoEOList); + } + } catch (Exception e) { + e.printStackTrace(); + if(CutEnum.CN.getValue().equals(cut)){ + resultMsg = "复制失败"; + }else{ + resultMsg = "Copy the failure"; + } + return Result.error(resultMsg); + } + + if(CutEnum.CN.getValue().equals(cut)){ + resultMsg = "复制成功"; + }else{ + resultMsg = "Copy success"; + } + return Result.OK(resultMsg); + } + + @Override + public Result setBatch(AuthDummyInventoryInfoEO authDummyInventoryInfoEO) { + String authDummyInventoryBaseId = authDummyInventoryInfoEO.getAuthDummyInventoryBaseId(); + AuthDummyInventoryBaseEO authDummyInventoryBaseEO = this.authDummyInventoryBaseEOService.queryById(authDummyInventoryBaseId); + if(ObjectUtils.isEmpty(authDummyInventoryBaseEO)){ + if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEO.getCut())){ + throw new JeroBootException("该虚拟认证清单不存在,批量编辑失败"); + }else{ + throw new JeroBootException("The virtual inventory does not exist, and batch editing failed."); + } + }else { + String ids = authDummyInventoryInfoEO.getIds(); + if(StringUtils.isEmpty(ids)){ + throw new JeroBootException("至少选择一条数据进行批量设置！"); + } + List idList = Arrays.asList(ids.split(",")); + List updateList = new ArrayList<>(); + for (String id : idList) { + AuthDummyInventoryInfoEO updateAuthDummyEO = new AuthDummyInventoryInfoEO(); + updateAuthDummyEO.setId(id); + + if(StringUtils.isNotEmpty(authDummyInventoryInfoEO.getCategory())){ + updateAuthDummyEO.setCategory(authDummyInventoryInfoEO.getCategory()); + } + if(StringUtils.isNotEmpty(authDummyInventoryInfoEO.getInspectionItem())){ + updateAuthDummyEO.setInspectionItem(authDummyInventoryInfoEO.getInspectionItem()); + } + if(StringUtils.isNotEmpty(authDummyInventoryInfoEO.getConfigItem())){ + updateAuthDummyEO.setConfigItem(authDummyInventoryInfoEO.getConfigItem()); + } + if(StringUtils.isNotEmpty(authDummyInventoryInfoEO.getWvtaId())){ + updateAuthDummyEO.setWvtaId(authDummyInventoryInfoEO.getWvtaId()); + } + if(StringUtils.isNotEmpty(authDummyInventoryInfoEO.getSerialNumber())){ + updateAuthDummyEO.setSerialNumber(authDummyInventoryInfoEO.getSerialNumber()); + } + if(StringUtils.isNotEmpty(authDummyInventoryInfoEO.getDutyTerritory())){ + updateAuthDummyEO.setDutyTerritory(authDummyInventoryInfoEO.getDutyTerritory()); + } + if(StringUtils.isNotEmpty(authDummyInventoryInfoEO.getDeliverable())){ + updateAuthDummyEO.setDeliverable(authDummyInventoryInfoEO.getDeliverable()); + } + if(StringUtils.isNotEmpty(authDummyInventoryInfoEO.getBussDocumentLibraryId())){ + updateAuthDummyEO.setBussDocumentLibraryId(authDummyInventoryInfoEO.getBussDocumentLibraryId()); + } + updateList.add(updateAuthDummyEO); + } + + if(CollectionUtils.isNotEmpty(updateList)){ + this.updateBatchById(updateList); + } + } + return Result.OK("批量设置成功！"); + } +} From a552d8b0ceaa5354c0c0ce08a0f2cc1f20216c88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Fri, 3 Mar 2023 11:52:58 +0800 Subject: [PATCH 052/645] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=B7=A5=E5=85=B7-?= =?UTF-8?q?=E8=99=9A=E6=8B=9F=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95-?= =?UTF-8?q?=E5=A2=9E=E5=88=A0=E6=94=B9=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 1 + .../views/virtualAuthenticationList/index.vue | 550 ++++++++++++++++++ 3 files changed, 552 insertions(+) create mode 100644 jero-web/src/views/virtualAuthenticationList/index.vue diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index e2f58b10f..e18287b58 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -597,6 +597,7 @@ module.exports = { selectDisplayList: 'Please select whether to display in list', documentSplitDisplay: 'Document splitting module display', VirtualListName: 'Virtual List Name', + CertificationListName:'Certification List Name', listStatus: 'List Status', creater: 'Creater', withdraw: 'Withdraw', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index ed71ce96b..9558852a3 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -605,6 +605,7 @@ module.exports = { selectDisplayList: '请选择是否列表展示', documentSplitDisplay: '文档拆分模块展示', VirtualListName: '虚拟清单名称', + CertificationListName:'认证清单名称', VirtualList: '虚拟清单', listStatus: '清单状态', creater: '创建人', diff --git a/jero-web/src/views/virtualAuthenticationList/index.vue b/jero-web/src/views/virtualAuthenticationList/index.vue new file mode 100644 index 000000000..c9a6272d2 --- /dev/null +++ b/jero-web/src/views/virtualAuthenticationList/index.vue @@ -0,0 +1,550 @@ + + + + + + From 98e232667294d9edae4f81b7aaf47ceb9357c283 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Fri, 3 Mar 2023 13:46:51 +0800 Subject: [PATCH 053/645] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=B7=A5=E5=85=B7-?= =?UTF-8?q?=E8=99=9A=E6=8B=9F=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95-?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/virtualAuthenticationList/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/virtualAuthenticationList/index.vue b/jero-web/src/views/virtualAuthenticationList/index.vue index c9a6272d2..0aff394d5 100644 --- a/jero-web/src/views/virtualAuthenticationList/index.vue +++ b/jero-web/src/views/virtualAuthenticationList/index.vue @@ -166,12 +166,12 @@ export default { name: [ { required: true, - message: this.$t('VirtualListName') + this.$t('cannotEmpty'), + message: this.$t('CertificationListName') + this.$t('cannotEmpty'), trigger: 'blur' }, { max: 100, - message: this.$t('VirtualListName') + this.$t('cannotExceed') + 100 + this.$t('Characters'), + message: this.$t('CertificationListName') + this.$t('cannotExceed') + 100 + this.$t('Characters'), trigger: 'blur' } ], From 7f04d830879de5bf2b5d353bdac15dc21b141b95 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Fri, 3 Mar 2023 14:36:58 +0800 Subject: [PATCH 054/645] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93-=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E6=B8=85=E5=8D=95=E6=A8=A1=E5=9D=97=E5=BC=80=E5=8F=91?= =?UTF-8?q?=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 | 65 ++++++ ...ectCertificationInventoryEOController.java | 186 ++++++++++++++++++ .../ProjectCertificationInventoryEO.java | 168 ++++++++++++++++ ...ProjectCertificationInventoryEOMapper.java | 17 ++ .../ProjectCertificationInventoryEOMapper.xml | 31 +++ ...rojectCertificationInventoryEOService.java | 77 ++++++++ ...ctCertificationInventoryEOServiceImpl.java | 155 +++++++++++++++ 7 files changed, 699 insertions(+) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryEOController.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectCertificationInventoryEOMapper.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectCertificationInventoryEOMapper.xml create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java diff --git a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql index 642a31268..7dfc766b0 100644 --- a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql +++ b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql @@ -210,3 +210,68 @@ WHERE SELECT id as temp_id FROM `laws_weilai`.`project_task_inventory` WHERE certification_progress IS NULL ) temp ); + + +-- 认证虚拟清单基础表 2023-03-03 未同步生产环境 +CREATE TABLE `auth_dummy_inventory_base` ( + `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建日期', + `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人', + `update_time` datetime NULL DEFAULT NULL COMMENT '更新日期', + `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门', + `name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '虚拟清单名称', + `use_explain` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '使用说明', + `state` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '状态', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '认证虚拟清单基础表' ROW_FORMAT = Dynamic; + +-- 认证虚拟清单详情表 2023-03-03 未同步生产环境 +CREATE TABLE `auth_dummy_inventory_info` ( + `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建日期', + `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人', + `update_time` datetime NULL DEFAULT NULL COMMENT '更新日期', + `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门', + `category` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '类别', + `inspection_item` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '检验项目', + `config_item` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '配置项', + `wvta_id` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'WVTA ID', + `serial_number` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标准编号', + `duty_territory` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '责任领域', + `deliverable` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '交付物', + `buss_document_library_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文档库id', + `auth_dummy_inventory_base_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '认证虚拟清单基础表id', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '认证虚拟清单详情表' ROW_FORMAT = Dynamic; + +-- 项目库-认证清单表 2023-03-03 未同步生产环境 +CREATE TABLE `project_certification_inventory` ( + `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建日期', + `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人', + `update_time` datetime NULL DEFAULT NULL COMMENT '更新日期', + `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门', + `category` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '类别', + `inspection_item` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '检验项目', + `config_item` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '配置项', + `wvta_id` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'WVTA ID', + `serial_number` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标准编号', + `duty_territory` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '责任领域', + `deliverable` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '交付物', + `buss_document_library_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文档库id', + `sdt` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '工程接口人', + `duty_person` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '责任人', + `deliverable_type` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '交付物类型', + `deliverable_template` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '交付物模板', + `delivery_result` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '交付结果', + `end_time` datetime NULL DEFAULT NULL COMMENT '截止日期', + `flow_status` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '流程状态', + `report_number` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '报告编号', + `product_model` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '产品型号', + `production_enterprise_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '生产企业名称', + `certification_progress` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '认证进度', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '项目库-认证清单表' ROW_FORMAT = Dynamic; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryEOController.java new file mode 100644 index 000000000..36454500a --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryEOController.java @@ -0,0 +1,186 @@ +package com.jero.modules.project.controller; + +import java.util.Arrays; +import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.alibaba.fastjson.JSONObject; +import com.jero.common.api.vo.Result; +import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.authDummy.entity.AuthDummyInventoryInfoEO; +import com.jero.modules.project.entity.ProjectCertificationInventoryEO; +import com.jero.modules.project.service.IProjectCertificationInventoryEOService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; +import com.jero.common.system.base.controller.JeroController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.jero.common.aspect.annotation.AutoLog; + + + /** + * @Description: 项目库-认证清单表 + * @Author: jero-boot + * @Date: 2023-03-03 + * @Version: V1.0 + */ +@Api(tags="项目库-认证清单表") +@RestController +@RequestMapping("/project/projectCertificationInventoryEO") +@Slf4j +public class ProjectCertificationInventoryEOController extends JeroController { + @Autowired + private IProjectCertificationInventoryEOService projectCertificationInventoryEOService; + + /** + * 分页列表查询 + * + * @param projectCertificationInventoryEO + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "项目库-认证清单表-分页列表查询") + @ApiOperation(value="项目库-认证清单表-分页列表查询", notes="项目库-认证清单表-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(ProjectCertificationInventoryEO projectCertificationInventoryEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(projectCertificationInventoryEO, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = projectCertificationInventoryEOService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "项目库-认证清单表-列表查询") + @ApiOperation(value="项目库-认证清单表-列表查询", notes="项目库-认证清单表-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = projectCertificationInventoryEOService.queryList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param projectCertificationInventoryEO + * @return + */ + @AutoLog(value = "项目库-认证清单表-添加") + @ApiOperation(value="项目库-认证清单表-添加", notes="项目库-认证清单表-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody ProjectCertificationInventoryEO projectCertificationInventoryEO) { + projectCertificationInventoryEOService.add(projectCertificationInventoryEO); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param projectCertificationInventoryEO + * @return + */ + @AutoLog(value = "项目库-认证清单表-编辑") + @ApiOperation(value="项目库-认证清单表-编辑", notes="项目库-认证清单表-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody ProjectCertificationInventoryEO projectCertificationInventoryEO) { + projectCertificationInventoryEOService.editById(projectCertificationInventoryEO); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "项目库-认证清单表-通过id删除") + @ApiOperation(value="项目库-认证清单表-通过id删除", notes="项目库-认证清单表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + projectCertificationInventoryEOService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "项目库-认证清单表-批量删除") + @ApiOperation(value="项目库-认证清单表-批量删除", notes="项目库-认证清单表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.projectCertificationInventoryEOService.deleteByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "项目库-认证清单表-通过id查询") + @ApiOperation(value="项目库-认证清单表-通过id查询", notes="项目库-认证清单表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + ProjectCertificationInventoryEO projectCertificationInventoryEO = projectCertificationInventoryEOService.queryById(id); + if(projectCertificationInventoryEO==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(projectCertificationInventoryEO); + } + + /** + * 导出excel + * + * @param request + * @param projectCertificationInventoryEO + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ProjectCertificationInventoryEO projectCertificationInventoryEO) { + return super.exportXls(request, projectCertificationInventoryEO, ProjectCertificationInventoryEO.class, "项目库-认证清单表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, ProjectCertificationInventoryEO.class); + } + + @AutoLog(value = "项目库-认证清单表-批量添加") + @ApiOperation(value="项目库-认证清单表-批量添加", notes="项目库-认证清单表-批量添加") + @PostMapping(value = "/batchAdd") + public Result batchAdd(@RequestBody JSONObject json) { + return this.projectCertificationInventoryEOService.batchAdd(json); + } + + @AutoLog(value = "认证虚拟清单详情表-批量设置") + @ApiOperation(value="认证虚拟清单详情表-批量设置", notes="认证虚拟清单详情表-批量设置") + @PostMapping(value = "/setBatch") + public Result setBatch(@RequestBody ProjectCertificationInventoryEO projectCertificationInventoryEO) { + return this.projectCertificationInventoryEOService.setBatch(projectCertificationInventoryEO); + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java new file mode 100644 index 000000000..22e7fdd3c --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java @@ -0,0 +1,168 @@ +package com.jero.modules.project.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + + +/** + * @Description: 项目库-认证清单表 + * @Author: jero-boot + * @Date: 2023-03-03 + * @Version: V1.0 + */ +@Data +@TableName("project_certification_inventory") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="project_certification_inventory对象", description="项目库-认证清单表") +public class ProjectCertificationInventoryEO implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private java.lang.String sysOrgCode; + + /**类别*/ + @Excel(name = "类别", width = 15) + @ApiModelProperty(value = "类别") + private java.lang.String category; + + /**检验项目*/ + @Excel(name = "检验项目", width = 15) + @ApiModelProperty(value = "检验项目") + private java.lang.String inspectionItem; + + /**配置项*/ + @Excel(name = "配置项", width = 15) + @ApiModelProperty(value = "配置项") + private java.lang.String configItem; + + /**WVTA ID*/ + @Excel(name = "WVTA ID", width = 15) + @ApiModelProperty(value = "WVTA ID") + private java.lang.String wvtaId; + + /**标准编号*/ + @Excel(name = "标准编号", width = 15) + @ApiModelProperty(value = "标准编号") + private java.lang.String serialNumber; + + /**责任领域*/ + @Excel(name = "责任领域", width = 15) + @ApiModelProperty(value = "责任领域") + private java.lang.String dutyTerritory; + + /**交付物*/ + @Excel(name = "交付物", width = 15) + @ApiModelProperty(value = "交付物") + private java.lang.String deliverable; + + /**文档库id*/ + @Excel(name = "文档库id", width = 15) + @ApiModelProperty(value = "文档库id") + private java.lang.String bussDocumentLibraryId; + + /**工程接口人*/ + @Excel(name = "工程接口人", width = 15) + @ApiModelProperty(value = "工程接口人") + private java.lang.String sdt; + + /**责任人*/ + @Excel(name = "责任人", width = 15) + @ApiModelProperty(value = "责任人") + private java.lang.String dutyPerson; + + /**交付物类型*/ + @Excel(name = "交付物类型", width = 15) + @ApiModelProperty(value = "交付物类型") + private java.lang.String deliverableType; + + /**交付物模板*/ + @Excel(name = "交付物模板", width = 15) + @ApiModelProperty(value = "交付物模板") + private java.lang.String deliverableTemplate; + + /**交付结果*/ + @Excel(name = "交付结果", width = 15) + @ApiModelProperty(value = "交付结果") + private java.lang.String deliveryResult; + + /**截止日期*/ + @Excel(name = "截止日期", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "截止日期") + private java.util.Date endTime; + + /**流程状态*/ + @Excel(name = "流程状态", width = 15) + @ApiModelProperty(value = "流程状态") + private java.lang.String flowStatus; + + /**报告编号*/ + @Excel(name = "报告编号", width = 15) + @ApiModelProperty(value = "报告编号") + private java.lang.String reportNumber; + + /**产品型号*/ + @Excel(name = "产品型号", width = 15) + @ApiModelProperty(value = "产品型号") + private java.lang.String productModel; + + /**生产企业名称*/ + @Excel(name = "生产企业名称", width = 15) + @ApiModelProperty(value = "生产企业名称") + private java.lang.String productionEnterpriseName; + + /**认证进度*/ + @Excel(name = "认证进度", width = 15) + @ApiModelProperty(value = "认证进度") + private java.lang.String certificationProgress; + + + @TableField(exist = false) + private String cut; + + @TableField(exist = false) + private String ids; +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectCertificationInventoryEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectCertificationInventoryEOMapper.java new file mode 100644 index 000000000..397f82044 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectCertificationInventoryEOMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.project.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.project.entity.ProjectCertificationInventoryEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 项目库-认证清单表 + * @Author: jero-boot + * @Date: 2023-03-03 + * @Version: V1.0 + */ +public interface ProjectCertificationInventoryEOMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectCertificationInventoryEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectCertificationInventoryEOMapper.xml new file mode 100644 index 000000000..0264bfa45 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectCertificationInventoryEOMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java new file mode 100644 index 000000000..e1f02c85a --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java @@ -0,0 +1,77 @@ +package com.jero.modules.project.service; + +import com.alibaba.fastjson.JSONObject; +import com.jero.common.api.vo.Result; +import com.jero.modules.project.entity.ProjectCertificationInventoryEO; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 项目库-认证清单表 + * @Author: jero-boot + * @Date: 2023-03-03 + * @Version: V1.0 + */ +public interface IProjectCertificationInventoryEOService extends IService { + + /** + * 保存 + * + * @param projectCertificationInventoryEO + * @return + */ + void add(ProjectCertificationInventoryEO projectCertificationInventoryEO); + + /** + * 更新 + * + * @param projectCertificationInventoryEO + * @return + */ + void editById(ProjectCertificationInventoryEO projectCertificationInventoryEO); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + ProjectCertificationInventoryEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); + + /** + * 批量添加 + * @param json + * @return + */ + Result batchAdd(JSONObject json); + + /** + * 批量设置 + * @param projectCertificationInventoryEO + * @return + */ + Result setBatch(ProjectCertificationInventoryEO projectCertificationInventoryEO); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java new file mode 100644 index 000000000..175ef6882 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -0,0 +1,155 @@ +package com.jero.modules.project.service.impl; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.jero.common.api.vo.Result; +import com.jero.common.exception.JeroBootException; +import com.jero.modules.project.entity.ProjectCertificationInventoryEO; +import com.jero.modules.project.mapper.ProjectCertificationInventoryEOMapper; +import com.jero.modules.project.service.IProjectCertificationInventoryEOService; +import org.springframework.beans.BeanUtils; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Date; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +/** + * @Description: 项目库-认证清单表 + * @Author: jero-boot + * @Date: 2023-03-03 + * @Version: V1.0 + */ +@Service +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) +public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl implements IProjectCertificationInventoryEOService { + + /** + * 保存 + * + * @param projectCertificationInventoryEO + * @return + */ + @Override + public void add(ProjectCertificationInventoryEO projectCertificationInventoryEO) { + Date now = new Date(); + projectCertificationInventoryEO.setCreateTime(now); + projectCertificationInventoryEO.setUpdateTime(now); + save(projectCertificationInventoryEO); + } + + /** + * 更新 + * + * @param projectCertificationInventoryEO + * @return + */ + @Override + public void editById(ProjectCertificationInventoryEO projectCertificationInventoryEO) { + Date now = new Date(); + projectCertificationInventoryEO.setUpdateTime(now); + saveOrUpdate(projectCertificationInventoryEO); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public ProjectCertificationInventoryEO queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } + + @Override + public Result batchAdd(JSONObject json) { + try { + String serialNumber = json.getString("serialNumber"); + String wvtaId = json.getString("wvtaId"); + String bussDocumentLibraryId = json.getString("bussDocumentLibraryId"); + + JSONArray dataList = json.getJSONArray("dataList"); + List projectCertificationInventoryEOList = new ArrayList<>(); + ProjectCertificationInventoryEO projectCertificationInventoryEO = null; + for (Object data : dataList) { + projectCertificationInventoryEO = JSONObject.parseObject(JSONObject.toJSONString(data),ProjectCertificationInventoryEO.class); + projectCertificationInventoryEO.setSerialNumber(serialNumber); + projectCertificationInventoryEO.setWvtaId(wvtaId); + projectCertificationInventoryEO.setBussDocumentLibraryId(bussDocumentLibraryId); + projectCertificationInventoryEOList.add(projectCertificationInventoryEO); + } + + if(CollectionUtils.isNotEmpty(projectCertificationInventoryEOList)){ + this.saveBatch(projectCertificationInventoryEOList); + } + }catch (Exception ex){ + throw new JeroBootException("添加失败！"); + } + return Result.OK("添加成功！"); + } + + @Override + public Result setBatch(ProjectCertificationInventoryEO projectCertificationInventoryEO) { + String ids = projectCertificationInventoryEO.getIds(); + if(StringUtils.isEmpty(ids)){ + throw new JeroBootException("至少选择一条数据进行批量设置！"); + } + try { + List idList = Arrays.asList(ids.split(",")); + + List updateList = new ArrayList<>(); + for (String id : idList) { + ProjectCertificationInventoryEO updateProjectCertificationInventoryEO = new ProjectCertificationInventoryEO(); + BeanUtils.copyProperties(projectCertificationInventoryEO,updateProjectCertificationInventoryEO); + updateProjectCertificationInventoryEO.setId(id); + updateList.add(updateProjectCertificationInventoryEO); + } + + if(CollectionUtils.isNotEmpty(updateList)){ + this.updateBatchById(updateList); + } + }catch (Exception ex){ + throw new JeroBootException("批量设置失败！"); + } + return Result.OK("批量设置成功！"); + } +} From 2e5e8a710a82b59bdd81fc0b7c68889787cb7893 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Fri, 3 Mar 2023 15:07:01 +0800 Subject: [PATCH 055/645] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E6=B8=85=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 8 + jero-web/src/common/lang/zh-cn.js | 8 + .../ProjectDetails/index.vue | 48 +- .../certificationList/components/addModel.vue | 590 ++++++++++++ .../components/batSetting.vue | 313 +++++++ .../components/transferList.vue | 269 ++++++ .../components/certificationList/index.vue | 837 ++++++++++++++++++ 7 files changed, 2056 insertions(+), 17 deletions(-) create mode 100644 jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue create mode 100644 jero-web/src/views/projectManagement/components/certificationList/components/batSetting.vue create mode 100644 jero-web/src/views/projectManagement/components/certificationList/components/transferList.vue create mode 100644 jero-web/src/views/projectManagement/components/certificationList/index.vue diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index e18287b58..a773e0f2f 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1384,4 +1384,12 @@ module.exports = { beforedate:'In... Before date', beforedatein:'In... Before date (inclusive)', inRecentMonthsin6:'Within 6 months (implemented)', + certificationList:'Certification List', + inspectionItems:'Inspection Items', + processReset:'Process Reset', + configurationItem:'Configuration Item', + DeliverablesResult:'Deliverables Result', + reportNo:'Report No', + productModel:'Product Model', + nameOfManufacturer:'Name Of Manufacturer', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 9558852a3..5501d53b0 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1485,4 +1485,12 @@ module.exports = { beforedate:'在...日期之前', beforedatein:'在...日期之前（包含）', inRecentMonthsin6:'近6个月内（已实施）', + certificationList:'认证清单', + inspectionItems:'检验项目', + processReset:'流程重置', + configurationItem:'配置项', + DeliverablesResult:'交付结果', + reportNo:'报告编号', + productModel:'产品型号', + nameOfManufacturer:'生产企业名称', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/ProjectDetails/index.vue b/jero-web/src/views/projectManagement/ProjectDetails/index.vue index ed161cf7f..b8a132c9c 100644 --- a/jero-web/src/views/projectManagement/ProjectDetails/index.vue +++ b/jero-web/src/views/projectManagement/ProjectDetails/index.vue @@ -40,17 +40,23 @@ {{$t('listOfRegulations')}}
-
+
- {{$t('taskList')}} -
-
- - {{$t('nonConformance')}} + {{$t('certificationList')}}
+ + + + + + + + + + +
@@ -77,15 +83,20 @@ @click="textClick(1,$t('listOfRegulations'))">
-
+
-
- -
+ + + + + + + + +
@@ -109,6 +120,7 @@ +
@@ -130,6 +142,7 @@ import historicalVersionList from '../components/historicalVersionList' import commentList from '../components/commentList' import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage' + import certificationList from '../components/certificationList/index' import { mapGetters } from 'vuex' export default { @@ -143,7 +156,8 @@ updateLog, historicalVersionList, commentList, - projectStatus + projectStatus, + certificationList }, data() { return { diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue new file mode 100644 index 000000000..879f2e479 --- /dev/null +++ b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue @@ -0,0 +1,590 @@ + + + + + + \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/batSetting.vue b/jero-web/src/views/projectManagement/components/certificationList/components/batSetting.vue new file mode 100644 index 000000000..61d250be0 --- /dev/null +++ b/jero-web/src/views/projectManagement/components/certificationList/components/batSetting.vue @@ -0,0 +1,313 @@ + + + + + + \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/transferList.vue b/jero-web/src/views/projectManagement/components/certificationList/components/transferList.vue new file mode 100644 index 000000000..3198cb9d6 --- /dev/null +++ b/jero-web/src/views/projectManagement/components/certificationList/components/transferList.vue @@ -0,0 +1,269 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue new file mode 100644 index 000000000..9c2c6f930 --- /dev/null +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -0,0 +1,837 @@ + + + + + + + \ No newline at end of file From 45c3372a31dd3f3c8e09e087509011ee985a52d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Fri, 3 Mar 2023 17:58:03 +0800 Subject: [PATCH 056/645] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E6=B8=85=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 2 + jero-web/src/common/lang/zh-cn.js | 2 + .../certificationList/components/addModel.vue | 399 ++++++++---------- .../components/certificationList/index.vue | 30 +- 4 files changed, 197 insertions(+), 236 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index a773e0f2f..2253642ca 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1392,4 +1392,6 @@ module.exports = { reportNo:'Report No', productModel:'Product Model', nameOfManufacturer:'Name Of Manufacturer', + regulationNo:'Regulation No', + itemInformation:'Item Information', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 5501d53b0..87d5c0993 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1493,4 +1493,6 @@ module.exports = { reportNo:'报告编号', productModel:'产品型号', nameOfManufacturer:'生产企业名称', + regulationNo:'法规编号', + itemInformation:'条目信息', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue index 879f2e479..c755d0570 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue @@ -16,12 +16,11 @@
* - {{$t('modelName')}} + {{$t('regulationNo')}}
- - + + @@ -39,132 +38,144 @@ * WVTA ID
- +
+
+
+ {{$t('itemInformation')}} + + +
+ + +
+
+ * + {{$t('category')}} +
+ + + +
+ + +
+
+ * + {{$t('inspectionItems')}} +
+ + + +
+ + - - -
-
- * - {{$t('category')}} + + +
+
+ * + {{$t('typeOfDeliverables')}} +
+ + +
- - - -
- - -
-
- * - {{$t('inspectionItems')}} + + +
+
+ {{$t('deliverableTemplate')}} +
+ + + {{ (formInline.deliverableTemplate === 'null' || formInline.deliverableTemplate === '' + || + formInline.deliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles') + }} + +
- - - -
- - + + - - -
-
- * - {{$t('typeOfDeliverables')}} + + +
+
+ * + {{$t('areaOfResponsibility')}} +
+ + +
- - - -
- - -
-
- * - {{$t('deliverableTemplate')}} + + +
+
+ * + {{$t('engineeringInterfacePerson')}} +
+ + +
- - - {{ (formInline.designDeliverableTemplate === 'null' || formInline.designDeliverableTemplate === '' - || - formInline.designDeliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles') - }} - - -
- - - - -
-
- {{$t('areaOfResponsibility')}} + + + + + +
+
+ * + {{$t('personLiable')}} +
+ + +
- - - -
- - -
-
- {{$t('engineeringInterfacePerson')}} -
- - - -
- - - - -
-
- {{$t('personLiable')}} -
- - - -
- - + + +
+ @@ -210,111 +221,75 @@ visible: false, yearNameDataList: [], rules: { - ipdInfo: [ + serialNumber: [ { - pattern: /(ht|f)tp(s?)\:\/\/[0-9a-zA-Z]([-.\w]*[0-9a-zA-Z])*(:(0-9)*)*(\/?)([a-zA-Z0-9\-\.\?\,\'\/\\\+&%$#_]*)?/, - message: this.$t('pleaseEnterTheCorrectWebAddress') + required: true, + message: this.$t('entryName') + this.$t('regulationNo'), + trigger: 'change' + } + ], + + wvtaId: [ + { + required: true, + message: 'WVTA ID' + this.$t('regulationNo'), + trigger: 'change' }, { max: 300, - message: this.$t('IPDInformation') + this.$t('cannotExceed') + 300 + this.$t('Characters'), + message: 'WVTA ID' + this.$t('cannotExceed') + 300 + this.$t('Characters'), trigger: 'blur' } ], - vehicleDevelopmentPlan: [ + category: [ { - pattern: /(ht|f)tp(s?)\:\/\/[0-9a-zA-Z]([-.\w]*[0-9a-zA-Z])*(:(0-9)*)*(\/?)([a-zA-Z0-9\-\.\?\,\'\/\\\+&%$#_]*)?/, - message: this.$t('pleaseEnterTheCorrectWebAddress') + required: true, + message: this.$t('category') + this.$t('regulationNo'), + trigger: 'change' }, { max: 300, - message: this.$t('dehicleDevelopmentPlan') + this.$t('cannotExceed') + 300 + this.$t('Characters'), + message: this.$t('category') + this.$t('cannotExceed') + 300 + this.$t('Characters'), trigger: 'blur' } ], - explanation: [ + inspectionItem: [ { - max: 500, - message: this.$t('explain') + this.$t('cannotExceed') + 500 + this.$t('Characters'), - trigger: 'blur' - } - ], - attestationPlan: [ - { - pattern: /(ht|f)tp(s?)\:\/\/[0-9a-zA-Z]([-.\w]*[0-9a-zA-Z])*(:(0-9)*)*(\/?)([a-zA-Z0-9\-\.\?\,\'\/\\\+&%$#_]*)?/, - message: this.$t('pleaseEnterTheCorrectWebAddress') + required: true, + message: this.$t('inspectionItems') + this.$t('regulationNo'), + trigger: 'change' }, { max: 300, - message: this.$t('certificationProgram') + this.$t('cannotExceed') + 300 + this.$t('Characters'), + message: this.$t('inspectionItems') + this.$t('cannotExceed') + 300 + this.$t('Characters'), trigger: 'blur' } ], - vehiclePlatform: [ - { - max: 100, - message: this.$t('ModelPlatform') + this.$t('cannotExceed') + 100 + this.$t('Characters'), - trigger: 'blur' - } - ], - digitalPlatform: [ - { - max: 100, - message: this.$t('DigitalPlatform') + this.$t('cannotExceed') + 100 + this.$t('Characters'), - trigger: 'blur' - } - ], - softwareVersion: [ - { - max: 300, - message: this.$t('softwareVersion') + this.$t('cannotExceed') + 300 + this.$t('Characters'), - trigger: 'blur' - } - ], - projectNameId: [ + deliverableType: [ { required: true, - message: this.$t('entryName') + this.$t('cannotEmpty'), + message: this.$t('typeOfDeliverables') + this.$t('cannotEmpty'), trigger: 'change' } ], - yearNameId: [ + dutyTerritory: [ { required: true, - message: this.$t('modelYear') + this.$t('cannotEmpty'), + message: this.$t('areaOfResponsibility') + this.$t('cannotEmpty'), trigger: 'change' } ], - targetMarket: [ + sdtName: [ { required: true, - message: this.$t('targetMarket') + this.$t('cannotEmpty'), + message: this.$t('engineeringInterfacePerson') + this.$t('cannotEmpty'), trigger: 'change' } ], - projectStatus: [ + dutyPersonName: [ { required: true, - message: this.$t('projectStatus') + this.$t('cannotEmpty'), - trigger: 'change' - } - ], - studioEngineerName: [ - { - required: true, - message: this.$t('StudioEngineer') + this.$t('cannotEmpty'), - trigger: 'change' - }, - { - max: 100, - message: this.$t('StudioEngineer') + this.$t('cannotExceed') + 100 + this.$t('Characters'), - trigger: 'change' - } - ], - certificationEngineerName: [ - { - max: 100, - message: this.$t('certifiedEngineer') + this.$t('cannotExceed') + 100 + this.$t('Characters'), + message: this.$t('personLiable') + this.$t('cannotEmpty'), trigger: 'change' } ] @@ -323,11 +298,10 @@ projectNameList: [], title: '', DeliverableTreeList: [], - uploadName: '' + uploadName: '', } }, mounted() { - this.getNameList() this.getDeliverableTree() }, methods: { @@ -341,32 +315,12 @@ } }) }, - getNameList(value) { - getAction('project/projectNameInfoEO/list', {}).then((res) => { - if (res.success) { - this.projectNameList = res.result || [] - if (this.title == this.$t('edit')) { - let content = this.projectNameList.filter(res => { - return res.id == value.projectNameId - }) - this.yearNameDataList = content[0].yearNameDataList || [] - this.formInline = value - this.formInline = { ...this.formInline } - } - } else { - this.projectNameList = [] - } - }) - }, addModel() { this.visible = true this.title = this.$t('add') this.formInline = {} - this.getNameList() - this.formInline.studioEngineerName = this.userInfo().username - this.formInline.studioEngineer = this.userInfo().id - this.formInline.projectVersion = '00' - this.formInline = { ...this.formInline } + this.formInline.dataList = [{}] + this.formInline = {...this.formInline} this.$nextTick(() => { this.$refs.ruleForm.clearValidate() }) @@ -374,7 +328,6 @@ editModel(value) { this.visible = true this.title = this.$t('edit') - this.getNameList(value) this.$nextTick(() => { this.$refs.ruleForm.clearValidate() }) @@ -425,16 +378,6 @@ this.formInline[value] = id this.formInline = { ...this.formInline } }, - projectNameChange(value) { - this.formInline.yearNameId = undefined - let content = this.projectNameList.filter(res => { - return res.id == value - }) - this.formInline.vehiclePlatform = content[0].vehiclePlatform || '' - this.yearNameDataList = content[0].yearNameDataList || [] - this.formInline.digitalPlatform = content[0].digitalPlatform || '' - this.formInline = { ...this.formInline } - }, clickButtonToUpload(item) { this.$refs.uploadFile.perentHandleFunc() this.$refs.uploadFile.visible = true @@ -458,7 +401,11 @@ /** 赋值给当前对应的表单文件 */ this.formInline[this.uploadName] = attIdList.join(',') this.formInline = { ...this.formInline } - } + }, + addClick(index){ + this.formInline.dataList.splice(1,index,{}) + this.formInline = {...this.formInline} + }, } } @@ -582,6 +529,16 @@ border: 1px #00B3BE solid; color: #00B3BE; } + + .header-text { + font-size: 16px; + font-weight: 500; + } + + .icon-text { + font-size: 16px; + margin-right: 4px; + } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue index 6c26e7792..98d16cee0 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -9,7 +9,7 @@ {{ $t('inspectionItems') }}
+ v-model="queryParam.inspectionItem">
@@ -17,10 +17,10 @@
{{ $t('areaOfResponsibility') }}
- +
@@ -32,7 +32,7 @@ class="box-input" allowClear :getPopupContainer="triggerNode=> triggerNode.parentNode" - v-model="queryParam.processStatus"> + v-model="queryParam.flowStatus"> @@ -67,18 +67,36 @@
-
+
+ + {{ $t('export') }} +
+
+ + {{ $t('preservation') }} +
+
{{ $t('Transfer') }}
-
+
{{ $t('BatchSetting') }}
-
+
{{ $t('CertificationDirectory') }}
+
+ + {{ $t('changeSetting') }} +
+
+ + {{ $t('referenceDeliverables') }} +
-
+
...{{ $t('more') }}
-
+
{{ $t('release') }}
-
+
{{ $t('withdraw') }}
-
+
+ + {{ $t('initiatingProcess') }} +
+
+ + {{ $t('returnToStudio') }} +
+
+ + {{ $t('Approved') }} +
+
+ + {{ $t('returnedForApproval') }} +
+
+ + {{ $t('missionAccepted') }} +
+
+ + {{ $t('missionRejection') }} +
+
+ + {{ $t('submit') }} +
+
+ + {{ $t('turnToDo') }} +
+
{{ $t('question') }}
@@ -160,6 +222,7 @@ + + style="width: 100%"/>
@@ -195,6 +258,40 @@ + + + + +
+
+ * + {{ $t('roleSwitching') }} +
+ + + + + + {{ item.roleName }} + + + + +
+ + + + @@ -205,8 +302,10 @@ import transferList from './components/transferList' import addModel from './components/addModel' import batSetting from './components/batSetting' + import modifyHistory from './components/modifyHistoryList' import { getAction, postAction, downloadFile, deleteAction } from '@/api/manage' - import moment from "moment"; + import moment from 'moment' + import { mapGetters } from 'vuex' export default { name: 'index', @@ -216,18 +315,19 @@ transferList, certificationDirectory, batSetting, - addModel + addModel, + modifyHistory }, data() { return { queryParam: {}, fieldList: [], queryParamQuery: {}, - formInline:{}, + formInline: {}, toggleSearchStatus: false, - confirmLoading:false, - listTitle:'', - visible:false, + confirmLoading: false, + listTitle: '', + visible: false, rules: { endTime: [ { @@ -235,7 +335,7 @@ message: this.$t('TaskCutOffTime') + this.$t('cannotEmpty'), trigger: 'change' } - ], + ] }, url: { list: '/project/projectCertificationInventoryEO/page', @@ -243,12 +343,28 @@ exportData: '', deleteBatch: '/project/projectCertificationInventoryEO/deleteBatch', setBatch: '/project/projectCertificationInventoryEO/setBatch', - deleteOne: '/project/projectCertificationInventoryEO/delete' + deleteOne: '/project/projectCertificationInventoryEO/delete', + AndUserId: '/project/projectLibraryRoleRelEO/queryByProjectLibraryIdAndUserId', + AndUserIdEdit: '/project/projectLibraryRoleRelEO/edit' }, - processStatusList: [], dataSource: [], + roleSwitchingCode:'', loading: false, - columns: [ + roleSwitchingList: [], + visibleRoleSwitching: false, + confirmLoadingRoleSwitching: false, + formInlineRoleSwitching: {}, + AndUserId: '', + rulesRoleSwitching: { + roleSwitchingCode: [ + { + required: true, + message: this.$t('roleSwitching') + this.$t('cannotEmpty'), + trigger: 'change' + } + ] + }, + columnsAll: [ { title: this.$t('category'), align: 'left', @@ -375,9 +491,31 @@ } }, mounted() { - this.getList() + // this.getList() + this.getRoleByUserId(() => { + this.getAndUserId() + }) + }, + computed: { + columns: function() { + let columns = JSON.parse(JSON.stringify(this.columnsAll)) + if (this.roleSwitchingCode == 11 || + this.roleSwitchingCode == 12 || this.roleSwitchingCode == 13 || this.roleSwitchingCode == 14) { + for (let i = 0; i < columns.length; i++) { + if (columns[i].title == this.$t('operation')) { + columns.splice(i, 1) + i-- + } + } + } + return columns + } }, methods: { + ...mapGetters(['userInfo']), + disabledDate(current) { + return current && current < moment().subtract(1, 'day') + }, searchQuery() { this.selectedRowKeys = [] this.getList() @@ -417,7 +555,8 @@ let query = { ...this.queryParamQuery, ...queryParam, - projectLibraryId: this.$route.query.id + projectLibraryId: this.$route.query.id, + roleCode: this.formInlineRoleSwitching.roleSwitchingCode } this.loading = true getAction(this.url.list, query).then((res) => { @@ -435,9 +574,9 @@ this.$refs.transferListRef.transferModel() }, BatchSettingClick() { - if (this.selectedRowKeys && this.selectedRowKeys.length > 0){ + if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { this.$refs.batSettingRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys))) - }else{ + } else { this.$message.warning(this.$t('selectLeastOne')) } }, @@ -515,38 +654,38 @@ }, releaseClick() { this.listTitle = this.$t('Deadline') - if(this.selectedRowKeysList.length < 1){ + if (this.selectedRowKeysList.length < 1) { this.$message.warning(this.$t('selectLeastOne')) - }else{ + } else { this.visible = true } }, handleOk() { this.$refs.ruleForm.validate(valid => { if (valid) { - let selectedRowKeys = [] - this.selectedRowKeysList.forEach(res => { - selectedRowKeys.push(res.id) - }) - let query = { - ids: selectedRowKeys.join(','), - projectLibraryId: this.$route.query.id, - ...this.formInline + let selectedRowKeys = [] + this.selectedRowKeysList.forEach(res => { + selectedRowKeys.push(res.id) + }) + let query = { + ids: selectedRowKeys.join(','), + projectLibraryId: this.$route.query.id, + ...this.formInline + } + this.confirmLoading = true + postAction('/project/projectCertificationInventoryEO/issue', query).then((res) => { + if (res.success) { + this.$message.success(this.$t('OperationSuccessful')) + this.visible = false + this.selectedRowKeys = [] + this.confirmLoading = false + this.getList() + } else { + this.$message.warning(this.$t('operationFailed')) + this.confirmLoading = false } - this.confirmLoading = true - postAction('/project/projectCertificationInventoryEO/issue', query).then((res) => { - if (res.success) { - this.$message.success(this.$t('OperationSuccessful')) - this.visible = false - this.selectedRowKeys = [] - this.confirmLoading = false - this.getList() - } else { - this.$message.warning(this.$t('operationFailed')) - this.confirmLoading = false - } - this.detailedSuccessList = [] - }) + this.detailedSuccessList = [] + }) } }) }, @@ -590,7 +729,85 @@ }) }, modifyHistoryClick() { - + this.$refs.modifyHistoryRef.getList() + }, + getRoleByUserId(callback) { + getAction('/project/projectCertificationInventoryEO/getRoleByUserId', { projectLibraryId: this.$route.query.id }).then((res) => { + if (res.success) { + this.roleSwitchingList = res.result || [] + } else { + this.roleSwitchingList = [] + } + callback && callback() + }) + }, + getAndUserId() { + let query = { + projectLibraryId: this.$route.query.id, + userId: this.userInfo().id, + modelType: 'Certification inventory' + } + getAction(this.url.AndUserId, query).then((res) => { + if (res.success) { + this.isDisplay = true + this.formInlineRoleSwitching.roleSwitchingCode = res.result.roleCode + this.AndUserId = res.result.id + if (this.formInlineRoleSwitching.roleSwitchingCode) { + if (!(this.roleSwitchingList.some(val => val.roleCode == this.formInlineRoleSwitching.roleSwitchingCode))) { + this.formInlineRoleSwitching.roleSwitchingCode = this.roleSwitchingList[0] ? this.roleSwitchingList[0].roleCode : '' + } + } else { + this.formInlineRoleSwitching.roleSwitchingCode = this.roleSwitchingList[0] ? this.roleSwitchingList[0].roleCode : '' + } + this.roleSwitchingCode = this.formInlineRoleSwitching.roleSwitchingCode + this.getList() + } else { + this.JLoading = false + } + }) + }, + roleSwitchingClick() { + this.visibleRoleSwitching = true + this.$nextTick(() => { + this.$refs.ruleFormRoleSwitching.clearValidate() + if (!this.formInlineRoleSwitching.roleSwitchingCode) { + this.formInlineRoleSwitching.roleSwitchingCode = '0' + } + if (!(this.roleSwitchingList.some(val => val.roleCode == this.formInlineRoleSwitching.roleSwitchingCode))) { + this.formInlineRoleSwitching.roleSwitchingCode = this.roleSwitchingList[0] ? this.roleSwitchingList[0].roleCode : '' + } + this.roleSwitchingCode = this.formInlineRoleSwitching.roleSwitchingCode + this.formInlineRoleSwitching = { ...this.formInlineRoleSwitching } + }) + }, + handleOkRoleSwitching() { + this.$refs.ruleFormRoleSwitching.validate(valid => { + if (valid) { + let query = { + roleCode: this.formInlineRoleSwitching.roleSwitchingCode, + id: this.AndUserId, + projectLibraryId: this.$route.query.id, + modelType: 'Certification inventory' + } + this.confirmLoadingRoleSwitching = true + postAction(this.url.AndUserIdEdit, query).then((res) => { + if (res.success) { + this.isRoleSwitching = true + this.roleSwitchingCode = this.formInlineRoleSwitching.roleSwitchingCode + this.$message.success(this.$t('OperationSuccessful')) + this.visibleRoleSwitching = false + this.confirmLoadingRoleSwitching = false + this.getList() + } else { + this.confirmLoadingRoleSwitching = false + this.$message.warning(this.$t('operationFailed')) + } + }) + } + }) + }, + handleCancelRoleSwitching() { + this.visibleRoleSwitching = false } } } diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index fa45597e2..669e66bda 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -207,12 +207,12 @@ {{ $t('add') }}
-
- - {{ $t('roleSwitching') }} -
+ + + + + +
{{ $t('batchSettingInformation') }}
-
- - {{ $t('roleSwitching') }} -
+ + + + + +
@@ -1504,7 +1504,8 @@ export default { getAndUserId() { let query = { projectLibraryId: this.$route.query.id, - userId: this.userInfo().id + userId: this.userInfo().id, + modelType:"Laws inventory" } getAction(this.url.AndUserId, query).then((res) => { if (res.success) { @@ -1528,9 +1529,6 @@ export default { this.isRoleSwitching = false } } - console.log(this.formInlineRoleSwitching.roleSwitchingCode) - console.log(this.isRoleSwitching) - console.log(this.isDisplay) this.getList() // this.JLoading = false } else { @@ -1769,7 +1767,8 @@ export default { let query = { roleCode: this.formInlineRoleSwitching.roleSwitchingCode, id: this.AndUserId, - projectLibraryId: this.$route.query.id + projectLibraryId: this.$route.query.id, + modelType:"Laws inventory", } this.confirmLoadingRoleSwitching = true postAction(this.url.AndUserIdEdit, query).then((res) => { From fb5ff2f3bb55f1d6d7cdbcee9e6841bf84845dae Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Tue, 7 Mar 2023 16:17:45 +0800 Subject: [PATCH 069/645] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93-=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E6=B8=85=E5=8D=95-=E5=88=86=E9=A1=B5=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=83=E9=99=90=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/system/enums/ProjectRoleEnum.java | 11 +++ ...ectCertificationInventoryEOController.java | 3 +- .../ProjectCertificationInventoryEO.java | 3 + ...rojectCertificationInventoryEOService.java | 10 +++ ...ctCertificationInventoryEOServiceImpl.java | 70 +++++++++++++++++++ 5 files changed, 95 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/ProjectRoleEnum.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/ProjectRoleEnum.java index 4cf5ba39d..5c67bfbee 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/ProjectRoleEnum.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/ProjectRoleEnum.java @@ -1,5 +1,7 @@ package com.jero.modules.system.enums; +import org.apache.commons.lang3.StringUtils; + /** * 项目角色枚举类 */ @@ -27,6 +29,15 @@ public enum ProjectRoleEnum { this.code = code; } + public static ProjectRoleEnum getByValue(String value) { + for (ProjectRoleEnum projectRoleEnum : ProjectRoleEnum.values()) { + if(StringUtils.equals(value,projectRoleEnum.getValue())){ + return projectRoleEnum; + } + } + return null; + } + public String getName() { return name; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryEOController.java index 24e08fa85..a7db40a4c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryEOController.java @@ -59,8 +59,7 @@ public class ProjectCertificationInventoryEOController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(projectCertificationInventoryEO, req.getParameterMap()); Page page = new Page(pageNo, pageSize); - IPage pageList = projectCertificationInventoryEOService.page(page, queryWrapper); - this.projectCertificationInventoryEOService.disposeData(pageList.getRecords(),cut); + IPage pageList = this.projectCertificationInventoryEOService.queryPage(queryWrapper,page,projectCertificationInventoryEO,cut); return Result.OK(pageList); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java index 2880be9f8..2a34dc9c2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java @@ -183,4 +183,7 @@ public class ProjectCertificationInventoryEO implements Serializable { @TableField(exist = false) private String ids; + + @TableField(exist = false) + private String roleCode; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java index bfec7292f..51bb2538a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java @@ -1,6 +1,9 @@ package com.jero.modules.project.service; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; import com.jero.modules.project.entity.ProjectCertificationInventoryEO; import com.baomidou.mybatisplus.extension.service.IService; @@ -104,4 +107,11 @@ public interface IProjectCertificationInventoryEOService extends IService> getRoleByUserId(Map params); Result getFlowStatusList(String cut); + + IPage queryPage(QueryWrapper queryWrapper, + Page page, + ProjectCertificationInventoryEO projectCertificationInventoryEO, + String cut); + + void createQueryPermission(QueryWrapper queryWrapper, String roleCode); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index f804be764..cfcd8962d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -3,6 +3,8 @@ package com.jero.modules.project.service.impl; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; import com.jero.common.constant.enums.CutEnum; import com.jero.common.exception.JeroBootException; @@ -545,4 +547,72 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl queryPage(QueryWrapper queryWrapper, + Page page, + ProjectCertificationInventoryEO projectCertificationInventoryEO, + String cut) { + + String roleCode = projectCertificationInventoryEO.getRoleCode(); + // 创建查询权限 + this.createQueryPermission(queryWrapper,roleCode); + IPage pageList = this.page(page, queryWrapper); + this.disposeData(pageList.getRecords(),cut); + return pageList; + } + + @Override + public void createQueryPermission(QueryWrapper queryWrapper, String roleCode) { + /** + * 处理查询权限 + * studio、法规工程师、领导、系统管理员、Viewer、品牌管理员: 可以查询所有数据 + * 认证工程师：可以查询所有数据 + * 接口人：可查看所有接口人为自己的数据 + * 责任人：可以查看流程状态为：任务待确认、结果待提交 、审查通过（并且责任人为自己） + */ + ProjectRoleEnum projectRoleEnum = ProjectRoleEnum.getByValue(roleCode); + if(ObjectUtils.isEmpty(projectRoleEnum)){ + throw new JeroBootException("当前用户角色有误，请重新选择后角色进行操作！"); + } + + LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + + switch (projectRoleEnum){ + case STUDIO_ENGINEER: + break; + case REGULATI_ENGINEER: + break; + case MANAGER: + break; + case ADMIN: + break; + case VIEWER: + break; + case BRAND_ADMINISTRATOR: + break; + case HOMOLOGATION_ENGINEER: + break; + case INTERFACE_PERSON: + queryWrapper.lambda().eq(ProjectCertificationInventoryEO::getSdt,currentUser.getId()); + break; + case PERSON_LIABLE: + List flowStatusList = new ArrayList<>(); + flowStatusList.add(CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()); + flowStatusList.add(CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()); + + queryWrapper.lambda().and(queryWrap -> { + queryWrap.and(query -> { + query.eq(ProjectCertificationInventoryEO::getDutyPerson,currentUser.getId()); + query.in(ProjectCertificationInventoryEO::getFlowStatus,flowStatusList); + }).or(query -> { + query.eq(ProjectCertificationInventoryEO::getSdt,currentUser.getId()); + query.eq(ProjectCertificationInventoryEO::getFlowStatus,CertificationInventoryFlowStatusEnum.REVIEW_AND_PASS.getValue()); + }); + }); + break; + default: + throw new JeroBootException("当前用户角色有误，请重新选择后角色进行操作！"); + } + } } From 7c652429138632aa046a03724a62d1851ef716e3 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Tue, 7 Mar 2023 16:46:43 +0800 Subject: [PATCH 070/645] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E8=99=9A=E6=8B=9F?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E8=AF=A6=E6=83=85=E8=A1=A8-=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AuthDummyInventoryInfoEOController.java | 11 ++++-- .../IAuthDummyInventoryInfoEOService.java | 8 +++++ .../AuthDummyInventoryInfoEOServiceImpl.java | 34 ++++++++++++++++++- 3 files changed, 50 insertions(+), 3 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/controller/AuthDummyInventoryInfoEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/controller/AuthDummyInventoryInfoEOController.java index e92df32f1..267283442 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/controller/AuthDummyInventoryInfoEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/controller/AuthDummyInventoryInfoEOController.java @@ -4,8 +4,9 @@ import java.util.Arrays; import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import com.alibaba.fastjson.JSONObject; import com.jero.common.api.vo.Result; -import com.jero.common.constant.enums.CutEnum; import com.jero.common.system.query.QueryGenerator; import com.jero.modules.authDummy.entity.AuthDummyInventoryInfoEO; import com.jero.modules.authDummy.service.IAuthDummyInventoryInfoEOService; @@ -14,7 +15,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; import com.jero.common.system.base.controller.JeroController; -import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -184,4 +184,11 @@ public class AuthDummyInventoryInfoEOController extends JeroController setBatch(@RequestBody AuthDummyInventoryInfoEO authDummyInventoryInfoEO) { return this.authDummyInventoryInfoEOService.setBatch(authDummyInventoryInfoEO); } + + @AutoLog(value = "认证虚拟清单详情表-批量添加") + @ApiOperation(value="认证虚拟清单详情表-批量添加", notes="认证虚拟清单详情表-批量添加") + @PostMapping(value = "/batchAdd") + public Result batchAdd(@RequestBody JSONObject json) { + return this.authDummyInventoryInfoEOService.batchAdd(json); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/IAuthDummyInventoryInfoEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/IAuthDummyInventoryInfoEOService.java index 1869864d4..81ad84b8f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/IAuthDummyInventoryInfoEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/IAuthDummyInventoryInfoEOService.java @@ -1,5 +1,6 @@ package com.jero.modules.authDummy.service; +import com.alibaba.fastjson.JSONObject; import com.jero.common.api.vo.Result; import com.jero.modules.authDummy.entity.AuthDummyInventoryInfoEO; import com.baomidou.mybatisplus.extension.service.IService; @@ -74,4 +75,11 @@ public interface IAuthDummyInventoryInfoEOService extends IService setBatch(AuthDummyInventoryInfoEO authDummyInventoryInfoEO); + + /** + * 批量添加 + * @param json + * @return + */ + Result batchAdd(JSONObject json); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java index 8c852548d..bd78fe5bb 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java @@ -1,5 +1,7 @@ package com.jero.modules.authDummy.service.impl; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.common.api.vo.Result; import com.jero.common.constant.enums.CutEnum; @@ -9,7 +11,6 @@ import com.jero.modules.authDummy.entity.AuthDummyInventoryInfoEO; import com.jero.modules.authDummy.mapper.AuthDummyInventoryInfoEOMapper; import com.jero.modules.authDummy.service.IAuthDummyInventoryBaseEOService; import com.jero.modules.authDummy.service.IAuthDummyInventoryInfoEOService; -import com.jero.modules.dummy.entity.DummyInventoryInfoEO; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -190,4 +191,35 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl batchAdd(JSONObject json) { + try { + String serialNumber = json.getString("serialNumber"); + String wvtaId = json.getString("wvtaId"); + String dutyTerritory = json.getString("dutyTerritory"); + String bussDocumentLibraryId = json.getString("bussDocumentLibraryId"); + String authDummyInventoryBaseId = json.getString("authDummyInventoryBaseId"); + + List authDummyInventoryInfoEOList = new ArrayList<>(); + JSONArray dataList = json.getJSONArray("dataList"); + AuthDummyInventoryInfoEO authDummyInventoryInfoEO = null; + for (Object data : dataList) { + authDummyInventoryInfoEO = JSONObject.parseObject(JSONObject.toJSONString(data), AuthDummyInventoryInfoEO.class); + authDummyInventoryInfoEO.setSerialNumber(serialNumber); + authDummyInventoryInfoEO.setWvtaId(wvtaId); + authDummyInventoryInfoEO.setBussDocumentLibraryId(bussDocumentLibraryId); + authDummyInventoryInfoEO.setDutyTerritory(dutyTerritory); + authDummyInventoryInfoEO.setAuthDummyInventoryBaseId(authDummyInventoryBaseId); + authDummyInventoryInfoEOList.add(authDummyInventoryInfoEO); + } + + if(CollectionUtils.isNotEmpty(authDummyInventoryInfoEOList)){ + this.saveBatch(authDummyInventoryInfoEOList); + } + }catch (Exception ex){ + throw new JeroBootException("添加失败！"); + } + return Result.OK("添加成功！"); + } } From 9ba26093c43fb2339784e084299cb5d922971728 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Tue, 7 Mar 2023 17:58:29 +0800 Subject: [PATCH 071/645] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E8=A7=92=E8=89=B2=E5=88=87=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 1 + .../ProjectDetails/index.vue | 55 ++- .../components/TaskListModel.vue | 2 +- .../components/certificationList/index.vue | 363 ++++++++++++++++-- .../components/listOfRegulations.vue | 2 + 6 files changed, 379 insertions(+), 45 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index b18a0b0e6..a9277aab8 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1403,4 +1403,5 @@ module.exports = { missionAccepted:'Mission Accepted', missionRejection:'Mission Rejection', turnToDo:'Turn To Do', + initiateTask:'Initiate a Task', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index d142c0cd5..8e64e06f5 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1504,4 +1504,5 @@ module.exports = { missionAccepted:'任务接受', missionRejection:'任务拒绝', turnToDo:'转办', + initiateTask:'发起任务', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/ProjectDetails/index.vue b/jero-web/src/views/projectManagement/ProjectDetails/index.vue index 296cb1747..bc1917952 100644 --- a/jero-web/src/views/projectManagement/ProjectDetails/index.vue +++ b/jero-web/src/views/projectManagement/ProjectDetails/index.vue @@ -34,7 +34,7 @@ v-if="textTitle === $t('certificationList') || textTitle === $t('listOfRegulations')" @click="roleSwitchingClick"> - {{$t('roleSwitching')}} + {{roleSwitchName}}
@@ -59,12 +59,12 @@ {{$t('certificationList')}}
- - - - - - + + + + + + @@ -127,6 +127,7 @@ @@ -134,7 +135,9 @@ - +
@@ -187,8 +190,33 @@ historicalVersionUrl: '', queryUserPremissionByProjectLibraryId: '/project/projectCertificationDirectoryEO/queryUserPremissionByProjectLibraryId' }, + roleSwitchListCn: { + '0': 'studio工程师', + '1': '法规工程师', + '2': '认证工程师', + '4': '法规工程师/认证工程师', + '11': '领导角色', + '12': '系统管理员', + '13': 'Viewer', + '14': '品牌管理员', + '20': '接口人', + '21': '责任人' + }, + roleSwitchListEn: { + '0': 'R&H Studio', + '1': 'studio', + '2': 'homo', + '4': 'Regulatory Engineer/Certification Engineer', + '11': 'R&H Manager', + '12': 'admin', + '13': 'Viewer', + '14': 'BrandAdministrator', + '20': 'Interface person', + '21': 'Person liable' + }, areaOfResponsibility: {}, - engineeringInterfacePerson: '' + engineeringInterfacePerson: '', + roleSwitchName: '' } }, created() { @@ -360,6 +388,15 @@ } else { this.$refs.certificationListRef.roleSwitchingClick() } + }, + getRoleSwitch(value) { + console.log(value) + let long = localStorage.getItem('language') || 'zh-cn' + if (long == 'zh-cn'){ + this.roleSwitchName = this.roleSwitchListCn[value] + }else{ + this.roleSwitchName = this.roleSwitchListEn[value] + } } } } diff --git a/jero-web/src/views/projectManagement/components/TaskListModel.vue b/jero-web/src/views/projectManagement/components/TaskListModel.vue index 75489baf1..8430cd4f2 100644 --- a/jero-web/src/views/projectManagement/components/TaskListModel.vue +++ b/jero-web/src/views/projectManagement/components/TaskListModel.vue @@ -208,7 +208,7 @@ this.disabled = true } } else { - if (val.roleCode == '2' || val.roleCode == '4') { + if (val.roleCode == '2') { this.disabled = false } else { this.disabled = true diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue index 98d16cee0..0f908d6a8 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -34,10 +34,10 @@ :getPopupContainer="triggerNode=> triggerNode.parentNode" v-model="queryParam.flowStatus"> - - {{ item.label }} + + {{ item.name }} @@ -67,67 +67,95 @@
+ +
{{ $t('export') }}
-
- + + +
+ {{ $t('preservation') }}
+ +
{{ $t('Transfer') }}
+ +
{{ $t('BatchSetting') }}
+ +
{{ $t('CertificationDirectory') }}
-
- + + +
+ {{ $t('changeSetting') }}
-
+ + +
{{ $t('referenceDeliverables') }}
+ \ No newline at end of file diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue new file mode 100644 index 000000000..c833c2255 --- /dev/null +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue @@ -0,0 +1,313 @@ + + + + + + \ No newline at end of file From 9972d1571a187f015911d112bd6aea101215b4d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Mon, 20 Mar 2023 16:14:42 +0800 Subject: [PATCH 202/645] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=B8=85=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/dealtWith.vue | 9 ++- .../components/designCompliance.vue | 66 ++++--------------- .../reviewedByThePersonInCharge.vue | 28 +++++++- 3 files changed, 41 insertions(+), 62 deletions(-) diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue index 264068267..ed956af09 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue @@ -279,7 +279,7 @@ TaskKey: row.taskDefinitionKey, isDisplay: true, flowType: 2, - Sponsor: 'designInitiatorName', + Sponsor: 'regulationOwnerName', personLiable: 'designDutyName', typeOfDeliverables: 'designDeliverableTypeName', deliverableTemplate: 'designDeliverableTemplate', @@ -296,7 +296,7 @@ // query: query // }) // window.open(newUrl.href, '_blank') - this.$refs.designComplianceRef.getList(JSON.parse(JSON.stringify(query)),this.$t('designComplianceReview')) + this.$refs.designComplianceRef.getList(JSON.parse(JSON.stringify(query)), this.$t('designComplianceReview')) } else if (row.flowType == '3') { row.taskId = row.taskId + '' @@ -349,7 +349,7 @@ TaskKey: row.taskDefinitionKey, flowType: 4, isDisplay: true, - Sponsor: 'verifyInitiatorName', + Sponsor: 'regulationOwnerName', personLiable: 'verifyDutyName', typeOfDeliverables: 'verifyDeliverableTypeName', deliverableTemplate: 'verifyDeliverableTemplate', @@ -366,8 +366,7 @@ // query: query // }) // window.open(newUrl.href, '_blank') - this.visible = true - this.title = this.$t('verificationComplianceReview') + this.$refs.designComplianceRef.getList(JSON.parse(JSON.stringify(query)), this.$t('verificationComplianceReview')) } }, searchQuery(value) { diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue index b553eb9d1..aa6b4c8ed 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue @@ -91,15 +91,7 @@ value: 'projectName' }, { - title: this.$t('targetMarket'), - value: 'targetMarket_dictText' - }, - { - title: this.$t('subtitle'), - value: 'subtitle' - }, - { - title: this.$t('standard'), + title: this.$t('regulationNo'), value: 'serialNumber', type: '4' }, @@ -107,6 +99,10 @@ title: this.$t('title'), value: 'title' }, + { + title: this.$t('subtitle'), + value: 'subtitle' + }, { title: this.$t('applicableSupplement'), value: 'applicableSupplement' @@ -126,16 +122,14 @@ }, computed: { isSendBack() { - if (this.queryData.TaskKey == 'fqrsh' && this.queryData.isDisplay) { + if (this.queryData.TaskKey == 'zrrtjjfw' || this.queryData.TaskKey == 'fggcssh' || this.queryData.TaskKey == 'dezrrtjjfw') { return true } return false }, isAdopt() { - if (this.queryData.TaskKey == 'fqrsh' && this.queryData.isDisplay) { - if (this.queryBy.reviewResult == 'Compliance' || this.queryBy.reviewResult == 'NA') { - return true - } + if (this.queryData.TaskKey == 'fggcssh') { + return true } return false }, @@ -154,13 +148,13 @@ return false }, isCancel() { - if (this.queryData.TaskKey == 'zrrqr' || this.queryData.TaskKey == 'dezrrqr') { + if (this.queryData.TaskKey == 'zrrqr' || this.queryData.TaskKey == 'dezrrqr' || this.queryData.TaskKey == 'zrrtjjfw') { return true } return false }, isConfirm() { - if (this.queryData.TaskKey == 'zrrqr' || this.queryData.TaskKey == 'dezrrqr') { + if (this.queryData.TaskKey == 'zrrqr' || this.queryData.TaskKey == 'dezrrqr' || this.queryData.TaskKey == 'zrrtjjfw') { return true } return false @@ -244,45 +238,9 @@ } }) }, - dreSubmit(val) { - let query = { - id: this.queryPersonInCharge.id, - engineerFeedbackContent: val.engineerFeedbackContent, - fileId: val.fileId, - flowType: this.$route.query.flowType, - actiProcInstId: this.$route.query.actiProcInstId, - deliveryRequirements: val.deliveryRequirements, - engineeringInterfacePersonReply: this.queryPersonInCharge.engineeringInterfacePersonReply - } - putAction(this.url.dreSubmit, query).then((res) => { - if (res.success) { - this.$message.success(this.$t('OperationSuccessful')) - if (this.$route.query.router) { - this.$router.push({ - path: '/projectRegulationTasks' - }) - } else { - this.$router.push({ - path: '/ProjectDetails', - query: { - type: '103', - ...this.$route.query - } - }) - } - // setTimeout(() => { - // this.loading = false - // window.close() - // }, 1000) - } else { - this.loading = false - this.$message.warning(this.$t('operationFailed')) - } - }) - }, - confirm(operatorTime){ + confirm(operatorTime) { this.$refs.reviewedByThePersonInChargeRef.submit((res) => { - this.completeTask({operatorTime: operatorTime, ...res }) + this.completeTask({ operatorTime: operatorTime, ...res }) }) }, completeTask(value) { diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue index c833c2255..5d0ea3fa3 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue @@ -9,10 +9,10 @@
- +
- * + * {{$t('resultofhandling')}}
@@ -30,6 +30,12 @@ {{$t('sendBack')}} + + {{$t('accord')}} + + + {{$t('nonConformity')}} + {{$t('Tracked')}} @@ -53,13 +59,29 @@
+ + +
+
+ {{$t('enclosure')}} +
+ + + {{ (formInline.approvalFile === 'null' || formInline.approvalFile === '' || + formInline.approvalFile == null) ? $t('clickUpload') : $t('viewUploadedFiles') + }} + + +
+ + Date: Mon, 20 Mar 2023 16:23:55 +0800 Subject: [PATCH 203/645] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=B8=85=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/designCompliance.vue | 82 ++----------------- 1 file changed, 7 insertions(+), 75 deletions(-) diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue index aa6b4c8ed..67199f91d 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue @@ -36,15 +36,10 @@ v-if="isDisplay" :is-adopt="isAdopt" :isSendBack="isSendBack" - :isSubmit="isSubmit" - :is-resubmit="isResubmit" :is-cancel="isCancel" :is-confirm="isConfirm" - @terminationProcess="terminationProcess" @adopt="adopt" @sendBack="sendBack" - @submit="submit" - @Resubmit="Resubmit" @cancel="handleCancel" @confirm="confirm" /> @@ -133,20 +128,6 @@ } return false }, - isSubmit() { - if (this.queryData.TaskKey == 'zrrclrw' && this.queryData.isDisplay) { - return true - } - return false - }, - isResubmit() { - if (this.queryData.TaskKey == 'dreDispose' && this.queryData.isDisplay) { - if (this.queryPersonInCharge.engineerFeedbackContent && this.queryPersonInCharge.status != 'haveDone') { - return true - } - } - return false - }, isCancel() { if (this.queryData.TaskKey == 'zrrqr' || this.queryData.TaskKey == 'dezrrqr' || this.queryData.TaskKey == 'zrrtjjfw') { return true @@ -167,75 +148,26 @@ handleCancel() { this.visible = false }, - terminationProcess(operatorTime) { - this.textLoading = this.$t('terminationProcessing') - this.loading = true - this.queryBy.reviewResult = 'Termination of task' - this.$refs.reviewedByThePersonInChargeRef.submitNoRule((res) => { - this.completeTask({ flag: 2, operatorTime: operatorTime, ...res }) - }) - }, adopt(operatorTime) { - this.$refs.reviewedByThePersonInChargeRef.submit((res) => { + this.$refs.reviewedByThePersonInChargeRef.submitNoRule((res) => { this.textLoading = this.$t('Submitting') this.loading = true - res.flag = 0 res.operatorTime = operatorTime + res.disposeResult = 'Accepted' this.completeTask(res) }) }, sendBack(operatorTime) { this.textLoading = this.$t('Returning') this.loading = true - if (this.queryBy.reviewResult == 'Non-Compliance' || this.queryBy.reviewResult == 'To be tracked') { - - } else { - this.queryBy.reviewResult = 'No rating' - } this.$refs.reviewedByThePersonInChargeRef.submitNoRule((res) => { - this.completeTask({ flag: 1, operatorTime: operatorTime, ...res }) - }) - }, - Resubmit(operatorTime) { - this.$refs.reviewedByThePersonInChargeRef.submit((res) => { - this.textLoading = this.$t('Submitting') - this.loading = true - res.operatorTime = operatorTime - if (this.$route.query.TaskKey == 'dreDispose') { - this.dreSubmit(res) - } - }) - }, - submit(operatorTime) { - this.$refs.reviewedByThePersonInChargeRef.submit((res) => { - this.textLoading = this.$t('Submitting') - this.loading = true - res.operatorTime = operatorTime - if (this.$route.query.TaskKey == 'dreDispose') { - this.dreSubmit(res) + if (this.queryData.TaskKey == 'fggcssh"') { + res.disposeResult = 'Rejected' } else { - if (this.$route.query.TaskKey == 'zrrclrw') { - let dataSource = this.$refs.engineeringConfirmationRef.dataSource - let isTrue - if (dataSource && dataSource.length > 0) { - for (let i = 0; i < dataSource.length; i++) { - if (dataSource[i].status == 'haveDone' || dataSource[i].createUser) { - isTrue = true - } else { - isTrue = false - this.$message.warning(this.$t('pleaseSubmitStatus')) - this.loading = false - return - } - } - } else { - isTrue = true - } - if (isTrue) { - this.completeTask(res) - } - } + res.disposeResult = 'Returned' } + res.secondChargePersonUserId = '' + this.completeTask({ operatorTime: operatorTime, ...res }) }) }, confirm(operatorTime) { From d42b5f988343541105d9bf1192c1ff2019032e46 Mon Sep 17 00:00:00 2001 From: cuijiaming <1410452759@qq.com> Date: Mon, 20 Mar 2023 16:26:33 +0800 Subject: [PATCH 204/645] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E6=B8=85=E5=8D=95-=E7=BB=B4=E6=8A=A4=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E4=B8=AD=E7=9A=84-=E6=9B=B4=E6=96=B0log=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_2nd_period.sql | 14 + .../controller/AuthDummyLogController.java | 173 ++++++++++++ .../authDummy/entity/AuthDummyLog.java | 79 ++++++ .../authDummy/mapper/AuthDummyLogMapper.java | 17 ++ .../mapper/xml/AuthDummyLogMapper.xml | 15 + .../IAuthDummyInventoryInfoEOService.java | 12 + .../service/IAuthDummyLogService.java | 73 +++++ .../AuthDummyInventoryInfoEOServiceImpl.java | 261 +++++++++++++++++- .../service/impl/AuthDummyLogServiceImpl.java | 174 ++++++++++++ 9 files changed, 817 insertions(+), 1 deletion(-) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/controller/AuthDummyLogController.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyLog.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/mapper/AuthDummyLogMapper.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/mapper/xml/AuthDummyLogMapper.xml create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/IAuthDummyLogService.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyLogServiceImpl.java diff --git a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql index a02c58a71..37ad5c249 100644 --- a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql +++ b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql @@ -399,6 +399,20 @@ INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `create_by`, `create_ti ALTER TABLE `project_laws_inventory` ADD COLUMN `design_flow_status` varchar(255) NULL COMMENT '设计符合性确认-流程状态' AFTER `design_due_date`, ADD COLUMN `verify_flow_status` varchar(255) NULL COMMENT '验证符合性确认-流程状态' AFTER `verify_due_date`; + +-- 认证虚拟清单log表 2023-03-17 未同步生产环境 +CREATE TABLE `auth_dummy_log` ( + `id` varchar(36) NOT NULL, + `create_by` varchar(50) DEFAULT NULL COMMENT '创建人', + `create_time` datetime DEFAULT NULL COMMENT '创建日期', + `update_by` varchar(50) DEFAULT NULL COMMENT '更新人', + `update_time` datetime DEFAULT NULL COMMENT '更新日期', + `sys_org_code` varchar(64) DEFAULT NULL COMMENT '所属部门', + `auth_dummy_inventory_base_id` varchar(32) DEFAULT NULL COMMENT '虚拟认证清单基础表id', + `log_content` varchar(5000) DEFAULT NULL COMMENT 'log内容', + `is_en_log` varchar(50) DEFAULT NULL COMMENT 'log语言类别,cn中文,en英文', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; -- 参数配置数据表，增加排序号字段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/authDummy/controller/AuthDummyLogController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/controller/AuthDummyLogController.java new file mode 100644 index 000000000..1deebeb83 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/controller/AuthDummyLogController.java @@ -0,0 +1,173 @@ +package com.jero.modules.authDummy.controller; + +import java.util.Arrays; +import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import com.jero.common.api.vo.Result; +import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.authDummy.entity.AuthDummyLog; +import com.jero.modules.authDummy.service.IAuthDummyLogService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.modules.dummy.entity.DummyLogEO; +import lombok.extern.slf4j.Slf4j; +import com.jero.common.system.base.controller.JeroController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.jero.common.aspect.annotation.AutoLog; + + + /** + * @Description: 虚拟认证清单log表 + * @Author: jero-boot + * @Date: 2023-03-17 + * @Version: V1.0 + */ +@Api(tags="虚拟认证清单log表") +@RestController +@RequestMapping("/authDummy/authDummyLog") +@Slf4j +public class AuthDummyLogController extends JeroController { + @Autowired + private IAuthDummyLogService authDummyLogService; + + /** + * 分页列表查询 + * + * @param authDummyLog + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "虚拟认证清单log表-分页列表查询") + @ApiOperation(value="虚拟认证清单log表-分页列表查询", notes="虚拟认证清单log表-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(AuthDummyLog authDummyLog,String cut, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(authDummyLog, req.getParameterMap()); + queryWrapper.orderByDesc("create_time").eq("is_en_log",cut); + Page page = new Page(pageNo, pageSize); + IPage pageList = authDummyLogService.page(page, queryWrapper); + IPage disposeLogList = authDummyLogService.disposeLog(pageList,cut); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "虚拟认证清单log表-列表查询") + @ApiOperation(value="虚拟认证清单log表-列表查询", notes="虚拟认证清单log表-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = authDummyLogService.queryList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param authDummyLog + * @return + */ + @AutoLog(value = "虚拟认证清单log表-添加") + @ApiOperation(value="虚拟认证清单log表-添加", notes="虚拟认证清单log表-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody AuthDummyLog authDummyLog) { + authDummyLogService.add(authDummyLog); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param authDummyLog + * @return + */ + @AutoLog(value = "虚拟认证清单log表-编辑") + @ApiOperation(value="虚拟认证清单log表-编辑", notes="虚拟认证清单log表-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody AuthDummyLog authDummyLog) { + authDummyLogService.editById(authDummyLog); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "虚拟认证清单log表-通过id删除") + @ApiOperation(value="虚拟认证清单log表-通过id删除", notes="虚拟认证清单log表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + authDummyLogService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "虚拟认证清单log表-批量删除") + @ApiOperation(value="虚拟认证清单log表-批量删除", notes="虚拟认证清单log表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.authDummyLogService.deleteByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "虚拟认证清单log表-通过id查询") + @ApiOperation(value="虚拟认证清单log表-通过id查询", notes="虚拟认证清单log表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + AuthDummyLog authDummyLog = authDummyLogService.queryById(id); + if(authDummyLog==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(authDummyLog); + } + + /** + * 导出excel + * + * @param request + * @param authDummyLog + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, AuthDummyLog authDummyLog) { + return super.exportXls(request, authDummyLog, AuthDummyLog.class, "虚拟认证清单log表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, AuthDummyLog.class); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyLog.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyLog.java new file mode 100644 index 000000000..355ad187f --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyLog.java @@ -0,0 +1,79 @@ +package com.jero.modules.authDummy.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + + +/** + * @Description: 虚拟认证清单log表 + * @Author: jero-boot + * @Date: 2023-03-17 + * @Version: V1.0 + */ +@Data +@TableName("auth_dummy_log") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="auth_dummy_log对象", description="虚拟认证清单log表") +public class AuthDummyLog implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private java.lang.String sysOrgCode; + + /**虚拟认证清单基础表id*/ + @Excel(name = "虚拟认证清单基础表id", width = 15) + @ApiModelProperty(value = "虚拟认证清单基础表id") + private java.lang.String authDummyInventoryBaseId; + + /**log内容*/ + @Excel(name = "log内容", width = 15) + @ApiModelProperty(value = "log内容") + private java.lang.String logContent; + + /**log语言类别,cn中文,en英文*/ + @Excel(name = "log语言类别,cn中文,en英文", width = 15) + @ApiModelProperty(value = "log语言类别,cn中文,en英文") + private java.lang.String isEnLog; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/mapper/AuthDummyLogMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/mapper/AuthDummyLogMapper.java new file mode 100644 index 000000000..7ec3134ac --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/mapper/AuthDummyLogMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.authDummy.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.authDummy.entity.AuthDummyLog; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 虚拟认证清单log表 + * @Author: jero-boot + * @Date: 2023-03-17 + * @Version: V1.0 + */ +public interface AuthDummyLogMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/mapper/xml/AuthDummyLogMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/mapper/xml/AuthDummyLogMapper.xml new file mode 100644 index 000000000..098643adb --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/mapper/xml/AuthDummyLogMapper.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/IAuthDummyInventoryInfoEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/IAuthDummyInventoryInfoEOService.java index c27ead70d..346f073c5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/IAuthDummyInventoryInfoEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/IAuthDummyInventoryInfoEOService.java @@ -128,4 +128,16 @@ public interface IAuthDummyInventoryInfoEOService extends IService datas, String cut); String getTreeNameImport(String cut, List categoryList, List technologyTerritoryList); + + /** + * 翻译为中文名 + * @param infoList + */ + void disposeDataToCn(List infoList); + + /** + * 翻译为英文 + * @param infoListCopy + */ + void disposeDataToEn(List infoListCopy); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/IAuthDummyLogService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/IAuthDummyLogService.java new file mode 100644 index 000000000..237e35382 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/IAuthDummyLogService.java @@ -0,0 +1,73 @@ +package com.jero.modules.authDummy.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jero.modules.authDummy.entity.AuthDummyLog; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 虚拟认证清单log表 + * @Author: jero-boot + * @Date: 2023-03-17 + * @Version: V1.0 + */ +public interface IAuthDummyLogService extends IService { + + /** + * 保存 + * + * @param authDummyLog + * @return + */ + void add(AuthDummyLog authDummyLog); + + /** + * 更新 + * + * @param authDummyLog + * @return + */ + void editById(AuthDummyLog authDummyLog); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + AuthDummyLog queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); + + //翻译log数据 + IPage disposeLog(IPage pageList, String cut); + + /** + * 设置更新log + * @param contentLog + * @param authDummyInventoryBaseId + * @param value + */ + void updateLog(String contentLog, String authDummyInventoryBaseId, String value); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java index af85c4577..8c584e443 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java @@ -11,22 +11,28 @@ import com.jero.common.api.vo.Result; import com.jero.common.constant.enums.CutEnum; import com.jero.common.exception.JeroBootException; import com.jero.common.system.query.QueryGenerator; +import com.jero.common.system.vo.LoginUser; import com.jero.modules.authDummy.entity.AuthDummyInventoryBaseEO; import com.jero.modules.authDummy.entity.AuthDummyInventoryInfoEO; import com.jero.modules.authDummy.entity.AuthDummyInventoryInfoEOEn; import com.jero.modules.authDummy.mapper.AuthDummyInventoryInfoEOMapper; import com.jero.modules.authDummy.service.IAuthDummyInventoryBaseEOService; import com.jero.modules.authDummy.service.IAuthDummyInventoryInfoEOService; +import com.jero.modules.authDummy.service.IAuthDummyLogService; import com.jero.modules.document.entity.BussDocumentLibraryEO; import com.jero.modules.document.mapper.BussDocumentLibraryEOMapper; import com.jero.modules.document.service.IBussDocumentLibraryEOService; +import com.jero.modules.dummy.entity.DummyInventoryInfoEO; +import com.jero.modules.dummy.enums.DummyInventoryBaseFieldEnum; import com.jero.modules.dummy.service.impl.DummyLogEOServiceImpl; +import com.jero.modules.dummy.util.DeepCopyListUtil; import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.project.enums.ProjectInventoryFieldEnum; import com.jero.modules.split.common.FileUnZip; import com.jero.modules.system.entity.SysCategory; import com.jero.modules.system.entity.SysDictItem; import com.jero.modules.system.mapper.SysCategoryMapper; +import com.jero.modules.system.mapper.SysDictItemMapper; import com.jero.modules.system.service.ISysDictItemService; import com.jero.modules.system.service.impl.SysCategoryServiceImpl; import com.jero.modules.system.service.impl.SysDictItemServiceImpl; @@ -45,6 +51,7 @@ import org.apache.poi.hssf.usermodel.HSSFCell; import org.apache.poi.hssf.usermodel.HSSFDateUtil; import org.apache.poi.ss.usermodel.*; import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import org.apache.shiro.SecurityUtils; import org.aspectj.util.FileUtil; import org.jeecgframework.poi.excel.ExcelExportUtil; import org.jeecgframework.poi.excel.entity.ExportParams; @@ -112,6 +119,12 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl"; + String enContentLog = username+" edited the “" + serialNumber + "” in the list:
"; + authDummyLogService.updateLog(contentLog, authDummyInventoryInfoEO.getAuthDummyInventoryBaseId(),CutEnum.CN.getValue()); + authDummyLogService.updateLog(enContentLog, authDummyInventoryInfoEO.getAuthDummyInventoryBaseId(),CutEnum.EN.getValue()); } /** @@ -158,7 +180,25 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl ids) { - removeByIds(ids); + + AuthDummyInventoryInfoEO infoEO = queryById(ids.get(0)); + + if(infoEO!=null){ + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(AuthDummyInventoryInfoEO::getId,ids); + List authDummyInventoryInfoEOList = this.list(wrapper); + + removeByIds(ids); + + //更新log + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + String username = sysUser.getUsername(); + String serialNumber = authDummyInventoryInfoEOList.stream().map(e->e.getSerialNumber()).collect(Collectors.joining(",")); + String contentLog = username+"删除了清单中的“"+serialNumber+"”"; + String enContentLog = username+" deleted “"+serialNumber+"” from the list"; + authDummyLogService.updateLog(contentLog, authDummyInventoryInfoEOList.get(0).getAuthDummyInventoryBaseId(),CutEnum.CN.getValue()); + authDummyLogService.updateLog(enContentLog, authDummyInventoryInfoEOList.get(0).getAuthDummyInventoryBaseId(),CutEnum.EN.getValue()); + } } /** @@ -196,6 +236,16 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImple.getSerialNumber()).collect(Collectors.joining(",")); + String contentLog = username+"复制了“"+serialNumber+"”"; + String enContentLog = username+" copied “"+serialNumber+"”."; + authDummyLogService.updateLog(contentLog, projectId,CutEnum.CN.getValue()); + authDummyLogService.updateLog(enContentLog, projectId,CutEnum.EN.getValue()); } } catch (Exception e) { e.printStackTrace(); @@ -231,6 +281,11 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl idList = Arrays.asList(ids.split(",")); + + QueryWrapper queryWrapper = new QueryWrapper<>(); + List infoList = list(queryWrapper.in("id", idList)); + String projectId = infoList.get(0).getAuthDummyInventoryBaseId(); + List updateList = new ArrayList<>(); for (String id : idList) { AuthDummyInventoryInfoEO updateAuthDummyEO = new AuthDummyInventoryInfoEO(); @@ -268,10 +323,86 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl infoListCopy = DeepCopyListUtil.depCopy(infoList); + + //根据id查询数据库中完整信息,翻译 + authDummyInventoryInfoEOService.disposeDataToCn(infoList); + authDummyInventoryInfoEOService.disposeDataToEn(infoListCopy); + + //翻译传入的数据 + List inputList = new ArrayList<>(); + inputList.add(authDummyInventoryInfoEO); + authDummyInventoryInfoEOService.disposeDataToCn(inputList); + AuthDummyInventoryInfoEO inputInfoEO = inputList.get(0); + + for (String id : idList) { + AuthDummyInventoryInfoEO info = infoList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList()).get(0); + AuthDummyInventoryInfoEO infoCopy = infoListCopy.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList()).get(0); + StringBuilder contentLogBuilder = new StringBuilder(); + StringBuilder enContentLogBuilder = new StringBuilder(); + contentLogBuilder.append(info.getSerialNumber() + ":"); + enContentLogBuilder.append(infoCopy.getSerialNumber() + ":"); + AuthDummyInventoryInfoEO authDummyInventoryInfoEOTemp = new AuthDummyInventoryInfoEO(); + authDummyInventoryInfoEOTemp.setId(id); + + //责任领域 dutyTerritory + if(StringUtils.isNotBlank(authDummyInventoryInfoEO.getDutyTerritory())) { + if (!info.getDutyTerritory().equals(inputInfoEO.getDutyTerritory()) && !inputInfoEO.getDutyTerritory().equals("空")){ + setUpdateContentLog(contentLogBuilder, "责任领域", info.getDutyTerritory(), inputInfoEO.getDutyTerritory()); + setUpdateEnContentLog(enContentLogBuilder, "Responsible Field", infoCopy.getDutyTerritory(), inputInfoEO.getDutyTerritory()); + } + } + //交付物类型 + if(StringUtils.isNotBlank(authDummyInventoryInfoEO.getDeliverable())) { + if (!info.getDeliverable().equals(inputInfoEO.getDeliverable()) && !inputInfoEO.getDeliverable().equals("空")){ + setUpdateContentLog(contentLogBuilder, "交付物类型", info.getDeliverable(), inputInfoEO.getDeliverable()); + setUpdateEnContentLog(enContentLogBuilder, "Deliverable Type", infoCopy.getDeliverable(), inputInfoEO.getDeliverable()); + } + } + //处理具体变动消息为空的contentLog + String contentInfoIndexStart = contentLogBuilder.substring(0,contentLogBuilder.lastIndexOf(":")); + String contentInfo= contentLogBuilder.substring(contentInfoIndexStart.length()+1,contentLogBuilder.length()); + + String enContentInfoIndexStart = enContentLogBuilder.substring(0,enContentLogBuilder.lastIndexOf(":")); + String enContentInfo= enContentLogBuilder.substring(enContentInfoIndexStart.length()+1,enContentLogBuilder.length()); + + if(StringUtils.isNotBlank(contentInfo) && StringUtils.isNotBlank(enContentInfo)){ + contentLog += contentLogBuilder; + enContentLog += enContentLogBuilder ; + } + } + String contentIndexStart = contentLog.substring(0,contentLog.indexOf("“")); + String content= contentLog.substring(contentIndexStart.length()+1,contentLog.length()); + + String enContentIndexStart = enContentLog.substring(0,enContentLog.indexOf("“")); + String enContent= enContentLog.substring(enContentIndexStart.length()+1,enContentLog.length()); + + if(StringUtils.isNotBlank(content)){ + contentLog = contentLog.substring(0, contentLog.length() - 5) + "”"; + authDummyLogService.updateLog(contentLog, projectId,CutEnum.CN.getValue()); + } + + if(StringUtils.isNotBlank(enContent)){ + enContentLog = enContentLog.substring(0, enContentLog.length() - 5) + "”"; + authDummyLogService.updateLog(enContentLog, projectId,CutEnum.EN.getValue()); + } } } return Result.OK("批量设置成功！"); } + public StringBuilder setUpdateContentLog(StringBuilder contentLogBuilder,String fieldName,String oldValue,String newValue){ + return contentLogBuilder.append("\'"+ fieldName + "\'由" + oldValue + "改为了" + newValue).append("
"); + } + public StringBuilder setUpdateEnContentLog(StringBuilder contentLogBuilder,String fieldName,String oldValue,String newValue){ + return contentLogBuilder.append("\'"+ fieldName + "\' changed from " + oldValue + " to " + newValue).append("
"); + } /** * 导出数据 @@ -612,6 +743,15 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImple.getSerialNumber()).collect(Collectors.joining(",")); + String contentLog = username+"向清单中添加了“"+serialNumber1+"”"; + String enContentLog = username+" added “"+serialNumber1+"” to the list."; + authDummyLogService.updateLog(contentLog, authDummyInventoryInfoEO.getAuthDummyInventoryBaseId(),CutEnum.CN.getValue()); + authDummyLogService.updateLog(enContentLog, authDummyInventoryInfoEO.getAuthDummyInventoryBaseId(),CutEnum.EN.getValue()); } }catch (Exception ex){ throw new JeroBootException("添加失败！"); @@ -895,8 +1035,21 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl list = new ArrayList<>(); list.add(data); + StringBuilder serialNumberBuilder = new StringBuilder(); if (list.size()>0) { authDummyInventoryInfoEOService.saveBatch(list); + + //更新log + for (AuthDummyInventoryInfoEO authDummyInventoryInfoEO : list){ + serialNumberBuilder.append(authDummyInventoryInfoEO.getSerialNumber()).append(","); + } + String serialNumber = serialNumberBuilder.substring(0, serialNumberBuilder.length() - 1); + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + String username = sysUser.getUsername(); + String contentLog = username+"向清单中导入了“"+serialNumber+"”"; + String enContentLog = username+" imported “"+serialNumber+"” into the list."; + authDummyLogService.updateLog(contentLog, list.get(0).getAuthDummyInventoryBaseId(),CutEnum.CN.getValue()); + authDummyLogService.updateLog(enContentLog, list.get(0).getAuthDummyInventoryBaseId(),CutEnum.EN.getValue()); } } } @@ -921,4 +1074,110 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl infoList) { + for(AuthDummyInventoryInfoEO authDummyInventoryInfoEO : infoList){ + if(StringUtils.isBlank(authDummyInventoryInfoEO.getCategory())){ + authDummyInventoryInfoEO.setCategory("空"); + } + if(StringUtils.isNotEmpty(authDummyInventoryInfoEO.getInspectionItem())){ + authDummyInventoryInfoEO.setInspectionItem("空"); + } + if(StringUtils.isNotEmpty(authDummyInventoryInfoEO.getConfigItem())){ + authDummyInventoryInfoEO.setConfigItem("空"); + } + if(StringUtils.isNotEmpty(authDummyInventoryInfoEO.getWvtaId())){ + authDummyInventoryInfoEO.setWvtaId("空"); + } + if(StringUtils.isNotEmpty(authDummyInventoryInfoEO.getSerialNumber())){ + authDummyInventoryInfoEO.setSerialNumber(authDummyInventoryInfoEO.getSerialNumber()); + } + //责任领域 + if (StringUtils.isNotBlank(authDummyInventoryInfoEO.getDutyTerritory())) { + List dutyTerritory = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseFieldEnum.DUTY_TERRITORY.getValue()); + List dutyTerritoryList = Arrays.asList(authDummyInventoryInfoEO.getDutyTerritory().split(",")); + StringBuilder dutyTerritoryBuilder = new StringBuilder(); + for (String midDutyTerritory : dutyTerritoryList) { + String dutyTerritoryName = dutyTerritory.stream().filter(e -> e.getItemValue().equals(midDutyTerritory)).map(f -> f.getItemText()).collect(Collectors.joining(",")); + dutyTerritoryBuilder.append(dutyTerritoryName).append(","); + } + authDummyInventoryInfoEO.setDutyTerritory(dutyTerritoryBuilder.substring(0, dutyTerritoryBuilder.toString().length() - 1)); + } + else { + authDummyInventoryInfoEO.setDutyTerritory("空"); + } + //交付物类型 + if(StringUtils.isNotEmpty(authDummyInventoryInfoEO.getDeliverableType())){ + List categoryList = this.sysCategoryService.list(); + List deliverableList = Arrays.asList(authDummyInventoryInfoEO.getDeliverableType().split(",")); + StringBuilder deliverableBuilder = new StringBuilder(); + for(String midDeliverable : deliverableList){ + String deliberableName = categoryList.stream().filter(e -> e.getId().equals(midDeliverable)).map(f ->f.getName()).collect(Collectors.joining(",")); + deliverableBuilder.append(deliberableName).append(","); + } + authDummyInventoryInfoEO.setDeliverable(deliverableBuilder.substring(0, deliverableBuilder.toString().length() - 1)); + } + else { + authDummyInventoryInfoEO.setDeliverable("空"); + } + } + } + + /** + * 翻译为英文 + * @param infoListCopy + */ + @Override + public void disposeDataToEn(List infoListCopy) { + for(AuthDummyInventoryInfoEO authDummyInventoryInfoEO : infoListCopy){ + if(StringUtils.isBlank(authDummyInventoryInfoEO.getCategory())){ + authDummyInventoryInfoEO.setCategory("null"); + } + if(StringUtils.isNotEmpty(authDummyInventoryInfoEO.getInspectionItem())){ + authDummyInventoryInfoEO.setInspectionItem("null"); + } + if(StringUtils.isNotEmpty(authDummyInventoryInfoEO.getConfigItem())){ + authDummyInventoryInfoEO.setConfigItem("null"); + } + if(StringUtils.isNotEmpty(authDummyInventoryInfoEO.getWvtaId())){ + authDummyInventoryInfoEO.setWvtaId("null"); + } + if(StringUtils.isNotEmpty(authDummyInventoryInfoEO.getSerialNumber())){ + authDummyInventoryInfoEO.setSerialNumber(authDummyInventoryInfoEO.getSerialNumber()); + } + //责任领域 + if (StringUtils.isNotBlank(authDummyInventoryInfoEO.getDutyTerritory())) { + List dutyTerritory = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseFieldEnum.DUTY_TERRITORY.getValue()); + List dutyTerritoryList = Arrays.asList(authDummyInventoryInfoEO.getDutyTerritory().split(",")); + StringBuilder dutyTerritoryBuilder = new StringBuilder(); + for (String midDutyTerritory : dutyTerritoryList) { + String dutyTerritoryEnName = dutyTerritory.stream().filter(e -> e.getItemValue().equals(midDutyTerritory)).map(f -> f.getEnName()).collect(Collectors.joining(",")); + dutyTerritoryBuilder.append(dutyTerritoryEnName).append(","); + } + authDummyInventoryInfoEO.setDutyTerritory(dutyTerritoryBuilder.substring(0, dutyTerritoryBuilder.toString().length() - 1)); + } + else { + authDummyInventoryInfoEO.setDutyTerritory("null"); + } + //交付物类型 + if(StringUtils.isNotEmpty(authDummyInventoryInfoEO.getDeliverable())){ + List categoryList = this.sysCategoryService.list(); + List deliverableList = Arrays.asList(authDummyInventoryInfoEO.getDeliverableType().split(",")); + StringBuilder deliverableBuilder = new StringBuilder(); + for(String midDeliverable : deliverableList){ + String deliberableEnName = categoryList.stream().filter(e -> e.getId().equals(midDeliverable)).map(f ->f.getEnName()).collect(Collectors.joining(",")); + deliverableBuilder.append(deliberableEnName).append(","); + } + authDummyInventoryInfoEO.setDeliverable(deliverableBuilder.substring(0, deliverableBuilder.toString().length() - 1)); + } + else { + authDummyInventoryInfoEO.setDeliverable("null"); + } + } + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyLogServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyLogServiceImpl.java new file mode 100644 index 000000000..202e883af --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyLogServiceImpl.java @@ -0,0 +1,174 @@ +package com.jero.modules.authDummy.service.impl; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jero.common.constant.enums.CutEnum; +import com.jero.common.system.vo.LoginUser; +import com.jero.modules.authDummy.entity.AuthDummyLog; +import com.jero.modules.authDummy.mapper.AuthDummyLogMapper; +import com.jero.modules.authDummy.service.IAuthDummyLogService; +import com.jero.modules.dummy.entity.DummyLogEO; +import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.SecurityUtils; +import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Date; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 虚拟认证清单log表 + * @Author: jero-boot + * @Date: 2023-03-17 + * @Version: V1.0 + */ +@Service +public class AuthDummyLogServiceImpl extends ServiceImpl implements IAuthDummyLogService { + + /** + * 保存 + * + * @param authDummyLog + * @return + */ + @Override + public void add(AuthDummyLog authDummyLog) { + Date now = new Date(); + authDummyLog.setCreateTime(now); + authDummyLog.setUpdateTime(now); + save(authDummyLog); + } + + /** + * 更新 + * + * @param authDummyLog + * @return + */ + @Override + public void editById(AuthDummyLog authDummyLog) { + Date now = new Date(); + authDummyLog.setUpdateTime(now); + saveOrUpdate(authDummyLog); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public AuthDummyLog queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } + + //翻译log数据 + @Override + public IPage disposeLog(IPage pageList, String cut) { + for(AuthDummyLog authDummyLog : pageList.getRecords()){ + if(CutEnum.EN.getValue().equals(cut)){ + //添加 + //String contentLog = username+"向清单中添加了标准“"+serialNumber+"”"; + if(authDummyLog.getLogContent().contains("向清单中添加了标准")){ + String replaceLog = authDummyLog.getLogContent().replace("向清单中添加了标准"," added the standard ") + .replace("”","” to the list."); + authDummyLog.setLogContent(replaceLog); + System.out.println(authDummyLog); + } + //编辑 + //String contentLog = username+"编辑了清单中的“" + dummyInventoryInfoEO.getSerialNumber() + "”标准:"; + else if(authDummyLog.getLogContent().contains("编辑了清单中的")){ + String replaceLog = authDummyLog.getLogContent().replace("编辑了清单中的"," edited the ") + .replace("”标准","” standard in the list"); +// replaceLog = transData(replaceLog); + authDummyLog.setLogContent(replaceLog); + System.out.println(authDummyLog); + } + //删除 + //String contentLog = username+"删除了清单中的“"+serialNumber+"”标准"; + else if(authDummyLog.getLogContent().contains("删除了清单中的")){ + String replaceLog = authDummyLog.getLogContent().replace("删除了清单中的"," deleted the ") + .replace("”标准","” standard from the list"); + authDummyLog.setLogContent(replaceLog); + System.out.println(authDummyLog); + } + //导入 + //String contentLog = username+"向清单中导入了“"+serialNumber+"”标准"; + /*else if(dummyLogEO.getLogContent().contains("向清单中导入了")){ + String replaceLog = dummyLogEO.getLogContent().replace("向清单中添加了标准"," imported ") + .replace("”","” standard into the list."); + dummyLogEO.setLogContent(replaceLog); + System.out.println(dummyLogEO); + }*/ + /*//复制 + //String contentLog = username+"复制了“"+serialNumber+"”"; + else if(dummyLogEO.getLogContent().contains("复制了")){ + String replaceLog = dummyLogEO.getLogContent().replace("复制了"," copied ") + .replace("”","” to the list."); + dummyLogEO.setLogContent(replaceLog); + System.out.println(dummyLogEO); + }*/ + /* //批量设置 + //XXX批量设置了“标准号1:'字段名'由XXX改为了XXX ,标准号2:"字段名'由XXX改为了xXX”。 + //XXX batch set "standard number 1:' field name' changed from XXX to XXX, standard number 2:' field name' changed from XXX to XXX". + else if(dummyLogEO.getLogContent().contains("批量设置了")){ + String replaceLog = dummyLogEO.getLogContent().replace("批量设置了"," batch set "); + //////// + dummyLogEO.setLogContent(replaceLog); + System.out.println(dummyLogEO); + }*/ + } + } + return pageList; + } + + /** + * 设置更新log + * @param contentLog + * @param authDummyInventoryBaseId + * @param value + */ + @Override + public void updateLog(String contentLog, String authDummyInventoryBaseId, String value) { + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + if (StringUtils.isNotBlank(contentLog)) { + AuthDummyLog authDummyLog = new AuthDummyLog(); + authDummyLog.setAuthDummyInventoryBaseId(authDummyInventoryBaseId); + authDummyLog.setLogContent(contentLog); + authDummyLog.setCreateBy(sysUser.getUsername()); + authDummyLog.setIsEnLog(value); + add(authDummyLog); + } + } +} From b46670349c57ef68b52aa71bb3752f5f8c8e48ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Mon, 20 Mar 2023 16:34:36 +0800 Subject: [PATCH 205/645] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=B8=85=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/circulationHistory.vue | 54 +++++++++++++++++++ .../components/designCompliance.vue | 8 ++- .../reviewedByThePersonInCharge.vue | 7 ++- 3 files changed, 66 insertions(+), 3 deletions(-) create mode 100644 jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue new file mode 100644 index 000000000..39f2d3e18 --- /dev/null +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue @@ -0,0 +1,54 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue index 67199f91d..ef4c417f5 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue @@ -31,6 +31,10 @@ :query="queryData" :queryBy="queryBy" :queryPersonInCharge="queryPersonInCharge"/> + +
@@ -199,7 +198,11 @@ }, //转办接口 SelectedByForm(userIds) { - this.formInline.secondChargePersonUserId = userIds + if (this.query.TaskKey == 'zrrtjjfw'){ + this.formInline.dezrrSubmitUserId = userIds + }else{ + this.formInline.secondChargePersonUserId = userIds + } this.$refs.SelectedByRef.visible = false }, submitNoRule(callBack) { From 7cf9507c2bb4d72d0a8221739e3fa61166093e26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Mon, 20 Mar 2023 16:56:46 +0800 Subject: [PATCH 206/645] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=B8=85=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/circulationHistory.vue | 101 ++++++++++++++++++ .../components/designCompliance.vue | 6 +- 2 files changed, 105 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue index 39f2d3e18..624d71225 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue @@ -5,12 +5,42 @@ {{title}}
+
+ + + {{approvalResult[text]}} + + + + {{$t('viewFile')}} + + -- + + +
+
@@ -51,4 +147,9 @@ color: #000F16; } } + + .viewFile { + color: #00B3BE; + cursor: pointer; + } \ No newline at end of file diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue index ef4c417f5..5510957e8 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue @@ -135,13 +135,15 @@ return false }, isCancel() { - if (this.queryData.TaskKey == 'zrrqr' || this.queryData.TaskKey == 'dezrrqr' || this.queryData.TaskKey == 'zrrtjjfw') { + if (this.queryData.TaskKey == 'zrrqr' || this.queryData.TaskKey == 'dezrrqr' || + this.queryData.TaskKey == 'zrrtjjfw' || this.queryData.TaskKey == 'dezrrtjjfw') { return true } return false }, isConfirm() { - if (this.queryData.TaskKey == 'zrrqr' || this.queryData.TaskKey == 'dezrrqr' || this.queryData.TaskKey == 'zrrtjjfw') { + if (this.queryData.TaskKey == 'zrrqr' || this.queryData.TaskKey == 'dezrrqr' || + this.queryData.TaskKey == 'zrrtjjfw' || this.queryData.TaskKey == 'dezrrtjjfw') { return true } return false From 98017d6bfe1e847e6d60c9249b1dc42bdc6fbbdc Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Mon, 20 Mar 2023 16:57:25 +0800 Subject: [PATCH 207/645] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E6=B5=81=E7=A8=8B-=E6=B5=81=E7=A8=8B=E5=8E=86=E5=8F=B2?= =?UTF-8?q?=E8=A1=A8=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5=20?= =?UTF-8?q?=E9=99=84=E4=BB=B6id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_2nd_period.sql | 4 ++++ .../com/jero/modules/wkflow/entity/ProcessHistoryEO.java | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql index 37ad5c249..8ad35e0cf 100644 --- a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql +++ b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql @@ -420,3 +420,7 @@ ALTER TABLE `laws_weilai`.`params_config_data` -- 上报库参数配置数据表，增加排序号字段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`; + +-- 流程历史表，增加字段 附件id 2023-3-20 未同步生产环境 +ALTER TABLE `process_history` + ADD COLUMN `approval_file` varchar(2000) NULL COMMENT '附件id，多个之间使用英文逗号分隔' AFTER `project_laws_inventory_id`; \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/entity/ProcessHistoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/entity/ProcessHistoryEO.java index f91cb062a..0cb75db7e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/entity/ProcessHistoryEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/entity/ProcessHistoryEO.java @@ -102,4 +102,10 @@ public class ProcessHistoryEO implements Serializable { private String projectLawsInventoryId; + @ApiModelProperty(value = "附件id，多个之间使用英文逗号分隔") + private String approvalFile; + + /**附件名称，页面展示字段**/ + @TableField(exist = false) + private String approvalFileName;; } From 6b8cadab4e0c38a0dd631ea395e09080bed31bee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Mon, 20 Mar 2023 18:04:36 +0800 Subject: [PATCH 208/645] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=B8=85=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/circulationHistory.vue | 10 +- .../components/dealtWith.vue | 9 +- .../components/designCompliance.vue | 99 ++++----- .../components/projectInformation.vue | 159 ++++++++++++++ .../reviewedByThePersonInCharge.vue | 119 ++++++----- .../components/standardContent.vue | 201 ++++++++++++++++++ 6 files changed, 469 insertions(+), 128 deletions(-) create mode 100644 jero-web/src/views/toDoCenter/projectRegulationTasks/components/projectInformation.vue create mode 100644 jero-web/src/views/toDoCenter/projectRegulationTasks/components/standardContent.vue diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue index 624d71225..22873d08a 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue @@ -138,13 +138,13 @@ .box-text { display: flex; justify-content: space-between; - height: 80px; - line-height: 80px; + height: 40px; + line-height: 24px; .header-text { - font-size: 18px; - font-weight: 400; - color: #000F16; + font-size: 16px; + font-weight: bold; + color: #000; } } diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue index ed956af09..c90c0026e 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue @@ -45,7 +45,7 @@ @showSizeChange="SizeChange" />
- +
@@ -96,14 +96,14 @@ { title: this.$t('Tasknode'), align: 'left', - dataIndex: '', + dataIndex: 'taskDefinitionKeyName', ellipsis: true, width: 170 }, { title: this.$t('typeOfDeliverables'), align: 'left', - dataIndex: '', + dataIndex: 'deliverableTypeName', ellipsis: true, width: 170 }, @@ -198,6 +198,9 @@ this.selectedRowKeys = value console.log(this.selectedRowKeys) }, + designComplianceList(){ + this.getList() + }, RelatedItemsClick(item) { let newUrl = this.$router.resolve({ path: '/ProjectDetails', diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue index 5510957e8..214b844e4 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue @@ -3,12 +3,13 @@ + style="height: 100%;overflow: auto;margin-bottom: 436px;"> + {{textLoading}} - +
+ +
+ + +
+ +
-
@@ -54,8 +57,8 @@ + + \ No newline at end of file diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue index 24939325e..8d45acc9a 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue @@ -9,45 +9,48 @@
- +
* {{$t('resultofhandling')}}
- - - - {{$t('accept')}} - - - {{$t('refuse')}} - - - {{$t('sendBack')}} - - - {{$t('accord')}} - - - {{$t('nonConformity')}} - - - {{$t('Tracked')}} - - - {{$t('notInvolved')}} - - - {{$t('turnToDo')}} - - -
+ + + + {{$t('accept')}} + + + {{$t('refuse')}} + + + {{$t('adopt')}} + + + {{$t('sendBack')}} + + + {{$t('accord')}} + + + {{$t('nonConformity')}} + + + {{$t('Tracked')}} + + + {{$t('notInvolved')}} + + + {{$t('turnToDo')}} + + + @@ -57,29 +60,29 @@ * {{$t('feedbackMessage')}}
- - -
+ + + - +
{{$t('enclosure')}}
- - - {{ (formInline.approvalFile === 'null' || formInline.approvalFile === '' || - formInline.approvalFile == null) ? $t('clickUpload') : $t('viewUploadedFiles') - }} - -
+ + + {{ (formInline.approvalFile === 'null' || formInline.approvalFile === '' || + formInline.approvalFile == null) ? $t('clickUpload') : $t('viewUploadedFiles') + }} + + @@ -242,32 +245,32 @@ \ No newline at end of file From b0a9d359d35f498458cae1c5583b65f332beeb56 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Tue, 21 Mar 2023 10:11:14 +0800 Subject: [PATCH 209/645] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E6=B5=81=E7=A8=8B-=E8=AE=BE=E8=AE=A1=E7=AC=A6=E5=90=88?= =?UTF-8?q?=E6=80=A7=E6=B5=81=E7=A8=8B=E5=AF=B9=E6=8E=A5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/enums/ReviewResultEnum.java | 7 ++- .../DesignComplianceFlowNodeKeyEnum.java | 20 +++---- .../VerifyComplianceFlowNodeKeyEnum.java | 20 +++---- .../impl/ProcessHistoryEOServiceImpl.java | 52 ++++++++++++++++++- 4 files changed, 77 insertions(+), 22 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ReviewResultEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ReviewResultEnum.java index 60d8a7486..9bb8aae4f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ReviewResultEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ReviewResultEnum.java @@ -13,7 +13,12 @@ public enum ReviewResultEnum { INCONFORMITY("不符合","Non-Compliance"), TO_TRACK("待追踪","To be tracked"), UNINVOLVED("不涉及","NA"), - TERMINATION_OF_TASK("任务终止","Termination of task") + TERMINATION_OF_TASK("任务终止","Termination of task"), + ACCEPTED("接受","Accepted"), + REJECTED("拒绝","Rejected"), + TRANSFER("转办","Transfer"), + RETURNED("退回","Returned"), + ADOPT("通过","Adopt"), ; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/enums/DesignComplianceFlowNodeKeyEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/enums/DesignComplianceFlowNodeKeyEnum.java index 9c097b85a..8c21a7240 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/enums/DesignComplianceFlowNodeKeyEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/enums/DesignComplianceFlowNodeKeyEnum.java @@ -7,12 +7,12 @@ import org.apache.commons.lang3.StringUtils; * 待办中心-设计符合性流程节点key枚举类 */ public enum DesignComplianceFlowNodeKeyEnum { - fqlc("发起流程","Initiate the process","fqlc"), - zrrqr("任务责任确认","Confirmation of mission responsibility","zrrqr"), // 责任人确认 - dezrrqr("任务责任确认","Confirmation of mission responsibility","dezrrqr"),// 第二责任人确认 - zrrtjjfw("设计符合性确认","Design compliance confirmation","zrrtjjfw"),// "责任人提交交付物" - dezrrtjjfw("设计符合性确认","Design compliance confirmation","dezrrtjjfw"),// 第二责任人提交交付物 - fggcssh("设计符合性审查","Design compliance review","fggcssh"), // 法规工程师审核 + FQLC("发起流程","Initiate the process","fqlc"), + ZRRQR("任务责任确认","Confirmation of mission responsibility","zrrqr"), // 责任人确认 + DEZRRQR("任务责任确认","Confirmation of mission responsibility","dezrrqr"),// 第二责任人确认 + ZRRTJJFW("设计符合性确认","Design compliance confirmation","zrrtjjfw"),// "责任人提交交付物" + DEZRRTJJFW("设计符合性确认","Design compliance confirmation","dezrrtjjfw"),// 第二责任人提交交付物 + FGGCSSH("设计符合性审查","Design compliance review","fggcssh"), // 法规工程师审核 ; String cnName; @@ -51,12 +51,12 @@ public enum DesignComplianceFlowNodeKeyEnum { public static String getTextByValue(String value,String cut) { DesignComplianceFlowNodeKeyEnum[] values = values(); - for (DesignComplianceFlowNodeKeyEnum todoCenterStatusEnum : values) { - if (todoCenterStatusEnum.value.equals(value)) { + for (DesignComplianceFlowNodeKeyEnum designComplianceFlowNodeKeyEnum : values) { + if (designComplianceFlowNodeKeyEnum.value.equals(value)) { if(StringUtils.equals(cut, CutEnum.CN.getValue())){ - return todoCenterStatusEnum.cnName; + return designComplianceFlowNodeKeyEnum.cnName; }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ - return todoCenterStatusEnum.enName; + return designComplianceFlowNodeKeyEnum.enName; } } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/enums/VerifyComplianceFlowNodeKeyEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/enums/VerifyComplianceFlowNodeKeyEnum.java index cf0f3d4b1..7c301023b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/enums/VerifyComplianceFlowNodeKeyEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/enums/VerifyComplianceFlowNodeKeyEnum.java @@ -7,12 +7,12 @@ import org.apache.commons.lang3.StringUtils; * 待办中心-验证符合性流程节点key枚举类 */ public enum VerifyComplianceFlowNodeKeyEnum { - fqlc("发起流程","Initiate the process","fqlc"), - zrrqr("任务责任确认","Confirmation of mission responsibility","zrrqr"), // 责任人确认 - dezrrqr("任务责任确认","Confirmation of mission responsibility","dezrrqr"),// 第二责任人确认 - zrrtjjfw("验证符合性确认","Verify compliance confirmation","zrrtjjfw"),// "责任人提交交付物" - dezrrtjjfw("验证符合性确认","Verify compliance confirmation","dezrrtjjfw"),// 第二责任人提交交付物 - fggcssh("验证符合性审查","Verify compliance review","fggcssh"), // 法规工程师审核 + FQLC("发起流程","Initiate the process","fqlc"), + ZRRQR("任务责任确认","Confirmation of mission responsibility","zrrqr"), // 责任人确认 + DEZRRQR("任务责任确认","Confirmation of mission responsibility","dezrrqr"),// 第二责任人确认 + ZRRTJJFW("验证符合性确认","Verify compliance confirmation","zrrtjjfw"),// "责任人提交交付物" + DEZRRTJJFW("验证符合性确认","Verify compliance confirmation","dezrrtjjfw"),// 第二责任人提交交付物 + FGGCSSH("验证符合性审查","Verify compliance review","fggcssh"), // 法规工程师审核 ; String cnName; @@ -51,12 +51,12 @@ public enum VerifyComplianceFlowNodeKeyEnum { public static String getTextByValue(String value,String cut) { VerifyComplianceFlowNodeKeyEnum[] values = values(); - for (VerifyComplianceFlowNodeKeyEnum todoCenterStatusEnum : values) { - if (todoCenterStatusEnum.value.equals(value)) { + for (VerifyComplianceFlowNodeKeyEnum verifyComplianceFlowNodeKeyEnum : values) { + if (verifyComplianceFlowNodeKeyEnum.value.equals(value)) { if(StringUtils.equals(cut, CutEnum.CN.getValue())){ - return todoCenterStatusEnum.cnName; + return verifyComplianceFlowNodeKeyEnum.cnName; }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ - return todoCenterStatusEnum.enName; + return verifyComplianceFlowNodeKeyEnum.enName; } } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/impl/ProcessHistoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/impl/ProcessHistoryEOServiceImpl.java index 1ffbcbec0..fc9f17943 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/impl/ProcessHistoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/impl/ProcessHistoryEOServiceImpl.java @@ -5,13 +5,20 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.jero.common.api.vo.Result; import com.jero.common.exception.JeroBootException; +import com.jero.modules.oss.entity.OSSFile; +import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.project.enums.OperatorTypeEnum; import com.jero.modules.project.enums.RequestSourceEnum; import com.jero.modules.project.enums.ReviewResultEnum; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysUserService; +import com.jero.modules.todoCenter.entity.ProcessInfoEO; +import com.jero.modules.todoCenter.enums.DesignComplianceFlowNodeKeyEnum; +import com.jero.modules.todoCenter.enums.VerifyComplianceFlowNodeKeyEnum; +import com.jero.modules.todoCenter.service.IProcessInfoEOService; import com.jero.modules.wkflow.entity.ProcessHistoryEO; import com.jero.modules.wkflow.enums.DesignComplianceNodeEnum; +import com.jero.modules.wkflow.enums.FlowTypeEnum; import com.jero.modules.wkflow.mapper.ProcessHistoryEOMapper; import com.jero.modules.wkflow.service.IProcessHistoryEOService; import org.apache.commons.collections4.CollectionUtils; @@ -38,6 +45,10 @@ public class ProcessHistoryEOServiceImpl extends ServiceImpl actiProcInstIdList = datas.stream().map(ProcessHistoryEO::getActiProcInstId).distinct().collect(Collectors.toList()); + QueryWrapper processInfoEOQueryWrap = new QueryWrapper<>(); + processInfoEOQueryWrap.lambda().in(ProcessInfoEO::getActiProcInstId,actiProcInstIdList); + List processInfoList = this.processInfoEOService.list(processInfoEOQueryWrap); + + String approvalFiles = datas.stream().map(ProcessHistoryEO::getApprovalFile).distinct().collect(Collectors.joining(",")); + List approvalFileList = this.ossFileService.getFileInfos(approvalFiles); + for (ProcessHistoryEO data : datas) { if(StringUtils.isNotEmpty(data.getOperatorResult())){ data.setReviewResult(ReviewResultEnum.getTextByValue(data.getOperatorResult(),cut)); @@ -149,9 +168,40 @@ public class ProcessHistoryEOServiceImpl extends ServiceImpl sysUser.getId().equals(data.getOperatorPersonId())).collect(Collectors.toList()).get(0); data.setAssignee(userInfo.getUsername()); } - if(StringUtils.isNotEmpty(data.getTaskDefinitionKey())){ + List processInfoListTemp = processInfoList.stream().filter(processInfo -> { + boolean flag = false; + if (StringUtils.equals(processInfo.getActiProcInstId(), data.getActiProcInstId())) { + flag = true; + } + return flag; + }).collect(Collectors.toList()); + + if(CollectionUtils.isNotEmpty(processInfoListTemp)){ + String flowType = processInfoListTemp.get(0).getFlowType(); + if(StringUtils.equals(flowType, FlowTypeEnum.SJFHXSHLC.getValue())){ + data.setName(DesignComplianceFlowNodeKeyEnum.getTextByValue(data.getTaskDefinitionKey(),cut)); + }else if(StringUtils.equals(flowType, FlowTypeEnum.YZFHXSCLC.getValue())){ + data.setName(VerifyComplianceFlowNodeKeyEnum.getTextByValue(data.getTaskDefinitionKey(),cut)); + }else if(StringUtils.isNotEmpty(data.getTaskDefinitionKey())){ + data.setName(DesignComplianceNodeEnum.getTextByValue(data.getTaskDefinitionKey(),cut)); + } + }else if(StringUtils.isNotEmpty(data.getTaskDefinitionKey())){ data.setName(DesignComplianceNodeEnum.getTextByValue(data.getTaskDefinitionKey(),cut)); } + + if(StringUtils.isNotEmpty(data.getApprovalFile())){ + if(CollectionUtils.isNotEmpty(approvalFileList)){ + String approvalFileNames = approvalFileList.stream().filter(file -> { + boolean flag = false; + if (StringUtils.contains(data.getApprovalFile(), file.getId())) { + flag = true; + } + return flag; + }).map(OSSFile::getFileName).collect(Collectors.joining(",")); + + data.setApprovalFileName(approvalFileNames); + } + } } } } From 275595c743744d49d1927f7c489f1f85d96026b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Tue, 21 Mar 2023 10:34:39 +0800 Subject: [PATCH 210/645] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=B8=85=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 2 + jero-web/src/common/lang/zh-cn.js | 2 + .../components/circulationHistory.vue | 150 +++++++++++++++--- .../components/designCompliance.vue | 10 +- .../components/projectInformation.vue | 2 +- .../reviewedByThePersonInCharge.vue | 8 +- .../components/standardContent.vue | 2 +- 7 files changed, 147 insertions(+), 29 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index bcbef9056..55df1c4f6 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1671,5 +1671,7 @@ module.exports = { thePersonResponsibleForDesignCannotBeBlank:'The person responsible for designing the compliance process cannot be empty', recordmaintenance:'Record maintenance', module:'module', + designComplianceReviewAdmin:'Design Compliance Review', + missionAccomplished:'Mission Accomplished', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 67efb250f..fdbe640a5 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1771,4 +1771,6 @@ module.exports = { thePersonResponsibleForDesignCannotBeBlank:'设计符合性流程的责任人不能为空', recordmaintenance:'备案维护', module:'模块', + designComplianceReviewAdmin:'设计符合性审查', + missionAccomplished:'任务完成', } \ No newline at end of file diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue index 22873d08a..0ed128549 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue @@ -5,6 +5,28 @@ {{title}}
+
+ +
+
+ + + + 4 + + + + + 5 + + +
+
{{item.name}}
+
+
+
+
+
{ - this.dataSource = res + this.loading = true + getAction('/wkflow/processHistoryEO/list', query).then((res) => { + if (res.success) { + this.dataSource = res.result || [] + this.loading = false + } else { + this.dataSource = [] + this.loading = false + } }) }, viewFileClick(item) { @@ -131,7 +178,7 @@ \ No newline at end of file diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue index 214b844e4..f7d6c57c8 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue @@ -3,7 +3,7 @@
@@ -267,7 +268,7 @@ .drawer-bootom-button { position: absolute; bottom: 0; - z-index: 100; + z-index: 1002; width: 100%; border-top: 1px solid #e8e8e8; padding: 10px 16px; @@ -280,11 +281,10 @@ .drawer-review { position: absolute; bottom: 40px; - z-index: 100; - height: 384px; + z-index: 1001; + height: 404px; width: 100%; border-top: 1px solid #e8e8e8; - padding: 10px 16px; left: 0; background: #fff; border-radius: 0 0 2px 2px; diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/projectInformation.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/projectInformation.vue index 1967e44dd..fb6e95f39 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/projectInformation.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/projectInformation.vue @@ -100,7 +100,7 @@ \ No newline at end of file diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue index 9398cb80a..e76e6451d 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue @@ -48,7 +48,7 @@ import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header' export default { - name: 'SentList', + name: 'safetyPrecautions', mixins:[ResizeHeader, ResizeColumnProvide], data() { return { diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue index 26d9d7611..cc548dde6 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue @@ -1,319 +1,232 @@ \ No newline at end of file diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue index 41f65af28..b0ce6b6d0 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue @@ -7,7 +7,7 @@ :loading="loading" :pagination="false" :scroll="{x: '100%',y:'calc(100vh - 140px)'}" - rowKey="id" + :rowKey="(record)=>JSON.stringify(record)" :data-source="dataSource" :columns="columns" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" @@ -46,6 +46,8 @@ />
+
@@ -194,13 +196,25 @@ this.getList() }, methods: { + getData(name) { + if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { + this.$refs.confirmationdrawer.confirmation(JSON.parse(JSON.stringify(this.selectedRowKeys)), name) + } else { + this.$message.warning(this.$t('selectLeastOne')) + } + }, onSelectChange(value) { this.selectedRowKeys = value - console.log(this.selectedRowKeys) }, - designComplianceList(){ + designComplianceList() { this.getList() }, + + confirmationdrawerList() { + this.selectedRowKeys = [] + this.getList() + }, + RelatedItemsClick(item) { let newUrl = this.$router.resolve({ path: '/ProjectDetails', diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue index dedfb5f39..cf6340b07 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue @@ -26,13 +26,13 @@ :url="url" :standardContentQuery="queryProject" /> -
- -
+
+ +
@@ -131,8 +131,8 @@ return true }, isConfirm() { - if (!this.queryData.isDisplay){ - return false + if (!this.queryData.isDisplay) { + return false } return true } @@ -150,6 +150,8 @@ }) }, completeTask(value) { + this.textLoading = this.$t('Submitting') + this.loading = true let json = Object.assign(this.queryBy, value) let data = JSON.stringify(json).replace(/\"/g, '\'') Object.keys(value).forEach(res => { @@ -167,6 +169,7 @@ if (res.success) { this.$message.success(this.$t('OperationSuccessful')) this.visible = false + this.loading = false this.$emit('designComplianceList') } else { this.loading = false @@ -294,10 +297,12 @@ background: #fff; border-radius: 0 0 2px 2px; } - .circulationHistory{ + + .circulationHistory { margin-bottom: 436px; } - .circulationHistoryOne{ + + .circulationHistoryOne { margin-bottom: 30px; } \ No newline at end of file diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue index 2887164b3..6e94a9c68 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue @@ -100,7 +100,6 @@ - @@ -109,78 +108,74 @@ import dealtWith from './components/dealtWith' import doneList from './components/doneList' import SentList from './components/SentList' - import confirmationDrawer from './components/confirmationDrawer' export default { name: 'index', components: { dealtWith, doneList, - SentList, - confirmationDrawer + SentList }, data() { return { title: '', queryParam: { - projectName:this.$route.query.projectName?this.$route.query.projectName:'' + projectName: this.$route.query.projectName ? this.$route.query.projectName : '' }, toggleSearchStatus: false, taskTypeList: [ { - name:this.$t('confirmationOfRegulationsList'), - value:'10', + name: this.$t('confirmationOfRegulationsList'), + value: '10' }, { - name:this.$t('listTaskConfirmation'), - value:'1', + name: this.$t('listTaskConfirmation'), + value: '1' }, { - name:this.$t('designComplianceReview'), - value:'2', + name: this.$t('designComplianceReview'), + value: '2' }, { - name:this.$t('preHomeConfirmation'), - value:'3', + name: this.$t('preHomeConfirmation'), + value: '3' }, { - name:this.$t('verificationComplianceReview'), - value:'4', - }, + name: this.$t('verificationComplianceReview'), + value: '4' + } ], taskStatusList: [ { - name:this.$t('listToConfirm'), - value:'List to confirm', + name: this.$t('listToConfirm'), + value: 'List to confirm' }, { - name:this.$t('Finished'), - value:'Completed', + name: this.$t('Finished'), + value: 'Completed' }, { - name:this.$t('inquiry'), - value:'Inquiry', + name: this.$t('inquiry'), + value: 'Inquiry' }, { - name:this.$t('toSubmit'), - value:'To submit', + name: this.$t('toSubmit'), + value: 'To submit' }, { - name:this.$t('toAudit'), - value:'To audit', - }, + name: this.$t('toAudit'), + value: 'To audit' + } ], tabActive: this.$t('toDoProcess') } }, methods: { TaskresponsibilityrecognitionClick() { - this.$refs.confirmationdrawer.confirmation(1) - // this.title = this.$t('Taskresponsibilityrecognition') + this.$refs.dealtWithRef.getData(this.$t('Taskresponsibilityrecognition')) }, complianceConfirmationClick() { - this.$refs.confirmationdrawer.confirmation(2) - // this.title = this.$t('complianceConfirmation') + this.$refs.dealtWithRef.getData(this.$t('complianceConfirmation')) }, callback(value) { this.tabActive = value @@ -190,11 +185,11 @@ }, searchQuery() { if (this.tabActive == this.$t('toDoProcess')) { - this.$refs.dealtWithRef.searchQuery(this.queryParam ) + this.$refs.dealtWithRef.searchQuery(this.queryParam) } else if (this.tabActive == this.$t('processDone')) { - this.$refs.doneListRef.searchQuery(this.queryParam ) + this.$refs.doneListRef.searchQuery(this.queryParam) } else if (this.tabActive == this.$t('sentProcess')) { - this.$refs.SentListRef.searchQuery(this.queryParam ) + this.$refs.SentListRef.searchQuery(this.queryParam) } }, searchReset() { @@ -206,7 +201,7 @@ } else if (this.tabActive == this.$t('sentProcess')) { this.$refs.SentListRef.searchReset() } - }, + } // taskConfirmationHandlingClick() { // this.$router.push({ // path: '/toDoTaskConfirmation' From 8e2ae69df92ceff0a041d52899d054e25f244c50 Mon Sep 17 00:00:00 2001 From: cuijiaming <1410452759@qq.com> Date: Tue, 21 Mar 2023 17:36:05 +0800 Subject: [PATCH 219/645] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93-=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=BA=93=E8=AF=A6=E6=83=85-=E5=90=88=E8=A7=84?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E8=AE=A1=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../enums/ProjectTaskPlanningNameEnum.java | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java index cdc9ad495..4d7cbc3ac 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java @@ -1,16 +1,23 @@ package com.jero.modules.project.enums; public enum ProjectTaskPlanningNameEnum { - LIST_CONFIRMATION("法规清单确认","Regulation List Confirmation"), - LEGAL_TASK_CONFIRMATION("法规任务确认","Regulation Task Confirmation"), - DESIGN_DEADLINE("设计符合性确认","Design Compliance Confirmation"), +// LIST_CONFIRMATION("法规清单确认","Regulation List Confirmation"), +// LEGAL_TASK_CONFIRMATION("法规任务确认","Regulation Task Confirmation"), +// DESIGN_DEADLINE("设计符合性确认","Design Compliance Confirmation"), // PREHOMO_DEADLINE("Pre-Homo","Pre-Homo"), // ATTESTATION_START_TIME("认证开始","Certification begins"), // ATTESTATION_END_TIME("认证结束"," End of certification"), - PREHOMO_DEADLINE("摸底试验结束","Pre-Homo Confirmation"), // name:Pre-Homo value:Pre-Homo - ATTESTATION_START_TIME("认证试验结束","Homo Completion"),// name:认证开始 value:Certification begins +// PREHOMO_DEADLINE("摸底试验结束","Pre-Homo Confirmation"), // name:Pre-Homo value:Pre-Homo +// ATTESTATION_START_TIME("认证试验结束","Homo Completion"),// name:认证开始 value:Certification begins ATTESTATION_END_TIME("认证批准","Homo KO"),// name:认证结束 value:End of certification - VERIFY_DEADLINE("验证符合性确认","Validation Compliance Confirmation"), +// VERIFY_DEADLINE("验证符合性确认","Validation Compliance Confirmation"), + + LIST_CONFIRMATION("清单发布","List Publishing"), + LEGAL_TASK_CONFIRMATION("责任确认","Responsibility Confirmation"), + DESIGN_DEADLINE("设计核查","Design Verification"), + PREHOMO_DEADLINE("摸底开始","Get Started"), // name:Pre-Homo value:Pre-Homo + ATTESTATION_START_TIME("认证开始","Certification Start"),// name:认证开始 value:Certification begins + VERIFY_DEADLINE("验证核查","Verification And Verification"), ; String name; String value; From 3704058fbf96529f8404f78f40dbf1103ad13c92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Tue, 21 Mar 2023 17:48:40 +0800 Subject: [PATCH 220/645] =?UTF-8?q?OTA=E7=AE=A1=E7=90=86=E5=B7=A5=E5=85=B7?= =?UTF-8?q?-=E8=BD=A6=E5=9E=8B=E5=9F=BA=E6=9C=AC=E4=BF=A1-=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E6=8E=AA=E6=96=BD-=E7=B3=BB=E7=BB=9F=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E4=B8=8E=E5=8F=82=E6=95=B0-=E9=A9=BE=E9=A9=B6?= =?UTF-8?q?=E8=BE=85=E5=8A=A9=E5=8A=9F=E8=83=BD=E5=90=8D=E7=A7=B0=E4=B8=8E?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 5 +- jero-web/src/common/lang/zh-cn.js | 3 + .../components/beupgradedonline.vue | 462 +++++++--------- .../components/safetyPrecautions.vue | 459 +++++++--------- .../components/upgradedonline.vue | 494 ++++++++---------- 5 files changed, 604 insertions(+), 819 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 19e21e2ce..dcd256104 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1483,7 +1483,9 @@ module.exports = { technicalparameters:'Upgrade Bulletin technical parameters that may change (if any)', architecturetopologydiagram:'System - Electronic Controller Architecture Topology diagram (Attachment includes topology diagram description)', controllerparameter:'Controller parameter', - electroniccontrollername:'Electronic controller name "Hardware"', + electronic:'Electronic controller name', + electronicController:'Electronic controller name (Hardware)', + electroniccontrollername:'Electronic Controller Vehicle Safety Integrity Level (ASIL)', electroniccontrollerproductionenterprises:'Electronic controller production enterprises', electroniccontrollertype:'Electronic controller type', hardwareversioninformation:'Hardware version information', @@ -1683,4 +1685,5 @@ module.exports = { missionAccomplished:'Mission Accomplished', taskTypeMismatch:'Task Type Mismatch', taskNodeMismatch:'Task Node Mismatch', + ifNot:'If not, fill in "none" or "not involved"', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 7203f5c5f..2cea9fc04 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1585,6 +1585,8 @@ module.exports = { technicalparameters:'升级可能变更的《公告》技术参数(如有)', architecturetopologydiagram:'系统-电子控制器架构拓扑图(附件需含拓扑图介绍)', controllerparameter:'控制器参数', + electronic:'电子控制器名称', + electronicController:'电子控制器名称(硬件)', electroniccontrollername:'电子控制器汽车安全完整性等级(ASIL)', electroniccontrollerproductionenterprises:'电子控制器生产企业', electroniccontrollertype:'电子控制器型号', @@ -1783,4 +1785,5 @@ module.exports = { missionAccomplished:'任务完成', taskTypeMismatch:'任务类型不匹配', taskNodeMismatch:'任务节点不匹配', + ifNot:'如无，则填写“无”或“不涉及”', } \ No newline at end of file diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue index 26d9d7611..d0cf8e1dc 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue @@ -1,320 +1,227 @@ - \ No newline at end of file diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue index e76e6451d..f59092b64 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue @@ -1,118 +1,148 @@ - \ No newline at end of file diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue index 26d9d7611..e8ae9052e 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue @@ -1,359 +1,279 @@ \ No newline at end of file From 811af6477e5947814972f9ae18ffd565e347b7f6 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Tue, 21 Mar 2023 17:48:47 +0800 Subject: [PATCH 221/645] =?UTF-8?q?ota=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 5 +- jero-web/src/common/lang/zh-cn.js | 6 + .../otamanagement/upgradeactivity/index.vue | 5 +- .../auxiliaryupgradehavechanged.vue | 359 ++++++ .../components/historicalrecord.vue | 380 ++++++ .../informationaboutotherupgradetasks.vue | 171 +++ .../thetargetvehicleofthisupgrade.vue | 212 ++++ .../components/upgradehavechanged.vue | 359 ++++++ .../components/upgradeimpactassessment.vue | 366 ++++++ .../components/upgradetargetmodel.vue | 236 ++++ .../components/usernotification.vue | 212 ++++ .../upgradeactivityrecord/index.vue | 337 ++++++ .../components/historicalrecord.vue | 6 +- .../vehicleinformation/components/other.vue | 462 ++------ .../components/recordparameters.vue | 1030 +++++++++++------ .../vehicleinformation/index.vue | 1 + 16 files changed, 3468 insertions(+), 679 deletions(-) create mode 100644 jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue create mode 100644 jero-web/src/views/otamanagement/upgradeactivityrecord/components/historicalrecord.vue create mode 100644 jero-web/src/views/otamanagement/upgradeactivityrecord/components/informationaboutotherupgradetasks.vue create mode 100644 jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue create mode 100644 jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue create mode 100644 jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue create mode 100644 jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue create mode 100644 jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue create mode 100644 jero-web/src/views/otamanagement/upgradeactivityrecord/index.vue diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index b43dc25a6..000d312f5 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1681,5 +1681,8 @@ module.exports = { last:'Last', designComplianceReviewAdmin:'Design Compliance Review', missionAccomplished:'Mission Accomplished', - + yesisselected:'If Yes is selected, enter', + forwardXquantity:'For example, forward X quantity, backward X quantity, right X quantity, etc', + upgraderecordnumber:'Upgrade record number', + Modelandfunctionrecord:'Model and function record "Announcement" batch', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 5f037e2fc..512587443 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1781,4 +1781,10 @@ module.exports = { module:'模块', designComplianceReviewAdmin:'设计符合性审查', missionAccomplished:'任务完成', + yesisselected:'如选择“有”，请输入', + forwardXquantity:'如前向X数量，后向X数量，右向X数量等', + upgraderecordnumber:'升级备案编号', + Modelandfunctionrecord:'车型及功能备案《公告》批次', + + } \ No newline at end of file diff --git a/jero-web/src/views/otamanagement/upgradeactivity/index.vue b/jero-web/src/views/otamanagement/upgradeactivity/index.vue index c871bfabf..dbd4052f3 100644 --- a/jero-web/src/views/otamanagement/upgradeactivity/index.vue +++ b/jero-web/src/views/otamanagement/upgradeactivity/index.vue @@ -393,7 +393,10 @@ export default { }, // 创建车型 createvehicleandfunctionrecords() { - + this.$router.push({ + path: '/upgradeactivityrecord', + query: {} + }) }, viewProcessClick(row) { this.$refs.processInformationRef.getData(JSON.parse(JSON.stringify(row))) diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue new file mode 100644 index 000000000..26d9d7611 --- /dev/null +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue @@ -0,0 +1,359 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/historicalrecord.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/historicalrecord.vue new file mode 100644 index 000000000..aa0ebbeca --- /dev/null +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/historicalrecord.vue @@ -0,0 +1,380 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/informationaboutotherupgradetasks.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/informationaboutotherupgradetasks.vue new file mode 100644 index 000000000..96c1c5846 --- /dev/null +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/informationaboutotherupgradetasks.vue @@ -0,0 +1,171 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue new file mode 100644 index 000000000..a74062a45 --- /dev/null +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue @@ -0,0 +1,212 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue new file mode 100644 index 000000000..26d9d7611 --- /dev/null +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue @@ -0,0 +1,359 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue new file mode 100644 index 000000000..e76e6451d --- /dev/null +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue @@ -0,0 +1,366 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue new file mode 100644 index 000000000..75c4e1a4a --- /dev/null +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue @@ -0,0 +1,236 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue new file mode 100644 index 000000000..6803a69dd --- /dev/null +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue @@ -0,0 +1,212 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/index.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/index.vue new file mode 100644 index 000000000..18d88cf9d --- /dev/null +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/index.vue @@ -0,0 +1,337 @@ + + + + + + \ No newline at end of file diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/historicalrecord.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/historicalrecord.vue index be693d27b..aa0ebbeca 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/historicalrecord.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/historicalrecord.vue @@ -366,9 +366,9 @@ .titlebox{ width: 816px; height: 70px; - margin-top: 10px; - margin-left: 26px; - border: #191E29 solid 1px; + margin-top: 5px; + margin-left: 9px; + border-left: #A3AAAD solid 1px; } .titlebox-text{ line-height: 5; diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/other.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/other.vue index 26d9d7611..8dd986423 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/other.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/other.vue @@ -1,359 +1,129 @@ - \ No newline at end of file diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue index 26d9d7611..787fb4542 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue @@ -1,359 +1,733 @@ \ No newline at end of file diff --git a/jero-web/src/views/otamanagement/vehicleinformation/index.vue b/jero-web/src/views/otamanagement/vehicleinformation/index.vue index 69ba8750d..897410f44 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/index.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/index.vue @@ -1,3 +1,4 @@ + - \ No newline at end of file diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/historicalrecord.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/historicalrecord.vue index aa0ebbeca..976e388e6 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/historicalrecord.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/historicalrecord.vue @@ -30,7 +30,9 @@
- +
+ {{$t('returntofill')}} +
@@ -119,6 +121,9 @@ this.getList() }, methods: { + back(){ + this.$emit('historicalrecordup') + }, monitoringProcessClick(row){ let newUrl = this.$router.resolve({ path: '/processDetails', @@ -377,4 +382,8 @@ .titlebox-text-text{ margin-left: 60px; } + .bootom-button{ + position: relative; + left: 30%; + } \ No newline at end of file diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/informationaboutotherupgradetasks.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/informationaboutotherupgradetasks.vue index 96c1c5846..edac44790 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/informationaboutotherupgradetasks.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/informationaboutotherupgradetasks.vue @@ -99,7 +99,7 @@ export default { \ No newline at end of file diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue index e76e6451d..63dd7b3aa 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue @@ -1,366 +1,466 @@ - \ No newline at end of file diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue index 6803a69dd..b400c4bc6 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue @@ -113,10 +113,10 @@ export default { }, methods: { next(){ - this.$emit('upgradeRequirementsdown') + this.$emit('recordparametersdown') }, last(){ - this.$emit('upgradeRequirementsup') + this.$emit('recordparametersup') }, dateChange(item) { this.formInline[item.db_field_name] = this.formInline[item.db_field_name] ? moment(this.formInline[item.db_field_name]).format('YYYY-MM-DD') : '' diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/index.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/index.vue index 18d88cf9d..aa920ed34 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/index.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/index.vue @@ -7,21 +7,26 @@ {{$t('fillintherecord')}}
+
+ + {{$t('historicalrecord')}} +
- + - + - + - + - + @@ -31,7 +36,7 @@ - + @@ -206,6 +211,12 @@ export default { this.pageSizehistory = pageSize this.bussLogList() }, + historicalrecordClick(){ + this.tabActive = this.$t('historicalrecord') + }, + historicalrecordup(){ + this.tabActive = this.$t('upgradetargetmodel') + }, basicInformationForm(){ this.tabActive = this.$t('thetargetvehicleofthisupgrade') }, diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue index d0cf8e1dc..ddf7a4bbc 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue @@ -54,6 +54,9 @@ {{$t('delete')}} +
+ {{$t('uploadattachment')}} +
{{$t('preservation')}} {{$t('last')}} diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/historicalrecord.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/historicalrecord.vue index aa0ebbeca..976e388e6 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/historicalrecord.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/historicalrecord.vue @@ -30,7 +30,9 @@
- +
+ {{$t('returntofill')}} +
@@ -119,6 +121,9 @@ this.getList() }, methods: { + back(){ + this.$emit('historicalrecordup') + }, monitoringProcessClick(row){ let newUrl = this.$router.resolve({ path: '/processDetails', @@ -377,4 +382,8 @@ .titlebox-text-text{ margin-left: 60px; } + .bootom-button{ + position: relative; + left: 30%; + } \ No newline at end of file diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue index 787fb4542..41b6586b4 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue @@ -12,28 +12,247 @@
+
+
+ {{$t('componentname')}} + + {{$t('networksecurityrequirements')}} + + + {{$t('millimeterwaveradar')}} + + + {{$t('ultrasonicradar')}} + + + + {{$t('camera')}} + + + {{$t('asternimage')}} + + + {{$t('Monocularbinocularmultiocular')}} + + + + + {{$t('driverattentionmonitoringsystem')}} + + + {{$t('driversurveillancecamera')}} + + + {{$t('drivermonitoringinfraredsensor')}} + + + + + {{$t('positioningandnavigationsystem')}} + + + {{$t('vehiclesatellitepositioningequipment')}} + + + {{$t('inertialnavigationsystem')}} + + + {{$t('wheelspeedmeter')}} + + + {{$t('highprecisionmap')}} + + + {{$t('electronicfence')}} + + + + {{$t('vehiclecommunicationsystem')}} + + + + {{$t('signalingdevices')}} + + + {{$t('driverassistancefunctioncontrols')}} + + + {{$t('drivingassistancefunctionindicatorsignaldevice')}} + + + {{$t('steerinwheelreleaseindicatorsignaldevice')}} + + + {{$t('driverattentionindicatorsignaldevice')}} + + + + {{$t('automaticDrivingDataRecordingSystem')}} + + + {{$t('eventdatarecordingsystem')}} + +
+
+ {{$t('fillincontent')}} + + + {{ $t('yes') }} + {{ $t('not') }} + + + + + {{ $t('yes') }} + {{ $t('not') }} + + + + + {{ $t('yes') }} + {{ $t('not') }} + + + + + {{ $t('yes') }} + {{ $t('not') }} + + + + + {{ $t('yes') }} + {{ $t('not') }} + + + + + {{ $t('yes') }} + {{ $t('not') }} + + + + + {{ $t('yes') }} + {{ $t('not') }} + + + + + {{ $t('yes') }} + {{ $t('not') }} + + + + + {{ $t('yes') }} + {{ $t('not') }} + + + + + {{ $t('yes') }} + {{ $t('not') }} + + + + + {{ $t('yes') }} + {{ $t('not') }} + + + + + {{ $t('yes') }} + {{ $t('not') }} + + + + + {{ $t('yes') }} + {{ $t('not') }} + + + + + {{ $t('yes') }} + {{ $t('not') }} + + + + + {{ $t('yes') }} + {{ $t('not') }} + + + + + {{ $t('yes') }} + {{ $t('not') }} + + + + + {{ $t('yes') }} + {{ $t('not') }} + + + + + {{ $t('yes') }} + {{ $t('not') }} + + + + + {{ $t('yes') }} + {{ $t('not') }} + + +
+
+ {{$t('ParameterName')}} + + {{item.ParameterName}} +
+
+
+ {{$t('fillincontent')}} + + +
+
+
- - - + + + {{ $t('yes') }} {{ $t('not') }} - - - + + + + + + + {{$t('uploadattachment')}} + + + + {{$t('addcontroller')}} + {{$t('delete')}}
@@ -57,6 +276,7 @@ export default { }, data() { return { + radioList:9, dataSource: [ { key: '1', @@ -476,121 +696,87 @@ export default { url: { }, queryParam: {}, + dataSourceList: [ + { + key:1, + systemclass: 'ceshi', + vaule: 2, + } + ], columns: [ { title: this.$t('componentname'), align: 'left', dataIndex: 'componentname', - width: 170, - // customRender: (value, row, index) => { - // const obj = { - // children: '', - // attrs: {}, - // }; - // if(index === 0){ // 第一行数据开始，跨行合并的长度为数据data的长度 - // obj.attrs.rowSpan = 2; - // obj.children = this.$t('networksecurityrequirements') - // }else if(index === 2){ // 第一行数据开始，跨行合并的长度为数据data的长度 - // obj.attrs.rowSpan = 6; - // obj.children = this.$t('upgradefunctionrequirements') - // }else if(index === 8){ - // obj.attrs.rowSpan = 2; - // obj.children = this.$t('usernotificationrequirement') - // }else{ - // obj.attrs.rowSpan = 0 - // } - // return obj; - // } + ellipsis: true, + width: 170 }, { title: this.$t('configuration'), align: 'left', dataIndex: 'configuration', - scopedSlots: { customRender: 'configuration' }, - width: 170, - // customRender: (value, row, index) => { - // const obj = { - // children: '', - // attrs: {}, - // }; - // if(index === 0){ // 第一行数据开始，跨行合并的长度为数据data的长度 - // obj.attrs.rowSpan = 2; - // obj.children = this.$t('networksecurityrequirements') - // }else if(index === 2){ // 第一行数据开始，跨行合并的长度为数据data的长度 - // obj.attrs.rowSpan = 6; - // obj.children = this.$t('upgradefunctionrequirements') - // }else if(index === 8){ - // obj.attrs.rowSpan = 2; - // obj.children = this.$t('usernotificationrequirement') - // }else{ - // obj.attrs.rowSpan = 0 - // obj.children = this.$t('usernotificationrequirement') - // } - // return obj; - // } - // customCell: (record, rowIndex) => { - // // return this.mergeCellsSlot(record, rowIndex); - // const obj = { - // children: '', - // attrs: {}, - // style: {display: record.row === 0 ? 'none' : undefined}, - // }; - // if(rowIndex === 0){ // 第一行数据开始，跨行合并的长度为数据data的长度 - // obj.attrs.rowSpan = 2; - // }else if(rowIndex === 2){ - // obj.attrs.rowSpan = 6; - // }else if(rowIndex === 8){ - // obj.attrs.rowSpan = 2; - // }else{ - // obj.attrs.rowSpan = 0 - // } - // return obj; - // // return { - // // style: {display: record.row === 0 ? 'none' : undefined}, - // // attrs: { - // // rowSpan: record.row, - // // } - // // } - // } - }, - { - title: this.$t('ParameterName'), - align: 'left', - dataIndex: 'ParameterName', - scopedSlots: { customRender: 'ParameterName' }, + scopedSlots: { customRender: 'systemclass' }, ellipsis: true, width: 170 }, { - title: this.$t('fillincontent'), + title: this.$t('controllerparameter'), align: 'left', - dataIndex: 'fillincontent', - scopedSlots: { customRender: 'fillincontent' }, + dataIndex: 'controllerparameter', ellipsis: true, - width: 370, - - // customRender: (value, row, index) => { - // const child = this.$createElement('button', { - // domProps: { - // innerHTML: value - // }, - // on: { - // click: () =>{this.click(row)} - // } - // }); - // const obj = { - // children: child, - // attrs: {}, - // }; - // if(index === 0){ // 第一行数据开始，跨行合并的长度为数据data的长度 - // obj.attrs.rowSpan = 10; - // }else{ - // obj.attrs.rowSpan = 0 - // } - // return obj - // - // } + width: 170, + children: [ + { + title: this.$t('controllername'), + align: 'left', + dataIndex: 'controllername', + ellipsis: true, + width: 170 + }, + { + title: this.$t('hardwarespecificationmodel'), + align: 'left', + dataIndex: 'hardwarespecificationmodel', + ellipsis: true, + width: 170 + }, + { + title: this.$t('hardwaremanufacturer'), + align: 'left', + dataIndex: 'hardwaremanufacturer', + ellipsis: true, + width: 170 + }, + { + title: this.$t('softwareversion'), + align: 'left', + dataIndex: 'softwareversion', + ellipsis: true, + width: 170 + }, + { + title: this.$t('softwaredevelopmententerprise'), + align: 'left', + dataIndex: 'softwaredevelopmententerprise', + ellipsis: true, + width: 170 + }, + { + title: this.$t('layoutposition'), + align: 'left', + dataIndex: 'layoutposition', + ellipsis: true, + width: 170 + }, + ] }, + { + title: this.$t('operation'), + align: 'left', + fixed: 'right', + width: 200, + scopedSlots: { customRender: 'operation' } + } ], selectedRowKeys: [], fileList:{}, @@ -730,4 +916,148 @@ button{ height: 38px; margin-top: 2px; } +.content-text{ + display: inline-block; + float: left; + border: #e8e8e8 solid 1px; + width: 100%; + line-height: 50px; + height: 50px; +} +.radio-text{ + display: inline-block; + float: left; + border: #e8e8e8 solid 1px; + width: 100%; + height: 200px; + line-height: 200px; +} +.radio-text-two{ + display: inline-block; + float: left; + border: #e8e8e8 solid 1px; + width: 100%; + height: 100px; + line-height: 100px; +} +.radio-text-three{ + display: inline-block; + float: left; + border: #e8e8e8 solid 1px; + width: 100%; + height: 50px; + line-height: 50px; +} +.radio-text-four{ + display: inline-block; + float: left; + border: #e8e8e8 solid 1px; + width: 100%; + height: 250px; + line-height: 250px; +} +.radio-text-five{ + display: inline-block; + float: left; + border: #e8e8e8 solid 1px; + width: 100%; + height: 150px; + line-height: 150px; +} +.text-box{ + display: inline-block; + float: left; + border: #e8e8e8 solid 1px; + width: 100%; + height: 400px; + line-height: 400px; +} +.text-box-two{ + display: inline-block; + float: left; + border: #e8e8e8 solid 1px; + width: 100%; + height: 450px; + line-height: 450px; +} +.text-text{ + display: inline-block; + float: left; + border: #e8e8e8 solid 1px; + width: 50%; + height: 400px; + line-height: 400px; +} +.text-text-two{ + display: inline-block; + float: left; + border: #e8e8e8 solid 1px; + width: 50%; + height: 200px; + line-height: 200px; +} +.text-text-three{ + display: inline-block; + float: left; + border: #e8e8e8 solid 1px; + width: 50%; + height: 100px; + line-height: 100px; +} +.text-text-five{ + display: inline-block; + float: left; + border: #e8e8e8 solid 1px; + width: 50%; + height: 50px; + line-height: 50px; +} +.text-box-three{ + isplay: inline-block; + float: left; + border: #e8e8e8 solid 1px; + width: 100%; + height: 250px; + line-height: 250px; +} +.text-box-four{ + isplay: inline-block; + float: left; + border: #e8e8e8 solid 1px; + width: 100%; + height: 600px; + line-height: 600px; +} +.four-text-text{ + isplay: inline-block; + float: left; + border: #e8e8e8 solid 1px; + width: 50%; + height: 600px; + line-height: 600px; +} +.four-text{ + isplay: inline-block; + float: left; + border: #e8e8e8 solid 1px; + width: 50%; + height: 150px; + line-height: 150px; +} +.text-box-five{ + isplay: inline-block; + float: left; + border: #e8e8e8 solid 1px; + width: 100%; + height: 100px; + line-height: 100px; +} +span{ + overflow: hidden; /*超出部分隐藏*/ + text-overflow: ellipsis; /*超出部分省略号表示*/ + white-space: nowrap; +} +.item-input{ + margin-top: 9px; +} \ No newline at end of file diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue index e8ae9052e..791eae4e8 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue @@ -42,6 +42,9 @@ {{$t('delete')}} +
+ {{$t('uploadattachment')}} +
{{$t('preservation')}} {{$t('last')}} diff --git a/jero-web/src/views/otamanagement/vehicleinformation/index.vue b/jero-web/src/views/otamanagement/vehicleinformation/index.vue index 897410f44..2161d144b 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/index.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/index.vue @@ -7,31 +7,36 @@ {{$t('fillintherecord')}}
+
+ + {{$t('historicalrecord')}} +
- + - + - + - + - + - + - + - + @@ -206,6 +211,9 @@ export default { this.pageSizehistory = pageSize this.bussLogList() }, + historicalrecordClick(){ + this.tabActive = this.$t('historicalrecord') + }, basicInformationForm(){ this.tabActive = this.$t('onlineupgraderequirements') }, @@ -242,6 +250,9 @@ export default { otherup(){ this.tabActive = this.$t('recordparameters') }, + historicalrecordup(){ + this.tabActive = this.$t('basicinformationofvehicletype') + }, // taskConfirmationHandlingClick() { // this.$router.push({ // path: '/toDoTaskConfirmation' From fd4946a43ac3a7b6f193309a787f8d48d2e8a99b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Wed, 22 Mar 2023 18:06:25 +0800 Subject: [PATCH 232/645] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E7=9A=84=E6=B5=81=E7=A8=8B=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E5=BC=B9=E6=A1=86=E3=80=81=E6=89=B9=E9=87=8F=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E3=80=81=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 4 + jero-web/src/common/lang/zh-cn.js | 4 + .../components/batSetting.vue | 34 +++- .../components/listEditModel.vue | 42 ++--- .../components/listOfRegulations.vue | 166 +++++++++++------- 5 files changed, 154 insertions(+), 96 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 65d6c5a03..dc512c442 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1690,6 +1690,10 @@ module.exports = { taskTypeMismatch:'Task Type Mismatch', taskNodeMismatch:'Task Node Mismatch', ifNot:'If not, fill in "none" or "not involved"', + designComplianceProcess:'Design Compliance Process', + validationComplianceProcess:'Validation Compliance Process', + onlyDataInTheReminderProcessBanBeProcessed:'Only data in the reminder process can be processed', + expeditionProcess:'Expedition Process', addfunction:'Add function', controllername:'Controller name', hardwaremanufacturer:'Hardware manufacturer', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 28f8158b6..8d7024f75 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1767,6 +1767,8 @@ module.exports = { theDataYouSelectedContainsSkip:'您所勾选的数据中包含交付物类型为空的数据；请确认是否跳过', designComplianceProcessFor:'的设计符合性流程', validationComplianceProcessFor:'的验证符合性流程', + designComplianceProcess:'设计符合性流程', + validationComplianceProcess:'验证符合性流程', thePersonResponsibleForVerifyingEmpty:'验证符合性流程的责任人不能为空', theDeadlineComplianceProcessCannotEmpty:'验证符合性流程的截止时间不能为空', theDeadlineForTheDesignCannotBeEmpty:'设计符合性流程的截止时间不能为空', @@ -1795,4 +1797,6 @@ module.exports = { hardwaremanufacturer:'硬件生产企业', softwareversion:'软件版本', returntofill:'返回填写', + onlyDataInTheReminderProcessBanBeProcessed:'只能催办流程中的数据', + expeditionProcess:'催办流程', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/batSetting.vue b/jero-web/src/views/projectManagement/components/batSetting.vue index e4371c4e2..ff8a45a32 100644 --- a/jero-web/src/views/projectManagement/components/batSetting.vue +++ b/jero-web/src/views/projectManagement/components/batSetting.vue @@ -100,13 +100,26 @@ :title="$t('engineeringInterfacePerson')">{{$t('engineeringInterfacePerson')}}
- + + + + {{ item.name }} + + + + + + + + + + @@ -347,7 +360,8 @@ rules: {}, ids: [], code: '', - regulatoryEngineerList: [] + regulatoryEngineerList: [], + engineeringInterfacePersonList:[], } }, mounted() { @@ -355,6 +369,7 @@ methods: { dutyTerritoryChange(event) { this.formInline.regulationOwnerId = undefined + this.formInline.engineeringInterfacePerson = undefined this.formInline = {...this.formInline} this.queryPersonByProject(event) }, @@ -366,6 +381,7 @@ getAction('/project/projectRelatedPersonnel/queryPersonByProjectId', query).then((res) => { if (res.success) { this.regulatoryEngineerList = res.result.lawEngineerList //法规工程师 + this.engineeringInterfacePersonList = res.result.engineeringInterfacePersonList //工程接口人 } }) }, @@ -375,6 +391,8 @@ }, edit(data, code) { this.visible = true + this.regulatoryEngineerList = [] + this.engineeringInterfacePersonList = [] this.getDeliverableTree() this.code = code this.$nextTick(() => { diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue index 7e428bf1b..ed29e8b10 100644 --- a/jero-web/src/views/projectManagement/components/listEditModel.vue +++ b/jero-web/src/views/projectManagement/components/listEditModel.vue @@ -252,26 +252,26 @@ {{$t('engineeringInterfacePerson')}}
- - - - - - - - - - - - - - + + + + + + + + + + + {{ item.name }} + + +
@@ -1389,7 +1389,7 @@ this.formInline[item.db_field_name] = this.formInline[item.db_field_name] ? moment(this.formInline[item.db_field_name]).format('YYYY-MM-DD') : '' }, PersonnelSelectionChange(value, id) { - this.formInline[value + '_id'] = id + this.formInline[value] = id this.formInline = { ...this.formInline } } } diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 48c48daf7..44946a6ed 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -472,15 +472,16 @@
* - {{ $t('roleSwitching') }} + {{ $t('expeditionProcess') }}
- - - - - - {{ item.roleName }} + + + + + {{ item.name }} @@ -547,6 +548,26 @@ visibleQuestion: false, confirmLoadingQuestion: false, roleSwitchingList: [], + formInlineQuestion: {}, + rulesRoleQuestion: { + questionStatus: [ + { + required: true, + message: this.$t('expeditionProcess') + this.$t('cannotEmpty'), + trigger: 'change' + } + ] + }, + questionList: [ + { + value: '1', + name: this.$t('designComplianceProcess') + }, + { + value: '2', + name: this.$t('validationComplianceProcess') + } + ], listTitle: '', orderBy: '1', orderByField: '', @@ -1132,7 +1153,9 @@ dataWarningList: [], completeTaskList: [], requestsNum: 0, - JTextLoading: false + JTextLoading: false, + questionIdList: [], + questionWarning: [] } }, @@ -1481,14 +1504,46 @@ }) }, + handleOkQuestion() { + this.$refs.ruleFormQuestion.validate(valid => { + let formInlineQuestion = JSON.parse(JSON.stringify(this.formInlineQuestion)) + if (formInlineQuestion.questionStatus && formInlineQuestion.questionStatus.length > 0) { + formInlineQuestion.questionStatus = formInlineQuestion.questionStatus.join(',') + } + let query = { + ids: this.questionIdList.join(','), + projectLibraryId: this.$route.query.id, + questionStatus: formInlineQuestion.questionStatus + } + this.confirmLoadingQuestion = true + postAction('project/projectLawsInventoryEO/expediting', query).then((res) => { + if (res.success) { + this.$message.success(this.$t('OperationSuccessful')) + this.selectedRowKeys = [] + this.getList() + this.visibleQuestion = false + this.confirmLoadingQuestion = false + if (this.questionWarning && this.questionWarning.length > 0) { + this.promptInformation(this.questionWarning) + } + } else { + this.$message.warning(this.$t('operationFailed')) + } + }) + }) + }, + handleCancelQuestion() { + this.visibleQuestion = false + }, //催办 questionClick() { if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys)) let isTrue let content = [] - let idList = [] + this.questionIdList = [] let detailedWarningList = [] + this.questionWarning = [] for (let i = 0; i < this.dataSource.length; i++) { for (let j = 0; j < selectedRowKeys.length; j++) { if (this.dataSource[i].id == selectedRowKeys[j]) { @@ -1497,72 +1552,40 @@ } } for (let i = 0; i < content.length > 0; i++) { - if (this.roleSwitchingCode == '0') { - //为studio角色时在通过判断流程状态是否为清单待校核 - if (content[i].verifyFlowStatus == 'List to be checked' || - content[i].designFlowStatus == 'List to be checked') { - idList.push(content[i].id) - } else { - detailedWarningList.push( - < div > { content[i].serialNumber + this.$t('pleaseSelectTheDataverificationVerified') } < /div> - ) - } - } else if (this.roleSwitchingCode == '1') { - if (content[i].verifyFlowStatus == 'Task to be confirmed' || - content[i].designFlowStatus == 'Task to be confirmed') { - idList.push(content[i].id) - } else { - detailedWarningList.push( - < div > { content[i].serialNumber + this.$t('pleaseSelectTheDataverificationVerified') } < /div> - ) - } - } else if (this.roleSwitchingCode == '30') { - if (content[i].verifyFlowStatus == 'List to be checked' || - content[i].designFlowStatus == 'List to be checked') { - idList.push(content[i].id) - } else { - detailedWarningList.push( - < div > { content[i].serialNumber + this.$t('pleaseSelectTheDataverificationVerified') } < /div> - ) - } + if (content[i].verifyFlowStatus == 'List to be checked' || + content[i].designFlowStatus == 'List to be checked' || + content[i].verifyFlowStatus == 'Task to be confirmed' || + content[i].designFlowStatus == 'Task to be confirmed' || + content[i].verifyFlowStatus == 'Results to be submitted' || + content[i].designFlowStatus == 'Results to be submitted' || + content[i].verifyFlowStatus == 'Results to be reviewed' || + content[i].designFlowStatus == 'Results to be reviewed') { + this.questionIdList.push(content[i].id) + } else { + detailedWarningList.push(content[i].serialNumber) } } - if (idList && idList.length > 0) { - this.questionAction(idList, detailedWarningList) + if (detailedWarningList && detailedWarningList.length > 0) { + this.questionWarning.push( + < div > { + detailedWarningList + .join(',') + this.$t('conditionsNotMet') + this.$t('onlyDataInTheReminderProcessBanBeProcessed') + } < /div>) + } + if (this.questionIdList && this.questionIdList.length > 0) { + this.visibleQuestion = true + this.$nextTick(() => { + this.formInlineQuestion = {} + this.$refs.ruleFormQuestion.clearValidate() + }) } else { - this.promptInformation(detailedWarningList) + this.promptInformation(this.questionWarning) } } else { this.$message.warning(this.$t('selectLeastOne')) } }, - //催办的接口 - questionAction(selectedRowKeys, detailedWarningList) { - let _this = this - this.$confirm({ - content: _this.$t('ConfirmQuestion'), - onOk() { - let query = { - ids: selectedRowKeys.join(','), - projectLibraryId: _this.$route.query.id - } - postAction('project/projectLawsInventoryEO/expediting', query).then((res) => { - if (res.success) { - _this.$message.success(_this.$t('OperationSuccessful')) - _this.selectedRowKeys = [] - _this.getList() - if (detailedWarningList && detailedWarningList.length > 0) { - _this.promptInformation(detailedWarningList) - } - } else { - _this.$message.warning(_this.$t('operationFailed')) - } - }) - } - }) - }, - //定版 fixedPlateClick() { if (this.dataSource && this.dataSource.length > 0) { @@ -1885,6 +1908,7 @@ } }) }, + getList() { let roleCode = this.roleSwitchingCode let queryParam = JSON.parse(JSON.stringify(this.queryParam)) @@ -1940,6 +1964,7 @@ } }) }, + onCheckAllChange(e) { this.checkedList = e.target.checked ? this.customizeList.map(item => item.field) : [] this.selectedValue = this.checkedList @@ -1985,6 +2010,7 @@ } }) }, + getPersonnelList() { this.getList() }, @@ -2174,6 +2200,7 @@ this.$message.warning(this.$t('selectLeastOne')) } }, + submitClick(dataList, num) { let content = [] let designList = [] @@ -2236,6 +2263,7 @@ _this.submitAdmin(dataList) } }, + submitAdmin(dataList) { let _this = this this.requestsNum = 0 @@ -2333,6 +2361,7 @@ postAction('/project/projectCommentEO/add', query).then((res) => { }) }, + rejectCauseAdd(rejectCause, ids) { let rejectTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss') let query = { @@ -2346,6 +2375,7 @@ }) }, + handleCancelComment() { this.visibleComment = false }, @@ -2385,9 +2415,11 @@ } }) }, + customizeClick() { this.$refs.customizeListRef.transferModel(this.columnsAll) }, + bringInRelevantPersonnelClick() { let _this = this if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { From 2d84b8903142d98c3e695611f03bb0023200e959 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Wed, 22 Mar 2023 18:08:21 +0800 Subject: [PATCH 233/645] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E7=9A=84=E6=B5=81=E7=A8=8B=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E5=BC=B9=E6=A1=86=E3=80=81=E6=89=B9=E9=87=8F=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E3=80=81=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/projectManagement/components/listOfRegulations.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 44946a6ed..3da734972 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -653,7 +653,7 @@ children: [ { title: this.$t('personLiable'), - dataIndex: 'designDutyName', + dataIndex: 'designDutyIdName', align: 'left', width: 180, ellipsis: true @@ -688,7 +688,7 @@ children: [ { title: this.$t('personLiable'), - dataIndex: 'verifyDutyName', + dataIndex: 'verifyDutyIdName', align: 'left', width: 180, ellipsis: true From da7c10e4b396978a8541fc1cf34fe85e41e82d92 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Wed, 22 Mar 2023 18:13:36 +0800 Subject: [PATCH 234/645] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=8F=91=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feishu/enums/TemplateInfoEnum2.java | 11 ++ .../ProjectLawsInventoryEOServiceImpl.java | 133 +++++++++++++++++- 2 files changed, 143 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/enums/TemplateInfoEnum2.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/enums/TemplateInfoEnum2.java index 08ffc61a2..c05abd5cb 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/enums/TemplateInfoEnum2.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/enums/TemplateInfoEnum2.java @@ -41,6 +41,17 @@ public enum TemplateInfoEnum2 { REGULATION_LIST_RELEASE2("法规清单发布-公用消息-绿色","ctp_AAuPKJ9Cj9w5"), REGULATION_LIST_RELEASE3("法规清单发布-公用消息-红色","ctp_AAu2lBIgaB79"), REGULATION_LIST_RELEASE4("法规清单发布-公用消息-黄色","ctp_AAuPh3LJWg1x"), + + /** + * 法规任务确认消息 + */ + REGULATION_TASK_CONFIRMATION1("法规任务确认-公用消息-绿色-无流程类型","ctp_AAuLRr2QIbMb"), + REGULATION_TASK_CONFIRMATION2("法规任务确认-公用消息-红色-无流程类型","ctp_AAuL6mDxffmu"), + REGULATION_TASK_CONFIRMATION3("法规任务确认-公用消息-黄色-无流程类型","ctp_AAuLRr2Qzyj0"), + REGULATION_TASK_CONFIRMATION4("法规任务确认-公用消息-绿色-有流程类型","ctp_AAuL6mDxf8l1"), + REGULATION_TASK_CONFIRMATION5("法规任务确认-公用消息-红色-有流程类型","ctp_AAuPWTSU2Fg2"), + REGULATION_TASK_CONFIRMATION6("法规任务确认-公用消息-黄色-有流程类型","ctp_AAuLRr2Qzkbo"), + ; String name; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index f79b294cf..bb1c9f47f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -477,6 +477,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl params = new HashMap<>(); + params.put("contentCn","您好，您以下任务已被发起人撤回。"); + params.put("contentEn","Hello! Your task has been withdrawn by the initiator."); + params.put("projectLibraryId", projectLawsInventoryEO.getProjectLibraryId()); + params.put("endTime",endTime); + params.put("userIdList",Arrays.asList(regulationOwnerId.split(","))); + params.put("serialNumbers",projectLawsInventoryOld.getSerialNumber()); + this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(),params); + } + } + if((projectLawsInventoryOld.getDesignDueDate() != null && projectLawsInventoryEO.getDesignDueDate() != null) && toBeCheckedFlag){ + if(!projectLawsInventoryOld.getDesignDueDate().equals(projectLawsInventoryEO.getDesignDueDate())){ + String endTime = ""; + if(projectLawsInventoryOld.getInventoryAffirmDueDate() != null){ + endTime = DateUtils.formatDate(projectLawsInventoryOld.getInventoryAffirmDueDate()); + } + + String regulationOwnerId = projectLawsInventoryOld.getRegulationOwnerId(); + // 给法规工程师发消息 + Map params = new HashMap<>(); + params.put("contentCn","您好，以下符合性任务的截止时间已被发起人修改。"); + params.put("contentEn","Hello! The due date of the compliance task has been modified by the initiator."); + params.put("projectLibraryId", projectLawsInventoryEO.getProjectLibraryId()); + params.put("endTime",endTime); + params.put("userIdList",Arrays.asList(regulationOwnerId.split(","))); + params.put("serialNumbers",projectLawsInventoryOld.getSerialNumber()); + this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(),params); + } + } + if((projectLawsInventoryOld.getVerifyDueDate() != null && projectLawsInventoryEO.getVerifyDueDate() != null) && toBeCheckedFlag){ + if(!projectLawsInventoryOld.getVerifyDueDate().equals(projectLawsInventoryEO.getVerifyDueDate())){ + String endTime = ""; + if(projectLawsInventoryOld.getInventoryAffirmDueDate() != null){ + endTime = DateUtils.formatDate(projectLawsInventoryOld.getInventoryAffirmDueDate()); + } + + String regulationOwnerId = projectLawsInventoryOld.getRegulationOwnerId(); + // 给法规工程师发消息 + Map params = new HashMap<>(); + params.put("contentCn","您好，以下符合性任务的截止时间已被发起人修改。"); + params.put("contentEn","Hello! The due date of the compliance task has been modified by the initiator."); + params.put("projectLibraryId", projectLawsInventoryEO.getProjectLibraryId()); + params.put("endTime",endTime); + params.put("userIdList",Arrays.asList(regulationOwnerId.split(","))); + params.put("serialNumbers",projectLawsInventoryOld.getSerialNumber()); + this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(),params); + } + } + + // 设计符合性 任务待确认消息 标识 + boolean toBeConfirmedDesignFlag = ( + StringUtils.equals(projectLawsInventoryOld.getDesignFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()) + || StringUtils.equals(projectLawsInventoryOld.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()) + ); + + if((projectLawsInventoryOld.getDesignDutyId() != null && projectLawsInventoryEO.getDesignDutyId() != null) && toBeConfirmedDesignFlag){ + if(!projectLawsInventoryOld.getDesignDutyId().equals(projectLawsInventoryEO.getDesignDutyId())){ + String endTime = ""; + if(projectLawsInventoryOld.getDesignDueDate() != null){ + endTime = DateUtils.formatDate(projectLawsInventoryOld.getDesignDueDate()); + } + + String regulationOwnerId = projectLawsInventoryOld.getRegulationOwnerId(); + // 给法规工程师发消息 + Map params = new HashMap<>(); + params.put("contentCn","您好，您以下任务已被发起人撤回。"); + params.put("contentEn","Hello! Your task has been withdrawn by the initiator."); + params.put("projectLibraryId", projectLawsInventoryEO.getProjectLibraryId()); + params.put("endTime",endTime); + params.put("userIdList",Arrays.asList(projectLawsInventoryOld.getDesignDutyId().split(","))); + params.put("serialNumbers",projectLawsInventoryOld.getSerialNumber()); + this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(),params); + } + } + + // 验证符合性 任务待确认消息 标识 + boolean toBeConfirmedVerifyFlag = ( + StringUtils.equals(projectLawsInventoryOld.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()) + || StringUtils.equals(projectLawsInventoryOld.getVerifyFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()) + ); + if((projectLawsInventoryOld.getVerifyDutyId() != null && projectLawsInventoryEO.getVerifyDutyId() != null) && toBeConfirmedVerifyFlag){ + if(!projectLawsInventoryOld.getVerifyDutyId().equals(projectLawsInventoryEO.getVerifyDutyId())){ + String endTime = ""; + if(projectLawsInventoryOld.getVerifyDueDate() != null){ + endTime = DateUtils.formatDate(projectLawsInventoryOld.getVerifyDueDate()); + } + + String regulationOwnerId = projectLawsInventoryOld.getRegulationOwnerId(); + // 给法规工程师发消息 + Map params = new HashMap<>(); + params.put("contentCn","您好，您以下任务已被发起人撤回。"); + params.put("contentEn","Hello! Your task has been withdrawn by the initiator."); + params.put("projectLibraryId", projectLawsInventoryEO.getProjectLibraryId()); + params.put("endTime",endTime); + params.put("userIdList",Arrays.asList(projectLawsInventoryOld.getDesignDutyId().split(","))); + params.put("serialNumbers",projectLawsInventoryOld.getSerialNumber()); + this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(),params); + } + } + } + private void setProjectLawsInventoryPermission(String userId, String projectId,String lawsInventoryId,Date now, List adds, String belong) { QueryWrapper del = new QueryWrapper<>(); del.eq("project_id", projectId) @@ -2812,7 +2936,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl prarams = (Map) jsonObject.get("params"); + String templateId = jsonObject.getString("templateId"); + this.sendMessageByTemplateId(templateId,prarams); } return new Result<>().success("调用成功！"); @@ -10249,6 +10376,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl Date: Wed, 22 Mar 2023 21:41:49 +0800 Subject: [PATCH 235/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7=20=E6=B7=BB=E5=8A=A0=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=8E=86=E5=8F=B2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ota/controller/OtaBaCxListController.java | 16 +- .../ota/controller/OtaBaSjListController.java | 13 ++ .../ota/service/IOtaBaCxListService.java | 7 + .../ota/service/IOtaBaSjListService.java | 7 + .../service/impl/OtaBaCxListServiceImpl.java | 137 +++++++++++------ .../service/impl/OtaBaSjListServiceImpl.java | 141 ++++++++++++------ 6 files changed, 232 insertions(+), 89 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java index b9956d7ec..e1f702cca 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java @@ -2,6 +2,7 @@ package com.jero.modules.ota.controller; import java.util.Arrays; import java.util.List; +import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.jero.common.api.vo.Result; @@ -167,4 +168,17 @@ public class OtaBaCxListController extends JeroController record(@RequestBody Map map) { + otaBaCxListService.record(map); + return Result.OK("备案维护成功!"); + } + + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java index 5e256a3c2..78cc3b348 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java @@ -2,6 +2,7 @@ package com.jero.modules.ota.controller; import java.util.Arrays; import java.util.List; +import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.jero.common.api.vo.Result; @@ -167,4 +168,16 @@ public class OtaBaSjListController extends JeroController record(@RequestBody Map map) { + otaBaSjListService.record(map); + return Result.OK("备案维护成功!"); + } + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxListService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxListService.java index c76057203..c38e75d3f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxListService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxListService.java @@ -3,6 +3,7 @@ package com.jero.modules.ota.service; import com.jero.modules.ota.entity.OtaBaCxList; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; +import java.util.Map; /** * @Description: 车型及功能备案列表 @@ -58,4 +59,10 @@ public interface IOtaBaCxListService extends IService { * @return */ List queryList(); + + /** + * 备案维护 + * + */ + void record(Map map); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjListService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjListService.java index 9644621c9..c9404e16c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjListService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjListService.java @@ -3,6 +3,7 @@ package com.jero.modules.ota.service; import com.jero.modules.ota.entity.OtaBaSjList; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; +import java.util.Map; /** * @Description: 升级备案-升级活动备案列表 @@ -58,4 +59,10 @@ public interface IOtaBaSjListService extends IService { * @return */ List queryList(); + + /** + * 备案维护 + * + */ + void record(Map map); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java index 7a5ced897..9697359f9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java @@ -1,29 +1,43 @@ package com.jero.modules.ota.service.impl; +import com.jero.common.exception.JeroBootException; import com.jero.modules.ota.entity.OtaBaCxList; +import com.jero.modules.ota.entity.OtaBaCxLsjl; import com.jero.modules.ota.mapper.OtaBaCxListMapper; import com.jero.modules.ota.service.IOtaBaCxListService; +import com.jero.modules.ota.service.IOtaBaCxLsjlService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; + +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.List; import java.util.Date; +import java.util.Map; + import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 车型及功能备案列表 * @Author: jero-boot - * @Date: 2023-03-17 + * @Date: 2023-03-17 * @Version: V1.0 */ @Service public class OtaBaCxListServiceImpl extends ServiceImpl implements IOtaBaCxListService { - /** - * 保存 - * - * @param otaBaCxList - * @return - */ - @Override + private static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + + @Autowired + private IOtaBaCxLsjlService otaBaCxLsjlService; + + /** + * 保存 + * + * @param otaBaCxList + * @return + */ + @Override public void add(OtaBaCxList otaBaCxList) { Date now = new Date(); otaBaCxList.setCreateTime(now); @@ -31,59 +45,96 @@ public class OtaBaCxListServiceImpl extends ServiceImpl ids) { removeByIds(ids); } - /** - * 通过id查询 - * - * @param id - * @return - */ - @Override + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override public OtaBaCxList queryById(String id) { return getById(id); } /** - * 列表查询 - * - * @return - */ - @Override + * 列表查询 + * + * @return + */ + @Override public List queryList() { return list(); } + + /** + * 备案维护 + * + * @param map + */ + @Override + public void record(Map map) { + try { + String id = (String) map.get("id"); + OtaBaCxList otaBaCxList = this.queryById(id); + if (null != otaBaCxList) { + String bazt = (String) map.get("bazt"); + otaBaCxList.setBazt(bazt); + Object batjsj = map.get("batjsj"); + if (null != batjsj) { + Date batjsjDate = null; + batjsjDate = sdf.parse((String) batjsj); + otaBaCxList.setBatjsj(batjsjDate); + } + String bz = (String) map.get("bz"); + otaBaCxList.setBz(bz); + this.saveOrUpdate(otaBaCxList); + //添加历史记录数据 + OtaBaCxLsjl lsjl = new OtaBaCxLsjl(); + lsjl.setOtaId(otaBaCxList.getId()); + lsjl.setSjzt(bazt); + otaBaCxLsjlService.add(lsjl); + } + } catch (ParseException e) { + e.printStackTrace(); + throw new JeroBootException(e.getMessage()); + } catch (Exception ex) { + ex.printStackTrace(); + throw new JeroBootException(ex.getMessage()); + } + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java index cbbe2eef5..b761bc537 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java @@ -1,29 +1,43 @@ package com.jero.modules.ota.service.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.exception.JeroBootException; +import com.jero.modules.ota.entity.OtaBaCxLsjl; import com.jero.modules.ota.entity.OtaBaSjList; +import com.jero.modules.ota.entity.OtaBaSjLsjl; import com.jero.modules.ota.mapper.OtaBaSjListMapper; import com.jero.modules.ota.service.IOtaBaSjListService; +import com.jero.modules.ota.service.IOtaBaSjLsjlService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.List; + +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.Date; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import java.util.List; +import java.util.Map; /** * @Description: 升级备案-升级活动备案列表 * @Author: jero-boot - * @Date: 2023-03-17 + * @Date: 2023-03-17 * @Version: V1.0 */ @Service public class OtaBaSjListServiceImpl extends ServiceImpl implements IOtaBaSjListService { - /** - * 保存 - * - * @param otaBaSjList - * @return - */ - @Override + private static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + + @Autowired + private IOtaBaSjLsjlService otaBaSjLsjlService; + + /** + * 保存 + * + * @param otaBaSjList + * @return + */ + @Override public void add(OtaBaSjList otaBaSjList) { Date now = new Date(); otaBaSjList.setCreateTime(now); @@ -31,59 +45,96 @@ public class OtaBaSjListServiceImpl extends ServiceImpl ids) { removeByIds(ids); } - /** - * 通过id查询 - * - * @param id - * @return - */ - @Override + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override public OtaBaSjList queryById(String id) { return getById(id); } /** - * 列表查询 - * - * @return - */ - @Override + * 列表查询 + * + * @return + */ + @Override public List queryList() { return list(); } + + /** + * 备案维护 + * + * @param map + */ + @Override + public void record(Map map) { + try { + String id = (String) map.get("id"); + OtaBaSjList otaBaSjList = this.queryById(id); + if (null != otaBaSjList) { + String bazt = (String) map.get("bazt"); + otaBaSjList.setBazt(bazt); + Object batjsj = map.get("batjsj"); + if (null != batjsj) { + Date batjsjDate = null; + batjsjDate = sdf.parse((String) batjsj); + otaBaSjList.setBatjsj(batjsjDate); + } + String bz = (String) map.get("bz"); + otaBaSjList.setBz(bz); + this.saveOrUpdate(otaBaSjList); + //添加历史记录数据 + OtaBaSjLsjl lsjl = new OtaBaSjLsjl(); + lsjl.setOtaId(otaBaSjList.getId()); + lsjl.setSjzt(bazt); + otaBaSjLsjlService.add(lsjl); + } + } catch (ParseException e) { + e.printStackTrace(); + throw new JeroBootException(e.getMessage()); + } catch (Exception ex) { + ex.printStackTrace(); + throw new JeroBootException(ex.getMessage()); + } + } } From cdbce3e10e9dfd7cdab2a2a7d7fa13597bbd40f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Wed, 22 Mar 2023 21:59:43 +0800 Subject: [PATCH 236/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7=20=E6=B7=BB=E5=8A=A0=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=8E=86=E5=8F=B2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ota/controller/OtaBaCxListController.java | 6 +-- .../ota/controller/OtaBaSjListController.java | 7 ++-- .../ota/service/IOtaBaCxListService.java | 2 +- .../ota/service/IOtaBaSjListService.java | 4 +- .../service/impl/OtaBaCxListServiceImpl.java | 37 +++++++----------- .../service/impl/OtaBaSjListServiceImpl.java | 38 +++++++------------ 6 files changed, 38 insertions(+), 56 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java index e1f702cca..0ab7a921d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java @@ -175,9 +175,9 @@ public class OtaBaCxListController extends JeroController record(@RequestBody Map map) { - otaBaCxListService.record(map); + @PutMapping(value = "/batchRecord") + public Result batchRecord(@RequestBody List recordList) { + otaBaCxListService.batchRecord(recordList); return Result.OK("备案维护成功!"); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java index 78cc3b348..7c46be347 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java @@ -7,6 +7,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.jero.common.api.vo.Result; import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.ota.entity.OtaBaCxList; import com.jero.modules.ota.entity.OtaBaSjList; import com.jero.modules.ota.service.IOtaBaSjListService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -174,9 +175,9 @@ public class OtaBaSjListController extends JeroController record(@RequestBody Map map) { - otaBaSjListService.record(map); + @PutMapping(value = "/batchRecord") + public Result batchRecord(@RequestBody List recordList) { + otaBaSjListService.batchRecord(recordList); return Result.OK("备案维护成功!"); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxListService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxListService.java index c38e75d3f..7a628e415 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxListService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxListService.java @@ -64,5 +64,5 @@ public interface IOtaBaCxListService extends IService { * 备案维护 * */ - void record(Map map); + void batchRecord(List recordList); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjListService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjListService.java index c9404e16c..f150daa5b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjListService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjListService.java @@ -2,6 +2,8 @@ package com.jero.modules.ota.service; import com.jero.modules.ota.entity.OtaBaSjList; import com.baomidou.mybatisplus.extension.service.IService; +import org.springframework.web.bind.annotation.RequestBody; + import java.util.List; import java.util.Map; @@ -64,5 +66,5 @@ public interface IOtaBaSjListService extends IService { * 备案维护 * */ - void record(Map map); + void batchRecord(List recordList); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java index 9697359f9..657ec57e5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java @@ -103,35 +103,24 @@ public class OtaBaCxListServiceImpl extends ServiceImpl map) { + public void batchRecord(List recordList) { try { - String id = (String) map.get("id"); - OtaBaCxList otaBaCxList = this.queryById(id); - if (null != otaBaCxList) { - String bazt = (String) map.get("bazt"); - otaBaCxList.setBazt(bazt); - Object batjsj = map.get("batjsj"); - if (null != batjsj) { - Date batjsjDate = null; - batjsjDate = sdf.parse((String) batjsj); - otaBaCxList.setBatjsj(batjsjDate); + if (null != recordList && recordList.size() > 0) { + for (OtaBaCxList obc : recordList) { + String id = obc.getId(); + OtaBaCxList otaBaCxList = this.queryById(id); + otaBaCxList.setBatjsj(obc.getBatjsj()); + otaBaCxList.setBz(obc.getBz()); + this.saveOrUpdate(otaBaCxList); + //添加历史记录数据 + OtaBaCxLsjl lsjl = new OtaBaCxLsjl(); + lsjl.setOtaId(id); + lsjl.setSjzt(obc.getBz()); + otaBaCxLsjlService.add(lsjl); } - String bz = (String) map.get("bz"); - otaBaCxList.setBz(bz); - this.saveOrUpdate(otaBaCxList); - //添加历史记录数据 - OtaBaCxLsjl lsjl = new OtaBaCxLsjl(); - lsjl.setOtaId(otaBaCxList.getId()); - lsjl.setSjzt(bazt); - otaBaCxLsjlService.add(lsjl); } - } catch (ParseException e) { - e.printStackTrace(); - throw new JeroBootException(e.getMessage()); } catch (Exception ex) { ex.printStackTrace(); throw new JeroBootException(ex.getMessage()); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java index b761bc537..1f89c89a0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java @@ -2,6 +2,7 @@ package com.jero.modules.ota.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.exception.JeroBootException; +import com.jero.modules.ota.entity.OtaBaCxList; import com.jero.modules.ota.entity.OtaBaCxLsjl; import com.jero.modules.ota.entity.OtaBaSjList; import com.jero.modules.ota.entity.OtaBaSjLsjl; @@ -103,35 +104,24 @@ public class OtaBaSjListServiceImpl extends ServiceImpl map) { + public void batchRecord(List recordList) { try { - String id = (String) map.get("id"); - OtaBaSjList otaBaSjList = this.queryById(id); - if (null != otaBaSjList) { - String bazt = (String) map.get("bazt"); - otaBaSjList.setBazt(bazt); - Object batjsj = map.get("batjsj"); - if (null != batjsj) { - Date batjsjDate = null; - batjsjDate = sdf.parse((String) batjsj); - otaBaSjList.setBatjsj(batjsjDate); + if (null != recordList && recordList.size() > 0) { + for (OtaBaSjList obs : recordList) { + String id = obs.getId(); + OtaBaSjList otaBaSjList = this.queryById(id); + otaBaSjList.setBatjsj(obs.getBatjsj()); + otaBaSjList.setBz(obs.getBz()); + this.saveOrUpdate(otaBaSjList); + //添加历史记录数据 + OtaBaSjLsjl lsjl = new OtaBaSjLsjl(); + lsjl.setOtaId(id); + lsjl.setSjzt(obs.getBz()); + otaBaSjLsjlService.add(lsjl); } - String bz = (String) map.get("bz"); - otaBaSjList.setBz(bz); - this.saveOrUpdate(otaBaSjList); - //添加历史记录数据 - OtaBaSjLsjl lsjl = new OtaBaSjLsjl(); - lsjl.setOtaId(otaBaSjList.getId()); - lsjl.setSjzt(bazt); - otaBaSjLsjlService.add(lsjl); } - } catch (ParseException e) { - e.printStackTrace(); - throw new JeroBootException(e.getMessage()); } catch (Exception ex) { ex.printStackTrace(); throw new JeroBootException(ex.getMessage()); From bd6912b229f6324dd7cec9a6fcdec2748c164371 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Wed, 22 Mar 2023 22:01:06 +0800 Subject: [PATCH 237/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7=20=E6=B7=BB=E5=8A=A0=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=8E=86=E5=8F=B2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ota/controller/OtaBaCxListController.java | 28 +++++++++--------- .../ota/controller/OtaBaSjListController.java | 29 +++++++++---------- .../ota/service/IOtaBaCxListService.java | 4 +-- .../ota/service/IOtaBaSjListService.java | 4 +-- .../service/impl/OtaBaCxListServiceImpl.java | 7 ++--- .../service/impl/OtaBaSjListServiceImpl.java | 4 --- 6 files changed, 33 insertions(+), 43 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java index 0ab7a921d..7070302ae 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java @@ -1,29 +1,29 @@ package com.jero.modules.ota.controller; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import com.jero.common.api.vo.Result; -import com.jero.common.system.query.QueryGenerator; -import com.jero.modules.ota.entity.OtaBaCxList; -import com.jero.modules.ota.service.IOtaBaCxListService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.extern.slf4j.Slf4j; +import com.jero.common.api.vo.Result; +import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.base.controller.JeroController; +import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.ota.entity.OtaBaCxList; +import com.jero.modules.ota.service.IOtaBaCxListService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import com.jero.common.aspect.annotation.AutoLog; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; +import java.util.List; - /** +/** * @Description: 车型及功能备案列表 * @Author: jero-boot * @Date: 2023-03-17 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java index 7c46be347..30bb4ba6b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java @@ -1,30 +1,29 @@ package com.jero.modules.ota.controller; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import com.jero.common.api.vo.Result; -import com.jero.common.system.query.QueryGenerator; -import com.jero.modules.ota.entity.OtaBaCxList; -import com.jero.modules.ota.entity.OtaBaSjList; -import com.jero.modules.ota.service.IOtaBaSjListService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.extern.slf4j.Slf4j; +import com.jero.common.api.vo.Result; +import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.base.controller.JeroController; +import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.ota.entity.OtaBaSjList; +import com.jero.modules.ota.service.IOtaBaSjListService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import com.jero.common.aspect.annotation.AutoLog; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; +import java.util.List; - /** +/** * @Description: 升级备案-升级活动备案列表 * @Author: jero-boot * @Date: 2023-03-17 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxListService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxListService.java index 7a628e415..45dbe6352 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxListService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxListService.java @@ -1,9 +1,9 @@ package com.jero.modules.ota.service; -import com.jero.modules.ota.entity.OtaBaCxList; import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.modules.ota.entity.OtaBaCxList; + import java.util.List; -import java.util.Map; /** * @Description: 车型及功能备案列表 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjListService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjListService.java index f150daa5b..8d99a3778 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjListService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjListService.java @@ -1,11 +1,9 @@ package com.jero.modules.ota.service; -import com.jero.modules.ota.entity.OtaBaSjList; import com.baomidou.mybatisplus.extension.service.IService; -import org.springframework.web.bind.annotation.RequestBody; +import com.jero.modules.ota.entity.OtaBaSjList; import java.util.List; -import java.util.Map; /** * @Description: 升级备案-升级活动备案列表 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java index 657ec57e5..ca1027c8c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java @@ -1,5 +1,6 @@ package com.jero.modules.ota.service.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.exception.JeroBootException; import com.jero.modules.ota.entity.OtaBaCxList; import com.jero.modules.ota.entity.OtaBaCxLsjl; @@ -9,13 +10,9 @@ import com.jero.modules.ota.service.IOtaBaCxLsjlService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.List; import java.util.Date; -import java.util.Map; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import java.util.List; /** * @Description: 车型及功能备案列表 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java index 1f89c89a0..808f867cd 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java @@ -2,8 +2,6 @@ package com.jero.modules.ota.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.exception.JeroBootException; -import com.jero.modules.ota.entity.OtaBaCxList; -import com.jero.modules.ota.entity.OtaBaCxLsjl; import com.jero.modules.ota.entity.OtaBaSjList; import com.jero.modules.ota.entity.OtaBaSjLsjl; import com.jero.modules.ota.mapper.OtaBaSjListMapper; @@ -12,11 +10,9 @@ import com.jero.modules.ota.service.IOtaBaSjLsjlService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; -import java.util.Map; /** * @Description: 升级备案-升级活动备案列表 From e92b3a30b9960d750426ae137fc93dab0c36bb79 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Wed, 22 Mar 2023 22:19:58 +0800 Subject: [PATCH 238/645] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=9B=B8=E5=85=B3-?= =?UTF-8?q?=E5=8F=91=E9=80=81=E9=A3=9E=E4=B9=A6=E6=B6=88=E6=81=AF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feishu/enums/TemplateInfoEnum2.java | 17 +- .../job/CertificationInventoryJob.java | 4 +- .../project/job/designComplianceJob.java | 176 +++++++++++++++++- .../impl/ProjectLibraryBaseServiceImpl.java | 57 ++++-- 4 files changed, 236 insertions(+), 18 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/enums/TemplateInfoEnum2.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/enums/TemplateInfoEnum2.java index c05abd5cb..974aea868 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/enums/TemplateInfoEnum2.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/enums/TemplateInfoEnum2.java @@ -18,7 +18,7 @@ public enum TemplateInfoEnum2 { CERTIFICATION_MESSAGE10("认证工程师发起流程，责任人收到消息","ctp_AAuePL6rUK1L"), CERTIFICATION_MESSAGE11("责任人拒绝，认证工程师收到消息","ctp_AAu2ZrSEiB1V"), CERTIFICATION_MESSAGE12("责任人接受，认证工程师收到消息","ctp_AAuePL6r3B0I"), - CERTIFICATION_MESSAGE13("studio修改认证工程师，被修改人收到消息",""), + CERTIFICATION_MESSAGE13("studio修改认证工程师，被修改人收到消息","ctp_AAuLRr2QhG9J"), CERTIFICATION_MESSAGE14("studio修改符合性截止时间，认证工程师收到消息","ctp_AAuePL6r3XqN"), CERTIFICATION_MESSAGE15("认证工程师修改责任人，被修改人收到消息","ctp_AAu2ZrSE1z3f"), CERTIFICATION_MESSAGE16("认证工程师催办，责任人收到消息","ctp_AAuPfn0M0H6i"), @@ -52,6 +52,21 @@ public enum TemplateInfoEnum2 { REGULATION_TASK_CONFIRMATION5("法规任务确认-公用消息-红色-有流程类型","ctp_AAuPWTSU2Fg2"), REGULATION_TASK_CONFIRMATION6("法规任务确认-公用消息-黄色-有流程类型","ctp_AAuLRr2Qzkbo"), + + /** + * 设计符合性流程 + */ + DESIGN_COMPLIANCE_CONFIRMATION1("设计符合性流程-公用消息-绿色","ctp_AAuPIdaoms57"), + DESIGN_COMPLIANCE_CONFIRMATION2("设计符合性流程-公用消息-红色","ctp_AAuLRr2QX8xb"), + DESIGN_COMPLIANCE_CONFIRMATION3("设计符合性流程-公用消息-黄色","ctp_AAuLdvF0lUtu"), + + /** + * 验证符合性流程 + */ + VALIDATION_COMPLIANCE_CONFIRMATION1("验证符合性流程-公用消息-绿色","ctp_AAuLdvF0lS41"), + VALIDATION_COMPLIANCE_CONFIRMATION2("验证符合性流程-公用消息-红色","ctp_AAu2lBI6MV0i"), + VALIDATION_COMPLIANCE_CONFIRMATION3("验证符合性流程-公用消息-黄色","ctp_AAupcD3RBbUV"), + ; String name; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/CertificationInventoryJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/CertificationInventoryJob.java index 2875f1db0..5e157da83 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/CertificationInventoryJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/CertificationInventoryJob.java @@ -254,13 +254,13 @@ public class CertificationInventoryJob implements Job { Calendar sevenCalendar=new GregorianCalendar(); sevenCalendar.setTime(new Date()); sevenCalendar.add(Calendar.DATE,7); - Date sevenDays = sevenCalendar.getTime(); //fourteen + Date sevenDays = sevenCalendar.getTime(); //获取后十四天后的时间 Calendar fourteenCalendar=new GregorianCalendar(); fourteenCalendar.setTime(new Date()); fourteenCalendar.add(Calendar.DATE,14); - Date fourteenDays = fourteenCalendar.getTime(); //fourteen + Date fourteenDays = fourteenCalendar.getTime(); String threeDaysStr = sdf.format(threeDays); String sevenDaysStr = sdf.format(sevenDays); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/designComplianceJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/designComplianceJob.java index ab755ed00..fb8f2dda9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/designComplianceJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/designComplianceJob.java @@ -4,12 +4,15 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.jero.common.constant.enums.MessageType2Enum; import com.jero.common.constant.enums.MessageTypeEnum; import com.jero.common.constant.enums.MsgColorEnum; +import com.jero.common.util.DateUtils; import com.jero.modules.document.entity.BussDocumentLibraryEO; import com.jero.modules.document.service.IBussDocumentLibraryEOService; +import com.jero.modules.feishu.enums.TemplateInfoEnum2; import com.jero.modules.feishu.service.IFeishuService; import com.jero.modules.feishu.vo.FeishuMsg2Vo; import com.jero.modules.feishu.vo.FeishuMsgVo; import com.jero.modules.project.entity.*; +import com.jero.modules.project.enums.ComplianceFlowStatusEnum; import com.jero.modules.project.enums.DesignComplianceStatusEnum; import com.jero.modules.project.enums.JumpLinkEnum; import com.jero.modules.project.enums.SendMsgFlagEnum; @@ -68,12 +71,112 @@ public class designComplianceJob implements Job { private ISysUserService sysUserService; @Autowired private IFeishuService feishuService; + private static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); @Override public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { log.info("设计符合性确认流程，定时任务开启 ====================================================="); + + // 查询出 任务待确认、结果待提交的数据 + List designFlowStatusList = new ArrayList<>(); + designFlowStatusList.add(ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()); + designFlowStatusList.add(ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()); + QueryWrapper lawsInventoryEOQueryWrap = new QueryWrapper<>(); + lawsInventoryEOQueryWrap.lambda().in(ProjectLawsInventoryEO::getDesignFlowStatus,designFlowStatusList); + List projectLawsInventoryEOList = this.projectLawsInventoryEOService.list(lawsInventoryEOQueryWrap); + if(CollectionUtils.isNotEmpty(projectLawsInventoryEOList)){ + // 根据项目进行分组 + Map> lawsInventoryByProjectLibraryIdGroupMap = projectLawsInventoryEOList.stream().collect(Collectors.groupingBy(ProjectLawsInventoryEO::getProjectLibraryId)); + for (Map.Entry> lawsInventoryByProjectLibraryIdGroup : lawsInventoryByProjectLibraryIdGroupMap.entrySet()) { + String projectLibraryId = lawsInventoryByProjectLibraryIdGroup.getKey(); + List lawsInventoryListByProjectLibraryId = lawsInventoryByProjectLibraryIdGroup.getValue(); + if(StringUtils.isEmpty(projectLibraryId) || CollectionUtils.isEmpty(lawsInventoryListByProjectLibraryId)){ + continue; + } + + // 设计符合性 + Map> lawsInventoryByDesignDutyIdGroupMap = lawsInventoryListByProjectLibraryId.stream().collect(Collectors.groupingBy(ProjectLawsInventoryEO::getDesignDutyId)); + for (Map.Entry> lawsInventoryByDesignDutyIdGroup : lawsInventoryByDesignDutyIdGroupMap.entrySet()) { + String designDutyId = lawsInventoryByDesignDutyIdGroup.getKey(); + List designDutyDataList = lawsInventoryByDesignDutyIdGroup.getValue(); + if(StringUtils.isEmpty(designDutyId) || CollectionUtils.isEmpty(designDutyDataList)){ + continue; + } + + List userIdList = Arrays.asList(designDutyId.split(",")); + + Map sendMsgDataListMap = this.disposeSendMsgDataList(designDutyDataList); + + // 三条后结束的 + List threeDaysList = (List) sendMsgDataListMap.get("threeDaysList"); + if(CollectionUtils.isNotEmpty(threeDaysList)){ + Date designDueDate = threeDaysList.get(0).getDesignDueDate(); + String endTime = ""; + if(designDueDate != null){ + endTime = DateUtils.formatDate(designDueDate); + } + String serialNumbers = threeDaysList.stream().map(ProjectLawsInventoryEO::getSerialNumber).distinct().collect(Collectors.joining(",")); + // 给法规工程师发消息 + Map params = new HashMap<>(); + params.put("contentCn","您好，以下待办任务距离截止日期仅剩3天，请及时查看处理。"); + params.put("contentEn","Hello! This task will expire in 3 days. Please check and address it in a timely manner. Thank you!"); + params.put("projectLibraryId",projectLibraryId); + params.put("endTime",endTime); + params.put("userIdList",userIdList); + params.put("serialNumbers",serialNumbers); + params.put("flowTypeCn","设计符合性流程"); + params.put("flowTypeEn","Design Compliance Process"); + this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION4.getValue(),params); + } + // 当天结束的 + List currentDaysList = (List) sendMsgDataListMap.get("currentDaysList"); + if(CollectionUtils.isNotEmpty(currentDaysList)){ + Date designDueDate = currentDaysList.get(0).getDesignDueDate(); + String endTime = ""; + if(designDueDate != null){ + endTime = DateUtils.formatDate(designDueDate); + } + String serialNumbers = currentDaysList.stream().map(ProjectLawsInventoryEO::getSerialNumber).distinct().collect(Collectors.joining(",")); + // 给法规工程师发消息 + Map params = new HashMap<>(); + params.put("contentCn","您好，以下待办任务已到截止日期，请尽快查看处理。"); + params.put("contentEn","Hello! This task will expire today. Please check and address it ASAP. Thank you!"); + params.put("projectLibraryId",projectLibraryId); + params.put("endTime",endTime); + params.put("userIdList",userIdList); + params.put("serialNumbers",serialNumbers); + params.put("flowTypeCn","设计符合性流程"); + params.put("flowTypeEn","Design Compliance Process"); + this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION4.getValue(),params); + } + // 逾期的 + List overdueList = (List) sendMsgDataListMap.get("overdueList"); + if(CollectionUtils.isNotEmpty(overdueList)){ + Date designDueDate = overdueList.get(0).getDesignDueDate(); + String endTime = ""; + if(designDueDate != null){ + endTime = DateUtils.formatDate(designDueDate); + } + String serialNumbers = overdueList.stream().map(ProjectLawsInventoryEO::getSerialNumber).distinct().collect(Collectors.joining(",")); + // 给法规工程师发消息 + Map params = new HashMap<>(); + params.put("contentCn","您好，以下待办任务已逾期，请尽快处理。"); + params.put("contentEn","Hello! This task is overdue. Please address it ASAP. Thank you!"); + params.put("projectLibraryId",projectLibraryId); + params.put("endTime",endTime); + params.put("userIdList",userIdList); + params.put("serialNumbers",serialNumbers); + params.put("flowTypeCn","设计符合性流程"); + params.put("flowTypeEn","Design Compliance Process"); + this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION5.getValue(),params); + } + } + } + + } + //查询出已经启动了设计符合性流程的数据。 并且流程没有结束。 - QueryWrapper queryProjectTaskInventoryWrapper = new QueryWrapper<>(); + /*QueryWrapper queryProjectTaskInventoryWrapper = new QueryWrapper<>(); queryProjectTaskInventoryWrapper.isNotNull("design_p_id"); List status = new ArrayList<>(); status.add(DesignComplianceStatusEnum.TO_SUBMIT.getValue()); @@ -378,7 +481,76 @@ public class designComplianceJob implements Job { } } } - } + }*/ log.info("设计符合性确认流程，定时任务结束 ====================================================="); } + + private Map disposeSendMsgDataList(List projectLawsInventoryEOList) { + Map result = new HashMap<>(); + Date currentDate = new Date(); + String currentDateStr = sdf.format(currentDate); + + //获取十四天后的时间 + Calendar fourteenCalendar=new GregorianCalendar(); + fourteenCalendar.setTime(new Date()); + fourteenCalendar.add(Calendar.DATE,14); + Date fourteenDays = fourteenCalendar.getTime(); + String fourteenDaysStr = sdf.format(fourteenDays); + + //获取七天后的时间 + Calendar sevenCalendar=new GregorianCalendar(); + sevenCalendar.setTime(new Date()); + sevenCalendar.add(Calendar.DATE,7); + Date sevenDays = sevenCalendar.getTime(); + String sevenDaysStr = sdf.format(sevenDays); + + // 十四天后结束的 + List fourteenDaysList = projectLawsInventoryEOList.stream().filter(data -> { + boolean flag = false; + if(data.getDesignDueDate() != null){ + if (StringUtils.equals(fourteenDaysStr, sdf.format(data.getDesignDueDate()))) { + flag = true; + } + } + return flag; + }).collect(Collectors.toList()); + + // 七天后结束的 + List threeDaysList = projectLawsInventoryEOList.stream().filter(data -> { + boolean flag = false; + if(data.getDesignDueDate() != null){ + if (StringUtils.equals(sevenDaysStr, sdf.format(data.getDesignDueDate()))) { + flag = true; + } + } + return flag; + }).collect(Collectors.toList()); + + // 当天结束的 + List currentDaysList = projectLawsInventoryEOList.stream().filter(data -> { + boolean flag = false; + //结束日期是当前日期 + if(data.getDesignDueDate() != null){ + if (StringUtils.equals(currentDateStr, sdf.format(data.getDesignDueDate()))) { + flag = true; + } + } + return flag; + }).collect(Collectors.toList()); + + // 逾期的 + List overdueList = projectLawsInventoryEOList.stream().filter(data -> { + // 只要早于当前日期都算逾期 不算当天。 + boolean flag = false; + if(data.getDesignDueDate() != null){ + flag = (data.getDesignDueDate().before(currentDate) && !StringUtils.equals(currentDateStr, sdf.format(data.getDesignDueDate()))); + } + return flag; + }).collect(Collectors.toList()); + + result.put("currentDaysList",currentDaysList); + result.put("threeDaysList",threeDaysList); + result.put("overdueList",overdueList); + return result; + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java index 282ddb548..72bcca4c5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java @@ -12,15 +12,8 @@ import com.jero.common.system.vo.LoginUser; import com.jero.modules.cert.collect.service.IParamsManifestEOService; import com.jero.modules.dummy.enums.OrderEnum; import com.jero.modules.enums.DictCodeEnum; -import com.jero.modules.project.entity.ConditionAssessmentEO; -import com.jero.modules.project.entity.ProjectLawsInventoryEO; -import com.jero.modules.project.entity.ProjectLawsInventoryLogEO; -import com.jero.modules.project.entity.ProjectLibraryBase; -import com.jero.modules.project.entity.ProjectLibraryRoleRelEO; -import com.jero.modules.project.entity.ProjectRelatedPersonnel; -import com.jero.modules.project.entity.ProjectTaskInventoryEO; -import com.jero.modules.project.entity.ProjectTaskPlanning; -import com.jero.modules.project.entity.ProjectUserPermission; +import com.jero.modules.feishu.enums.TemplateInfoEnum2; +import com.jero.modules.project.entity.*; import com.jero.modules.project.enums.*; import com.jero.modules.project.mapper.ProjectLawsInventoryEOMapper; import com.jero.modules.project.mapper.ProjectLibraryBaseMapper; @@ -28,10 +21,7 @@ import com.jero.modules.project.mapper.ProjectNameInfoEOMapper; import com.jero.modules.project.mapper.ProjectRelatedPersonnelMapper; import com.jero.modules.project.mapper.ProjectTaskInventoryEOMapper; import com.jero.modules.project.mapper.ProjectUserPermissionMapper; -import com.jero.modules.project.service.IConditionAssessmentEOService; -import com.jero.modules.project.service.IProjectLibraryBaseService; -import com.jero.modules.project.service.IProjectLibraryRoleRelEOService; -import com.jero.modules.project.service.IProjectUserPermissionService; +import com.jero.modules.project.service.*; import com.jero.modules.system.entity.SysDictItem; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.enums.DicCodeEnum; @@ -154,6 +144,9 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl originalCertificationEngineerIdList = Arrays.asList(original.getCertificationEngineer().split(",")); + List newCertificationEngineerIdList = Arrays.asList(projectLibraryBase.getCertificationEngineer().split(",")); + + originalCertificationEngineerIdList = originalCertificationEngineerIdList.stream().filter(originalCertificationEngineerId -> { + boolean flag = true; + for (String newCertificationEngineerId : newCertificationEngineerIdList) { + // 如果新传进来的 认证工程师id跟现有的认证工程师id一致，不用发消息 + if(StringUtils.equals(newCertificationEngineerId,originalCertificationEngineerId)){ + flag = false; + break; + } + } + return flag; + }).collect(Collectors.toList()); + + if(CollectionUtils.isNotEmpty(originalCertificationEngineerIdList)){ + // 判断当前项目下是否还有需要认证工程师操作的数据 只有清单待校核、结果待审查 这两个状态的数据由认证工程师操作。 + List flowStatusList = new ArrayList<>(); + flowStatusList.add(CertificationInventoryFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()); + flowStatusList.add(CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue()); + + QueryWrapper certificationInventoryEOQueryWrapper = new QueryWrapper<>(); + certificationInventoryEOQueryWrapper.lambda().eq(ProjectCertificationInventoryEO::getProjectLibraryId,projectLibraryBase.getId()); + certificationInventoryEOQueryWrapper.lambda().in(ProjectCertificationInventoryEO::getFlowStatus,flowStatusList); + List projectCertificationInventoryEOList = this.projectCertificationInventoryEOService.list(certificationInventoryEOQueryWrapper); + if(CollectionUtils.isNotEmpty(projectCertificationInventoryEOList)){ + List userInfoList = this.sysUserService.querySysUserListByIdList(originalCertificationEngineerIdList); + this.projectCertificationInventoryEOService.sendMessageByTemplateId( + projectCertificationInventoryEOList, + TemplateInfoEnum2.CERTIFICATION_MESSAGE13.getValue(), + originalCertificationEngineerIdList, + userInfoList + ); + } + } + } checkExitData(projectLibraryBase); saveOrUpdate(projectLibraryBase); From 89d818d587172b42c468985d3ed88c6a4fcbab1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Thu, 23 Mar 2023 09:27:28 +0800 Subject: [PATCH 239/645] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E7=9A=84=E6=B5=81=E7=A8=8B=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E5=BC=B9=E6=A1=86=E3=80=81=E6=89=B9=E9=87=8F=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E3=80=81=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../certificationList/components/addModel.vue | 18 +++++++++++++----- .../components/listEditModel.vue | 16 ++++++++-------- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue index a61672efa..39924c876 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue @@ -632,7 +632,7 @@ }) }, editModel(value) { - // this.formInline = {} + this.formInline = {} this.visible = true this.formInline = JSON.parse(JSON.stringify(value)) // if (this.formInline.deliverableType) { @@ -644,7 +644,7 @@ this.getRegulationNo() this.title = this.$t('edit') this.$nextTick(() => { - this.formInline = {...this.formInline} + this.formInline = { ...this.formInline } this.$refs.ruleForm.clearValidate() }) }, @@ -773,7 +773,7 @@ }, dutyHandleChange(index) { this.formInline.dataList[index].sdt = undefined - this.formInline = {... this.formInline} + this.formInline = { ...this.formInline } this.queryPersonByProject(this.formInline.dataList[index].dutyTerritory, index) }, queryPersonByProject(row, index) { @@ -785,10 +785,18 @@ if (res.success) { if (this.formInline.id) { this.engineeringInterfacePersonList = res.result.engineeringInterfacePersonList || [] //工程接口人 + if (res.result.engineeringInterfacePersonList && res.result.engineeringInterfacePersonList.length == 1){ + this.formInline.sdt = res.result.engineeringInterfacePersonList[0].value + }else if(this.engineeringInterfacePersonList.length == 0){ + this.formInline.sdt = undefined + } } else { - this.$nextTick(()=>{ + this.$nextTick(() => { this.formInline.dataList[index].engineeringInterfacePersonList = res.result.engineeringInterfacePersonList || [] - this.formInline = {...this.formInline} + if (res.result.engineeringInterfacePersonList && res.result.engineeringInterfacePersonList.length == 1) { + this.formInline.dataList[index].sdt = res.result.engineeringInterfacePersonList[0].value + } + this.formInline = { ...this.formInline } }) } } diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue index ed29e8b10..888cc6781 100644 --- a/jero-web/src/views/projectManagement/components/listEditModel.vue +++ b/jero-web/src/views/projectManagement/components/listEditModel.vue @@ -1022,11 +1022,11 @@ this.formInline.engineeringInterfacePerson = undefined this.formInline.homologationEngineerId = undefined this.formInline.designInitiatorId = undefined - this.formInline.designDutyId = undefined + // this.formInline.designDutyId = undefined this.formInline.prehomoInitiatorId = undefined this.formInline.prehomoDutyId = undefined this.formInline.verifyInitiatorId = undefined - this.formInline.verifyDutyId = undefined + // this.formInline.verifyDutyId = undefined this.queryPersonByProject(event) }, @@ -1158,9 +1158,9 @@ if (!(this.designInitiatorList.some(val => val.value == row.designInitiatorId))) { row.designInitiatorId = undefined } - if (!(this.designDutyList.some(val => val.value == row.designDutyId))) { - row.designDutyId = undefined - } + // if (!(this.designDutyList.some(val => val.value == row.designDutyId))) { + // row.designDutyId = undefined + // } if (!(this.prehomoInitiatorList.some(val => val.value == row.prehomoInitiatorId))) { row.prehomoInitiatorId = undefined } @@ -1170,9 +1170,9 @@ if (!(this.verifyInitiatorList.some(val => val.value == row.verifyInitiatorId))) { row.verifyInitiatorId = undefined } - if (!(this.verifyDutyList.some(val => val.value == row.verifyDutyId))) { - row.verifyDutyId = undefined - } + // if (!(this.verifyDutyList.some(val => val.value == row.verifyDutyId))) { + // row.verifyDutyId = undefined + // } if (!(this.regulatoryEngineerList.some(val => val.value == row.regulationOwnerId))) { row.regulationOwnerId = undefined } From b1f5407726e43d7513a4369f42d62c911cb08529 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Thu, 23 Mar 2023 09:58:29 +0800 Subject: [PATCH 240/645] =?UTF-8?q?=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/otamanagement/upgradeactivityrecord/index.vue | 6 +++--- .../src/views/otamanagement/vehicleinformation/index.vue | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/index.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/index.vue index aa920ed34..6f0ee565c 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/index.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/index.vue @@ -29,13 +29,13 @@ - + - + - + diff --git a/jero-web/src/views/otamanagement/vehicleinformation/index.vue b/jero-web/src/views/otamanagement/vehicleinformation/index.vue index 2161d144b..4feb71121 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/index.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/index.vue @@ -35,7 +35,7 @@ - + From f5755e08a7e821241a876c793639a97039262821 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Thu, 23 Mar 2023 10:27:15 +0800 Subject: [PATCH 241/645] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E9=85=8D=E7=BD=AE=E5=88=97=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParamsCollectManifestEOServiceImpl.java | 49 ++++++++++++++++--- 1 file changed, 41 insertions(+), 8 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 af7f1621f..97ab1d71f 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 @@ -773,29 +773,62 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl referencesColMap = new HashMap<>(); + referencesColMap.put("referencesColFlag",true); + 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); 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); manifestMap.put("referencesCol", referencesColMap); } } if (CollectionUtil.isNotEmpty(paramsConfigEOList)) { paramsConfigEOList.forEach(paramsConfigEO -> { // 参数配置 + Map paramsConfigDataVO = new HashMap<>(); Map configMap = new HashMap<>(); String paramsConfigId = paramsConfigEO.getId(); - 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); + List 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); + } + }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); + configMap.put("configId",paramsConfigEO.getId()); + manifestMap.put(paramsConfigEO.getId(),configMap); configIdList.add(paramsConfigEO.getId()); }); From 8f2c9b43741ca3004587c6c8dd30260f29647997 Mon Sep 17 00:00:00 2001 From: cuijiaming <1410452759@qq.com> Date: Thu, 23 Mar 2023 10:58:41 +0800 Subject: [PATCH 242/645] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93-=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=BA=93=E8=AF=A6=E6=83=85-=E5=90=88=E8=A7=84?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E8=AE=A1=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_2nd_period.sql | 12 ++++++++++- .../project/entity/ProjectTaskPlanning.java | 6 ++++++ .../enums/ProjectTaskPlanningNameEnum.java | 2 ++ .../impl/ProjectTaskPlanningServiceImpl.java | 21 +++++++++++++++++++ 4 files changed, 40 insertions(+), 1 deletion(-) diff --git a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql index 8ad35e0cf..079c40133 100644 --- a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql +++ b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql @@ -423,4 +423,14 @@ ALTER TABLE `laws_weilai`.`params_report_config_data` -- 流程历史表，增加字段 附件id 2023-3-20 未同步生产环境 ALTER TABLE `process_history` - ADD COLUMN `approval_file` varchar(2000) NULL COMMENT '附件id，多个之间使用英文逗号分隔' AFTER `project_laws_inventory_id`; \ No newline at end of file + ADD COLUMN `approval_file` varchar(2000) NULL COMMENT '附件id，多个之间使用英文逗号分隔' AFTER `project_laws_inventory_id`; + +-- 项目库-相关人员维护表，增加字段 工程接口人法规工程师设置,工程接口人认证工程师设置 2023-3-22 未同步生产环境 +ALTER TABLE `project_related_personnel` + ADD COLUMN `engineer_law_set` varchar(500) NULL COMMENT '工程接口人法规工程师设置' AFTER `law_engineer`; + ADD COLUMN `engineer_att_set` varchar(500) NULL COMMENT '工程接口人认证工程师设置' AFTER `certification_engineer`; + +-- 项目库-法规/认证任务计划 (各阶段确认进度) 表，增加字段 认证提交 2023-3-23 未同步生产环境 +ALTER TABLE `project_task_planning` + ADD COLUMN `certification_submission` datetime(0) NULL COMMENT '认证提交' AFTER `attestation_start_time`; + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskPlanning.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskPlanning.java index 3bcf71247..30dd70050 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskPlanning.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskPlanning.java @@ -67,6 +67,12 @@ public class ProjectTaskPlanning implements Serializable { @DateTimeFormat(pattern="yyyy-MM-dd") private Date attestationEndTime; + /**认证提交*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + private Date certificationSubmission; + + /**验证符合性确认截止时间*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java index 4d7cbc3ac..6d2563696 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java @@ -18,6 +18,8 @@ public enum ProjectTaskPlanningNameEnum { PREHOMO_DEADLINE("摸底开始","Get Started"), // name:Pre-Homo value:Pre-Homo ATTESTATION_START_TIME("认证开始","Certification Start"),// name:认证开始 value:Certification begins VERIFY_DEADLINE("验证核查","Verification And Verification"), + CERTIFICATION_SUBMISSION("认证提交","Certification Submission"), + ; String name; String value; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java index 6de8959a8..9302162bf 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java @@ -270,6 +270,27 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl Date: Thu, 23 Mar 2023 11:02:11 +0800 Subject: [PATCH 243/645] =?UTF-8?q?=E6=B3=95=E8=A7=84=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4-=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/project/job/TaskAffirmJob.java | 240 +++++++++++++++++- 1 file changed, 239 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/TaskAffirmJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/TaskAffirmJob.java index a0dc66fd9..d1befe3d5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/TaskAffirmJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/TaskAffirmJob.java @@ -4,23 +4,28 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.jero.common.constant.enums.MessageType2Enum; import com.jero.common.constant.enums.MessageTypeEnum; import com.jero.common.constant.enums.MsgColorEnum; +import com.jero.common.util.DateUtils; import com.jero.modules.document.entity.BussDocumentLibraryEO; import com.jero.modules.document.service.IBussDocumentLibraryEOService; +import com.jero.modules.feishu.enums.TemplateInfoEnum2; import com.jero.modules.feishu.service.IFeishuService; import com.jero.modules.feishu.vo.FeishuMsg2Vo; import com.jero.modules.project.entity.ProjectLawsInventoryEO; import com.jero.modules.project.entity.ProjectLibraryBase; import com.jero.modules.project.entity.ProjectNameInfoEO; import com.jero.modules.project.entity.ProjectYearNameInfoEO; +import com.jero.modules.project.enums.ComplianceFlowStatusEnum; import com.jero.modules.project.enums.InventoryAffirmStatusEnum; import com.jero.modules.project.enums.JumpLinkEnum; import com.jero.modules.project.mapper.ProjectLawsInventoryEOMapper; import com.jero.modules.project.mapper.ProjectLibraryBaseMapper; import com.jero.modules.project.mapper.ProjectNameInfoEOMapper; import com.jero.modules.project.mapper.ProjectYearNameInfoEOMapper; +import com.jero.modules.project.service.IProjectLawsInventoryEOService; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysUserService; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.quartz.Job; @@ -60,6 +65,11 @@ public class TaskAffirmJob implements Job { @Autowired private IBussDocumentLibraryEOService bussDocumentLibraryEOService; + @Autowired + private IProjectLawsInventoryEOService projectLawsInventoryEOService; + + private static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + /** * 任务确认流程定时 @@ -71,6 +81,183 @@ public class TaskAffirmJob implements Job { log.info("任务确认流程，定时任务开启 ====================================================="); QueryWrapper queryWrapperInventory = new QueryWrapper<>(); + // 获取出 任务待确认 的数据（这个状态的数据任务在责任人上） + queryWrapperInventory.and(queryWrapper -> { + queryWrapper.lambda().eq(ProjectLawsInventoryEO::getDesignFlowStatus, ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()); + }); + List projectLawsInventoryEOList = projectLawsInventoryEOMapper.selectList(queryWrapperInventory); + + if(CollectionUtils.isNotEmpty(projectLawsInventoryEOList)) { + // 根据项目进行分组 + Map> lawsInventoryByProjectLibraryIdGroupMap = projectLawsInventoryEOList.stream().collect(Collectors.groupingBy(ProjectLawsInventoryEO::getProjectLibraryId)); + + for (Map.Entry> lawsInventoryByProjectLibraryIdGroup : lawsInventoryByProjectLibraryIdGroupMap.entrySet()) { + String projectLibraryId = lawsInventoryByProjectLibraryIdGroup.getKey(); + List lawsInventoryListByProjectLibraryId = lawsInventoryByProjectLibraryIdGroup.getValue(); + if(StringUtils.isEmpty(projectLibraryId) || CollectionUtils.isEmpty(lawsInventoryListByProjectLibraryId)){ + continue; + } + + // 设计符合性 + Map> lawsInventoryByDesignDutyIdGroupMap = lawsInventoryListByProjectLibraryId.stream().collect(Collectors.groupingBy(ProjectLawsInventoryEO::getDesignDutyId)); + for (Map.Entry> lawsInventoryByDesignDutyIdGroup : lawsInventoryByDesignDutyIdGroupMap.entrySet()) { + String designDutyId = lawsInventoryByDesignDutyIdGroup.getKey(); + List designDutyDataList = lawsInventoryByDesignDutyIdGroup.getValue(); + if(StringUtils.isEmpty(designDutyId) || CollectionUtils.isEmpty(designDutyDataList)){ + continue; + } + + List userIdList = Arrays.asList(designDutyId.split(",")); + + Map sendMsgDataListMap = this.disposeSendMsgDataList(designDutyDataList); + + // 三条后结束的 + List threeDaysList = (List) sendMsgDataListMap.get("threeDaysList"); + if(CollectionUtils.isNotEmpty(threeDaysList)){ + Date designDueDate = threeDaysList.get(0).getDesignDueDate(); + String endTime = ""; + if(designDueDate != null){ + endTime = DateUtils.formatDate(designDueDate); + } + String serialNumbers = threeDaysList.stream().map(ProjectLawsInventoryEO::getSerialNumber).distinct().collect(Collectors.joining(",")); + // 给责任人发消息 + Map params = new HashMap<>(); + params.put("contentCn","您好，以下待办任务距离截止日期仅剩3天，请及时查看处理。"); + params.put("contentEn","Hello! This task will expire in 3 days. Please check and address it in a timely manner. Thank you!"); + params.put("projectLibraryId",projectLibraryId); + params.put("endTime",endTime); + params.put("userIdList",userIdList); + params.put("serialNumbers",serialNumbers); + params.put("flowTypeCn","设计符合性流程"); + params.put("flowTypeEn","Design Compliance Process"); + this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION4.getValue(),params); + } + // 当天结束的 + List currentDaysList = (List) sendMsgDataListMap.get("currentDaysList"); + if(CollectionUtils.isNotEmpty(currentDaysList)){ + Date designDueDate = currentDaysList.get(0).getDesignDueDate(); + String endTime = ""; + if(designDueDate != null){ + endTime = DateUtils.formatDate(designDueDate); + } + String serialNumbers = currentDaysList.stream().map(ProjectLawsInventoryEO::getSerialNumber).distinct().collect(Collectors.joining(",")); + // 给责任人发消息 + Map params = new HashMap<>(); + params.put("contentCn","您好，以下待办任务已到截止日期，请尽快查看处理。"); + params.put("contentEn","Hello! This task will expire today. Please check and address it ASAP. Thank you!"); + params.put("projectLibraryId",projectLibraryId); + params.put("endTime",endTime); + params.put("userIdList",userIdList); + params.put("serialNumbers",serialNumbers); + params.put("flowTypeCn","设计符合性流程"); + params.put("flowTypeEn","Design Compliance Process"); + this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION4.getValue(),params); + } + // 逾期的 + List overdueList = (List) sendMsgDataListMap.get("overdueList"); + if(CollectionUtils.isNotEmpty(overdueList)){ + Date designDueDate = overdueList.get(0).getDesignDueDate(); + String endTime = ""; + if(designDueDate != null){ + endTime = DateUtils.formatDate(designDueDate); + } + String serialNumbers = overdueList.stream().map(ProjectLawsInventoryEO::getSerialNumber).distinct().collect(Collectors.joining(",")); + // 给责任人发消息 + Map params = new HashMap<>(); + params.put("contentCn","您好，以下待办任务已逾期，请尽快处理。"); + params.put("contentEn","Hello! This task is overdue. Please address it ASAP. Thank you!"); + params.put("projectLibraryId",projectLibraryId); + params.put("endTime",endTime); + params.put("userIdList",userIdList); + params.put("serialNumbers",serialNumbers); + params.put("flowTypeCn","设计符合性流程"); + params.put("flowTypeEn","Design Compliance Process"); + this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION5.getValue(),params); + } + } + // 验证符合性 + Map> lawsInventoryByVerifyDutyIdGroupMap = lawsInventoryListByProjectLibraryId.stream().collect(Collectors.groupingBy(ProjectLawsInventoryEO::getVerifyDutyId)); + + for (Map.Entry> lawsInventoryByVerifyDutyIdGroup : lawsInventoryByVerifyDutyIdGroupMap.entrySet()) { + String verifyDutyId = lawsInventoryByVerifyDutyIdGroup.getKey(); + List verifyDutyDataList = lawsInventoryByVerifyDutyIdGroup.getValue(); + if(StringUtils.isEmpty(verifyDutyId) || CollectionUtils.isEmpty(verifyDutyDataList)){ + continue; + } + + List userIdList = Arrays.asList(verifyDutyId.split(",")); + + Map sendMsgDataListMap = this.disposeSendMsgDataList(verifyDutyDataList); + + // 三条后结束的 + List threeDaysList = (List) sendMsgDataListMap.get("threeDaysList"); + if(CollectionUtils.isNotEmpty(threeDaysList)){ + Date verifyDueDate = threeDaysList.get(0).getVerifyDueDate(); + String endTime = ""; + if(verifyDueDate != null){ + endTime = DateUtils.formatDate(verifyDueDate); + } + String serialNumbers = threeDaysList.stream().map(ProjectLawsInventoryEO::getSerialNumber).distinct().collect(Collectors.joining(",")); + // 给责任人发消息 + Map params = new HashMap<>(); + params.put("contentCn","您好，以下待办任务距离截止日期仅剩3天，请及时查看处理。"); + params.put("contentEn","Hello! This task will expire in 3 days. Please check and address it in a timely manner. Thank you!"); + params.put("projectLibraryId",projectLibraryId); + params.put("endTime",endTime); + params.put("userIdList",userIdList); + params.put("serialNumbers",serialNumbers); + params.put("flowTypeCn","验证符合性流程"); + params.put("flowTypeEn","Validation Compliance Process"); + this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION4.getValue(),params); + } + // 当天结束的 + List currentDaysList = (List) sendMsgDataListMap.get("currentDaysList"); + if(CollectionUtils.isNotEmpty(currentDaysList)){ + Date verifyDueDate = currentDaysList.get(0).getVerifyDueDate(); + String endTime = ""; + if(verifyDueDate != null){ + endTime = DateUtils.formatDate(verifyDueDate); + } + String serialNumbers = currentDaysList.stream().map(ProjectLawsInventoryEO::getSerialNumber).distinct().collect(Collectors.joining(",")); + // 给责任人发消息 + Map params = new HashMap<>(); + params.put("contentCn","您好，以下待办任务已到截止日期，请尽快查看处理。"); + params.put("contentEn","Hello! This task will expire today. Please check and address it ASAP. Thank you!"); + params.put("projectLibraryId",projectLibraryId); + params.put("endTime",endTime); + params.put("userIdList",userIdList); + params.put("serialNumbers",serialNumbers); + params.put("flowTypeCn","验证符合性流程"); + params.put("flowTypeEn","Validation Compliance Process"); + this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION4.getValue(),params); + } + // 逾期的 + List overdueList = (List) sendMsgDataListMap.get("overdueList"); + if(CollectionUtils.isNotEmpty(overdueList)){ + Date verifyDueDate = overdueList.get(0).getVerifyDueDate(); + String endTime = ""; + if(verifyDueDate != null){ + endTime = DateUtils.formatDate(verifyDueDate); + } + String serialNumbers = overdueList.stream().map(ProjectLawsInventoryEO::getSerialNumber).distinct().collect(Collectors.joining(",")); + // 给责任人发消息 + Map params = new HashMap<>(); + params.put("contentCn","您好，以下待办任务已逾期，请尽快处理。"); + params.put("contentEn","Hello! This task is overdue. Please address it ASAP. Thank you!"); + params.put("projectLibraryId",projectLibraryId); + params.put("endTime",endTime); + params.put("userIdList",userIdList); + params.put("serialNumbers",serialNumbers); + params.put("flowTypeCn","验证符合性流程"); + params.put("flowTypeEn","Validation Compliance Process"); + this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION5.getValue(),params); + } + } + } + + } + + /*QueryWrapper queryWrapperInventory = new QueryWrapper<>(); queryWrapperInventory.lambda().eq(ProjectLawsInventoryEO::getTaskAffirmStatus, InventoryAffirmStatusEnum.LIST_TO_CONFIRM.getValue()); List projectLawsInventoryEOList = projectLawsInventoryEOMapper.selectList(queryWrapperInventory); if (ObjectUtils.isNotEmpty(projectLawsInventoryEOList)) { @@ -290,8 +477,59 @@ public class TaskAffirmJob implements Job { } } } - } + }*/ log.info("任务确认流程，定时任务结束 ====================================================="); } + + private Map disposeSendMsgDataList(List projectLawsInventoryEOList) { + Map result = new HashMap<>(); + Date currentDate = new Date(); + String currentDateStr = sdf.format(currentDate); + + //获取后三天的时间 + Calendar calendar=new GregorianCalendar(); + calendar.setTime(new Date()); + calendar.add(Calendar.DATE,3); + Date threeDays = calendar.getTime(); + String threeDaysStr = sdf.format(threeDays); + + // 当天结束的 + List currentDaysList = projectLawsInventoryEOList.stream().filter(data -> { + boolean flag = false; + //结束日期是当前日期 + if(data.getInventoryAffirmDueDate() != null){ + if (StringUtils.equals(currentDateStr, sdf.format(data.getInventoryAffirmDueDate()))) { + flag = true; + } + } + return flag; + }).collect(Collectors.toList()); + + // 三天后结束的 + List threeDaysList = projectLawsInventoryEOList.stream().filter(data -> { + boolean flag = false; + if(data.getInventoryAffirmDueDate() != null){ + if (StringUtils.equals(threeDaysStr, sdf.format(data.getInventoryAffirmDueDate()))) { + flag = true; + } + } + return flag; + }).collect(Collectors.toList()); + + // 逾期的 + List overdueList = projectLawsInventoryEOList.stream().filter(data -> { + // 只要早于当前日期都算逾期 不算当天。 + boolean flag = false; + if(data.getInventoryAffirmDueDate() != null){ + flag = (data.getInventoryAffirmDueDate().before(currentDate) && !StringUtils.equals(currentDateStr, sdf.format(data.getInventoryAffirmDueDate()))); + } + return flag; + }).collect(Collectors.toList()); + + result.put("currentDaysList",currentDaysList); + result.put("threeDaysList",threeDaysList); + result.put("overdueList",overdueList); + return result; + } } From baf53ed07a93900c2c6b58e5561f5791e9c97a99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Thu, 23 Mar 2023 11:29:47 +0800 Subject: [PATCH 244/645] =?UTF-8?q?=E7=AC=A6=E5=90=88=E6=80=A7=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4=E6=89=B9=E9=87=8F=E5=A4=84=E7=90=86\=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E8=B4=A3=E4=BB=BB=E7=A1=AE=E8=AE=A4=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 15 ++--- jero-web/src/common/lang/zh-cn.js | 16 ++--- .../components/listOfRegulations.vue | 41 ++++++++++--- .../components/settingList.vue | 19 ++++++ .../components/confirmationDrawer.vue | 58 ++++++++++++------- .../reviewedByThePersonInCharge.vue | 3 +- 6 files changed, 107 insertions(+), 45 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index dc512c442..b419bea40 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -600,7 +600,7 @@ module.exports = { selectSplitListDisplay: 'Please select whether to split the document list for display', selectDisplayList: 'Please select whether to display in list', documentSplitDisplay: 'Document splitting module display', - VirtualListName: 'Virtual List Name', + VirtualListName: 'Market List Name', CertificationListName:'Certification List Name', listStatus: 'List Status', creater: 'Creater', @@ -857,7 +857,7 @@ module.exports = { cannotExceed: 'Cannot Exceed', Characters: 'Characters', standardInformation: 'Standard Information', - VirtualList: 'VirtualList', + VirtualList: 'MarketList', importTemplate: 'Import Template', verificationConfirmationDeadline: 'Verification compliance confirmation deadline', technicalEvaluationResults: 'Technical Evaluation Results', @@ -875,7 +875,7 @@ module.exports = { reminder: 'Reminder', adopt: 'Adopt', reviewedByThePersonInCharge: 'Reviewed by the person in charge', - onlyDeleted: 'Only data whose list confirmation status is not initiated or rejected can be deleted', + onlyDeleted: 'Only data that has not started or ended the process can be deleted', experimentPassed: 'Test Passed', experimentFailed: 'Test Failed', toBeStarted: 'Not Start', @@ -897,10 +897,10 @@ module.exports = { pleaseDesignConformityConfirmation: 'Please complete the data of design conformity confirmation', pleaseConfirmedByPrehomo: 'Please complete the data confirmed by Pre-Homo', pleaseConformityVerification: 'Please complete the data of Conformity verification', - virtualListDetails: 'Virtual List Details', + virtualListDetails: 'Market List Details', virtualAuthenticationListDetails: 'Virtual Authentication List Details', VirtualAuthenticationList: 'Virtual Authentication List', - maintainVirtualList: 'Maintain Virtual List', + maintainVirtualList: 'Maintain Market List', certificationListMaintenance: 'Certification List Maintenance', reasonsForRejection: 'Reasons For Rejection', inconformity: 'Non-Compliance', @@ -950,7 +950,7 @@ module.exports = { pleaseSubmitStatus: 'Please confirm all engineer data before submission.', modelName: 'Model Name', modelYear: 'Model Year', - NoteConfirmTheChange: 'Note: after the change, the list will be in the status of not being reviewed, which will start from the internal review, and the historical data will be discarded Confirm the change', + NoteConfirmTheChange: 'Note: After resetting, the selected item data will change to a list pending release status, and the historical data will disappear. Please confirm whether to perform a process reset', onlyDataChanged: 'Only data whose task confirmation status is accepted can be changed', inquiry: 'Inquiry', ConfirmationDeadline: 'Confirmation Deadline', @@ -1699,6 +1699,7 @@ module.exports = { hardwaremanufacturer:'Hardware manufacturer', softwareversion:'Software version', returntofill:'Return to fill', - + thereAreCurrentlyNoRegulationsToHandle:'There are currently no regulations to handle', + certificationSubmission:'Certification Submission', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 8d7024f75..3552ba9c8 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -608,9 +608,9 @@ module.exports = { selectSplitListDisplay: '请选择是否文档拆分列表展示', selectDisplayList: '请选择是否列表展示', documentSplitDisplay: '文档拆分模块展示', - VirtualListName: '虚拟清单名称', + VirtualListName: '市场清单名称', CertificationListName:'认证清单名称', - VirtualList: '虚拟清单', + VirtualList: '市场清单', listStatus: '清单状态', creater: '创建人', withdraw: '撤回', @@ -890,7 +890,7 @@ module.exports = { reminder: '提醒', adopt: '通过', reviewedByThePersonInCharge: '负责人审核', - onlyDeleted: '只能删除清单确认状态为未发起或拒绝的数据', + onlyDeleted: '只能删除流程未开始和流程结束的数据', experimentPassed: '实验通过', experimentFailed: '实验失败', toBeStarted: '待开始', @@ -901,7 +901,7 @@ module.exports = { blue: '蓝', yellow: '黄', resultReported: '结果报告', - TheDoesNotContainData: '该虚拟清单的维护清单中没有数据,是否需要添加', + TheDoesNotContainData: '该市场清单的维护清单中没有数据,是否需要添加', number: '序号', Deadline: '截止时间', designComplianceReview: '设计符合性确认', @@ -910,10 +910,10 @@ module.exports = { pleaseDesignConformityConfirmation: '请补全设计符合性确认的数据', pleaseConfirmedByPrehomo: '请补全 Pre-Homo确认的数据', pleaseConformityVerification: '请补全验证符合性确认的数据', - virtualListDetails: '虚拟清单详情', + virtualListDetails: '市场清单详情', virtualAuthenticationListDetails: '虚拟认证清单详情', VirtualAuthenticationList: '虚拟认证清单', - maintainVirtualList: '维护虚拟清单', + maintainVirtualList: '维护市场清单', certificationListMaintenance: '认证清单维护', reasonsForRejection: '驳回原因', inconformity: '不符合', @@ -962,7 +962,7 @@ module.exports = { pleaseSubmitStatus: '请把工程确认的数据都点为确认状态进行提交', modelName: '车型名称', modelYear: '年款', - NoteConfirmTheChange: '注意：变更后该条清单变为未审查状态，将从内部审查工作开始从头进行，历史数据都将丢弃是否确认变更', + NoteConfirmTheChange: '注意：重置后所选条目数据将变为清单待发布状态，历史数据将消失，请确认是否进行流程重置', onlyDataChanged: '只能变更任务确认状态为接受的数据', inquiry: '询问', ConfirmationDeadline: '确认截止时间', @@ -1799,4 +1799,6 @@ module.exports = { returntofill:'返回填写', onlyDataInTheReminderProcessBanBeProcessed:'只能催办流程中的数据', expeditionProcess:'催办流程', + thereAreCurrentlyNoRegulationsToHandle:'当前没有可处理的法规', + certificationSubmission:'认证提交', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 3da734972..333a2acdb 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -274,9 +274,18 @@ {{ $t('deleteLib') }} @@ -1220,7 +1229,11 @@ TaskKey = 'zrrqr' } else if (row.designFlowStatus == 'Results to be submitted') { TaskKey = 'zrrtjjfw' - } else if (row.designFlowStatus == 'Results to be reviewed') { + } else if (row.designFlowStatus == 'Results to be reviewed' || + row.designFlowStatus == 'Compliance' || + row.designFlowStatus == 'Non-Compliance' || + row.designFlowStatus == 'To be tracked' || + row.designFlowStatus == 'NA') { TaskKey = 'fggcssh' } query = { @@ -1246,7 +1259,11 @@ TaskKey = 'zrrqr' } else if (row.verifyFlowStatus == 'Results to be submitted') { TaskKey = 'zrrtjjfw' - } else if (row.verifyFlowStatus == 'Results to be reviewed') { + } else if (row.verifyFlowStatus == 'Results to be reviewed' || + row.verifyFlowStatus == 'Compliance' || + row.verifyFlowStatus == 'Non-Compliance' || + row.verifyFlowStatus == 'To be tracked' || + row.verifyFlowStatus == 'NA') { TaskKey = 'fggcssh' } query = { @@ -1711,8 +1728,18 @@ for (let i = 0; i < this.dataSource.length; i++) { for (let j = 0; j < selectedRowKeys.length; j++) { if (this.dataSource[i].id == selectedRowKeys[j]) { - if (this.dataSource[i].verifyFlowStatus == 'List to be released' || - this.dataSource[i].designFlowStatus == 'List to be released') { + if ( + (this.dataSource[i].verifyFlowStatus == 'List to be released' || + this.dataSource[i].verifyFlowStatus == 'Compliance' || + this.dataSource[i].verifyFlowStatus == 'Non-Compliance' || + this.dataSource[i].verifyFlowStatus == 'To be tracked' || + this.dataSource[i].verifyFlowStatus == 'NA') + && + (this.dataSource[i].designFlowStatus == 'List to be released' || + this.dataSource[i].designFlowStatus == 'Compliance' || + this.dataSource[i].designFlowStatus == 'Non-Compliance' || + this.dataSource[i].designFlowStatus == 'To be tracked' || + this.dataSource[i].designFlowStatus == 'NA')) { isTrue = true } else { isTrue = false diff --git a/jero-web/src/views/projectManagement/components/settingList.vue b/jero-web/src/views/projectManagement/components/settingList.vue index 1fa78f812..e06252266 100644 --- a/jero-web/src/views/projectManagement/components/settingList.vue +++ b/jero-web/src/views/projectManagement/components/settingList.vue @@ -109,6 +109,25 @@
+ + + {{$t('certificationSubmission')}} +
+ + + +
+ + +
+
{{$t('certificationEnd')}} diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/confirmationDrawer.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/confirmationDrawer.vue index 9b060963e..8d89b4242 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/confirmationDrawer.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/confirmationDrawer.vue @@ -56,9 +56,9 @@ {{$t('resultofhandling')}}
- + + v-model="formInline.flag"> {{$t('accept')}} @@ -130,6 +130,7 @@ import uploadFile from '@/components/uploadFile/file' import { getAction, postAction, putAction, deleteAction } from '@/api/manage' import { mapGetters } from 'vuex' + import moment from 'moment' export default { name: 'confirmationDrawer', @@ -226,12 +227,12 @@ ], processableList: [], noProcessableList: [], - loading:false, + loading: false, rules: { - disposeResult: [ + flag: [ { required: true, - message: this.$t('reviewResults') + this.$t('cannotEmpty'), + message: this.$t('resultofhandling') + this.$t('cannotEmpty'), trigger: 'change' } ], @@ -296,24 +297,37 @@ this.visible = false }, determineClick() { - this.$refs.ruleForm.validate(valid => { - if (valid) { - let query = { - userid: this.userInfo().id, - taskId: this.queryData.taskId || this.queryData.taskIds, - } - postAction('/workFlow/completeTask', query).then((res) => { - if (res.success) { - this.$message.success(this.$t('OperationSuccessful')) - this.visible = false - this.$emit('confirmationdrawerList') - } else { - this.loading = false - this.$message.warning(res.message) + if (this.processableList && this.processableList.length > 0) { + this.$refs.ruleForm.validate(valid => { + if (valid) { + this.loading = true + let taskIds = [] + this.processableList.forEach(res => { + taskIds.push(res.taskId) + }) + let handlingTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss') + let query = { + ...this.formInline, + taskIds: taskIds.join(','), + userId: this.userInfo().id, + handlingTime: handlingTime } - }) - } - }) + postAction('/workFlow/completeTaskBatch', query).then((res) => { + if (res.success) { + this.$message.success(this.$t('OperationSuccessful')) + this.visible = false + this.loading = false + this.$emit('confirmationdrawerList') + } else { + this.loading = false + this.$message.warning(this.$t('operationFailed')) + } + }) + } + }) + } else { + this.$message.warning(this.$t('thereAreCurrentlyNoRegulationsToHandle')) + } }, clickButtonToUpload(item) { this.$refs.uploadFile.perentHandleFunc() diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue index c5972a464..230759ce6 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue @@ -120,7 +120,7 @@ disposeResult: [ { required: true, - message: this.$t('reviewResults') + this.$t('cannotEmpty'), + message: this.$t('resultofhandling') + this.$t('cannotEmpty'), trigger: 'change' } ], @@ -159,7 +159,6 @@ } }, mounted() { - console.log(this.query) this.formInline.approvalOpinion = '' this.formInline = { ...this.formInline } // this.query.isDisplay = JSON.parse(this.query.isDisplay) From 84724c555353b3b3b16a1fca5670ce25a6a66da4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Thu, 23 Mar 2023 11:41:45 +0800 Subject: [PATCH 245/645] =?UTF-8?q?=E5=AE=9A=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 2 +- jero-web/src/common/lang/zh-cn.js | 2 +- .../components/listOfRegulations.vue | 21 +++++++++++++++---- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index b419bea40..535dd71ce 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -852,7 +852,7 @@ module.exports = { record: 'Record', replyToComments: 'Reply To Comments', noComment: 'No Comment', - theReceived: 'The final version can be made only when the list confirmation status and task confirmation status of All data are received', + theReceived: 'Finalize all process data only after completing the task responsibility confirmation node', notEvaluated: 'Not Evaluated', cannotExceed: 'Cannot Exceed', Characters: 'Characters', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 3552ba9c8..4c9c614cb 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -868,7 +868,7 @@ module.exports = { record: '记录', replyToComments: '回复评论', noComment: '暂无评论', - theReceived: '所有数据的清单确认状态和任务确认状态都为接受才可以定版', + theReceived: '所有流程数据均完成任务责任确认节点后才能进行定版操作', notEvaluated: '未评估', cannotExceed: '不能超出', Characters: '个字符', diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 333a2acdb..d37e2fa21 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -1608,7 +1608,20 @@ if (this.dataSource && this.dataSource.length > 0) { let isTrue for (let i = 0; i < this.dataSource.length; i++) { - if (this.dataSource[i].taskAffirmStatus == 'Accepted' && this.dataSource[i].inventoryAffirmStatus == 'Accepted') { + if ((this.dataSource[i].verifyFlowStatus == 'Results to be submitted' || + this.dataSource[i].verifyFlowStatus == 'Results to be reviewed' || + this.dataSource[i].verifyFlowStatus == 'Compliance' || + this.dataSource[i].verifyFlowStatus == 'Non-Compliance' || + this.dataSource[i].verifyFlowStatus == 'To be tracked' || + this.dataSource[i].verifyFlowStatus == 'NA' + ) && + (this.dataSource[i].designFlowStatus == 'Results to be submitted' || + this.dataSource[i].designFlowStatus == 'Results to be reviewed' || + this.dataSource[i].designFlowStatus == 'Compliance' || + this.dataSource[i].designFlowStatus == 'Non-Compliance' || + this.dataSource[i].designFlowStatus == 'To be tracked' || + this.dataSource[i].designFlowStatus == 'NA' + )) { isTrue = true } else { isTrue = false @@ -1729,13 +1742,13 @@ for (let j = 0; j < selectedRowKeys.length; j++) { if (this.dataSource[i].id == selectedRowKeys[j]) { if ( - (this.dataSource[i].verifyFlowStatus == 'List to be released' || + (this.dataSource[i].verifyFlowStatus == 'List to be released' || this.dataSource[i].verifyFlowStatus == 'Compliance' || this.dataSource[i].verifyFlowStatus == 'Non-Compliance' || this.dataSource[i].verifyFlowStatus == 'To be tracked' || this.dataSource[i].verifyFlowStatus == 'NA') - && - (this.dataSource[i].designFlowStatus == 'List to be released' || + && + (this.dataSource[i].designFlowStatus == 'List to be released' || this.dataSource[i].designFlowStatus == 'Compliance' || this.dataSource[i].designFlowStatus == 'Non-Compliance' || this.dataSource[i].designFlowStatus == 'To be tracked' || From 22a54fb9d30e76d5df6dd5858fa4a2221003da7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Thu, 23 Mar 2023 11:45:26 +0800 Subject: [PATCH 246/645] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E6=B7=BB=E5=8A=A0=E5=92=8C=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=97=B6=20=E6=8E=A5=E5=8F=A3=E4=BA=BA?= =?UTF-8?q?=E5=92=8C=E8=B4=A3=E4=BB=BB=E4=BA=BA=E7=9A=84=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../enums/PermissionDescriptionEnum.java | 1 + .../enums/ProjectUserLocationEnum.java | 5 + ...ctCertificationInventoryEOServiceImpl.java | 92 ++++++++++++++++++- 3 files changed, 93 insertions(+), 5 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/PermissionDescriptionEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/PermissionDescriptionEnum.java index 42644a441..f6cd8cb9c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/PermissionDescriptionEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/PermissionDescriptionEnum.java @@ -4,6 +4,7 @@ public enum PermissionDescriptionEnum { PROJECT_RELATED_PERSONNEL("相关人员名单","projectRelatedPersonnelId:"), PROJECT_LAWS_INVENTORY("法规清单","projectLawsInventoryId:"), + PROJECT_CERTIFICATION_INVENTORY("认证清单","projectCertificationInventoryId:"), PARAMS_COLLECT_MANIFEST("参数项","paramsCollectManifestId:"); String label; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectUserLocationEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectUserLocationEnum.java index 5d8cab1ec..798ec0373 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectUserLocationEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectUserLocationEnum.java @@ -29,10 +29,15 @@ public enum ProjectUserLocationEnum { PROJECT_LAWS_PREHOMO_DISTRIBUTION("PROJECT_LAWS_PREHOMO_DISTRIBUTION","prehomo确认分发工程师"), PROJECT_LAWS_VERIFY_DISTRIBUTION("PROJECT_LAWS_VERIFY_DISTRIBUTION","验证符合性确认分发工程师"), + PROJECT_CERTIFICATION_INVENTORY_SDT("PROJECT_CERTIFICATION_INVENTORY_SDT","认证清单中接口人"), + PROJECT_CERTIFICATION_INVENTORY_DP("PROJECT_CERTIFICATION_INVENTORY_DP","认证清单中责任人"), + PROJECT_PARAMS_COLLECT_MANIFEST_DRE("PROJECT_PARAMS_COLLECT_MANIFEST_DRE","认证参数收集中填写人"), PROJECT_PARAMS_COLLECT_MANIFEST_SDT("PROJECT_PARAMS_COLLECT_MANIFEST_SDT","认证参数收集中工程接口人"); + + String value; String label; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index d4ec8e3da..3699cee42 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -31,13 +31,10 @@ import com.jero.modules.project.entity.ProjectCertificationInventoryLogEO; import com.jero.modules.project.entity.ProjectLibraryBase; import com.jero.modules.project.entity.ProjectRelatedPersonnel; import com.jero.modules.project.enums.*; -import com.jero.modules.project.service.IProjectCertificationInventoryLogEOService; -import com.jero.modules.project.service.IProjectRelatedPersonnelService; +import com.jero.modules.project.service.*; import com.jero.modules.split.common.FileUnZip; import com.jero.modules.system.enums.ProjectRoleEnum; import com.jero.modules.project.mapper.ProjectCertificationInventoryEOMapper; -import com.jero.modules.project.service.IProjectCertificationInventoryEOService; -import com.jero.modules.project.service.IProjectLibraryBaseService; import com.jero.modules.system.entity.SysCategory; import com.jero.modules.system.entity.SysDictItem; import com.jero.modules.system.entity.SysRole; @@ -82,7 +79,7 @@ import java.util.stream.Collectors; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.ObjectUtils; +import org.apache.commons.lang3.ObjectUtils; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; @@ -129,6 +126,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl adds = new ArrayList<>(); + if (ObjectUtils.isNotEmpty(projectCertificationInventoryEO.getSdt())) { + setProjectCertificationInventoryPermission(projectCertificationInventoryEO.getSdt(), projectCertificationInventoryEO.getProjectLibraryId(), projectCertificationInventoryEO.getId(), now, adds, ProjectUserLocationEnum.PROJECT_CERTIFICATION_INVENTORY_SDT.getValue()); + } + if (ObjectUtils.isNotEmpty(projectCertificationInventoryEO.getDutyPerson())) { + setProjectCertificationInventoryPermission(projectCertificationInventoryEO.getDutyPerson(), projectCertificationInventoryEO.getProjectLibraryId(), projectCertificationInventoryEO.getId(), now, adds, ProjectUserLocationEnum.PROJECT_CERTIFICATION_INVENTORY_DP.getValue()); + } + if (ObjectUtils.isNotEmpty(adds)) { + projectUserPermissionService.saveBatch(adds); + } } /** @@ -386,6 +396,21 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl adds = new ArrayList<>(); + for (ProjectCertificationInventoryEO pci: updateList) { + if (ObjectUtils.isNotEmpty(pci.getSdt())) { + setProjectCertificationInventoryPermission(pci.getSdt(), pci.getProjectLibraryId(), pci.getId(), now, adds, ProjectUserLocationEnum.PROJECT_CERTIFICATION_INVENTORY_SDT.getValue()); + } + if (ObjectUtils.isNotEmpty(pci.getDutyPerson())) { + setProjectCertificationInventoryPermission(pci.getDutyPerson(), pci.getProjectLibraryId(), pci.getId(), now, adds, ProjectUserLocationEnum.PROJECT_CERTIFICATION_INVENTORY_DP.getValue()); + } + } + if (ObjectUtils.isNotEmpty(adds)) { + projectUserPermissionService.saveBatch(adds); + } }catch (Exception ex){ throw new JeroBootException("批量设置失败！"); } @@ -529,6 +554,20 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl0) { projectCertificationInventoryEOService.saveBatch(list); } + Date now = new Date(); + //设置权限 先删后加 + List adds = new ArrayList<>(); + for (ProjectCertificationInventoryEO pci: list) { + if (ObjectUtils.isNotEmpty(pci.getSdt())) { + setProjectCertificationInventoryPermission(pci.getSdt(), pci.getProjectLibraryId(), pci.getId(), now, adds, ProjectUserLocationEnum.PROJECT_CERTIFICATION_INVENTORY_SDT.getValue()); + } + if (ObjectUtils.isNotEmpty(pci.getDutyPerson())) { + setProjectCertificationInventoryPermission(pci.getDutyPerson(), pci.getProjectLibraryId(), pci.getId(), now, adds, ProjectUserLocationEnum.PROJECT_CERTIFICATION_INVENTORY_DP.getValue()); + } + } + if (ObjectUtils.isNotEmpty(adds)) { + projectUserPermissionService.saveBatch(adds); + } } } } @@ -1950,15 +1989,27 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl saveBatch(JSONObject json) { + Date now = new Date(); if (!json.containsKey("dataList")) { throw new JeroBootException("无法获取需要保存的数据，请检查！"); } JSONArray dataList = json.getJSONArray("dataList"); List projectCertificationInventoryEOList = new ArrayList<>(); ProjectCertificationInventoryEO projectCertificationInventoryEO = null; + //设置权限 先删后加 + List adds = new ArrayList<>(); for (Object data : dataList) { projectCertificationInventoryEO = JSONObject.parseObject(JSONObject.toJSONString(data),ProjectCertificationInventoryEO.class); projectCertificationInventoryEOList.add(projectCertificationInventoryEO); + if(ObjectUtils.isNotEmpty(projectCertificationInventoryEO.getSdt())){ + setProjectCertificationInventoryPermission(projectCertificationInventoryEO.getSdt(), projectCertificationInventoryEO.getProjectLibraryId(), projectCertificationInventoryEO.getId(), now, adds, ProjectUserLocationEnum.PROJECT_CERTIFICATION_INVENTORY_SDT.getValue()); + } + if(ObjectUtils.isNotEmpty(projectCertificationInventoryEO.getDutyPerson())){ + setProjectCertificationInventoryPermission(projectCertificationInventoryEO.getDutyPerson(), projectCertificationInventoryEO.getProjectLibraryId(), projectCertificationInventoryEO.getId(), now, adds, ProjectUserLocationEnum.PROJECT_CERTIFICATION_INVENTORY_DP.getValue()); + } + } + if (ObjectUtils.isNotEmpty(adds)) { + projectUserPermissionService.saveBatch(adds); } if(CollectionUtils.isEmpty(projectCertificationInventoryEOList)){ throw new JeroBootException("无法获取需要保存的数据，请检查！"); @@ -2537,6 +2588,20 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl adds = new ArrayList<>(); + for (ProjectCertificationInventoryEO pci: projectCertificationInventoryEOList) { + if (ObjectUtils.isNotEmpty(pci.getSdt())) { + setProjectCertificationInventoryPermission(pci.getSdt(), pci.getProjectLibraryId(), pci.getId(), now, adds, ProjectUserLocationEnum.PROJECT_CERTIFICATION_INVENTORY_SDT.getValue()); + } + if (ObjectUtils.isNotEmpty(pci.getDutyPerson())) { + setProjectCertificationInventoryPermission(pci.getDutyPerson(), pci.getProjectLibraryId(), pci.getId(), now, adds, ProjectUserLocationEnum.PROJECT_CERTIFICATION_INVENTORY_DP.getValue()); + } + } + if (ObjectUtils.isNotEmpty(adds)) { + projectUserPermissionService.saveBatch(adds); + } } return Result.OK("调取成功！"); @@ -3103,4 +3168,21 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl adds, String belong) { + QueryWrapper del = new QueryWrapper<>(); + del.eq("project_id", projectId) + .eq("belong", belong) + .eq("description", PermissionDescriptionEnum.PROJECT_CERTIFICATION_INVENTORY.getValue() + certificationInventoryId); + projectUserPermissionService.remove(del); + + ProjectUserPermission permission = new ProjectUserPermission(); + permission.setProjectId(projectId); + permission.setUserId(userId); + permission.setBelong(belong); + permission.setDescription(PermissionDescriptionEnum.PROJECT_CERTIFICATION_INVENTORY.getValue() + certificationInventoryId); + permission.setCreateTime(now); + permission.setUpdateTime(now); + adds.add(permission); + } } From afa718fe6c3d083645c0254dd8bd9271067c06ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Thu, 23 Mar 2023 11:48:02 +0800 Subject: [PATCH 247/645] =?UTF-8?q?=E5=AE=9A=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectManagement/components/listOfRelevantPersonnel.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue b/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue index 11d8fa6dd..5879a3959 100644 --- a/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue +++ b/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue @@ -326,14 +326,14 @@ { align: 'left', slots: { title: 'projectInterfacePersonRegulationEngineerSetting' }, - dataIndex: 'engineeringInterfacePersonName', + dataIndex: 'engineerLawSetName', ellipsis: true, width: 203 }, { align: 'left', slots: { title: 'projectInterfacePersonCertificationEngineerSetting' }, - dataIndex: 'engineeringInterfacePersonName', + dataIndex: 'engineerAttSetName', ellipsis: true, width: 203 }, From 79014e5f45dff35b6706680ce2a9b88fe44d0294 Mon Sep 17 00:00:00 2001 From: cuijiaming <1410452759@qq.com> Date: Thu, 23 Mar 2023 13:48:17 +0800 Subject: [PATCH 248/645] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93-=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=BA=93=E8=AF=A6=E6=83=85-=E5=90=88=E8=A7=84?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E8=AE=A1=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProjectTaskPlanningServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java index 9302162bf..e1645260d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java @@ -280,10 +280,10 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl Date: Thu, 23 Mar 2023 14:07:32 +0800 Subject: [PATCH 249/645] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95-?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=A1=AE=E8=AE=A4=E3=80=81=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=E7=AC=A6=E5=90=88=E6=80=A7=E5=AE=9A=E6=97=B6=E5=8F=91=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/project/job/TaskAffirmJob.java | 45 ++++++--- .../project/job/designComplianceJob.java | 97 ++++++++++++------- 2 files changed, 96 insertions(+), 46 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/TaskAffirmJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/TaskAffirmJob.java index d1befe3d5..3f5ab9dc5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/TaskAffirmJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/TaskAffirmJob.java @@ -24,6 +24,7 @@ import com.jero.modules.project.mapper.ProjectYearNameInfoEOMapper; import com.jero.modules.project.service.IProjectLawsInventoryEOService; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysUserService; +import com.jero.modules.wkflow.enums.FlowTypeEnum; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; @@ -109,7 +110,7 @@ public class TaskAffirmJob implements Job { List userIdList = Arrays.asList(designDutyId.split(",")); - Map sendMsgDataListMap = this.disposeSendMsgDataList(designDutyDataList); + Map sendMsgDataListMap = this.disposeSendMsgDataList(designDutyDataList, FlowTypeEnum.SJFHXSHLC.getValue()); // 三条后结束的 List threeDaysList = (List) sendMsgDataListMap.get("threeDaysList"); @@ -187,7 +188,7 @@ public class TaskAffirmJob implements Job { List userIdList = Arrays.asList(verifyDutyId.split(",")); - Map sendMsgDataListMap = this.disposeSendMsgDataList(verifyDutyDataList); + Map sendMsgDataListMap = this.disposeSendMsgDataList(verifyDutyDataList,FlowTypeEnum.YZFHXSCLC.getValue()); // 三条后结束的 List threeDaysList = (List) sendMsgDataListMap.get("threeDaysList"); @@ -482,7 +483,7 @@ public class TaskAffirmJob implements Job { log.info("任务确认流程，定时任务结束 ====================================================="); } - private Map disposeSendMsgDataList(List projectLawsInventoryEOList) { + private Map disposeSendMsgDataList(List projectLawsInventoryEOList,String flowType) { Map result = new HashMap<>(); Date currentDate = new Date(); String currentDateStr = sdf.format(currentDate); @@ -498,9 +499,17 @@ public class TaskAffirmJob implements Job { List currentDaysList = projectLawsInventoryEOList.stream().filter(data -> { boolean flag = false; //结束日期是当前日期 - if(data.getInventoryAffirmDueDate() != null){ - if (StringUtils.equals(currentDateStr, sdf.format(data.getInventoryAffirmDueDate()))) { - flag = true; + if(StringUtils.equals(flowType,FlowTypeEnum.SJFHXSHLC.getValue())){ + if(data.getDesignDueDate() != null){ + if (StringUtils.equals(currentDateStr, sdf.format(data.getDesignDueDate()))) { + flag = true; + } + } + }else if(StringUtils.equals(flowType,FlowTypeEnum.YZFHXSCLC.getValue())){ + if(data.getVerifyDueDate() != null){ + if (StringUtils.equals(currentDateStr, sdf.format(data.getVerifyDueDate()))) { + flag = true; + } } } return flag; @@ -509,9 +518,17 @@ public class TaskAffirmJob implements Job { // 三天后结束的 List threeDaysList = projectLawsInventoryEOList.stream().filter(data -> { boolean flag = false; - if(data.getInventoryAffirmDueDate() != null){ - if (StringUtils.equals(threeDaysStr, sdf.format(data.getInventoryAffirmDueDate()))) { - flag = true; + if(StringUtils.equals(flowType,FlowTypeEnum.SJFHXSHLC.getValue())){ + if(data.getDesignDueDate() != null){ + if (StringUtils.equals(threeDaysStr, sdf.format(data.getDesignDueDate()))) { + flag = true; + } + } + }else if(StringUtils.equals(flowType,FlowTypeEnum.YZFHXSCLC.getValue())){ + if(data.getVerifyDueDate() != null){ + if (StringUtils.equals(threeDaysStr, sdf.format(data.getVerifyDueDate()))) { + flag = true; + } } } return flag; @@ -521,8 +538,14 @@ public class TaskAffirmJob implements Job { List overdueList = projectLawsInventoryEOList.stream().filter(data -> { // 只要早于当前日期都算逾期 不算当天。 boolean flag = false; - if(data.getInventoryAffirmDueDate() != null){ - flag = (data.getInventoryAffirmDueDate().before(currentDate) && !StringUtils.equals(currentDateStr, sdf.format(data.getInventoryAffirmDueDate()))); + if(StringUtils.equals(flowType,FlowTypeEnum.SJFHXSHLC.getValue())){ + if(data.getDesignDueDate() != null){ + flag = (data.getDesignDueDate().before(currentDate) && !StringUtils.equals(currentDateStr, sdf.format(data.getDesignDueDate()))); + } + }else if(StringUtils.equals(flowType,FlowTypeEnum.YZFHXSCLC.getValue())){ + if(data.getVerifyDueDate() != null){ + flag = (data.getVerifyDueDate().before(currentDate) && !StringUtils.equals(currentDateStr, sdf.format(data.getVerifyDueDate()))); + } } return flag; }).collect(Collectors.toList()); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/designComplianceJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/designComplianceJob.java index fb8f2dda9..361be9a51 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/designComplianceJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/designComplianceJob.java @@ -77,12 +77,9 @@ public class designComplianceJob implements Job { public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { log.info("设计符合性确认流程，定时任务开启 ====================================================="); - // 查询出 任务待确认、结果待提交的数据 - List designFlowStatusList = new ArrayList<>(); - designFlowStatusList.add(ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()); - designFlowStatusList.add(ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()); + // 查询出 结果待提交的数据 QueryWrapper lawsInventoryEOQueryWrap = new QueryWrapper<>(); - lawsInventoryEOQueryWrap.lambda().in(ProjectLawsInventoryEO::getDesignFlowStatus,designFlowStatusList); + lawsInventoryEOQueryWrap.lambda().eq(ProjectLawsInventoryEO::getDesignFlowStatus,ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()); List projectLawsInventoryEOList = this.projectLawsInventoryEOService.list(lawsInventoryEOQueryWrap); if(CollectionUtils.isNotEmpty(projectLawsInventoryEOList)){ // 根据项目进行分组 @@ -94,7 +91,6 @@ public class designComplianceJob implements Job { continue; } - // 设计符合性 Map> lawsInventoryByDesignDutyIdGroupMap = lawsInventoryListByProjectLibraryId.stream().collect(Collectors.groupingBy(ProjectLawsInventoryEO::getDesignDutyId)); for (Map.Entry> lawsInventoryByDesignDutyIdGroup : lawsInventoryByDesignDutyIdGroupMap.entrySet()) { String designDutyId = lawsInventoryByDesignDutyIdGroup.getKey(); @@ -107,27 +103,46 @@ public class designComplianceJob implements Job { Map sendMsgDataListMap = this.disposeSendMsgDataList(designDutyDataList); - // 三条后结束的 - List threeDaysList = (List) sendMsgDataListMap.get("threeDaysList"); - if(CollectionUtils.isNotEmpty(threeDaysList)){ - Date designDueDate = threeDaysList.get(0).getDesignDueDate(); + // 十四天后结束的 + List fourteenDaysList = (List) sendMsgDataListMap.get("fourteenDaysList"); + if(CollectionUtils.isNotEmpty(fourteenDaysList)){ + Date designDueDate = fourteenDaysList.get(0).getDesignDueDate(); String endTime = ""; if(designDueDate != null){ endTime = DateUtils.formatDate(designDueDate); } - String serialNumbers = threeDaysList.stream().map(ProjectLawsInventoryEO::getSerialNumber).distinct().collect(Collectors.joining(",")); - // 给法规工程师发消息 + String serialNumbers = fourteenDaysList.stream().map(ProjectLawsInventoryEO::getSerialNumber).distinct().collect(Collectors.joining(",")); + // 给责任人发消息 Map params = new HashMap<>(); - params.put("contentCn","您好，以下待办任务距离截止日期仅剩3天，请及时查看处理。"); - params.put("contentEn","Hello! This task will expire in 3 days. Please check and address it in a timely manner. Thank you!"); + params.put("contentCn","您好，您的任务将于14天后结束，请及时查看处理。"); + params.put("contentEn","Hello! Your task will end in 14 days. Please check and address it in a timely manner. "); params.put("projectLibraryId",projectLibraryId); params.put("endTime",endTime); params.put("userIdList",userIdList); params.put("serialNumbers",serialNumbers); - params.put("flowTypeCn","设计符合性流程"); - params.put("flowTypeEn","Design Compliance Process"); - this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION4.getValue(),params); + this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION1.getValue(),params); } + + // 七天后结束的 + List sevenDaysList = (List) sendMsgDataListMap.get("sevenDaysList"); + if(CollectionUtils.isNotEmpty(sevenDaysList)){ + Date designDueDate = sevenDaysList.get(0).getDesignDueDate(); + String endTime = ""; + if(designDueDate != null){ + endTime = DateUtils.formatDate(designDueDate); + } + String serialNumbers = sevenDaysList.stream().map(ProjectLawsInventoryEO::getSerialNumber).distinct().collect(Collectors.joining(",")); + // 给责任人发消息 + Map params = new HashMap<>(); + params.put("contentCn","您好，您的任务将于7天后结束，请及时查看处理。"); + params.put("contentEn","Hello! Your task will end in 7 days. Please check and address it in a timely manner. "); + params.put("projectLibraryId",projectLibraryId); + params.put("endTime",endTime); + params.put("userIdList",userIdList); + params.put("serialNumbers",serialNumbers); + this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION1.getValue(),params); + } + // 当天结束的 List currentDaysList = (List) sendMsgDataListMap.get("currentDaysList"); if(CollectionUtils.isNotEmpty(currentDaysList)){ @@ -139,15 +154,13 @@ public class designComplianceJob implements Job { String serialNumbers = currentDaysList.stream().map(ProjectLawsInventoryEO::getSerialNumber).distinct().collect(Collectors.joining(",")); // 给法规工程师发消息 Map params = new HashMap<>(); - params.put("contentCn","您好，以下待办任务已到截止日期，请尽快查看处理。"); - params.put("contentEn","Hello! This task will expire today. Please check and address it ASAP. Thank you!"); + params.put("contentCn","您好，您的任务将于今天到期，请尽快查看处理。"); + params.put("contentEn","Hello! Your task will expire today. Please check and address it ASAP. "); params.put("projectLibraryId",projectLibraryId); params.put("endTime",endTime); params.put("userIdList",userIdList); params.put("serialNumbers",serialNumbers); - params.put("flowTypeCn","设计符合性流程"); - params.put("flowTypeEn","Design Compliance Process"); - this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION4.getValue(),params); + this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION1.getValue(),params); } // 逾期的 List overdueList = (List) sendMsgDataListMap.get("overdueList"); @@ -160,15 +173,13 @@ public class designComplianceJob implements Job { String serialNumbers = overdueList.stream().map(ProjectLawsInventoryEO::getSerialNumber).distinct().collect(Collectors.joining(",")); // 给法规工程师发消息 Map params = new HashMap<>(); - params.put("contentCn","您好，以下待办任务已逾期，请尽快处理。"); - params.put("contentEn","Hello! This task is overdue. Please address it ASAP. Thank you!"); + params.put("contentCn","您好，您的任务已逾期，请尽快查看处理。"); + params.put("contentEn","Hello! Your task is overdue. Please check and address it ASAP. "); params.put("projectLibraryId",projectLibraryId); params.put("endTime",endTime); params.put("userIdList",userIdList); params.put("serialNumbers",serialNumbers); - params.put("flowTypeCn","设计符合性流程"); - params.put("flowTypeEn","Design Compliance Process"); - this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION5.getValue(),params); + this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION3.getValue(),params); } } } @@ -516,7 +527,7 @@ public class designComplianceJob implements Job { }).collect(Collectors.toList()); // 七天后结束的 - List threeDaysList = projectLawsInventoryEOList.stream().filter(data -> { + List sevenDaysList = projectLawsInventoryEOList.stream().filter(data -> { boolean flag = false; if(data.getDesignDueDate() != null){ if (StringUtils.equals(sevenDaysStr, sdf.format(data.getDesignDueDate()))) { @@ -538,19 +549,35 @@ public class designComplianceJob implements Job { return flag; }).collect(Collectors.toList()); - // 逾期的 + // 逾期的 3天 7天 14天 List overdueList = projectLawsInventoryEOList.stream().filter(data -> { - // 只要早于当前日期都算逾期 不算当天。 - boolean flag = false; - if(data.getDesignDueDate() != null){ - flag = (data.getDesignDueDate().before(currentDate) && !StringUtils.equals(currentDateStr, sdf.format(data.getDesignDueDate()))); - } + Calendar day3Later = new GregorianCalendar(); + day3Later.setTime(data.getDesignDueDate()); + day3Later.add(Calendar.DATE, 3); + Date overdue3Days = day3Later.getTime(); + + Calendar day7Later = new GregorianCalendar(); + day7Later.setTime(data.getDesignDueDate()); + day7Later.add(Calendar.DATE, 7); + Date overdue7Days = day7Later.getTime(); + + Calendar day14Later = new GregorianCalendar(); + day14Later.setTime(data.getDesignDueDate()); + day14Later.add(Calendar.DATE, 14); + Date overdue14Days = day14Later.getTime(); + + boolean flag = ( + StringUtils.equals(sdf.format(overdue3Days), sdf.format(currentDate)) + || StringUtils.equals(sdf.format(overdue7Days), sdf.format(currentDate)) + || StringUtils.equals(sdf.format(overdue14Days), sdf.format(currentDate)) + ); return flag; }).collect(Collectors.toList()); result.put("currentDaysList",currentDaysList); - result.put("threeDaysList",threeDaysList); + result.put("sevenDaysList",sevenDaysList); result.put("overdueList",overdueList); + result.put("fourteenDaysList",fourteenDaysList); return result; } } From b5cdf1001500c55cd34592cc0825ff8396c7aff2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Thu, 23 Mar 2023 15:39:03 +0800 Subject: [PATCH 250/645] =?UTF-8?q?=E5=AE=9A=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/listOfRegulations.vue | 14 +- .../components/codeNumber.vue | 38 - .../components/transferList.vue | 5 +- .../views/virtualAuthenticationList/index.vue | 6 +- .../certificationListMaintenance.vue | 970 ++++++++---------- 5 files changed, 469 insertions(+), 564 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index d37e2fa21..f8ba6e3d6 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -487,7 +487,7 @@ + v-model="formInlineQuestion.expeditingType"> {{ item.name }} @@ -559,7 +559,7 @@ roleSwitchingList: [], formInlineQuestion: {}, rulesRoleQuestion: { - questionStatus: [ + expeditingType: [ { required: true, message: this.$t('expeditionProcess') + this.$t('cannotEmpty'), @@ -569,11 +569,11 @@ }, questionList: [ { - value: '1', + value: 'lawsInventoryDesignExpediting', name: this.$t('designComplianceProcess') }, { - value: '2', + value: 'lawsInventoryVerifyExpediting', name: this.$t('validationComplianceProcess') } ], @@ -1524,13 +1524,13 @@ handleOkQuestion() { this.$refs.ruleFormQuestion.validate(valid => { let formInlineQuestion = JSON.parse(JSON.stringify(this.formInlineQuestion)) - if (formInlineQuestion.questionStatus && formInlineQuestion.questionStatus.length > 0) { - formInlineQuestion.questionStatus = formInlineQuestion.questionStatus.join(',') + if (formInlineQuestion.expeditingType && formInlineQuestion.expeditingType.length > 0) { + formInlineQuestion.expeditingType = formInlineQuestion.expeditingType.join(',') } let query = { ids: this.questionIdList.join(','), projectLibraryId: this.$route.query.id, - questionStatus: formInlineQuestion.questionStatus + expeditingType: formInlineQuestion.expeditingType } this.confirmLoadingQuestion = true postAction('project/projectLawsInventoryEO/expediting', query).then((res) => { diff --git a/jero-web/src/views/virtualAuthenticationList/components/codeNumber.vue b/jero-web/src/views/virtualAuthenticationList/components/codeNumber.vue index 60008065b..814f1c77c 100644 --- a/jero-web/src/views/virtualAuthenticationList/components/codeNumber.vue +++ b/jero-web/src/views/virtualAuthenticationList/components/codeNumber.vue @@ -50,9 +50,6 @@ - {{$t('query')}} {{$t('reset')}} @@ -103,14 +100,10 @@ \ No newline at end of file From 4f6a11bb4dd61e2c59ef98d99669bc15feebea3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Thu, 23 Mar 2023 15:51:22 +0800 Subject: [PATCH 251/645] =?UTF-8?q?ota=E7=AE=A1=E7=90=86=20=E7=BB=B4?= =?UTF-8?q?=E6=8A=A4=E5=AF=B9=E6=8E=A5=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 7 ++++ jero-web/src/common/lang/zh-cn.js | 6 ++++ .../components/maintenance.vue | 32 +++++++++++++------ .../otamanagement/upgradeactivity/index.vue | 8 ++--- .../components/maintenance.vue | 27 +++++++++++----- .../vehicleregistration/index.vue | 8 ++--- 6 files changed, 63 insertions(+), 25 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 535dd71ce..65c93d40b 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1701,5 +1701,12 @@ module.exports = { returntofill:'Return to fill', thereAreCurrentlyNoRegulationsToHandle:'There are currently no regulations to handle', certificationSubmission:'Certification Submission', + upgradecompletion:'Upgrade completion', + implementedupgrade:'Whether the implemented upgrade is consistent with the record', + numberofvehicles:'Number of vehicles that have completed upgrades', + vehicleshavenotcompletedonlineupgrade:'The reason why some vehicles have not completed online upgrade', + cause:'cause', + implementationrecords:'Fault handling measures and emergency response implementation records', + } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 4c9c614cb..027eb8a72 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1801,4 +1801,10 @@ module.exports = { expeditionProcess:'催办流程', thereAreCurrentlyNoRegulationsToHandle:'当前没有可处理的法规', certificationSubmission:'认证提交', + upgradecompletion:'升级完成情况', + implementedupgrade:'实施的升级是否和备案一致', + numberofvehicles:'完成升级的车辆数', + vehicleshavenotcompletedonlineupgrade:'部分车辆未完在线升级的原因', + cause:'原因', + implementationrecords:'故障处置措施和应急响应实施记录', } \ No newline at end of file diff --git a/jero-web/src/views/otamanagement/upgradeactivity/components/maintenance.vue b/jero-web/src/views/otamanagement/upgradeactivity/components/maintenance.vue index 612427415..8440de293 100644 --- a/jero-web/src/views/otamanagement/upgradeactivity/components/maintenance.vue +++ b/jero-web/src/views/otamanagement/upgradeactivity/components/maintenance.vue @@ -19,7 +19,7 @@ {{$t('recordstatus')}}
- @@ -36,10 +36,10 @@ @@ -54,7 +54,7 @@
@@ -75,7 +75,9 @@ export default { return { visible: false, confirmLoading: false, - formInline: {}, + formInline: { + batjs:'', + }, rules: { // listConfirmation: [ // { @@ -134,7 +136,13 @@ export default { }, methods: { edit(row) { - console.log(row) + if(row instanceof Array){ + this.ids = row + }else{ + this.formInline.bazt = row.bazt + this.formInline.batjs = row.batjs + this.formInline.bz = row.bz + } this.visible = true this.$nextTick(() => { this.$refs.ruleForm.clearValidate() @@ -145,14 +153,17 @@ export default { if (valid) { let query = { ...this.formInline, + id:this.ids.join(',') } this.confirmLoading = true - postAction('', query).then((res) => { + postAction('ota/otaBaSjList/batchRecord', { + recordList :query + }).then((res) => { if (res.success) { this.$message.success(this.$t('OperationSuccessful')) this.visible = false this.confirmLoading = false - this.$emit('settingListForm') + this.$emit('getList') } else { this.$message.warning(this.$t('operationFailed')) this.confirmLoading = false @@ -162,7 +173,10 @@ export default { }) }, handleCancel() { - this.formInline = {} + this.formInline = { + batjs:'' + } + this.ids = [] this.visible = false }, dateChange(item) { diff --git a/jero-web/src/views/otamanagement/upgradeactivity/index.vue b/jero-web/src/views/otamanagement/upgradeactivity/index.vue index dbd4052f3..9cf5e3567 100644 --- a/jero-web/src/views/otamanagement/upgradeactivity/index.vue +++ b/jero-web/src/views/otamanagement/upgradeactivity/index.vue @@ -163,7 +163,7 @@ />
- + @@ -351,14 +351,14 @@ export default { ...queryParam } this.loading = true - getAction('/ota/otaBaSjList/list', query).then((res) => { + getAction('/ota/otaBaSjList/page', query).then((res) => { if (res.success) { if (res.result.current > 1 && res.result.records.length == 0) { this.pageNo = 1 this.getList() return } - this.dataSource = res.result || [] + this.dataSource = res.result.records || [] this.total = res.result.total this.loading = false } else { @@ -437,7 +437,7 @@ export default { if(this.selectedRowKeys.length < 1){ this.$message.warning(this.$t('selectLeastOne')) }else{ - this.$refs.maintenanceRef.edit() + this.$refs.maintenanceRef.edit(this.selectedRowKeys) } }, // 模板下载 diff --git a/jero-web/src/views/otamanagement/vehicleregistration/components/maintenance.vue b/jero-web/src/views/otamanagement/vehicleregistration/components/maintenance.vue index 13b4c1751..8b904a6a1 100644 --- a/jero-web/src/views/otamanagement/vehicleregistration/components/maintenance.vue +++ b/jero-web/src/views/otamanagement/vehicleregistration/components/maintenance.vue @@ -36,11 +36,10 @@
@@ -75,7 +74,9 @@ export default { return { visible: false, confirmLoading: false, - formInline: {}, + formInline: { + batjs:'', + }, rules: { // listConfirmation: [ // { @@ -134,8 +135,12 @@ export default { }, methods: { edit(row) { - if(row){ - this.formInline = {...row} + if(row instanceof Array){ + this.ids = row + }else{ + this.formInline.bazt = row.bazt + this.formInline.batjs = row.batjs + this.formInline.bz = row.bz } this.visible = true this.$nextTick(() => { @@ -147,14 +152,17 @@ export default { if (valid) { let query = { ...this.formInline, + id:this.ids.join(',') } this.confirmLoading = true - postAction('', query).then((res) => { + postAction('ota/otaBaCxList/batchRecord', { + recordList: query + }).then((res) => { if (res.success) { this.$message.success(this.$t('OperationSuccessful')) this.visible = false this.confirmLoading = false - this.$emit('settingListForm') + this.$emit('getList') } else { this.$message.warning(this.$t('operationFailed')) this.confirmLoading = false @@ -164,7 +172,10 @@ export default { }) }, handleCancel() { - this.formInline = {} + this.formInline = { + batjs:'' + } + this.ids = [] this.visible = false }, dateChange(item) { diff --git a/jero-web/src/views/otamanagement/vehicleregistration/index.vue b/jero-web/src/views/otamanagement/vehicleregistration/index.vue index 30249e4a9..21b7eec3e 100644 --- a/jero-web/src/views/otamanagement/vehicleregistration/index.vue +++ b/jero-web/src/views/otamanagement/vehicleregistration/index.vue @@ -161,7 +161,7 @@ />
- + @@ -346,14 +346,14 @@ export default { ...queryParam } this.loading = true - getAction('/ota/otaBaCxList/list', query).then((res) => { + getAction('/ota/otaBaCxList/page', query).then((res) => { if (res.success) { if (res.result.current > 1 && res.result.records.length == 0) { this.pageNo = 1 this.getList() return } - this.dataSource = res.result || [] + this.dataSource = res.result.records || [] this.total = res.result.total this.loading = false } else { @@ -432,7 +432,7 @@ export default { if(this.selectedRowKeys.length < 1){ this.$message.warning(this.$t('selectLeastOne')) }else{ - this.$refs.maintenanceRef.edit() + this.$refs.maintenanceRef.edit(this.selectedRowKeys) } }, // 模板下载 From 8f1eeddc7908f4e0ae77f0261791acf5e31bf6c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Thu, 23 Mar 2023 15:52:52 +0800 Subject: [PATCH 252/645] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=82=AC=E5=8A=9E?= =?UTF-8?q?=E4=BC=A0=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/listOfRegulations.vue | 21 +++++++++++++------ .../components/codeNumber.vue | 11 ++++++++++ 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index f8ba6e3d6..da81f8583 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -1527,10 +1527,19 @@ if (formInlineQuestion.expeditingType && formInlineQuestion.expeditingType.length > 0) { formInlineQuestion.expeditingType = formInlineQuestion.expeditingType.join(',') } + let operateType = '' + if (this.roleSwitchingCode == '0') { + operateType = 'lawsInventoryStudioExpediting' + } else if (this.roleSwitchingCode == '1') { + operateType = 'lawsInventoryRegulationOwnerExpediting' + } else if (this.roleSwitchingCode == '30') { + operateType = 'lawsInventoryEngineeringInterfacePersonExpediting' + } let query = { ids: this.questionIdList.join(','), projectLibraryId: this.$route.query.id, - expeditingType: formInlineQuestion.expeditingType + expeditingType: formInlineQuestion.expeditingType, + operateType: operateType } this.confirmLoadingQuestion = true postAction('project/projectLawsInventoryEO/expediting', query).then((res) => { @@ -1616,11 +1625,11 @@ this.dataSource[i].verifyFlowStatus == 'NA' ) && (this.dataSource[i].designFlowStatus == 'Results to be submitted' || - this.dataSource[i].designFlowStatus == 'Results to be reviewed' || - this.dataSource[i].designFlowStatus == 'Compliance' || - this.dataSource[i].designFlowStatus == 'Non-Compliance' || - this.dataSource[i].designFlowStatus == 'To be tracked' || - this.dataSource[i].designFlowStatus == 'NA' + this.dataSource[i].designFlowStatus == 'Results to be reviewed' || + this.dataSource[i].designFlowStatus == 'Compliance' || + this.dataSource[i].designFlowStatus == 'Non-Compliance' || + this.dataSource[i].designFlowStatus == 'To be tracked' || + this.dataSource[i].designFlowStatus == 'NA' )) { isTrue = true } else { diff --git a/jero-web/src/views/virtualAuthenticationList/components/codeNumber.vue b/jero-web/src/views/virtualAuthenticationList/components/codeNumber.vue index 814f1c77c..4a1c20c10 100644 --- a/jero-web/src/views/virtualAuthenticationList/components/codeNumber.vue +++ b/jero-web/src/views/virtualAuthenticationList/components/codeNumber.vue @@ -47,6 +47,17 @@ :triggerChange="false" :dictCode="'state'"/>
+ +
+
+ {{$t('zoneOfApplication')}} +
+ +
+ + From 8d0dd464392a3b683b20c247d6bdb6685397f086 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Thu, 23 Mar 2023 16:39:28 +0800 Subject: [PATCH 253/645] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=8A=A8=E5=8A=9B?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/basicInformation.vue | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue index 05f836c76..87a40f6be 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue @@ -122,13 +122,26 @@
{{$t('Vehicledynamictype')}}
- + + + + + + {{ item.projectName}} + + + +
@@ -178,6 +191,8 @@ return { confirmLoading: false, disabled: false, + formInline:{}, + projectNameList:[], } }, mounted() { From 4d812ed8f42b3b24c6b37e06db45bd5665538b5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Thu, 23 Mar 2023 17:01:31 +0800 Subject: [PATCH 254/645] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=82=AC=E5=8A=9E?= =?UTF-8?q?=E4=BC=A0=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectDetails/index.vue | 3 +- .../components/certificationDirectory.vue | 8 +++-- .../components/transferList.vue | 16 ++++++--- .../components/transferListvirtal.vue | 36 +++++++++---------- .../components/certificationList/index.vue | 14 +++++--- 5 files changed, 45 insertions(+), 32 deletions(-) diff --git a/jero-web/src/views/projectManagement/ProjectDetails/index.vue b/jero-web/src/views/projectManagement/ProjectDetails/index.vue index 95d0f33d4..b80f7017a 100644 --- a/jero-web/src/views/projectManagement/ProjectDetails/index.vue +++ b/jero-web/src/views/projectManagement/ProjectDetails/index.vue @@ -143,6 +143,7 @@
@@ -206,7 +207,7 @@ '12': '系统管理员', '13': 'Viewer', '14': '品牌管理员', - '20': '接口人', + '20': '工程接口人', '21': '责任人', '30': '工程接口人', '31': '责任人', diff --git a/jero-web/src/views/projectManagement/components/certificationDirectory.vue b/jero-web/src/views/projectManagement/components/certificationDirectory.vue index 2adc1d21b..e15fbb63f 100644 --- a/jero-web/src/views/projectManagement/components/certificationDirectory.vue +++ b/jero-web/src/views/projectManagement/components/certificationDirectory.vue @@ -11,7 +11,8 @@ style="height: 100%;overflow: auto;padding-bottom: 53px;">
-
+
{{$t('add')}}
@@ -76,7 +77,7 @@ certificationDirectoryAdd, viewFileModel }, - props: ['isDisplayNum'], + props: ['isDisplayNum','roleSwitchingCode'], mixins:[ResizeHeader, ResizeColumnProvide], data() { return { @@ -158,7 +159,8 @@ computed: { columns() { let columnResult = JSON.parse(JSON.stringify(this.columnsAll)) - if (this.isDisplayNum != 2) { + if (this.roleSwitchingCode == 2 && this.isDisplayNum == 2){ + }else{ for (var i = 0; i < columnResult.length; i++) { if (columnResult[i].title === this.$t('operation')) { columnResult.splice(i, 1) diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/transferList.vue b/jero-web/src/views/projectManagement/components/certificationList/components/transferList.vue index 5e6100722..25ccd69f9 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/transferList.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/transferList.vue @@ -15,10 +15,10 @@
-
- {{$t('VirtualListName')}} +
+ {{$t('CertificationListName')}}
-
@@ -87,7 +87,7 @@ selectedRowKeys: [], columns: [ { - title: this.$t('VirtualListName'), + title: this.$t('CertificationListName'), dataIndex: 'name', align: 'left', ellipsis: true, @@ -155,11 +155,17 @@ let query = { pageNo: this.pageNo, pageSize: this.pageSize, - ...this.queryParam + ...this.queryParam, + state:'1', } this.loading = true getAction('/authDummy/authDummyInventoryBaseEO/page', query).then((res) => { if (res.success) { + if (res.result.current > 1 && res.result.records.length == 0) { + this.pageNo = 1 + this.replacePage() + return + } this.dataList = res.result.records || [] this.total = res.result.total this.loading = false diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/transferListvirtal.vue b/jero-web/src/views/projectManagement/components/certificationList/components/transferListvirtal.vue index 9416a4fd8..a23a71c49 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/transferListvirtal.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/transferListvirtal.vue @@ -32,9 +32,9 @@ - + + + {{$t('query')}} {{$t('reset')}} @@ -180,8 +180,8 @@ export default { this.pageNo = 1 this.queryParam = {} this.replacePage() - this.$refs.globalAdvancedQueryRef.resetLine() - this.$refs.globalAdvancedQueryRef.emitCallback() + // this.$refs.globalAdvancedQueryRef.resetLine() + // this.$refs.globalAdvancedQueryRef.emitCallback() }, onChange(page, pageSize) { this.pageNo = page @@ -192,19 +192,19 @@ export default { this.pageSize = pageSize this.replacePage() }, - handleSuperQuery(params, matchType) { - let sqp = {} - if (!params || (params && params.length == 0)) { - sqp['superQueryParams'] = '' - this.$refs.globalAdvancedQueryRef.superQueryFlag = false - } else { - this.$refs.globalAdvancedQueryRef.superQueryFlag = true - sqp['superQueryParams'] = encodeURI(JSON.stringify(params)) - sqp['superQueryMatchType'] = matchType - } - this.queryParamQuery = sqp - this.replacePage() - }, + // handleSuperQuery(params, matchType) { + // let sqp = {} + // if (!params || (params && params.length == 0)) { + // sqp['superQueryParams'] = '' + // this.$refs.globalAdvancedQueryRef.superQueryFlag = false + // } else { + // this.$refs.globalAdvancedQueryRef.superQueryFlag = true + // sqp['superQueryParams'] = encodeURI(JSON.stringify(params)) + // sqp['superQueryMatchType'] = matchType + // } + // this.queryParamQuery = sqp + // this.replacePage() + // }, replacePage() { let query = { // pageNo: this.pageNo, diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue index 44cbc496d..7f30ea37e 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -96,7 +96,8 @@
-
+
{{ $t('CertificationDirectory') }}
@@ -377,7 +378,8 @@
- + @@ -477,6 +479,7 @@ export default { name: 'index', + props:['isDisplayNum'], components: { globalAdvancedQuery, ImportFile, @@ -601,14 +604,16 @@ align: 'left', dataIndex: 'category', width: 180, - ellipsis: true + ellipsis: true, + fixed: 'left', }, { title: this.$t('inspectionItems'), align: 'left', dataIndex: 'inspectionItem', width: 180, - ellipsis: true + ellipsis: true, + fixed: 'left', }, { title: this.$t('configurationItem'), @@ -723,7 +728,6 @@ ], selectedRowKeys: [], selectedRowKeysList: [], - isDisplayNum: 2, long: '', toDoIds: [], toDoNotConditions: [], From 67320ac02965fa57711f563ec60669cfcdd1fab0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Thu, 23 Mar 2023 17:08:09 +0800 Subject: [PATCH 255/645] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=94=B6=E9=9B=86-=E5=88=97=E8=A1=A8-NIO=E7=BC=96=E5=8F=B7?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=8D=E7=BE=8E=E8=A7=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/tableCollection/index.vue | 2 +- jero-web/src/components/tableCollection/index1.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index 948ab4a67..fe5619225 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -819,7 +819,7 @@ customRender: 'titleName' } if (res.db_field_name == 'nioNumber') { - this.columns[index].width = 100 + this.columns[index].width = 120 } if (res.click1) { this.columns[index].scopedSlots = { diff --git a/jero-web/src/components/tableCollection/index1.vue b/jero-web/src/components/tableCollection/index1.vue index 1a2c3d641..f8ecad5d1 100644 --- a/jero-web/src/components/tableCollection/index1.vue +++ b/jero-web/src/components/tableCollection/index1.vue @@ -610,7 +610,7 @@ customRender: 'titleName' } if (res.db_field_name == 'nioNumber') { - this.columns[index].width = 100 + this.columns[index].width = 120 } if (res.click) { // 工程接口人列表修改 From b485ddbb96b34e7546bd289770f7c3f31618238c Mon Sep 17 00:00:00 2001 From: cuijiaming <1410452759@qq.com> Date: Thu, 23 Mar 2023 20:02:50 +0800 Subject: [PATCH 256/645] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93-=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=BA=93=E8=AF=A6=E6=83=85-=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=90=8D=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/ProjectRelatedPersonnel.java | 10 +++ .../IProjectRelatedPersonnelService.java | 3 + .../ProjectLawsInventoryEOServiceImpl.java | 78 ++++++++++++++++++- .../ProjectRelatedPersonnelServiceImpl.java | 13 ++++ 4 files changed, 101 insertions(+), 3 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRelatedPersonnel.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRelatedPersonnel.java index e94f363f6..2b1a62419 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRelatedPersonnel.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRelatedPersonnel.java @@ -56,6 +56,16 @@ public class ProjectRelatedPersonnel implements Serializable { @Excel(name = "工程接口人,Engineering Interface", width = 15,orderNum = "3") private java.lang.String engineeringInterfacePersonName; + /**工程接口人法规工程师设置*/ + private java.lang.String engineerLawSet; + @TableField(exist = false) + private java.lang.String engineerLawSetName; + + /**工程接口人认证工程师设置*/ + private java.lang.String engineerAttSet; + @TableField(exist = false) + private java.lang.String engineerAttSetName; + /**认证工程师*/ private java.lang.String certificationEngineer; @TableField(exist = false) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java index fe8cc762c..f19b5f1e1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java @@ -71,6 +71,9 @@ public interface IProjectRelatedPersonnelService extends IService queryPersonByProjectId(String projectId, String dutyTerritory); + //通过项目库id 和责任领域查询 + List queryByProjectIdAndDutyTerritoy(String projectId, List dutyTerritoryList); + /**处理导出数据*/ List disposeExportXls(String id,String projectId,String cut); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index bb1c9f47f..cdfe8f18d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -506,6 +506,78 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl dutyTerritoryList = new ArrayList<>(); + dutyTerritoryList = Arrays.asList(projectLawsInventoryEO.getDutyTerritory().split(",")); + dutyTerritoryList = dutyTerritoryList.stream().distinct().collect(Collectors.toList()); + + String projectLibrartId = projectLawsInventoryEO.getProjectLibraryId(); + + List designDutyIdList = new ArrayList<>(); + designDutyIdList = Arrays.asList(projectLawsInventoryEO.getDesignDutyId().split(",")); + designDutyIdList = designDutyIdList.stream().distinct().collect(Collectors.toList()); + List verifyDutyIdList = new ArrayList<>(); + verifyDutyIdList = Arrays.asList(projectLawsInventoryEO.getVerifyDutyId().split(",")); + verifyDutyIdList = verifyDutyIdList.stream().distinct().collect(Collectors.toList()); + + //allList 为法规工程师中验证符合性和确认符合中的责任人 + List allList = new ArrayList<>(); +// allList = Arrays.asList(designDutyIdList.toString()+","+verifyDutyIdList.toString()); + allList.addAll(designDutyIdList); + allList.addAll(verifyDutyIdList); + allList = allList.stream().distinct().collect(Collectors.toList()); + + +// List engineeringInterfacePersonList = new ArrayList<>(); +// engineeringInterfacePersonList = Arrays.asList(projectLawsInventoryEO.getEngineeringInterfacePerson().split(",")); +// engineeringInterfacePersonList = engineeringInterfacePersonList.stream().distinct().collect(Collectors.toList()); + + + List projectRelatedPersonnelList = projectRelatedPersonnelService.queryByProjectIdAndDutyTerritoy(projectLibrartId, dutyTerritoryList); + + //enginnerList为每一条的工程接口人的集合 + List enginnerList = new ArrayList<>(); + if(projectRelatedPersonnelList.size()>0){ + for(ProjectRelatedPersonnel projectRelatedPersonnel : projectRelatedPersonnelList){ + if(StringUtils.isEmpty(projectRelatedPersonnel.getEngineeringInterfacePerson())){ + //直接将allList存入到 + String all = String.join(",",allList); + projectRelatedPersonnel.setEngineerLawSet(all); + projectRelatedPersonnelService.editById(projectRelatedPersonnel); + + }else { + enginnerList.add(projectRelatedPersonnel.getEngineeringInterfacePerson()); + enginnerList = enginnerList.stream().distinct().collect(Collectors.toList()); + //比较allList中有而enginnerList中没有的工程接口人 + boolean flag = false; + List resultList = new ArrayList<>(); + if(allList.size()>0){ + flag = CollectionUtils.isEqualCollection(allList,enginnerList); + if(!flag){ + //进行遍历两个list，将allList中有的而enginnerList没有的存入到相关人员名单中的法规那里 + + for(String all : allList){ + boolean flag1 = true; + for(String enginner : enginnerList){ + if(all.equals(enginner)){ + flag1 = false; + break; + } + } + if(flag1){ + resultList.add(all); + } + } + } + } + //将相关人员名单中没有的resultList添加到相关人员记录表中 + String result = String.join(",",resultList); + projectRelatedPersonnel.setEngineerLawSet(result); + projectRelatedPersonnelService.editById(projectRelatedPersonnel); + } + } + } + + //翻译-中文 translateData(infoEOList); translateData(dataList); @@ -1800,7 +1872,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl projectLawsInventoryEOS = this.list(queryWrapper); - + List idList = Arrays.asList(ids.split(",")); String projectLawsInventoryIds = ids; String pIds = ""; @@ -5999,7 +6071,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl queryByProjectIdAndDutyTerritoy(String projectId, List dutyTerritoryList) { + + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("project_id",projectId).in("duty_territory",dutyTerritoryList); + List projectRelatedPersonnels = baseMapper.selectList(wrapper); + + return projectRelatedPersonnels; + + + } + /**处理导出数据*/ @Override public List disposeExportXls(String id,String projectId,String cut){ From e4585df8d7267a75fcaf0aa85d851fe00094ef46 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Thu, 23 Mar 2023 20:47:20 +0800 Subject: [PATCH 257/645] =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=AC=A6=E5=90=88?= =?UTF-8?q?=E6=80=A7=E6=B5=81=E7=A8=8B-=E5=AE=9A=E6=97=B6=E5=8F=91?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E3=80=82=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E5=82=AC=E5=8A=9E=E5=BC=80=E5=8F=91=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/enums/OperatorTypeEnum.java | 9 + .../project/job/VerifyComplianceJob.java | 202 ++++++++++++- .../IProjectLawsInventoryEOService.java | 12 + .../ProjectLawsInventoryEOServiceImpl.java | 284 +++++++++++++++++- 4 files changed, 503 insertions(+), 4 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java index 64d746a4f..f39631239 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java @@ -67,6 +67,15 @@ public enum OperatorTypeEnum { CERTIFICATION_INVENTORY_DUTY_PERSON_SUBMIT_TASK("认证清单-责任人提交任务","certificationInventoryDutyPersonSubmitTask"), CERTIFICATION_INVENTORY_REVIEW_THROUGH("认证清单-认证工程师审核通过","certificationInventoryReviewThrough"), CERTIFICATION_INVENTORY_REVIEW_RETURNED("认证清单-认证工程师审核退回","certificationInventoryReviewReturned"), + + /** + * 项目库-法规清单 + */ + LAWS_INVENTORY_DESIGN_EXPEDITING("法规清单-催办设计符合性流程","lawsInventoryDesignExpediting"), + LAWS_INVENTORY_VERIFY_EXPEDITING("法规清单-催办验证符合性流程","lawsInventoryVerifyExpediting"), + LAWS_INVENTORY_STUDIO_EXPEDITING("法规清单-studio催办","lawsInventoryStudioExpediting"), + LAWS_INVENTORY_REGULATION_OWNER_EXPEDITING("法规清单-法规工程师催办","lawsInventoryRegulationOwnerExpediting"), + LAWS_INVENTORY_ENGINEERING_INTERFACE_PERSON_EXPEDITING("法规清单-工程接口人催办","lawsInventoryEngineeringInterfacePersonExpediting"), ; String name; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/VerifyComplianceJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/VerifyComplianceJob.java index 5a79ae3bb..f22a64f06 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/VerifyComplianceJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/VerifyComplianceJob.java @@ -4,12 +4,15 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.jero.common.constant.enums.MessageType2Enum; import com.jero.common.constant.enums.MessageTypeEnum; import com.jero.common.constant.enums.MsgColorEnum; +import com.jero.common.util.DateUtils; import com.jero.modules.document.entity.BussDocumentLibraryEO; import com.jero.modules.document.service.IBussDocumentLibraryEOService; +import com.jero.modules.feishu.enums.TemplateInfoEnum2; import com.jero.modules.feishu.service.IFeishuService; import com.jero.modules.feishu.vo.FeishuMsg2Vo; import com.jero.modules.feishu.vo.FeishuMsgVo; import com.jero.modules.project.entity.*; +import com.jero.modules.project.enums.ComplianceFlowStatusEnum; import com.jero.modules.project.enums.DesignComplianceStatusEnum; import com.jero.modules.project.enums.JumpLinkEnum; import com.jero.modules.project.enums.SendMsgFlagEnum; @@ -68,12 +71,122 @@ public class VerifyComplianceJob implements Job { private ISysUserService sysUserService; @Autowired private IFeishuService feishuService; + private static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); @Override public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { log.info("验证符合性流程，定时任务开启 ====================================================="); + + // 查询出 结果待提交的数据 + QueryWrapper lawsInventoryEOQueryWrap = new QueryWrapper<>(); + lawsInventoryEOQueryWrap.lambda().eq(ProjectLawsInventoryEO::getVerifyFlowStatus, ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()); + List projectLawsInventoryEOList = this.projectLawsInventoryEOService.list(lawsInventoryEOQueryWrap); + if(CollectionUtils.isNotEmpty(projectLawsInventoryEOList)){ + // 根据项目进行分组 + Map> lawsInventoryByProjectLibraryIdGroupMap = projectLawsInventoryEOList.stream().collect(Collectors.groupingBy(ProjectLawsInventoryEO::getProjectLibraryId)); + for (Map.Entry> lawsInventoryByProjectLibraryIdGroup : lawsInventoryByProjectLibraryIdGroupMap.entrySet()) { + String projectLibraryId = lawsInventoryByProjectLibraryIdGroup.getKey(); + List lawsInventoryListByProjectLibraryId = lawsInventoryByProjectLibraryIdGroup.getValue(); + if(StringUtils.isEmpty(projectLibraryId) || CollectionUtils.isEmpty(lawsInventoryListByProjectLibraryId)){ + continue; + } + + Map> lawsInventoryByVerifyDutyIdGroupMap = lawsInventoryListByProjectLibraryId.stream().collect(Collectors.groupingBy(ProjectLawsInventoryEO::getVerifyDutyId)); + for (Map.Entry> lawsInventoryByVerifyDutyIdGroup : lawsInventoryByVerifyDutyIdGroupMap.entrySet()) { + String verifyDutyId = lawsInventoryByVerifyDutyIdGroup.getKey(); + List verifyDutyDataList = lawsInventoryByVerifyDutyIdGroup.getValue(); + if(StringUtils.isEmpty(verifyDutyId) || CollectionUtils.isEmpty(verifyDutyDataList)){ + continue; + } + + List userIdList = Arrays.asList(verifyDutyId.split(",")); + + Map sendMsgDataListMap = this.disposeSendMsgDataList(verifyDutyDataList); + + // 十四天后结束的 + List fourteenDaysList = (List) sendMsgDataListMap.get("fourteenDaysList"); + if(CollectionUtils.isNotEmpty(fourteenDaysList)){ + Date verifyDueDate = fourteenDaysList.get(0).getVerifyDueDate(); + String endTime = ""; + if(verifyDueDate != null){ + endTime = DateUtils.formatDate(verifyDueDate); + } + String serialNumbers = fourteenDaysList.stream().map(ProjectLawsInventoryEO::getSerialNumber).distinct().collect(Collectors.joining(",")); + // 给责任人发消息 + Map params = new HashMap<>(); + params.put("contentCn","您好，您的任务将于14天后结束，请及时查看处理。"); + params.put("contentEn","Hello! Your task will end in 14 days. Please check and address it in a timely manner. "); + params.put("projectLibraryId",projectLibraryId); + params.put("endTime",endTime); + params.put("userIdList",userIdList); + params.put("serialNumbers",serialNumbers); + this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION1.getValue(),params); + } + + // 七天后结束的 + List sevenDaysList = (List) sendMsgDataListMap.get("sevenDaysList"); + if(CollectionUtils.isNotEmpty(sevenDaysList)){ + Date verifyDueDate = sevenDaysList.get(0).getVerifyDueDate(); + String endTime = ""; + if(verifyDueDate != null){ + endTime = DateUtils.formatDate(verifyDueDate); + } + String serialNumbers = sevenDaysList.stream().map(ProjectLawsInventoryEO::getSerialNumber).distinct().collect(Collectors.joining(",")); + // 给责任人发消息 + Map params = new HashMap<>(); + params.put("contentCn","您好，您的任务将于7天后结束，请及时查看处理。"); + params.put("contentEn","Hello! Your task will end in 7 days. Please check and address it in a timely manner. "); + params.put("projectLibraryId",projectLibraryId); + params.put("endTime",endTime); + params.put("userIdList",userIdList); + params.put("serialNumbers",serialNumbers); + this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION1.getValue(),params); + } + + // 当天结束的 + List currentDaysList = (List) sendMsgDataListMap.get("currentDaysList"); + if(CollectionUtils.isNotEmpty(currentDaysList)){ + Date verifyDueDate = currentDaysList.get(0).getVerifyDueDate(); + String endTime = ""; + if(verifyDueDate != null){ + endTime = DateUtils.formatDate(verifyDueDate); + } + String serialNumbers = currentDaysList.stream().map(ProjectLawsInventoryEO::getSerialNumber).distinct().collect(Collectors.joining(",")); + // 给法规工程师发消息 + Map params = new HashMap<>(); + params.put("contentCn","您好，您的任务将于今天到期，请尽快查看处理。"); + params.put("contentEn","Hello! Your task will expire today. Please check and address it ASAP. "); + params.put("projectLibraryId",projectLibraryId); + params.put("endTime",endTime); + params.put("userIdList",userIdList); + params.put("serialNumbers",serialNumbers); + this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION1.getValue(),params); + } + // 逾期的 + List overdueList = (List) sendMsgDataListMap.get("overdueList"); + if(CollectionUtils.isNotEmpty(overdueList)){ + Date verifyDueDate = overdueList.get(0).getVerifyDueDate(); + String endTime = ""; + if(verifyDueDate != null){ + endTime = DateUtils.formatDate(verifyDueDate); + } + String serialNumbers = overdueList.stream().map(ProjectLawsInventoryEO::getSerialNumber).distinct().collect(Collectors.joining(",")); + // 给法规工程师发消息 + Map params = new HashMap<>(); + params.put("contentCn","您好，您的任务已逾期，请尽快查看处理。"); + params.put("contentEn","Hello! Your task is overdue. Please check and address it ASAP. "); + params.put("projectLibraryId",projectLibraryId); + params.put("endTime",endTime); + params.put("userIdList",userIdList); + params.put("serialNumbers",serialNumbers); + this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION3.getValue(),params); + } + } + } + } + //查询出已经启动了验证符合性流程的数据。 并且流程没有结束。 - QueryWrapper queryProjectTaskInventoryWrapper = new QueryWrapper<>(); + /*QueryWrapper queryProjectTaskInventoryWrapper = new QueryWrapper<>(); queryProjectTaskInventoryWrapper.isNotNull("verify_p_id"); List status = new ArrayList<>(); status.add(DesignComplianceStatusEnum.TO_SUBMIT.getValue()); @@ -364,7 +477,92 @@ public class VerifyComplianceJob implements Job { } } } - } + }*/ log.info("验证符合性流程，定时任务结束 ====================================================="); } + + private Map disposeSendMsgDataList(List projectLawsInventoryEOList) { + Map result = new HashMap<>(); + Date currentDate = new Date(); + String currentDateStr = sdf.format(currentDate); + + //获取十四天后的时间 + Calendar fourteenCalendar=new GregorianCalendar(); + fourteenCalendar.setTime(new Date()); + fourteenCalendar.add(Calendar.DATE,14); + Date fourteenDays = fourteenCalendar.getTime(); + String fourteenDaysStr = sdf.format(fourteenDays); + + //获取七天后的时间 + Calendar sevenCalendar=new GregorianCalendar(); + sevenCalendar.setTime(new Date()); + sevenCalendar.add(Calendar.DATE,7); + Date sevenDays = sevenCalendar.getTime(); + String sevenDaysStr = sdf.format(sevenDays); + + // 十四天后结束的 + List fourteenDaysList = projectLawsInventoryEOList.stream().filter(data -> { + boolean flag = false; + if(data.getVerifyDueDate() != null){ + if (StringUtils.equals(fourteenDaysStr, sdf.format(data.getVerifyDueDate()))) { + flag = true; + } + } + return flag; + }).collect(Collectors.toList()); + + // 七天后结束的 + List sevenDaysList = projectLawsInventoryEOList.stream().filter(data -> { + boolean flag = false; + if(data.getVerifyDueDate() != null){ + if (StringUtils.equals(sevenDaysStr, sdf.format(data.getVerifyDueDate()))) { + flag = true; + } + } + return flag; + }).collect(Collectors.toList()); + + // 当天结束的 + List currentDaysList = projectLawsInventoryEOList.stream().filter(data -> { + boolean flag = false; + //结束日期是当前日期 + if(data.getVerifyDueDate() != null){ + if (StringUtils.equals(currentDateStr, sdf.format(data.getVerifyDueDate()))) { + flag = true; + } + } + return flag; + }).collect(Collectors.toList()); + + // 逾期的 3天 7天 14天 + List overdueList = projectLawsInventoryEOList.stream().filter(data -> { + Calendar day3Later = new GregorianCalendar(); + day3Later.setTime(data.getVerifyDueDate()); + day3Later.add(Calendar.DATE, 3); + Date overdue3Days = day3Later.getTime(); + + Calendar day7Later = new GregorianCalendar(); + day7Later.setTime(data.getVerifyDueDate()); + day7Later.add(Calendar.DATE, 7); + Date overdue7Days = day7Later.getTime(); + + Calendar day14Later = new GregorianCalendar(); + day14Later.setTime(data.getVerifyDueDate()); + day14Later.add(Calendar.DATE, 14); + Date overdue14Days = day14Later.getTime(); + + boolean flag = ( + StringUtils.equals(sdf.format(overdue3Days), sdf.format(currentDate)) + || StringUtils.equals(sdf.format(overdue7Days), sdf.format(currentDate)) + || StringUtils.equals(sdf.format(overdue14Days), sdf.format(currentDate)) + ); + return flag; + }).collect(Collectors.toList()); + + result.put("currentDaysList",currentDaysList); + result.put("sevenDaysList",sevenDaysList); + result.put("overdueList",overdueList); + result.put("fourteenDaysList",fourteenDaysList); + return result; + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java index ca0d79d06..fd885984d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java @@ -214,4 +214,16 @@ public interface IProjectLawsInventoryEOService extends IService projectLawsInventoryEOS); + + /** + * 法规清单根据设计符合性截至日期顺序排序 + * @param projectLawsInventoryEOS + */ + void lawsInventoryEOListSortByDesignDueDate(List projectLawsInventoryEOS); + + /** + * 法规清单根据验证符合性截至日期顺序排序 + * @param projectLawsInventoryEOS + */ + void lawsInventoryEOListSortByVerifyDueDate(List projectLawsInventoryEOS); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index bb1c9f47f..5f948f61e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -572,6 +572,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl params = new HashMap<>(); + params.put("contentCn","您好，"+currentUser.getUsername()+"向您分发了该任务，请及时查看处理。"); + params.put("contentEn","Hello! "+currentUser.getUsername()+" has assigned this task to you. Please check and address it in a timely manner."); + params.put("projectLibraryId", projectLawsInventoryEO.getProjectLibraryId()); + params.put("endTime",endTime); + params.put("userIdList",Arrays.asList(regulationOwnerId.split(","))); + params.put("serialNumbers",projectLawsInventoryEO.getSerialNumber()); + this.sendMessageByTemplateId(TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION1.getValue(),params); + } + + // 验证符合性 结果待审查、结果待提交 标识 判断法规工程师是否被修改了 如果被修改了，给新的法规工程师发消息 + boolean toBeReviewedVerifyFlag = ( + StringUtils.equals(projectLawsInventoryOld.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue()) + || StringUtils.equals(projectLawsInventoryOld.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()) + ); + if (toBeReviewedVerifyFlag) { + if(projectLawsInventoryEO.getVerifyDueDate() != null){ + endTime = DateUtils.formatDate(projectLawsInventoryEO.getVerifyDueDate()); + } + regulationOwnerId = projectLawsInventoryEO.getRegulationOwnerId(); + // 给法规工程师发消息 + Map params = new HashMap<>(); + params.put("contentCn","您好，"+currentUser.getUsername()+"向您分发了该任务，请及时查看处理。"); + params.put("contentEn","Hello! "+currentUser.getUsername()+" has assigned this task to you. Please check and address it in a timely manner."); + params.put("projectLibraryId", projectLawsInventoryEO.getProjectLibraryId()); + params.put("endTime",endTime); + params.put("userIdList",Arrays.asList(regulationOwnerId.split(","))); + params.put("serialNumbers",projectLawsInventoryEO.getSerialNumber()); + this.sendMessageByTemplateId(TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION1.getValue(),params); + } + } + } } private void setProjectLawsInventoryPermission(String userId, String projectId,String lawsInventoryId,Date now, List adds, String belong) { @@ -9333,6 +9386,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl projectLawsInventoryEOList = this.baseMapper.selectList(lawsInventoryEOQueryWrapper); - //获取已经发起的 任务确认流程信息（当前处理人） + // 只有studio催办的时候，才会给法规工程师发消息 + if(StringUtils.equals(operateType,OperatorTypeEnum.LAWS_INVENTORY_STUDIO_EXPEDITING.getValue())){ + // 如果设计符合性或验证符合性流程状态其中一个为 清单待校核，催办时就需要给这一条数据的法规工程师发消息 + List toBeCheckedLawsInventoryList = projectLawsInventoryEOList.stream().filter(lawsInventory -> { + boolean flag =false; + if (StringUtils.equals(lawsInventory.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()) + || StringUtils.equals(lawsInventory.getVerifyFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())){ + flag = true; + } + return flag; + }).collect(Collectors.toList()); + + if(CollectionUtils.isNotEmpty(toBeCheckedLawsInventoryList)){ + Map> regulationOwnerGroupMap = toBeCheckedLawsInventoryList.stream().collect(Collectors.groupingBy(ProjectLawsInventoryEO::getRegulationOwnerId)); + for (Map.Entry> regulationOwnerMap : regulationOwnerGroupMap.entrySet()) { + String regulationOwnerId = regulationOwnerMap.getKey(); + List lawsInventoryEOList = regulationOwnerMap.getValue(); + if(StringUtils.isEmpty(regulationOwnerId) || CollectionUtils.isEmpty(lawsInventoryEOList)){ + continue; + } + + this.lawsInventoryEOListSortByInventoryAffirmDueDate(lawsInventoryEOList); + Date inventoryAffirmDueDate = lawsInventoryEOList.get(0).getInventoryAffirmDueDate(); + String endTime = ""; + if(inventoryAffirmDueDate != null){ + endTime = DateUtils.formatDate(inventoryAffirmDueDate); + } + String serialNumbers = lawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getSerialNumber).distinct().collect(Collectors.joining(",")); + + List userIdList = Arrays.asList(regulationOwnerId.split(",")); + // 给法规工程师发消息 + Map params = new HashMap<>(); + params.put("contentCn","您好，请及时校核法规清单内容并发起符合性流程，谢谢！"); + params.put("contentEn","Please check the content of the regulation list and initiate the compliance process in a timely manner. Thank you!"); + params.put("projectLibraryId",projectLibraryId); + params.put("endTime",endTime); + params.put("userIdList",userIdList); + params.put("serialNumbers",serialNumbers); + this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE1.getValue(),params); + } + } + } + + // 催办类型 可以只催设计符合性 也可以只催验证符合性 + String expeditingType = json.getString("expeditingType"); + if(StringUtils.contains(expeditingType,OperatorTypeEnum.LAWS_INVENTORY_DESIGN_EXPEDITING.getValue())){ + // 催办设计符合性流程状态为 清单待确认的 责任人 + List toBeConfirmedLawsInventoryList = projectLawsInventoryEOList.stream().filter(lawsInventory -> { + boolean flag =false; + if (StringUtils.equals(lawsInventory.getDesignFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())){ + flag = true; + } + return flag; + }).collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(toBeConfirmedLawsInventoryList)) { + Map> designDutyGroupMap = toBeConfirmedLawsInventoryList.stream().collect(Collectors.groupingBy(ProjectLawsInventoryEO::getDesignDutyId)); + for (Map.Entry> designDutyMap : designDutyGroupMap.entrySet()) { + String designDutyId = designDutyMap.getKey(); + List lawsInventoryEOList = designDutyMap.getValue(); + if(StringUtils.isEmpty(designDutyId) || CollectionUtils.isEmpty(lawsInventoryEOList)){ + continue; + } + + this.lawsInventoryEOListSortByDesignDueDate(lawsInventoryEOList); + Date designDueDate = lawsInventoryEOList.get(0).getDesignDueDate(); + String endTime = ""; + if(designDueDate != null){ + endTime = DateUtils.formatDate(designDueDate); + } + String serialNumbers = lawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getSerialNumber).distinct().collect(Collectors.joining(",")); + + List userIdList = Arrays.asList(designDutyId.split(",")); + // 给设计符合性流程责任人发消息 + Map params = new HashMap<>(); + params.put("contentCn","您好，请及时查看确认以下任务要求，谢谢！"); + params.put("contentEn","Hello! Please check and confirm the following task requirement in a timely manner. Thank you!"); + params.put("projectLibraryId",projectLibraryId); + params.put("endTime",endTime); + params.put("userIdList",userIdList); + params.put("serialNumbers",serialNumbers); + this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE2.getValue(),params); + } + } + + // 催办设计符合性流程状态为 结果待提交的 责任人 + List toBeSubmitLawsInventoryList = projectLawsInventoryEOList.stream().filter(lawsInventory -> { + boolean flag =false; + if (StringUtils.equals(lawsInventory.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())){ + flag = true; + } + return flag; + }).collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(toBeSubmitLawsInventoryList)) { + Map> designDutyGroupMap = toBeSubmitLawsInventoryList.stream().collect(Collectors.groupingBy(ProjectLawsInventoryEO::getVerifyDutyId)); + for (Map.Entry> designDutyMap : designDutyGroupMap.entrySet()) { + String designDutyId = designDutyMap.getKey(); + List lawsInventoryEOList = designDutyMap.getValue(); + if(StringUtils.isEmpty(designDutyId) || CollectionUtils.isEmpty(lawsInventoryEOList)){ + continue; + } + this.lawsInventoryEOListSortByVerifyDueDate(lawsInventoryEOList); + + Date designDueDate = lawsInventoryEOList.get(0).getVerifyDueDate(); + String endTime = ""; + if(designDueDate != null){ + endTime = DateUtils.formatDate(designDueDate); + } + String serialNumbers = lawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getSerialNumber).distinct().collect(Collectors.joining(",")); + + List userIdList = Arrays.asList(designDutyId.split(",")); + // 给设计符合性流程责任人发消息 + Map params = new HashMap<>(); + params.put("contentCn","您好，请尽快查看处理此项任务，谢谢！"); + params.put("contentEn","Hello! Please check and address the task ASAP. Thank you!"); + params.put("projectLibraryId",projectLibraryId); + params.put("endTime",endTime); + params.put("userIdList",userIdList); + params.put("serialNumbers",serialNumbers); + this.sendMessageByTemplateId(TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION1.getValue(),params); + } + } + } + if(StringUtils.contains(expeditingType,OperatorTypeEnum.LAWS_INVENTORY_VERIFY_EXPEDITING.getValue())){ + // 催办验证符合性流程状态为 清单待确认的 责任人 + List toBeConfirmedLawsInventoryList = projectLawsInventoryEOList.stream().filter(lawsInventory -> { + boolean flag =false; + if (StringUtils.equals(lawsInventory.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())){ + flag = true; + } + return flag; + }).collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(toBeConfirmedLawsInventoryList)) { + Map> verifyDutyGroupMap = toBeConfirmedLawsInventoryList.stream().collect(Collectors.groupingBy(ProjectLawsInventoryEO::getVerifyDutyId)); + for (Map.Entry> verifyDutyMap : verifyDutyGroupMap.entrySet()) { + String verifyDutyId = verifyDutyMap.getKey(); + List lawsInventoryEOList = verifyDutyMap.getValue(); + if(StringUtils.isEmpty(verifyDutyId) || CollectionUtils.isEmpty(lawsInventoryEOList)){ + continue; + } + + this.lawsInventoryEOListSortByVerifyDueDate(lawsInventoryEOList); + Date verifyDueDate = lawsInventoryEOList.get(0).getVerifyDueDate(); + String endTime = ""; + if(verifyDueDate != null){ + endTime = DateUtils.formatDate(verifyDueDate); + } + String serialNumbers = lawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getSerialNumber).distinct().collect(Collectors.joining(",")); + + List userIdList = Arrays.asList(verifyDutyId.split(",")); + // 给设计符合性流程责任人发消息 + Map params = new HashMap<>(); + params.put("contentCn","您好，请及时查看确认以下任务要求，谢谢！"); + params.put("contentEn","Hello! Please check and confirm the following task requirement in a timely manner. Thank you!"); + params.put("projectLibraryId",projectLibraryId); + params.put("endTime",endTime); + params.put("userIdList",userIdList); + params.put("serialNumbers",serialNumbers); + this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE2.getValue(),params); + } + } + + // 催办验证符合性流程状态为 结果待提交的 责任人 + List toBeSubmitLawsInventoryList = projectLawsInventoryEOList.stream().filter(lawsInventory -> { + boolean flag =false; + if (StringUtils.equals(lawsInventory.getVerifyFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())){ + flag = true; + } + return flag; + }).collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(toBeSubmitLawsInventoryList)) { + Map> verifyDutyGroupMap = toBeSubmitLawsInventoryList.stream().collect(Collectors.groupingBy(ProjectLawsInventoryEO::getVerifyDutyId)); + for (Map.Entry> verifyDutyMap : verifyDutyGroupMap.entrySet()) { + String verifyDutyId = verifyDutyMap.getKey(); + List lawsInventoryEOList = verifyDutyMap.getValue(); + if(StringUtils.isEmpty(verifyDutyId) || CollectionUtils.isEmpty(lawsInventoryEOList)){ + continue; + } + this.lawsInventoryEOListSortByVerifyDueDate(lawsInventoryEOList); + + Date verifyDueDate = lawsInventoryEOList.get(0).getVerifyDueDate(); + String endTime = ""; + if(verifyDueDate != null){ + endTime = DateUtils.formatDate(verifyDueDate); + } + String serialNumbers = lawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getSerialNumber).distinct().collect(Collectors.joining(",")); + + List userIdList = Arrays.asList(verifyDutyId.split(",")); + // 给设计符合性流程责任人发消息 + Map params = new HashMap<>(); + params.put("contentCn","您好，请尽快查看处理此项任务，谢谢！"); + params.put("contentEn","Hello! Please check and address the task ASAP. Thank you!"); + params.put("projectLibraryId",projectLibraryId); + params.put("endTime",endTime); + params.put("userIdList",userIdList); + params.put("serialNumbers",serialNumbers); + this.sendMessageByTemplateId(TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION1.getValue(),params); + } + } + } + + /*//获取已经发起的 任务确认流程信息（当前处理人） JSONObject queryFlowCurrentTaskJson = new JSONObject(); queryFlowCurrentTaskJson.put("projectLawsInventoryIdList",projectLawsInventoryIdList); queryFlowCurrentTaskJson.put("flowType",FlowTypeEnum.RWQRLC.getValue()); @@ -9556,7 +9810,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl projectLawsInventoryEOS) { + Collections.sort(projectLawsInventoryEOS, new Comparator() { + @Override + public int compare(ProjectLawsInventoryEO p1, ProjectLawsInventoryEO p2) { + if(p1.getDesignDueDate() != null && p2.getDesignDueDate() != null){ + return p1.getDesignDueDate().compareTo(p2.getDesignDueDate()); + } + return 1; + } + }); + } + + @Override + public void lawsInventoryEOListSortByVerifyDueDate(List projectLawsInventoryEOS) { + Collections.sort(projectLawsInventoryEOS, new Comparator() { + @Override + public int compare(ProjectLawsInventoryEO p1, ProjectLawsInventoryEO p2) { + if(p1.getDesignDueDate() != null && p2.getDesignDueDate() != null){ + return p1.getDesignDueDate().compareTo(p2.getDesignDueDate()); + } + return 1; + } + }); + } + } From 7cf1f441b4b681c98c925898ac9b64ca989eea9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Thu, 23 Mar 2023 23:27:50 +0800 Subject: [PATCH 258/645] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E8=BD=AC=E5=8A=9E=E6=97=B6=20=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BA=BA=E5=92=8C=E8=B4=A3=E4=BB=BB=E4=BA=BA=E7=9A=84?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ProjectCertificationInventoryEOServiceImpl.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index 3699cee42..82e68a6cc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -2204,6 +2204,20 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl adds = new ArrayList<>(); + for (ProjectCertificationInventoryEO pci:projectCertificationInventoryEOList) { + if (ObjectUtils.isNotEmpty(pci.getSdt())) { + setProjectCertificationInventoryPermission(pci.getSdt(), pci.getProjectLibraryId(), pci.getId(), now, adds, ProjectUserLocationEnum.PROJECT_CERTIFICATION_INVENTORY_SDT.getValue()); + } + if (ObjectUtils.isNotEmpty(pci.getDutyPerson())) { + setProjectCertificationInventoryPermission(pci.getDutyPerson(), pci.getProjectLibraryId(), pci.getId(), now, adds, ProjectUserLocationEnum.PROJECT_CERTIFICATION_INVENTORY_DP.getValue()); + } + } + if (ObjectUtils.isNotEmpty(adds)) { + projectUserPermissionService.saveBatch(adds); + } Collections.sort(projectCertificationInventoryEOList, new Comparator() { @Override From 99f276f2c9ef41a17ec1a2e44f21d5afe2ae400f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Thu, 23 Mar 2023 23:47:39 +0800 Subject: [PATCH 259/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7=20=E4=BF=AE=E6=94=B9=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=8E=86=E5=8F=B2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ota/controller/OtaBaCxListController.java | 12 ++++++++---- .../ota/controller/OtaBaSjListController.java | 12 ++++++++---- .../ota/service/IOtaBaCxListService.java | 2 +- .../ota/service/IOtaBaSjListService.java | 2 +- .../service/impl/OtaBaCxListServiceImpl.java | 16 +++++++++------- .../service/impl/OtaBaSjListServiceImpl.java | 18 +++++++++++------- 6 files changed, 38 insertions(+), 24 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java index 7070302ae..8ba1c6df6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java @@ -174,10 +174,14 @@ public class OtaBaCxListController extends JeroController batchRecord(@RequestBody List recordList) { - otaBaCxListService.batchRecord(recordList); + @ApiOperation(value = "车型及功能备案列表-备案维护", notes = "车型及功能备案列表-备案维护") + @PostMapping(value = "/batchRecord") + public Result batchRecord(@RequestParam(name = "ids", required = true) String ids, + @RequestParam(name = "bazt", required = true) String bazt, + @RequestParam(name = "batjsj", required = true) String batjsj, + @RequestParam(name = "bz", required = true) String bz, + @RequestParam(name = "cut") String cut) { + otaBaCxListService.batchRecord(ids, bazt, batjsj, bz, cut); return Result.OK("备案维护成功!"); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java index 30bb4ba6b..b46297dca 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java @@ -173,10 +173,14 @@ public class OtaBaSjListController extends JeroController batchRecord(@RequestBody List recordList) { - otaBaSjListService.batchRecord(recordList); + @ApiOperation(value = "升级备案-备案维护", notes = "升级备案-备案维护") + @PostMapping(value = "/batchRecord") + public Result batchRecord(@RequestParam(name = "ids", required = true) String ids, + @RequestParam(name = "bazt", required = true) String bazt, + @RequestParam(name = "batjsj", required = true) String batjsj, + @RequestParam(name = "bz", required = true) String bz, + @RequestParam(name = "cut") String cut) { + otaBaSjListService.batchRecord(ids, bazt, batjsj, bz, cut); return Result.OK("备案维护成功!"); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxListService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxListService.java index 45dbe6352..4ada7932b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxListService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxListService.java @@ -64,5 +64,5 @@ public interface IOtaBaCxListService extends IService { * 备案维护 * */ - void batchRecord(List recordList); + void batchRecord(String ids, String bazt, String batjsj, String bz, String cut); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjListService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjListService.java index 8d99a3778..d0b34c3ca 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjListService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjListService.java @@ -64,5 +64,5 @@ public interface IOtaBaSjListService extends IService { * 备案维护 * */ - void batchRecord(List recordList); + void batchRecord(String ids, String bazt, String batjsj, String bz, String cut); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java index ca1027c8c..ec6a70bad 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java @@ -7,6 +7,7 @@ import com.jero.modules.ota.entity.OtaBaCxLsjl; import com.jero.modules.ota.mapper.OtaBaCxListMapper; import com.jero.modules.ota.service.IOtaBaCxListService; import com.jero.modules.ota.service.IOtaBaCxLsjlService; +import com.jero.modules.system.util.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -102,19 +103,20 @@ public class OtaBaCxListServiceImpl extends ServiceImpl recordList) { + public void batchRecord(String ids, String bazt, String batjsj, String bz, String cut) { try { - if (null != recordList && recordList.size() > 0) { - for (OtaBaCxList obc : recordList) { - String id = obc.getId(); + if (StringUtils.isNotEmpty(ids)) { + String[] idList = ids.split(","); + for (String id : idList) { OtaBaCxList otaBaCxList = this.queryById(id); - otaBaCxList.setBatjsj(obc.getBatjsj()); - otaBaCxList.setBz(obc.getBz()); + otaBaCxList.setBazt(bazt); + otaBaCxList.setBatjsj(sdf.parse(batjsj)); + otaBaCxList.setBz(bz); this.saveOrUpdate(otaBaCxList); //添加历史记录数据 OtaBaCxLsjl lsjl = new OtaBaCxLsjl(); lsjl.setOtaId(id); - lsjl.setSjzt(obc.getBz()); + lsjl.setSjzt(bazt); otaBaCxLsjlService.add(lsjl); } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java index 808f867cd..879f67e95 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java @@ -2,11 +2,14 @@ package com.jero.modules.ota.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.exception.JeroBootException; +import com.jero.modules.ota.entity.OtaBaCxList; +import com.jero.modules.ota.entity.OtaBaCxLsjl; import com.jero.modules.ota.entity.OtaBaSjList; import com.jero.modules.ota.entity.OtaBaSjLsjl; import com.jero.modules.ota.mapper.OtaBaSjListMapper; import com.jero.modules.ota.service.IOtaBaSjListService; import com.jero.modules.ota.service.IOtaBaSjLsjlService; +import com.jero.modules.system.util.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -102,19 +105,20 @@ public class OtaBaSjListServiceImpl extends ServiceImpl recordList) { + public void batchRecord(String ids, String bazt, String batjsj, String bz, String cut) { try { - if (null != recordList && recordList.size() > 0) { - for (OtaBaSjList obs : recordList) { - String id = obs.getId(); + if (StringUtils.isNotEmpty(ids)) { + String[] idList = ids.split(","); + for (String id : idList) { OtaBaSjList otaBaSjList = this.queryById(id); - otaBaSjList.setBatjsj(obs.getBatjsj()); - otaBaSjList.setBz(obs.getBz()); + otaBaSjList.setBazt(bazt); + otaBaSjList.setBatjsj(sdf.parse(batjsj)); + otaBaSjList.setBz(bz); this.saveOrUpdate(otaBaSjList); //添加历史记录数据 OtaBaSjLsjl lsjl = new OtaBaSjLsjl(); lsjl.setOtaId(id); - lsjl.setSjzt(obs.getBz()); + lsjl.setSjzt(bazt); otaBaSjLsjlService.add(lsjl); } } From f2a7a8d0f15a3883233fc91263b7a40bd0469687 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Fri, 24 Mar 2023 09:08:01 +0800 Subject: [PATCH 260/645] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=94=B6=E9=9B=86-=E5=88=97=E8=A1=A8-NIO=E7=BC=96=E5=8F=B7?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=8D=E7=BE=8E=E8=A7=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/projectManagement/ProjectDetails/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/projectManagement/ProjectDetails/index.vue b/jero-web/src/views/projectManagement/ProjectDetails/index.vue index b80f7017a..b1e58dede 100644 --- a/jero-web/src/views/projectManagement/ProjectDetails/index.vue +++ b/jero-web/src/views/projectManagement/ProjectDetails/index.vue @@ -37,8 +37,8 @@ {{$t('historicalVersion')}}
-
{{roleSwitchName}} From ee8540b5b6560650e28a0e55a7dddd8cac7eea5c Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Fri, 24 Mar 2023 09:58:09 +0800 Subject: [PATCH 261/645] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E8=99=9A=E6=8B=9F?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E8=B0=83=E5=8F=96=E6=B7=BB=E5=8A=A0=E6=8E=A5?= =?UTF-8?q?=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 --- .../AuthDummyInventoryInfoEOController.java | 9 ++++ .../IAuthDummyInventoryInfoEOService.java | 2 + .../AuthDummyInventoryInfoEOServiceImpl.java | 47 +++++++++++++++++++ 3 files changed, 58 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/controller/AuthDummyInventoryInfoEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/controller/AuthDummyInventoryInfoEOController.java index 8cbff81f1..cc70ef79a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/controller/AuthDummyInventoryInfoEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/controller/AuthDummyInventoryInfoEOController.java @@ -13,6 +13,7 @@ import com.jero.modules.authDummy.service.IAuthDummyInventoryInfoEOService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.modules.dummy.entity.DummyInventoryInfoEO; import lombok.extern.slf4j.Slf4j; import com.jero.common.system.base.controller.JeroController; import org.springframework.beans.factory.annotation.Autowired; @@ -230,4 +231,12 @@ public class AuthDummyInventoryInfoEOController extends JeroController acquireAdd(@RequestBody JSONObject json) { + this.authDummyInventoryInfoEOService.acquireAdd(json); + return Result.OK("调取成功！"); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/IAuthDummyInventoryInfoEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/IAuthDummyInventoryInfoEOService.java index 346f073c5..5b1281004 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/IAuthDummyInventoryInfoEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/IAuthDummyInventoryInfoEOService.java @@ -140,4 +140,6 @@ public interface IAuthDummyInventoryInfoEOService extends IService infoListCopy); + + void acquireAdd(JSONObject json); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java index 8c584e443..97b08724e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java @@ -22,6 +22,7 @@ import com.jero.modules.authDummy.service.IAuthDummyLogService; import com.jero.modules.document.entity.BussDocumentLibraryEO; import com.jero.modules.document.mapper.BussDocumentLibraryEOMapper; import com.jero.modules.document.service.IBussDocumentLibraryEOService; +import com.jero.modules.dummy.entity.DummyInventoryBaseEO; import com.jero.modules.dummy.entity.DummyInventoryInfoEO; import com.jero.modules.dummy.enums.DummyInventoryBaseFieldEnum; import com.jero.modules.dummy.service.impl.DummyLogEOServiceImpl; @@ -1180,4 +1181,50 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl baseQueryWrap = new QueryWrapper<>(); + List baseList = this.authDummyInventoryBaseEOService.list(baseQueryWrap.eq("id", authDummyInventoryBaseId)); + if(CollectionUtils.isNotEmpty(baseList)){ + if(StringUtils.isNotBlank(ids)){ + //要添加的认证虚拟清单 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(AuthDummyInventoryInfoEO::getId, Arrays.asList(ids.split(","))); + List authDummyInventoryInfoEOList = this.list(wrapper); + + //不需要验重，直接添加，此时可以存在多条编号一样的数据 + List addList = new ArrayList<>(); + for (AuthDummyInventoryInfoEO authDummyInventoryInfoEOTemp : authDummyInventoryInfoEOList) { + String id = UUID.randomUUID().toString().replace("-", ""); + authDummyInventoryInfoEOTemp.setId(id); + authDummyInventoryInfoEOTemp.setAuthDummyInventoryBaseId(authDummyInventoryBaseId); + authDummyInventoryInfoEOTemp.setCreateTime(new Date()); + authDummyInventoryInfoEOTemp.setUpdateTime(new Date()); + addList.add(authDummyInventoryInfoEOTemp); + } + this.saveBatch(addList); + + //更新log + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + String username = sysUser.getUsername(); + String serialNumber = addList.stream().map(e->e.getSerialNumber()).collect(Collectors.joining(",")); + String contentLog = username+"向清单中添加了“"+serialNumber+"”"; + String enContentLog = username+" added “"+serialNumber+"” to the list."; + authDummyLogService.updateLog(contentLog, authDummyInventoryBaseId,CutEnum.CN.getValue()); + authDummyLogService.updateLog(enContentLog, authDummyInventoryBaseId,CutEnum.EN.getValue()); + } + }else{ + if(CutEnum.CN.getValue().equals(cut)){ + throw new JeroBootException("该虚拟清单不存在,新增失败"); + }else{ + throw new JeroBootException("The virtual list does not exist, and adding failed."); + } + } + } } From 90a73a6ddc32975f269f79a59363114efede1bf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Fri, 24 Mar 2023 10:04:05 +0800 Subject: [PATCH 262/645] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E8=A1=A8=E5=A4=B4=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/listOfRegulations.vue | 164 ++++++++---------- 1 file changed, 75 insertions(+), 89 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index da81f8583..1aa50845a 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -331,7 +331,8 @@ + result.designFlowStatus == 'List to be checked'" + :title="text"> {{text}} + result.verifyFlowStatus == 'List to be checked'" + :title="text"> {{text}} { - if (res.success) { - this.columnsAll = this.column - this.columnsAll.forEach((item) => { - if (item.children) { - item.children.forEach((val) => { - this.checkedList.push(item.dataIndex, val.dataIndex) - }) - } else { - this.checkedList.push(item.dataIndex) - } - }) - return - if (res.result.length != 0) { - this.columnsAll = res.result - } else { - this.columnsAll = this.column - } - this.columnsAll.forEach((item, index) => { - if (item.title != '设计符合性确认' && item.title != 'Pre-Homo确认' && item.title != '验证符合性确认' && item.title != '操作') { - item.width = 180 - item.align = 'left' - if (item.title == '编号') { - item.sorter = true - item.scopedSlots = { - customRender: 'standard' - } - } else if (item.title == '标题') { - item.scopedSlots = { - customRender: 'titleName' - } - } else if (item.title == '清单确认状态' || item.title == '任务确认状态' || item.title == '认证级别' || item.title == 'WVTA ID' || - item.title == '责任领域' || item.title == '法规工程师' || item.title == '认证工程师' || item.title == '工程接口人') { - item.sorter = true - } - } else { - delete item.dataIndex - delete item.fixed - item.children.forEach((val, index) => { - val.width = 180 - val.align = 'left' - val.ellipsis = true - }) - } - }) - if (res.result.length != 0) { - this.columnsAll.push({ - title: this.$t('operation'), - align: 'left', - fixed: 'right', - width: 200, - scopedSlots: { customRender: 'operation' } - }, - { - title: this.$t('operation'), - align: 'left', - fixed: 'right', - width: 140, - scopedSlots: { customRender: 'operationOne' } - }) - } - this.columnsAll.forEach((item) => { - if (item.children) { - item.children.forEach((val) => { - this.checkedList.push(item.dataIndex, val.dataIndex) - }) - } else { - this.checkedList.push(item.dataIndex) - } - }) - this.loading = false - this.JLoading = false - } else { - this.JLoading = false - this.loading = false - } - }) - }, - getList() { let roleCode = this.roleSwitchingCode let queryParam = JSON.parse(JSON.stringify(this.queryParam)) @@ -2015,7 +1935,8 @@ }, onCheckAllChange(e) { - this.checkedList = e.target.checked ? this.customizeList.map(item => item.field) : [] + let selectedValue = ['serialNumber', 'title', 'operation'] + this.checkedList = e.target.checked ? this.customizeList.map(item => item.field) : selectedValue this.selectedValue = this.checkedList this.indeterminate = false }, @@ -2028,6 +1949,71 @@ cancel() { this.customizevisible = false }, + + getHeader() { + getAction('head/headCustomEO/list', { + moduleFlag: '法规清单' + }).then((res) => { + if (res.success) { + this.columnsAll = res.result + for (let j = 0; j < this.columnsAll.length; j++) { + for (let i = 0; i < this.column.length; i++) { + if (this.columnsAll[j].title == this.$t('confirmationOfDesignConformity')) { + if (this.column[i].title == this.$t('confirmationOfDesignConformity')) { + if (this.columnsAll[j].children && this.columnsAll[j].children.length > 0) { + for (let k = 0; k < this.columnsAll[j].children.length; k++) { + for (let l = 0; l < this.column[i].children.length; l++) { + if (this.columnsAll[j].children[k].title == this.column[i].children[l].title) { + this.columnsAll[j].children[k] = this.column[i].children[l] + } + } + } + } + } + } else if (this.columnsAll[j].title == this.$t('verificationAndConformityconfirmation')) { + if (this.column[i].title == this.$t('verificationAndConformityconfirmation')) { + if (this.columnsAll[j].children && this.columnsAll[j].children.length > 0) { + for (let k = 0; k < this.columnsAll[j].children.length; k++) { + for (let l = 0; l < this.column[i].children.length; l++) { + if (this.columnsAll[j].children[k].title == this.column[i].children[l].title) { + this.columnsAll[j].children[k] = this.column[i].children[l] + } + } + } + } + } + } else { + if (this.column[i].dataIndex == this.columnsAll[j].dataIndex) { + this.columnsAll[j] = this.column[i] + } + } + } + } + this.columnsAll.push({ + title: this.$t('operation'), + align: 'left', + fixed: 'right', + width: 260, + scopedSlots: { customRender: 'operation' } + }) + this.columnsAll.forEach((item) => { + if (item.children) { + item.children.forEach((val) => { + this.checkedList.push(item.dataIndex, val.dataIndex) + }) + } else { + this.checkedList.push(item.dataIndex) + } + }) + this.loading = false + this.JLoading = false + } else { + this.JLoading = false + this.loading = false + } + }) + }, + handleSubmit() { let list = [] let uniqueArray = this.selectedValue.filter((item, index, array) => { From 0e948809ad468b8c73fc8b475609bc6a52a482bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Fri, 24 Mar 2023 10:10:06 +0800 Subject: [PATCH 263/645] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B8=82=E5=9C=BA?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/virtualListDetails.vue | 78 +++++++++---------- .../views/documentTools/virtualList/index.vue | 4 +- 2 files changed, 41 insertions(+), 41 deletions(-) diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue index afcddbf77..838e20155 100644 --- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue +++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue @@ -935,7 +935,7 @@ headFieldEn:'Number', field: 'serialNumber', key: 1, - moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', status:1, }, { @@ -946,7 +946,7 @@ headFieldEn:'title', field: 'title', key: 2, - moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', status:2, }, { @@ -956,7 +956,7 @@ headFieldEn:'Sub-title', field: 'subtitle', key: 3, - moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', }, { sort: '', @@ -965,7 +965,7 @@ headFieldEn:'List Confirmation Status', field: 'inventoryAffirmStatusName', key: 4, - moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', }, { sort: '', @@ -974,7 +974,7 @@ headFieldEn:'Task Confirmation Status', field: 'taskAffirmStatusName', key: 5, - moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', }, { sort: '', @@ -983,7 +983,7 @@ headFieldEn:'Area', field: 'region_dictText', key: 6, - moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', }, { sort: '', @@ -992,7 +992,7 @@ headFieldEn:'Compare EU/CN', field: 'correspondingStandard', key: 7, - moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', }, { sort: '', @@ -1001,7 +1001,7 @@ headFieldEn:'Usage', field: 'implementType_dictText', key: 8, - moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', }, { sort: '', @@ -1010,7 +1010,7 @@ headFieldEn:'New Type Execution Date', field: 'xin1Che1Xing2Shi2Shi1Ri4Qi1String', key: 9, - moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', }, { sort: '', @@ -1019,7 +1019,7 @@ headFieldEn:'New Vehicle Execution Date', field: 'implementTimeString', key: 10, - moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', }, { sort: '', @@ -1028,7 +1028,7 @@ headFieldEn:'Certification Type', field: 'attestationType_dictText', key: 11, - moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', }, { sort: '', @@ -1037,7 +1037,7 @@ headFieldEn:'Certification Level', field: 'attestationRank_dictText', key: 12, - moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', }, { sort: '', @@ -1046,7 +1046,7 @@ headFieldEn:'Applicable Supplement', field: 'applicableSupplement', key: 13, - moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', }, { sort: '', @@ -1055,7 +1055,7 @@ headFieldEn:'WVTA ID', field: 'wvtaId', key: 14, - moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', }, { sort: '', @@ -1064,7 +1064,7 @@ headFieldEn:'Responsible Field', field: 'dutyTerritory_dictText', key: 15, - moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', }, { sort: '', @@ -1073,7 +1073,7 @@ headFieldEn:'Regulation Engineer', field: 'regulationOwnerName', key: 16, - moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', }, { sort: '', @@ -1082,7 +1082,7 @@ headFieldEn:'Homo Engineer', field: 'homologationEngineerName', key: 17, - moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', }, { sort: '', @@ -1091,7 +1091,7 @@ headFieldEn:'Eng. Interface', field: 'engineeringInterfacePersonName', key: 18, - moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', }, { sort: '', @@ -1100,7 +1100,7 @@ headFieldEn:'Comments', field: 'remark', key: 19, - moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', }, { sort: '', @@ -1110,7 +1110,7 @@ field: 'designDeliverableTemplateName', affirmFlag:'1', key: 20, - moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', }, { sort: '', @@ -1120,7 +1120,7 @@ field: 'designInitiatorName', affirmFlag:'1', key: 21, - moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', }, { sort: '', @@ -1130,7 +1130,7 @@ field: 'designDutyName', affirmFlag:'1', key: 22, - moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', }, { sort: '', @@ -1140,7 +1140,7 @@ field: 'designDueDate', affirmFlag:'1', key: 23, - moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', }, { sort: '', @@ -1150,7 +1150,7 @@ field: 'designRemark', affirmFlag:'1', key: 24, - moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', }, { sort: '', @@ -1160,7 +1160,7 @@ field: 'prehomoDeliverableTemplateName', affirmFlag:'2', key: 25, - moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', }, { sort: '', @@ -1170,7 +1170,7 @@ field: 'prehomoInitiatorName', affirmFlag:'2', key:26, - moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', }, { sort: '', @@ -1180,7 +1180,7 @@ field: 'prehomoDutyName', affirmFlag:'2', key: 27, - moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', }, { sort: '', @@ -1190,7 +1190,7 @@ field: 'prehomoDueDate', affirmFlag:'2', key: 28, - moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', }, { sort: '', @@ -1200,7 +1200,7 @@ field: 'prehomoRemark', affirmFlag:'2', key: 29, - moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', }, { sort: '', @@ -1210,7 +1210,7 @@ field: 'verifyDeliverableTemplateName', affirmFlag:'3', key: 30, - moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', }, { sort: '', @@ -1220,7 +1220,7 @@ field: 'verifyInitiatorName', affirmFlag:'3', key: 31, - moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', }, { sort: '', @@ -1230,7 +1230,7 @@ field: 'verifyDutyName', affirmFlag:'3', key: 32, - moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', }, { sort: '', @@ -1240,7 +1240,7 @@ field: 'verifyDueDate', affirmFlag:'3', key: 33, - moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', }, { sort: '', @@ -1250,7 +1250,7 @@ field: 'verifyRemark', affirmFlag:'3', key: 34, - moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', }, { sort: '', @@ -1260,7 +1260,7 @@ headFieldEn:'Operation', key: 35, field:'operation', - moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', status:2, }, ], @@ -1335,7 +1335,7 @@ } }, created() { - if (this.$route.query.title == '虚拟清单详情') { + if (this.$route.query.title == '市场清单详情') { document.title = this.$t('virtualListDetails') } else { document.title = this.$t('maintainVirtualList') @@ -1343,14 +1343,14 @@ }, mounted() { this.title = this.$route.query.title - this.isTrue = this.$route.query.title == '虚拟清单详情' ? false : true + this.isTrue = this.$route.query.title == '市场清单详情' ? false : true this.getHeader() this.getList() }, computed: { columns() { let columnResult = JSON.parse(JSON.stringify(this.columnsAll)) - if (this.title === '虚拟清单详情') { + if (this.title === '市场清单详情') { for (var i = 0; i < columnResult.length; i++) { if (columnResult[i].title === this.$t('operation')) { columnResult.splice(i, 1) @@ -1483,7 +1483,7 @@ }, getHeader(){ getAction('head/headCustomEO/list', { - moduleFlag: this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单' + moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单' }).then((res) => { if (res.success) { console.log(res.result) diff --git a/jero-web/src/views/documentTools/virtualList/index.vue b/jero-web/src/views/documentTools/virtualList/index.vue index d597f3921..c2ebf8edc 100644 --- a/jero-web/src/views/documentTools/virtualList/index.vue +++ b/jero-web/src/views/documentTools/virtualList/index.vue @@ -363,7 +363,7 @@ name: item.name, useExplain: item.useExplain, id: item.id, - title: '维护虚拟清单' + title: '维护市场清单' } }) window.open(newUrl.href, '_blank') @@ -416,7 +416,7 @@ name: item.name, useExplain: item.useExplain, id: item.id, - title: '虚拟清单详情' + title: '市场清单详情' } }) window.open(newUrl.href, '_blank') From d8c29874803bb93d7e3494e7eaba2b7daccaf135 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Fri, 24 Mar 2023 10:24:17 +0800 Subject: [PATCH 264/645] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E5=B8=88=E8=A7=92=E8=89=B2=E6=9D=83=E9=99=90?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectCertificationDirectoryEOServiceImpl.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationDirectoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationDirectoryEOServiceImpl.java index c89a02088..f30894f6b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationDirectoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationDirectoryEOServiceImpl.java @@ -156,10 +156,18 @@ public class ProjectCertificationDirectoryEOServiceImpl extends ServiceImpl inventoryEOQueryWrapperRZ = new QueryWrapper<>(); + /*QueryWrapper inventoryEOQueryWrapperRZ = new QueryWrapper<>(); inventoryEOQueryWrapperRZ.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectLibraryId); inventoryEOQueryWrapperRZ.lambda().eq(ProjectLawsInventoryEO::getHomologationEngineerId,currentUser.getId()); - Integer lawsInventoryCountRZ = projectLawsInventoryEOMapper.selectCount(inventoryEOQueryWrapperRZ); + Integer lawsInventoryCountRZ = projectLawsInventoryEOMapper.selectCount(inventoryEOQueryWrapperRZ);*/ + // 2023-03-24 修改，由于将认证工程师 挪到了 项目库详情信息中，法规清单中没有认证工程师信息了。 + ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseMapper.selectById(projectLibraryId); + Integer lawsInventoryCountRZ = 0; + if(StringUtils.isNotEmpty(projectLibraryBase.getCertificationEngineer())){ + if(StringUtils.contains(projectLibraryBase.getCertificationEngineer(),currentUser.getId())){ + lawsInventoryCountRZ = 1; + } + } if(lawsInventoryCountRZ > 0){ result = Integer.parseInt(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue()); return result; From b4b83b8283c0790fc58c74e0de17c9ef70ef0905 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Fri, 24 Mar 2023 10:34:43 +0800 Subject: [PATCH 265/645] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B8=82=E5=9C=BA?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95=E7=9A=84=E8=B0=83=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/transferList.vue | 449 ++++++++++-------- .../components/transferListvirtal.vue | 313 ++++++++++++ .../certificationListMaintenance.vue | 6 +- 3 files changed, 580 insertions(+), 188 deletions(-) create mode 100644 jero-web/src/views/virtualAuthenticationList/components/transferListvirtal.vue diff --git a/jero-web/src/views/virtualAuthenticationList/components/transferList.vue b/jero-web/src/views/virtualAuthenticationList/components/transferList.vue index 7679f8d82..25ccd69f9 100644 --- a/jero-web/src/views/virtualAuthenticationList/components/transferList.vue +++ b/jero-web/src/views/virtualAuthenticationList/components/transferList.vue @@ -1,215 +1,290 @@ \ No newline at end of file diff --git a/jero-web/src/views/virtualAuthenticationList/components/transferListvirtal.vue b/jero-web/src/views/virtualAuthenticationList/components/transferListvirtal.vue new file mode 100644 index 000000000..63389d01a --- /dev/null +++ b/jero-web/src/views/virtualAuthenticationList/components/transferListvirtal.vue @@ -0,0 +1,313 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue index 76a5a4661..3da9a0222 100644 --- a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue +++ b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue @@ -232,7 +232,7 @@
- + @@ -382,6 +382,10 @@ searchQuery() { this.getList() }, + transferListForm() { + this.selectedRowKeys = [] + this.getList() + }, //清空 searchReset() { this.queryParam = {} From d097e13a2ac2c55491bfd07e58b09580338520a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Fri, 24 Mar 2023 11:07:19 +0800 Subject: [PATCH 266/645] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/dashboard/components/myList.vue | 45 +- .../components/SentList.vue | 13 + .../components/doneList.vue | 13 + .../views/virtualAuthenticationList/index.vue | 774 +++++++++--------- 4 files changed, 449 insertions(+), 396 deletions(-) diff --git a/jero-web/src/views/dashboard/components/myList.vue b/jero-web/src/views/dashboard/components/myList.vue index a3f743475..3bd57aa82 100644 --- a/jero-web/src/views/dashboard/components/myList.vue +++ b/jero-web/src/views/dashboard/components/myList.vue @@ -10,11 +10,11 @@
- {{item.projectName+'-'+ item.flowTypeShow}} - + {{item.serialNumber+'-'+item.flowTypeShow}} @@ -31,17 +31,22 @@
{{$t('dataLoading')}} +
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue index 4b4c5c89a..739c4de1c 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue @@ -208,6 +208,19 @@ } }) window.open(newUrl.href, '_blank') + } else if (row.flowType == '21') { + let newUrl = this.$router.resolve({ + path: '/ProjectDetails', + query: { + id: row.projectLibraryId, + projectName: row.projectName, + projectNameId: row.projectNameId, + targetMarket: row.targetMarket, + studioEngineer: row.studioEngineer, + type: '106' + } + }) + window.open(newUrl.href, '_blank') } else if (row.flowType == '2') { row.taskId = row.taskId + '' if (row.taskId.length > 30) { diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue index 74873bffe..239842f2a 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue @@ -203,6 +203,19 @@ } }) window.open(newUrl.href, '_blank') + } else if (row.flowType == '21') { + let newUrl = this.$router.resolve({ + path: '/ProjectDetails', + query: { + id: row.projectLibraryId, + projectName: row.projectName, + projectNameId: row.projectNameId, + targetMarket: row.targetMarket, + studioEngineer: row.studioEngineer, + type: '106' + } + }) + window.open(newUrl.href, '_blank') }else if(row.flowType == '2'){ row.taskId = row.taskId + '' if (row.taskId.length > 30) { diff --git a/jero-web/src/views/virtualAuthenticationList/index.vue b/jero-web/src/views/virtualAuthenticationList/index.vue index 5c5fe7dd3..10c635433 100644 --- a/jero-web/src/views/virtualAuthenticationList/index.vue +++ b/jero-web/src/views/virtualAuthenticationList/index.vue @@ -49,7 +49,7 @@ :loading="loading" :pagination="false" :scroll="{x: '100%',y:'calc(100vh - 300px)'}" - rowKey="id" + :rowKey="(record)=>JSON.stringify(record)" :data-source="dataSource" :columns="columns" @change="tableOnChange" @@ -113,7 +113,8 @@
* - {{$t('CertificationListName')}} + {{$t('CertificationListName')}}
From b3230842fd8b8c6ca4b3242112da05b1629d025b Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Fri, 24 Mar 2023 11:23:22 +0800 Subject: [PATCH 267/645] =?UTF-8?q?=E7=A6=85=E9=81=93bug=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 --- .../com/jero/modules/system/enums/ProjectRoleEnum.java | 2 +- .../impl/AuthDummyInventoryBaseEOServiceImpl.java | 1 + .../modules/project/entity/ProjectLibraryBase.java | 1 + .../ProjectCertificationInventoryEOServiceImpl.java | 10 ++++++++-- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/ProjectRoleEnum.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/ProjectRoleEnum.java index ba21bd92d..e07b4c2d9 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/ProjectRoleEnum.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/ProjectRoleEnum.java @@ -18,7 +18,7 @@ public enum ProjectRoleEnum { INTERFACE_PERSON1("工程接口人","30","Interface person"), PERSON_LIABLE1("责任人","31","Person liable"), // 项目库-认证清单使用。 - INTERFACE_PERSON("接口人","20","Interface person"), + INTERFACE_PERSON("工程接口人","20","Interface person"), PERSON_LIABLE("责任人","21","Person liable"), ; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryBaseEOServiceImpl.java index 2d2227610..593bd08c9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryBaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryBaseEOServiceImpl.java @@ -105,6 +105,7 @@ public class AuthDummyInventoryBaseEOServiceImpl extends ServiceImpl { private String sort; //置顶标识(flag为空的时候为置顶, flag为1的时候取消置顶) + // flag为1时置顶 空时不置顶。 private String flag; @TableField(exist = false) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index 82e68a6cc..17b938696 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -374,8 +374,10 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl { boolean flag = false; - if(!projectCertificationInventoryEO.getEndTime().equals(certificationInventory.getEndTime())){ - flag = true; + if(projectCertificationInventoryEO.getEndTime() != null && certificationInventory.getEndTime() != null){ + if(!projectCertificationInventoryEO.getEndTime().equals(certificationInventory.getEndTime())){ + flag = true; + } } return flag; }).collect(Collectors.toList()); @@ -412,6 +414,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl querySdtCountWrap = new QueryWrapper<>(); querySdtCountWrap.lambda().eq(ProjectCertificationInventoryEO::getSdt,loginUser.getId()); + querySdtCountWrap.lambda().eq(ProjectCertificationInventoryEO::getProjectLibraryId,projectLibraryId); Integer sdtCount = this.baseMapper.selectCount(querySdtCountWrap); if(sdtCount > 0){ SysRole sysRole = new SysRole(); @@ -944,6 +949,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl queryDutyPersonCountWrap = new QueryWrapper<>(); queryDutyPersonCountWrap.lambda().eq(ProjectCertificationInventoryEO::getDutyPerson,loginUser.getId()); + queryDutyPersonCountWrap.lambda().eq(ProjectCertificationInventoryEO::getProjectLibraryId,projectLibraryId); Integer dutyPersonCount = this.baseMapper.selectCount(queryDutyPersonCountWrap); if(dutyPersonCount > 0){ SysRole sysRole = new SysRole(); From b0574de10e10ec3f6ff5c513a9553cd7a9707cf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Fri, 24 Mar 2023 11:36:08 +0800 Subject: [PATCH 268/645] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E7=BB=B4=E6=8A=A4=E5=B1=95=E7=A4=BA=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectManagement/components/TaskListModel.vue | 10 +++++++++- .../components/certificationList/index.vue | 9 +++++---- .../src/views/virtualAuthenticationList/index.vue | 2 +- .../certificationListMaintenance.vue | 12 ++++++------ 4 files changed, 21 insertions(+), 12 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/TaskListModel.vue b/jero-web/src/views/projectManagement/components/TaskListModel.vue index 31e1cc703..06ca28a16 100644 --- a/jero-web/src/views/projectManagement/components/TaskListModel.vue +++ b/jero-web/src/views/projectManagement/components/TaskListModel.vue @@ -176,7 +176,15 @@ data() { return { formInline: {}, - rules: {}, + rules: { + certificationProgressRemark:[ + { + max: 500, + message: this.$t('remarks') + this.$t('cannotExceed') + 500 + this.$t('Characters'), + trigger: 'blur' + } + ], + }, title: this.$t('CertificationProgress'), visible: false, confirmLoading: false, diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue index 7f30ea37e..96bec6188 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -70,7 +70,8 @@
{{ $t('export') }} @@ -129,7 +130,7 @@
{{ $t('templateDownload') }} @@ -144,7 +145,7 @@
-
+
@@ -167,7 +168,7 @@
+ v-if="roleSwitchingCode == 0 || roleSwitchingCode == 2"> ...{{ $t('more') }}
diff --git a/jero-web/src/views/virtualAuthenticationList/index.vue b/jero-web/src/views/virtualAuthenticationList/index.vue index 10c635433..4765a055d 100644 --- a/jero-web/src/views/virtualAuthenticationList/index.vue +++ b/jero-web/src/views/virtualAuthenticationList/index.vue @@ -409,7 +409,7 @@ name: item.name, useExplain: item.useExplain, id: item.id, - title: '虚拟认证清单详情' + title: '市场认证清单详情' } }) window.open(newUrl.href, '_blank') diff --git a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue index 3da9a0222..95301d8a7 100644 --- a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue +++ b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue @@ -292,7 +292,7 @@ title: this.$t('category'), align: 'left', dataIndex: 'category', - width: 150, + width: 200, fixed: 'left', ellipsis: true }, @@ -300,7 +300,7 @@ title: this.$t('inspectionItems'), align: 'left', dataIndex: 'inspectionItem', - width: 150, + width: 200, ellipsis: true, fixed: 'left', scopedSlots: { customRender: 'inspectionItems' } @@ -323,7 +323,7 @@ title: this.$t('standard'), align: 'left', dataIndex: 'serialNumber', - width: 150, + width: 210, ellipsis: true }, { @@ -353,7 +353,7 @@ } }, created() { - if (this.$route.query.title == '虚拟认证清单详情') { + if (this.$route.query.title == '市场认证清单详情') { document.title = this.$t('virtualAuthenticationListDetails') this.columns.splice(7, 1) } else { @@ -362,8 +362,8 @@ }, mounted() { this.title = this.$route.query.title - this.isTrue = this.$route.query.title == '虚拟认证清单详情' ? false : true - this.isFalse = this.$route.query.title == '虚拟认证清单详情' ? true : false + this.isTrue = this.$route.query.title == '市场认证清单详情' ? false : true + this.isFalse = this.$route.query.title == '市场认证清单详情' ? true : false this.getList() }, computed: {}, From e6e0faf9ca90b6414932ec086fefb9527d0a0aba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Fri, 24 Mar 2023 11:39:33 +0800 Subject: [PATCH 269/645] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E7=BB=B4=E6=8A=A4=E5=B1=95=E7=A4=BA=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectManagement/components/certificationList/index.vue | 5 ----- 1 file changed, 5 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue index 96bec6188..67604767d 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -514,11 +514,6 @@ value: 'category', text: this.$t('category') }, - { - type: 'string', - value: 'inspectionItem', - text: this.$t('inspectionItems') - }, { type: 'string', value: 'configItem', From ce4432cd0fb526e46233d693e1ac2c2b0e9ed4ae Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Fri, 24 Mar 2023 11:39:34 +0800 Subject: [PATCH 270/645] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93=20?= =?UTF-8?q?66867=20=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../document/service/impl/BussDocumentLibraryEOServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index 45b9a2129..527036bb8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -4936,7 +4936,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl"); } if(detailsEO.getImplementationDate()!=null){ - phasedImplDetailsSbTemp.append(DateUtils.formatTime(detailsEO.getImplementationDate())).append(""); + phasedImplDetailsSbTemp.append(DateUtils.formatDate(detailsEO.getImplementationDate())).append(""); } if(StringUtils.isNotEmpty(detailsEO.getRemarks())){ phasedImplDetailsSbTemp.append(detailsEO.getRemarks()).append(""); From 24945eadd1fba6bf6227fbdf0eee8b9101bfaa76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Fri, 24 Mar 2023 11:46:56 +0800 Subject: [PATCH 271/645] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E7=BB=B4=E6=8A=A4=E8=B0=83=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/certificationList/components/addModel.vue | 9 +++++---- .../components/transferListvirtal.vue | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue index 39924c876..71e0eb61c 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue @@ -15,13 +15,14 @@
- * + * {{$t('regulationNo')}}
- + { if (res.success) { From 335caf58211da8d65863c00610b04543b80a8090 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Fri, 24 Mar 2023 13:47:04 +0800 Subject: [PATCH 272/645] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E6=A8=A1=E6=9D=BF=E4=BF=AE=E6=94=B9=2066859?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/BussDocumentLibraryEOServiceImpl.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index 527036bb8..d2d20693e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -795,12 +795,12 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl fieldListTemp = fieldList.stream().filter(e -> onlCgformAreaTemp.getId().equals(e.getShowArea())).collect(Collectors.toList()); - OnlCgformField phasedOnlCgformField = new OnlCgformField(); + /*OnlCgformField phasedOnlCgformField = new OnlCgformField(); phasedOnlCgformField.setId(UUID.randomUUID().toString().replace("-", "")); phasedOnlCgformField.setDbFieldTxt("分阶段实施详情"); phasedOnlCgformField.setDbFieldEnName("Details of the phased implementation"); phasedOnlCgformField.setDbFieldName("phasedImplDetails"); - fieldListTemp.add(phasedOnlCgformField); + fieldListTemp.add(phasedOnlCgformField);*/ for (OnlCgformField onlCgformField : fieldListTemp) { String dictId = onlCgformField.getDictId(); List sysCategoryTreeVOList = new ArrayList<>(); @@ -814,6 +814,15 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl fjdssMap = new HashMap<>(); + fjdssMap.put("area","文本信息"); + if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + fjdssMap.put("db_field_txt","分阶段实施详情"); + }else { + fjdssMap.put("db_field_txt","Details of the phased implementation"); + } + fjdssMap.put("db_field_name","phasedImplDetails"); + result.add(fjdssMap); return result; } From bd8dd3bfedc43c8587e1b36ee1ecf192cd1f9fb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Fri, 24 Mar 2023 14:05:47 +0800 Subject: [PATCH 273/645] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E7=9A=84=E5=BF=85=E5=A1=AB=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../certificationList/components/addModel.vue | 29 +++++++++++++------ .../components/certificationList/index.vue | 5 +++- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue index 71e0eb61c..25f1f896c 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue @@ -46,7 +46,7 @@
@@ -75,7 +75,7 @@ }]" >
@@ -92,7 +92,7 @@ {max: 300,message: $t('inspectionItems') + $t('cannotExceed') + 300 + $t('Characters'),trigger: 'blur' }]">
@@ -113,7 +113,7 @@ }]" > @@ -204,7 +204,7 @@
@@ -295,7 +295,7 @@
@@ -313,7 +313,7 @@ :prop="'configItem'" > @@ -398,6 +398,7 @@ > { + return res.value === id + }) + if (content && content.length > 0) { + this.formInline.dataList[index].dutyPersonName = content[0].name + this.formInline.dataList[index].dutyPerson = content[0].value + } + } this.$nextTick(() => { this.formInline = { ...this.formInline } this.$refs.ruleForm.validateField([value]) @@ -796,6 +806,7 @@ this.formInline.dataList[index].engineeringInterfacePersonList = res.result.engineeringInterfacePersonList || [] if (res.result.engineeringInterfacePersonList && res.result.engineeringInterfacePersonList.length == 1) { this.formInline.dataList[index].sdt = res.result.engineeringInterfacePersonList[0].value + this.handleInput('dataList.' + index + '.sdt', this.formInline.dataList[index].sdt, index, res.result.engineeringInterfacePersonList) } this.formInline = { ...this.formInline } }) diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue index 67604767d..ec076d2c6 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -284,7 +284,10 @@ + (record.flowStatus == 'Review and return' && + record.dutyPersonName == userInfoQuery.username && roleSwitchingCode == 20) || + (record.flowStatus == 'Results to be submitted' && roleSwitchingCode == 21) || + (record.flowStatus == 'Review and return' && roleSwitchingCode == 21)"> From d80e09640a38f9a7380c6795ffa4088373a4a0fa Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Fri, 24 Mar 2023 14:36:40 +0800 Subject: [PATCH 274/645] =?UTF-8?q?66873=20=E6=96=87=E6=A1=A3=E5=BA=93?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PhasedImplementationDetailsEOServiceImpl.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/PhasedImplementationDetailsEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/PhasedImplementationDetailsEOServiceImpl.java index f3da21a6a..7a1377bc6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/PhasedImplementationDetailsEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/PhasedImplementationDetailsEOServiceImpl.java @@ -101,11 +101,6 @@ public class PhasedImplementationDetailsEOServiceImpl extends ServiceImpl deleteWrap = new QueryWrapper<>(); - deleteWrap.lambda().eq(PhasedImplementationDetailsEO::getBussDocumentLibraryId,bussDocumentLibraryId); - this.baseMapper.delete(deleteWrap); - this.saveBatch(phasedImplDetailsEOList); }catch (Exception ex){ flag = false; From d0575113663842974be2b3d0d26d3eac84ce7253 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Fri, 24 Mar 2023 14:38:11 +0800 Subject: [PATCH 275/645] update --- .../service/impl/BussDocumentLibraryEOServiceImpl.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index d2d20693e..ffafe63bc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -6897,6 +6897,11 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl insertBatchPhasedImplementationDetailsInfo(Map map){ String id = (String) map.get("id"); + // 删除之前的分阶段实施明细信息 + QueryWrapper deleteWrap = new QueryWrapper<>(); + deleteWrap.lambda().eq(PhasedImplementationDetailsEO::getBussDocumentLibraryId,id); + this.phasedImplementationDetailsEOService.getBaseMapper().delete(deleteWrap); + List phasedImplDetailsEOList = new ArrayList<>(); if(map.containsKey("phasedImplementationDetailsEOList")){ PhasedImplementationDetailsEO phasedImplDetailsEO = null; @@ -6910,6 +6915,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl Date: Fri, 24 Mar 2023 14:46:28 +0800 Subject: [PATCH 276/645] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B8=82=E5=9C=BA?= =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E7=9A=84=E8=A1=A8=E5=A4=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 1 + .../virtualList/components/editModel.vue | 271 ++--- .../components/virtualListDetails.vue | 1025 +++++------------ 4 files changed, 447 insertions(+), 851 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 65c93d40b..23869551a 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -578,6 +578,7 @@ module.exports = { modifyNode: 'Modify Node', deleteNode: 'Delete Node', ImplementationDate: 'New Type Execution Date', + ImplementationDateOne: 'New Type Execution Date', vehicleInProductionDate: 'New Vehicle Execution Date', deleteNodes: 'If there are child nodes under this node, they will be deleted synchronously. Are you sure to delete this data?', leastTwo: 'Please Select at Least two pieces of data', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 027eb8a72..ff7ca4844 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -585,6 +585,7 @@ module.exports = { modifyNode: '修改节点', deleteNode: '删除节点', ImplementationDate: '新车型实施日期', + ImplementationDateOne:'新车型实施日期', vehicleInProductionDate: '在产车实施日期', deleteNodes: '该节点下若有子节点将同步删除，确认删除该条数据？', leastTwo: '请选择至少两条数据', diff --git a/jero-web/src/views/documentTools/virtualList/components/editModel.vue b/jero-web/src/views/documentTools/virtualList/components/editModel.vue index 0fea84383..06d7311a2 100644 --- a/jero-web/src/views/documentTools/virtualList/components/editModel.vue +++ b/jero-web/src/views/documentTools/virtualList/components/editModel.vue @@ -295,22 +295,22 @@  {{$t('confirmationOfDesignConformity')}}
- -
-
- {{$t('Sponsor')}} -
- - - -
- + + + + + + + + + + + + + + + +
@@ -327,8 +327,6 @@
- -
@@ -356,6 +354,8 @@
+ +
@@ -389,125 +389,125 @@
-
-  {{$t('PrehomoConfirmation')}} -
- - -
-
- {{$t('Sponsor')}} -
- - - -
- - -
-
- {{$t('personLiable')}} -
- - - -
- - - - -
-
- {{$t('typeOfDeliverables')}} -
- - - - - - - - - -
- - -
-
- {{$t('deliverableTemplate')}} -
- - - {{ (formInline.prehomoDeliverableTemplate === 'null' || formInline.prehomoDeliverableTemplate === '' - || - formInline.prehomoDeliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles') - }} - - -
- - - - -
-
- {{$t('descriptionDeliverables')}} -
- - - -
- - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
 {{$t('verificationAndConformityconfirmation')}}
- -
-
- {{$t('Sponsor')}} -
- - - -
- + + + + + + + + + + + + + + + +
@@ -524,8 +524,6 @@
- -
@@ -553,6 +551,9 @@
+ + +
diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue index 838e20155..624da74c4 100644 --- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue +++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue @@ -114,16 +114,17 @@ - -
+ +
- +
+ class="operator-text"> {{$t('templateDownload')}}
@@ -135,47 +136,52 @@ {{$t('export')}}
- +
+ class="operator-text"> {{$t('copy')}}
- +
+ class="operator-text"> {{$t('batSetting')}}
- +
+ class="operator-text"> {{$t('Transfer')}}
- +
+ class="operator-text"> {{$t('add')}}
- +
+ class="operator-text"> {{$t('BatchDelete')}}
- + @@ -238,37 +246,37 @@ {{record.designDeliverableTypeName}}
- - - - - - - + + + + + + + -- {{record.prehomoDeliverableTypeName}}
- - - - - - - + + + + + + + -- {{record.verifyDeliverableTypeName}}
- - - - - - - + + + + + + + -- @@ -332,7 +340,7 @@ import { getAction, postAction, downloadFile } from '@/api/manage' import { Base64 } from 'js-base64' import { mapGetters } from 'vuex' - import { ResizeHeader,ResizeColumnProvide } from '@/mixins/header' + import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header' export default { name: 'virtualListDetails', @@ -346,7 +354,7 @@ batSetting, globalAdvancedQuery }, - mixins: [ResizeColumnProvide,ResizeHeader], + mixins: [ResizeColumnProvide, ResizeHeader], data() { return { title: '维护虚拟清单', @@ -400,7 +408,7 @@ dataIndex: 'serialNumber', width: 180, fixed: 'left', - sorter:true, + sorter: true, scopedSlots: { customRender: 'standard' } }, { @@ -418,27 +426,6 @@ ellipsis: true, width: 180 }, - { - title: this.$t('listConfirmationStatus'), - align: 'left', - dataIndex: 'inventoryAffirmStatusName', - width: 240, - sorter:true, - ellipsis: true - }, - { - title: this.$t('taskAffirmStatus'), - align: 'left', - sorter:true, - dataIndex: 'taskAffirmStatusName', - width: 240, - ellipsis: true - }, - // { - // title: this.$t('taskReleaseStatus'), - // align: 'center', - // dataIndex: 'taskReleaseStatus' - // }, { title: this.$t('zoneOfApplication'), align: 'left', @@ -488,7 +475,7 @@ align: 'left', dataIndex: 'attestationRank_dictText', width: 180, - sorter:true, + sorter: true, ellipsis: true }, { @@ -503,14 +490,14 @@ align: 'left', dataIndex: 'wvtaId', width: 180, - sorter:true, + sorter: true, ellipsis: true }, { title: this.$t('areaOfResponsibility'), align: 'left', ellipsis: true, - sorter:true, + sorter: true, dataIndex: 'dutyTerritory_dictText', width: 180 }, @@ -518,7 +505,7 @@ title: this.$t('regulatoryEngineer'), align: 'left', ellipsis: true, - sorter:true, + sorter: true, dataIndex: 'regulationOwnerName', width: 180 }, @@ -526,7 +513,7 @@ title: this.$t('certifiedEngineer'), align: 'left', ellipsis: true, - sorter:true, + sorter: true, dataIndex: 'homologationEngineerName', width: 180 }, @@ -534,7 +521,7 @@ title: this.$t('engineeringInterfacePerson'), align: 'left', ellipsis: true, - sorter:true, + sorter: true, dataIndex: 'engineeringInterfacePersonName', width: 180 }, @@ -556,27 +543,27 @@ ellipsis: true, scopedSlots: { customRender: 'designDeliverableTemplateName' } }, - { - title: this.$t('Sponsor'), - dataIndex: 'designInitiatorName', - align: 'left', - width: 180, - ellipsis: true - }, + // { + // title: this.$t('Sponsor'), + // dataIndex: 'designInitiatorName', + // align: 'left', + // width: 180, + // ellipsis: true + // }, { title: this.$t('personLiable'), - dataIndex: 'designDutyName', + dataIndex: 'designDuty_dictText', align: 'left', width: 180, ellipsis: true }, - { - title: this.$t('TaskCutOffTime'), - dataIndex: 'designDueDate', - align: 'left', - ellipsis: true, - width: 140 - }, + // { + // title: this.$t('TaskCutOffTime'), + // dataIndex: 'designDueDate', + // align: 'left', + // ellipsis: true, + // width: 140 + // }, { title: this.$t('descriptionDeliverables'), dataIndex: 'designRemark', @@ -586,47 +573,6 @@ } ] }, - { - title: this.$t('PrehomoConfirmation'), - children: [ - { - title: this.$t('Deliverables'), - dataIndex: 'prehomoDeliverableTemplateName', - align: 'left', - width: 180, - ellipsis: true, - scopedSlots: { customRender: 'prehomoDeliverableTemplateName' } - }, - { - title: this.$t('Sponsor'), - dataIndex: 'prehomoInitiatorName', - align: 'left', - width: 180, - ellipsis: true - }, - { - title: this.$t('personLiable'), - dataIndex: 'prehomoDutyName', - align: 'left', - width: 180, - ellipsis: true - }, - { - title: this.$t('TaskCutOffTime'), - dataIndex: 'prehomoDueDate', - align: 'left', - width: 140, - ellipsis: true - }, - { - title: this.$t('descriptionDeliverables'), - dataIndex: 'prehomoRemark', - align: 'left', - width: 220, - ellipsis: true - } - ] - }, { title: this.$t('verificationAndConformityconfirmation'), children: [ @@ -638,27 +584,20 @@ ellipsis: true, scopedSlots: { customRender: 'verifyDeliverableTemplateName' } }, - { - title: this.$t('Sponsor'), - dataIndex: 'verifyInitiatorName', - align: 'left', - width: 180, - ellipsis: true - }, { title: this.$t('personLiable'), - dataIndex: 'verifyDutyName', + dataIndex: 'verifyDuty_dictText', align: 'left', width: 180, ellipsis: true }, - { - title: this.$t('TaskCutOffTime'), - dataIndex: 'verifyDueDate', - align: 'left', - ellipsis: true, - width: 140 - }, + // { + // title: this.$t('TaskCutOffTime'), + // dataIndex: 'verifyDueDate', + // align: 'left', + // ellipsis: true, + // width: 140 + // }, { title: this.$t('descriptionDeliverables'), dataIndex: 'verifyRemark', @@ -674,595 +613,245 @@ fixed: 'right', width: 240, scopedSlots: { customRender: 'operation' } - }, + } ], columnsAll: [], - // columnsAll: [ - // { - // title: this.$t('standard'), - // align: 'left', - // dataIndex: 'serialNumber', - // width: 180, - // sorter:true, - // fixed: 'left', - // scopedSlots: { customRender: 'standard' } - // }, - // { - // title: this.$t('title'), - // align: 'left', - // dataIndex: 'title', - // width: 180, - // fixed: 'left', - // scopedSlots: { customRender: 'titleName' } - // }, - // { - // title: this.$t('subtitle'), - // align: 'left', - // dataIndex: 'subtitle', - // width: 180, - // ellipsis: true - // }, - // { - // title: this.$t('zoneOfApplication'), - // align: 'left', - // width: 150, - // ellipsis: true, - // dataIndex: 'region_dictText' - // }, - // { - // title: this.$t('scopeOfApplication'), - // align: 'left', - // width: 180, - // ellipsis: true, - // sorter:true, - // dataIndex: 'shi4Yong4Fan4Wei2_dictText' - // }, - // { - // title: this.$t('status'), - // align: 'left', - // width: 100, - // ellipsis: true, - // sorter:true, - // dataIndex: 'state_dictText' - // }, - // { - // title: this.$t('correspondingStandard'), - // align: 'left', - // width: 140, - // ellipsis: true, - // dataIndex: 'correspondingStandard' - // }, - // { - // title: this.$t('implementationCategory'), - // align: 'left', - // width: 140, - // ellipsis: true, - // dataIndex: 'implementType_dictText' - // }, - // { - // title: this.$t('ImplementationDate'), - // align: 'left', - // width: 200, - // ellipsis: true, - // sorter:true, - // dataIndex: 'xin1Che1Xing2Shi2Shi1Ri4Qi1' - // }, - // { - // title: this.$t('vehicleInProductionDate'), - // align: 'left', - // width: 210, - // ellipsis: true, - // sorter:true, - // dataIndex: 'implementTime' - // }, - // { - // title: 'WVTA ID', - // align: 'left', - // dataIndex: 'wvtaId', - // width: 180, - // sorter:true, - // ellipsis: true - // }, - // { - // title: this.$t('certificationType'), - // align: 'left', - // width: 180, - // ellipsis: true, - // dataIndex: 'attestationType_dictText' - // }, - // { - // title: this.$t('certificationLevel'), - // align: 'left', - // width: 200, - // ellipsis: true, - // sorter:true, - // dataIndex: 'attestationRank_dictText' - // }, - // { - // title: this.$t('applicableSupplement'), - // align: 'left', - // width: 200, - // ellipsis: true, - // dataIndex: 'applicableSupplement' - // }, - // { - // title: this.$t('technicalField'), - // align: 'left', - // width: 180, - // ellipsis: true, - // dataIndex: 'technologyTerritoryName' - // }, - // { - // title: this.$t('areaOfResponsibility'), - // align: 'left', - // width: 180, - // ellipsis: true, - // sorter:true, - // dataIndex: 'dutyTerritory_dictText' - // }, - // { - // title: this.$t('remarks'), - // align: 'left', - // dataIndex: 'remark', - // width: 180, - // ellipsis: true - // }, - // - // { - // title: this.$t('confirmationOfDesignConformity'), - // children: [ - // { - // // TODO 未按要求实现，该列分为上下行，上行显示交付物类型，下行显示交付物模板名称，且交付物模板名称点击可下载。其他2个流程同理 - // title: this.$t('Deliverables'), - // dataIndex: 'designDeliverableTemplateName', - // ellipsis: true, - // align: 'left', - // width: 180, - // scopedSlots: { customRender: 'designDeliverableTemplateName' } - // }, - // { - // title: this.$t('Sponsor'), - // dataIndex: 'designInitiator_dictText', - // width: 180, - // ellipsis: true, - // align: 'left' - // }, - // { - // title: this.$t('personLiable'), - // dataIndex: 'designDuty_dictText', - // width: 180, - // ellipsis: true, - // align: 'left' - // }, - // { - // title: this.$t('descriptionDeliverables'), - // dataIndex: 'designRemark', - // align: 'left', - // width: 220, - // ellipsis: true - // } - // ] - // }, - // { - // title: this.$t('PrehomoConfirmation'), - // children: [ - // { - // title: this.$t('Deliverables'), - // dataIndex: 'prehomoDeliverableTemplateName', - // ellipsis: true, - // align: 'left', - // width: 180, - // scopedSlots: { customRender: 'prehomoDeliverableTemplateName' } - // }, - // { - // title: this.$t('Sponsor'), - // dataIndex: 'prehomoInitiator_dictText', - // width: 180, - // ellipsis: true, - // align: 'left' - // }, - // { - // title: this.$t('personLiable'), - // dataIndex: 'prehomoDuty_dictText', - // width: 180, - // ellipsis: true, - // align: 'left' - // }, - // { - // title: this.$t('descriptionDeliverables'), - // dataIndex: 'prehomoRemark', - // align: 'left', - // width: 220, - // ellipsis: true - // } - // ] - // }, - // { - // title: this.$t('verificationAndConformityconfirmation'), - // children: [ - // { - // title: this.$t('Deliverables'), - // dataIndex: 'verifyDeliverableTemplateName', - // ellipsis: true, - // align: 'left', - // width: 180, - // scopedSlots: { customRender: 'verifyDeliverableTemplateName' } - // }, - // { - // title: this.$t('Sponsor'), - // dataIndex: 'verifyInitiator_dictText', - // width: 180, - // align: 'left', - // ellipsis: true - // }, - // { - // title: this.$t('personLiable'), - // dataIndex: 'verifyDuty_dictText', - // width: 180, - // align: 'left', - // ellipsis: true - // }, - // { - // title: this.$t('descriptionDeliverables'), - // dataIndex: 'verifyRemark', - // align: 'left', - // width: 220, - // ellipsis: true - // } - // ] - // }, - // { - // title: this.$t('operation'), - // align: 'left', - // fixed: 'right', - // width: 140, - // scopedSlots: { customRender: 'operation' } - // } - // ], confirmLoading: false, indeterminate: false, customizevisible: false, checkAll: false, - disabled:false, - checkedList: ['serialNumber','title','operation'], - selectedValue:[], + disabled: false, + checkedList: ['serialNumber', 'title', 'operation'], + selectedValue: [], customizeList: [ { sort: '1', name: this.$t('standard'), - disabled:true, - headFieldCn:'编号', - headFieldEn:'Number', + disabled: true, + headFieldCn: '编号', + headFieldEn: 'Number', field: 'serialNumber', key: 1, - moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', - status:1, + moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', + status: 1 }, { sort: '2', - disabled:true, + disabled: true, name: this.$t('title'), - headFieldCn:'标题', - headFieldEn:'title', + headFieldCn: '标题', + headFieldEn: 'title', field: 'title', key: 2, - moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', - status:2, + moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', + status: 2 }, { sort: '', name: this.$t('subtitle'), - headFieldCn:'子标题', - headFieldEn:'Sub-title', + headFieldCn: '子标题', + headFieldEn: 'Sub-title', field: 'subtitle', key: 3, - moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', - }, - { - sort: '', - name: this.$t('listConfirmationStatus'), - headFieldCn:'清单确认状态', - headFieldEn:'List Confirmation Status', - field: 'inventoryAffirmStatusName', - key: 4, - moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', - }, - { - sort: '', - name: this.$t('taskAffirmStatus'), - headFieldCn:'任务确认状态', - headFieldEn:'Task Confirmation Status', - field: 'taskAffirmStatusName', - key: 5, - moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单' }, { sort: '', name: this.$t('zoneOfApplication'), - headFieldCn:'适用地区', - headFieldEn:'Area', + headFieldCn: '适用地区', + headFieldEn: 'Area', field: 'region_dictText', key: 6, - moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单' }, { sort: '', name: this.$t('correspondingStandard'), - headFieldCn:'对应标准', - headFieldEn:'Compare EU/CN', + headFieldCn: '对应标准', + headFieldEn: 'Compare EU/CN', field: 'correspondingStandard', key: 7, - moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单' }, { sort: '', name: this.$t('implementationCategory'), - headFieldCn:'实施类别', - headFieldEn:'Usage', + headFieldCn: '实施类别', + headFieldEn: 'Usage', field: 'implementType_dictText', key: 8, - moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单' }, { sort: '', - name: this.$t('ImplementationDate'), - headFieldCn:'标准实施日期', - headFieldEn:'New Type Execution Date', + name: this.$t('ImplementationDateOne'), + headFieldCn: '新车型实施日期', + headFieldEn: 'New Type Execution Date', field: 'xin1Che1Xing2Shi2Shi1Ri4Qi1String', key: 9, - moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单' }, { sort: '', name: this.$t('vehicleInProductionDate'), - headFieldCn:'在产车实施日期', - headFieldEn:'New Vehicle Execution Date', + headFieldCn: '在产车实施日期', + headFieldEn: 'New Vehicle Execution Date', field: 'implementTimeString', key: 10, - moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单' }, { sort: '', name: this.$t('certificationType'), - headFieldCn:'认证类型', - headFieldEn:'Certification Type', + headFieldCn: '认证类型', + headFieldEn: 'Certification Type', field: 'attestationType_dictText', key: 11, - moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单' }, { sort: '', name: this.$t('certificationLevel'), - headFieldCn:'认证级别', - headFieldEn:'Certification Level', + headFieldCn: '认证级别', + headFieldEn: 'Certification Level', field: 'attestationRank_dictText', key: 12, - moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单' }, { sort: '', name: this.$t('applicableSupplement'), - headFieldCn:'适用增补件', - headFieldEn:'Applicable Supplement', + headFieldCn: '适用增补件', + headFieldEn: 'Applicable Supplement', field: 'applicableSupplement', key: 13, - moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单' }, { sort: '', name: 'WVTA ID', - headFieldCn:'WVTA ID', - headFieldEn:'WVTA ID', + headFieldCn: 'WVTA ID', + headFieldEn: 'WVTA ID', field: 'wvtaId', key: 14, - moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单' }, { sort: '', name: this.$t('areaOfResponsibility'), - headFieldCn:'责任领域', - headFieldEn:'Responsible Field', + headFieldCn: '责任领域', + headFieldEn: 'Responsible Field', field: 'dutyTerritory_dictText', key: 15, - moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单' }, { sort: '', name: this.$t('regulatoryEngineer'), - headFieldCn:'法规工程师', - headFieldEn:'Regulation Engineer', + headFieldCn: '法规工程师', + headFieldEn: 'Regulation Engineer', field: 'regulationOwnerName', key: 16, - moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单' }, { sort: '', name: this.$t('certifiedEngineer'), - headFieldCn:'认证工程师', - headFieldEn:'Homo Engineer', + headFieldCn: '认证工程师', + headFieldEn: 'Homo Engineer', field: 'homologationEngineerName', key: 17, - moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单' }, { sort: '', name: this.$t('engineeringInterfacePerson'), - headFieldCn:'工程接口人', - headFieldEn:'Eng. Interface', + headFieldCn: '工程接口人', + headFieldEn: 'Eng. Interface', field: 'engineeringInterfacePersonName', key: 18, - moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单' }, { sort: '', name: this.$t('remarks'), - headFieldCn:'备注', - headFieldEn:'Comments', + headFieldCn: '备注', + headFieldEn: 'Comments', field: 'remark', key: 19, - moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单' }, { sort: '', name: this.$t('confirmationOfDesignConformity') + '/' + this.$t('Deliverables'), - headFieldCn:'交付物', - headFieldEn:'Deliverables', + headFieldCn: '交付物', + headFieldEn: 'Deliverables', field: 'designDeliverableTemplateName', - affirmFlag:'1', + affirmFlag: '1', key: 20, - moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', - }, - { - sort: '', - name: this.$t('confirmationOfDesignConformity') + '/' + this.$t('Sponsor'), - headFieldCn:'发起人', - headFieldEn:'Creator', - field: 'designInitiatorName', - affirmFlag:'1', - key: 21, - moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单' }, { sort: '', name: this.$t('confirmationOfDesignConformity') + '/' + this.$t('personLiable'), - headFieldCn:'责任人', - headFieldEn:'Assignee', + headFieldCn: '责任人', + headFieldEn: 'Assignee', field: 'designDutyName', - affirmFlag:'1', + affirmFlag: '1', key: 22, - moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', - }, - { - sort: '', - name: this.$t('confirmationOfDesignConformity') + '/' + this.$t('TaskCutOffTime'), - headFieldCn:'截止时间', - headFieldEn:'Due Date', - field: 'designDueDate', - affirmFlag:'1', - key: 23, - moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单' }, { sort: '', name: this.$t('confirmationOfDesignConformity') + '/' + this.$t('descriptionDeliverables'), - headFieldCn:'交付物说明', - headFieldEn:'Instruction', + headFieldCn: '交付物说明', + headFieldEn: 'Instruction', field: 'designRemark', - affirmFlag:'1', + affirmFlag: '1', key: 24, - moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', - }, - { - sort: '', - name: this.$t('PrehomoConfirmation') + '/' + this.$t('Deliverables'), - headFieldCn:'交付物', - headFieldEn:'Deliverables', - field: 'prehomoDeliverableTemplateName', - affirmFlag:'2', - key: 25, - moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', - }, - { - sort: '', - name: this.$t('PrehomoConfirmation') + '/' + this.$t('Sponsor'), - headFieldCn:'发起人', - headFieldEn:'Creator', - field: 'prehomoInitiatorName', - affirmFlag:'2', - key:26, - moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', - }, - { - sort: '', - name: this.$t('PrehomoConfirmation') + '/' + this.$t('personLiable'), - headFieldCn:'责任人', - headFieldEn:'Assignee', - field: 'prehomoDutyName', - affirmFlag:'2', - key: 27, - moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', - }, - { - sort: '', - name: this.$t('PrehomoConfirmation') + '/' + this.$t('TaskCutOffTime'), - headFieldCn:'截止时间', - headFieldEn:'Due Date', - field: 'prehomoDueDate', - affirmFlag:'2', - key: 28, - moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', - }, - { - sort: '', - name: this.$t('PrehomoConfirmation') + '/' + this.$t('descriptionDeliverables'), - headFieldCn:'交付物说明', - headFieldEn:'Instruction', - field: 'prehomoRemark', - affirmFlag:'2', - key: 29, - moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单' }, { sort: '', name: this.$t('verificationAndConformityconfirmation') + '/' + this.$t('Deliverables'), - headFieldCn:'交付物', - headFieldEn:'Deliverables', + headFieldCn: '交付物', + headFieldEn: 'Deliverables', field: 'verifyDeliverableTemplateName', - affirmFlag:'3', + affirmFlag: '3', key: 30, - moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', - }, - { - sort: '', - name: this.$t('verificationAndConformityconfirmation') + '/' + this.$t('Sponsor'), - headFieldCn:'发起人', - headFieldEn:'Creator', - field: 'verifyInitiatorName', - affirmFlag:'3', - key: 31, - moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单' }, { sort: '', name: this.$t('verificationAndConformityconfirmation') + '/' + this.$t('personLiable'), - headFieldCn:'责任人', - headFieldEn:'Assignee', + headFieldCn: '责任人', + headFieldEn: 'Assignee', field: 'verifyDutyName', - affirmFlag:'3', + affirmFlag: '3', key: 32, - moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', - }, - { - sort: '', - name: this.$t('verificationAndConformityconfirmation') + '/' + this.$t('TaskCutOffTime'), - headFieldCn:'截止时间', - headFieldEn:'Due Date', - field: 'verifyDueDate', - affirmFlag:'3', - key: 33, - moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单' }, { sort: '', name: this.$t('verificationAndConformityconfirmation') + '/' + this.$t('descriptionDeliverables'), - headFieldCn:'交付物说明', - headFieldEn:'Instruction', + headFieldCn: '交付物说明', + headFieldEn: 'Instruction', field: 'verifyRemark', - affirmFlag:'3', + affirmFlag: '3', key: 34, - moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', + moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单' }, { sort: '', - disabled:true, + disabled: true, name: this.$t('operation'), - headFieldCn:'操作', - headFieldEn:'Operation', + headFieldCn: '操作', + headFieldEn: 'Operation', key: 35, - field:'operation', - moduleFlag:this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', - status:2, - }, + field: 'operation', + moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单', + status: 2 + } ], selectedRowKeys: [], isTrue: false, @@ -1359,7 +948,7 @@ } } this.isTruee = false - this.$nextTick(()=>{ + this.$nextTick(() => { this.isTruee = true }) return columnResult @@ -1367,7 +956,7 @@ }, methods: { ...mapGetters(['userInfo']), - sVisible(){ + sVisible() { this.getDataAdmin() }, handleSuperQuery(params, matchType) { @@ -1401,13 +990,13 @@ }, //调取 transferClick() { - this.$refs.transferListRef.transferModel() + this.$refs.transferListRef.transferModel() }, - getDataAdmin(){ + getDataAdmin() { this.isTrue = false - setTimeout(()=>{ + setTimeout(() => { this.isTrue = true - },100) + }, 100) }, //导出 handleExport() { @@ -1452,28 +1041,28 @@ editModelList() { this.getList() }, - transferListForm(id){ + transferListForm(id) { this.$refs.transferListvirtalRef.transferModel(id) }, - transferListFormHomo(){ + transferListFormHomo() { this.$refs.transferListRef.handleCancel() this.getList() }, tableOnChange(pagination, filters, sorter) { this.orderBy = sorter.order == 'ascend' ? '1' : '2' - if(sorter.columnKey == 'shi4Yong4Fan4Wei2_dictText'){ + if (sorter.columnKey == 'shi4Yong4Fan4Wei2_dictText') { this.orderByField = 'shi4Yong4Fan4Wei2' - } else if(sorter.columnKey == 'state_dictText') { + } else if (sorter.columnKey == 'state_dictText') { this.orderByField = 'state' - } else if(sorter.columnKey == 'xin1Che1Xing2Shi2Shi1Ri4Qi1') { + } else if (sorter.columnKey == 'xin1Che1Xing2Shi2Shi1Ri4Qi1') { this.orderByField = 'xin1_che1_xing2_shi2_shi1_ri4_qi1' - } else if(sorter.columnKey == 'implementTime') { + } else if (sorter.columnKey == 'implementTime') { this.orderByField = 'implement_time' - } else if(sorter.columnKey == 'dutyTerritory_dictText') { + } else if (sorter.columnKey == 'dutyTerritory_dictText') { this.orderByField = 'dutyTerritory' - } else if(sorter.columnKey == 'attestationRank_dictText') { + } else if (sorter.columnKey == 'attestationRank_dictText') { this.orderByField = 'attestationRank' - } else{ + } else { this.orderByField = sorter.columnKey } this.getList() @@ -1481,70 +1070,62 @@ handleToggleSearch() { this.toggleSearchStatus = !this.toggleSearchStatus }, - getHeader(){ + getHeader() { getAction('head/headCustomEO/list', { moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单' }).then((res) => { if (res.success) { - console.log(res.result) - if(res.result.length != 0){ - this.columnsAll = res.result - }else{ - this.columnsAll = this.column - } - this.columnsAll.forEach((item,index) => { - if(item.title != '设计符合性确认' && item.title != 'Pre-Homo确认' && item.title != '验证符合性确认'){ - item.width = 180 - item.align = 'left' - if(item.title == '操作'){ - item.scopedSlots = { - customRender: 'operation' + this.columnsAll = res.result + for (let j = 0; j < this.columnsAll.length; j++) { + for (let i = 0; i < this.column.length; i++) { + if (this.columnsAll[j].title == this.$t('confirmationOfDesignConformity')) { + if (this.column[i].title == this.$t('confirmationOfDesignConformity')) { + if (this.columnsAll[j].children && this.columnsAll[j].children.length > 0) { + for (let k = 0; k < this.columnsAll[j].children.length; k++) { + for (let l = 0; l < this.column[i].children.length; l++) { + if (this.columnsAll[j].children[k].title == this.column[i].children[l].title) { + this.columnsAll[j].children[k] = this.column[i].children[l] + } + } + } + } } - item.fixed = 'right' - }else if(item.title == '编号'){ - item.sorter = true - item.fixed = 'left' - item.scopedSlots = { - customRender: 'standard' + } else if (this.columnsAll[j].title == this.$t('verificationAndConformityconfirmation')) { + if (this.column[i].title == this.$t('verificationAndConformityconfirmation')) { + if (this.columnsAll[j].children && this.columnsAll[j].children.length > 0) { + for (let k = 0; k < this.columnsAll[j].children.length; k++) { + for (let l = 0; l < this.column[i].children.length; l++) { + if (this.columnsAll[j].children[k].title == this.column[i].children[l].title) { + this.columnsAll[j].children[k] = this.column[i].children[l] + } + } + } + } } - }else if(item.title == '标题'){ - item.fixed = 'left' - item.scopedSlots = { - customRender: 'titleName' - } - }else if(item.title == '在产车实施日期'){ - item.scopedSlots = { - customRender: 'titleName' - } - }else if(item.title == '标准实施日期'){ - item.scopedSlots = { - customRender: 'titleName' + } else { + if (this.column[i].dataIndex == this.columnsAll[j].dataIndex) { + this.columnsAll[j] = this.column[i] } } - else if(item.title == '清单确认状态' || item.title == '任务确认状态' || item.title == '认证级别' || item.title == 'WVTA ID' || - item.title == '责任领域' || item.title == '法规工程师' || item.title == '认证工程师' || item.title == '工程接口人'){ - item.sorter = true - } - }else { - delete item.dataIndex - delete item.fixed - item.children.forEach((val,index) => { - val.width = 180 - val.align = 'left' - val.ellipsis = true - }) } - }) + } this.columnsAll.forEach((item) => { - if(item.children){ + if (item.children) { item.children.forEach((val) => { - this.checkedList.push(item.dataIndex,val.dataIndex) + this.checkedList.push(item.dataIndex, val.dataIndex) }) - }else { + } else { this.checkedList.push(item.dataIndex) } }) - console.log(this.checkedList) + this.columnsAll.push({ + title: this.$t('operation'), + align: 'left', + fixed: 'right', + width: 160, + scopedSlots: { customRender: 'operation' } + }) + this.loading = false this.JLoading = false } else { @@ -1554,10 +1135,10 @@ }) }, getList() { - if(this.queryParam.xin1Che1Xing2Shi2Shi1Ri4Qi1String && this.queryParam.xin1Che1Xing2Shi2Shi1Ri4Qi1String instanceof Array){ + if (this.queryParam.xin1Che1Xing2Shi2Shi1Ri4Qi1String && this.queryParam.xin1Che1Xing2Shi2Shi1Ri4Qi1String instanceof Array) { this.queryParam.xin1Che1Xing2Shi2Shi1Ri4Qi1String = this.queryParam.xin1Che1Xing2Shi2Shi1Ri4Qi1String.join(',') } - if(this.queryParam.implementTimeString && this.queryParam.implementTimeString instanceof Array){ + if (this.queryParam.implementTimeString && this.queryParam.implementTimeString instanceof Array) { this.queryParam.implementTimeString = this.queryParam.implementTimeString.join(',') } let query = { @@ -1601,43 +1182,44 @@ }) }, onCheckAllChange(e) { - this.checkedList = e.target.checked ? this.customizeList.map(item => item.field) : []; + let selectedValue = ['serialNumber', 'title', 'operation'] + this.checkedList = e.target.checked ? this.customizeList.map(item => item.field) : selectedValue this.selectedValue = this.checkedList this.indeterminate = false }, - onChange(){ + onChange() { this.selectedValue = this.checkedList }, - onChangedatet(values){ + onChangedatet(values) { let StartTime = values[0].format('YYYY-MM-DD') let EndTime = values[1].format('YYYY-MM-DD') let array = [] - array.push(StartTime,EndTime) + array.push(StartTime, EndTime) console.log(array) this.queryParam.xin1Che1Xing2Shi2Shi1Ri4Qi1String = array }, - onChangedate(values){ + onChangedate(values) { let StartTime = values[0].format('YYYY-MM-DD') let EndTime = values[1].format('YYYY-MM-DD') let array = [] - array.push(StartTime,EndTime) + array.push(StartTime, EndTime) console.log(array) this.queryParam.implementTimeString = array }, - getcustomize(){ + getcustomize() { this.customizevisible = true }, - cancel(){ + cancel() { this.customizevisible = false }, - handleSubmit(){ + handleSubmit() { let list = [] let uniqueArray = this.selectedValue.filter((item, index, array) => { return array.indexOf(item) === index }) uniqueArray.forEach(item => { - this.customizeList.forEach((val,index) => { - if(item == val.field){ + this.customizeList.forEach((val, index) => { + if (item == val.field) { val.sort = index + 1 list.push(val) } @@ -1645,8 +1227,8 @@ }) this.confirmLoading = true let headCustomEOList = JSON.parse(JSON.stringify(list)) - let query ={ - headCustomEOList :headCustomEOList + let query = { + headCustomEOList: headCustomEOList } postAction('head/headCustomEO/add', query).then((res) => { if (res.success) { @@ -1739,7 +1321,7 @@ } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') { let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix) window.open(url, '_blank') - }else if(fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg'){ + } else if (fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg') { let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadImgUrl + '/' + fileQuery.id + fileSuffix) window.open(url, '_blank') } else { @@ -1759,7 +1341,7 @@ } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') { let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + id + fileSuffix) window.open(url, '_blank') - }else if(fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg'){ + } else if (fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg') { let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadImgUrl + '/' + id + fileSuffix) window.open(url, '_blank') } else { @@ -1803,7 +1385,7 @@ \ No newline at end of file diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue index ddf7a4bbc..6a017d7dd 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue @@ -22,16 +22,19 @@ :columns="columns" style="margin-bottom: 20px" > + + + - - + + {{ $t('yes') }} {{ $t('not') }} - + {{ $t('yes') }} {{ $t('not') }} @@ -42,20 +45,53 @@ :disabled="disable" :placeholder="$t('PleaseSelect')" :type="'select'" - :triggerChange="false"/> + :triggerChange="false" + v-model="record.jszdhjb"/> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - {{$t('addcontroller')}} - {{$t('delete')}} + {{$t('addcontroller')}} + {{$t('addfunction')}} + {{$t('delete')}}
{{$t('uploadattachment')}} +

注:附件包括测试项目清单、测试报告．测试标准或技术规范

+

    支持doc/docx/pdf格式,大小50M以内

+
{{$t('preservation')}} @@ -79,8 +115,6 @@ return { dataSource: [ { - key:1, - functionname:'ceshi', } ], loading: false, @@ -91,7 +125,8 @@ align: 'left', dataIndex: 'functionname', ellipsis: true, - width: 170 + width: 170, + scopedSlots: { customRender: 'functionname' }, }, { title: this.$t('configuration'), @@ -130,14 +165,16 @@ align: 'left', dataIndex: 'functiondescription', ellipsis: true, - width: 170 + width: 170, + scopedSlots: { customRender: 'functiondescription' }, }, { title: this.$t('applicationconditions'), align: 'left', dataIndex: 'applicationconditions', ellipsis: true, - width: 170 + width: 170, + scopedSlots: { customRender: 'applicationconditions' }, }, { title: this.$t('controllerparameter'), @@ -151,63 +188,56 @@ align: 'left', dataIndex: 'electronic', ellipsis: true, - width: 170 + width: 170, + scopedSlots: { customRender: 'functiondeelectronicscription' }, }, { title: this.$t('electroniccontrollerproductionenterprises'), align: 'left', dataIndex: 'electroniccontrollerproductionenterprises', ellipsis: true, - width: 170 + width: 170, + scopedSlots: { customRender: 'electroniccontrollerproductionenterprises' }, }, { title: this.$t('electroniccontrollertype'), align: 'left', dataIndex: 'electroniccontrollertypeone', ellipsis: true, - width: 170 + width: 170, + scopedSlots: { customRender: 'electroniccontrollertypeone' }, }, { title: this.$t('hardwareversioninformation'), align: 'left', dataIndex: 'hardwareversioninformation', ellipsis: true, - width: 170 - }, - { - title: this.$t('electroniccontrollertype'), - align: 'left', - dataIndex: 'electroniccontrollertype', - ellipsis: true, - width: 170 - }, - { - title: this.$t('hardwareversioninformation'), - align: 'left', - dataIndex: 'hardwareversioninformationone', - ellipsis: true, - width: 170 + width: 170, + scopedSlots: { customRender: 'hardwareversioninformation' }, }, { title: this.$t('softwaredevelopmententerprise'), align: 'left', dataIndex: 'softwaredevelopmententerprise', ellipsis: true, - width: 170 + width: 170, + scopedSlots: { customRender: 'softwaredevelopmententerprise' }, }, { title: this.$t('operatingsystemversion'), align: 'left', dataIndex: 'operatingsystemversion', ellipsis: true, - width: 170 + width: 170, + scopedSlots: { customRender: 'operatingsystemversion' }, }, { title: this.$t('inflammatorydata'), align: 'left', dataIndex: 'inflammatorydata', ellipsis: true, - width: 170 + width: 170, + scopedSlots: { customRender: 'inflammatorydata' }, }, ] }, @@ -273,6 +303,19 @@ this.fileList.uploadName = attIdList this.fileList.certifyingmaterials = this.$t('viewFile') }, + //中间加 + addlineAtMid(record){ + let obj = {} + this.dataSource.splice(this.dataSource.indexOf(record)+1,0,obj) + }, + //最后一行加 + addlineAtBot(){ + let obj={} + this.dataSource.push(obj) + }, + deleteData(record){ + this.dataSource.splice(this.dataSource.indexOf(record),1) + }, } } diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue index 41b6586b4..75363cefb 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue @@ -234,6 +234,9 @@ :columns="columns" style="margin-bottom: 20px" > + + + @@ -249,10 +252,28 @@ {{$t('uploadattachment')}} + + + + + + + + + + + + + + + + + + - {{$t('addcontroller')}} - {{$t('delete')}} + {{$t('addcontroller')}} + {{$t('delete')}}
@@ -698,9 +719,7 @@ export default { queryParam: {}, dataSourceList: [ { - key:1, - systemclass: 'ceshi', - vaule: 2, + } ], columns: [ @@ -709,7 +728,8 @@ export default { align: 'left', dataIndex: 'componentname', ellipsis: true, - width: 170 + width: 170, + scopedSlots: { customRender: 'componentname' }, }, { title: this.$t('configuration'), @@ -731,42 +751,48 @@ export default { align: 'left', dataIndex: 'controllername', ellipsis: true, - width: 170 + width: 170, + scopedSlots: { customRender: 'controllername' }, }, { title: this.$t('hardwarespecificationmodel'), align: 'left', dataIndex: 'hardwarespecificationmodel', ellipsis: true, - width: 170 + width: 170, + scopedSlots: { customRender: 'hardwarespecificationmodel' }, }, { title: this.$t('hardwaremanufacturer'), align: 'left', dataIndex: 'hardwaremanufacturer', ellipsis: true, - width: 170 + width: 170, + scopedSlots: { customRender: 'hardwaremanufacturer' }, }, { title: this.$t('softwareversion'), align: 'left', dataIndex: 'softwareversion', ellipsis: true, - width: 170 + width: 170, + scopedSlots: { customRender: 'softwareversion' }, }, { title: this.$t('softwaredevelopmententerprise'), align: 'left', dataIndex: 'softwaredevelopmententerprise', ellipsis: true, - width: 170 + width: 170, + scopedSlots: { customRender: 'softwaredevelopmententerprise' }, }, { title: this.$t('layoutposition'), align: 'left', dataIndex: 'layoutposition', ellipsis: true, - width: 170 + width: 170, + scopedSlots: { customRender: 'layoutposition' }, }, ] }, @@ -853,7 +879,14 @@ export default { console.log(obj,'2') } return obj; - } + }, + addlineAtBot(){ + let obj={} + this.dataSourceList.push(obj) + }, + deleteData(record){ + this.dataSourceList.splice(this.dataSourceList.indexOf(record),1) + }, } } diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue index f59092b64..d43653929 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue @@ -24,8 +24,10 @@ > @@ -33,7 +35,7 @@
- {{$t('preservation')}} + {{$t('preservation')}} {{$t('last')}} {{$t('next')}}
@@ -59,6 +61,7 @@ safetymeasure: this.$t('authenticityandintegrityprotectionmechanism'), relevantverification: 'havemeasures', certifyingmaterials: this.$t('uploadattachment'), + dictCode:'protection_mechanism' }, { key: '2', @@ -66,6 +69,7 @@ safetymeasure: this.$t('failsafmechanism'), relevantverification: 'havemeasures', certifyingmaterials:'', + dictCode:'fail_safe_mechanism' }, { key: '3', @@ -73,6 +77,7 @@ safetymeasure: this.$t('vehiclesafetyMeasuresafterUpgradefailure'), relevantverification: 'havemeasures', certifyingmaterials:'', + dictCode:'upgrade_failure' }, { key: '4', @@ -80,6 +85,7 @@ safetymeasure: this.$t('informationsecuritymechanism'), relevantverification: 'havemeasures', certifyingmaterials:'', + dictCode:'Information_security_mechanism' }, ], loading: false, @@ -207,6 +213,16 @@ } }) }, + save(){ + let obj={} + obj.bhjz = this.dataSource[0].info + obj.fsxjz= this.dataSource[1].info + obj.sjsbcs = this.dataSource[2].info + obj.xxaqjz = this.dataSource[3].info + postAction('/ota/otaBaCxAqcs/add',obj).then(res =>{ + console.log(res); + }) + }, last(){ this.$emit('safetyPrecautionsup') }, diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue index cc548dde6..21f84696e 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue @@ -2,312 +2,322 @@
- - {{$t('dataimport')}} + + {{ $t('dataimport') }}
- - {{$t('templateDownload')}} + + {{ $t('templateDownload') }}
- + - - {{ $t('yes') }} - {{ $t('not') }} - + + {{ $t('yes') }} + {{ $t('not') }} + - {{$t('uploadattachment')}} + {{ $t('uploadattachment') }}
- {{$t('preservation')}} - {{$t('last')}} - {{$t('next')}} + {{ $t('preservation') }} + {{ $t('last') }} + {{ $t('next') }}
- \ No newline at end of file diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue index 791eae4e8..73d3a9178 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue @@ -21,32 +21,72 @@ :columns="columns" style="margin-bottom: 20px" > + + + - + {{ $t('yes') }} {{ $t('not') }} - + {{$t('uploadattachment')}} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - {{$t('addcontroller')}} - {{$t('delete')}} + + {{$t('addcontroller')}} + {{$t('addsystem')}} + {{$t('delete')}}
{{$t('uploadattachment')}} +

注:附件包括测试项目清单、测试报告．测试标准或技术规范

+

    支持doc/docx/pdf格式,大小50M以内

+
- {{$t('preservation')}} + {{$t('preservation')}} {{$t('last')}} {{$t('next')}}
@@ -61,15 +101,13 @@ export default { name: 'upgradedonline', components:{ - uploadFile + uploadFile, }, data() { return { dataSource: [ { - key:1, - systemclass: 'ceshi', - vaule: 2, + } ], columns: [ @@ -78,7 +116,8 @@ align: 'left', dataIndex: 'systemclass', ellipsis: true, - width: 170 + width: 170, + scopedSlots: { customRender: 'sys' }, }, { title: this.$t('whetheritcanbeupgraded'), @@ -116,77 +155,88 @@ align: 'left', dataIndex: 'electronicController', ellipsis: true, - width: 170 + width: 170, + scopedSlots: { customRender: 'electronicController' }, }, { title: this.$t('electroniccontrollername'), align: 'left', dataIndex: 'electroniccontrollername', ellipsis: true, - width: 170 + width: 170, + scopedSlots: { customRender: 'electroniccontrollername' }, }, { title: this.$t('electroniccontrollerproductionenterprises'), align: 'left', dataIndex: 'electroniccontrollerproductionenterprises', ellipsis: true, - width: 170 + width: 170, + scopedSlots: { customRender: 'electroniccontrollerproductionenterprises' }, }, { title: this.$t('electroniccontrollertype'), align: 'left', dataIndex: 'electroniccontrollertype', ellipsis: true, - width: 170 + width: 170, + scopedSlots: { customRender: 'electroniccontrollertype' }, }, { title: this.$t('hardwareversioninformation'), align: 'left', dataIndex: 'hardwareversioninformation', ellipsis: true, - width: 170 + width: 170, + scopedSlots: { customRender: 'hardwareversioninformation' }, }, { title: this.$t('initialsoftwareversionnumber'), align: 'left', dataIndex: 'initialsoftwareversionnumber', ellipsis: true, - width: 170 + width: 170, + scopedSlots: { customRender: 'initialsoftwareversionnumber' }, }, { title: this.$t('initialpackageforintegrityinflammatorydata'), align: 'left', dataIndex: 'initialpackageforintegrityinflammatorydata', ellipsis: true, - width: 170 + width: 170, + scopedSlots: { customRender: 'initialpackageforintegrityinflammatorydata' }, }, { title: this.$t('environmentalprotection'), align: 'left', dataIndex: 'environmentalprotection', ellipsis: true, - width: 170 + width: 170, + scopedSlots: { customRender: 'environmentalprotection' }, }, { title: this.$t('operatingsystemtype'), align: 'left', dataIndex: 'operatingsystemtype', ellipsis: true, - width: 170 + width: 170, + scopedSlots: { customRender: 'operatingsystemtype' }, }, { title: this.$t('operatingsystemmanufacturer'), align: 'left', dataIndex: 'operatingsystemmanufacturer', ellipsis: true, - width: 170 + width: 170, + scopedSlots: { customRender: 'operatingsystemmanufacturer' }, }, { title: this.$t('operatingsystemversion'), align: 'left', dataIndex: 'operatingsystemversion', ellipsis: true, - width: 170 + width: 170, + scopedSlots: { customRender: 'operatingsystemversion' }, }, ] }, @@ -198,6 +248,7 @@ scopedSlots: { customRender: 'operation' } } ], + form:[{}] } }, mounted() { @@ -233,9 +284,11 @@ // }) }, last(){ + this.save() this.$emit('upgradedonlineup') }, next(){ + this.save() this.$emit('upgradedonlinedown') }, uploadSuccess(data) { @@ -256,6 +309,24 @@ this.$refs.uploadFile.perentHandleFunc() this.$refs.uploadFile.visible = true }, + //中间加 + addlineAtMid(record){ + let obj = {} + this.dataSource.splice(this.dataSource.indexOf(record)+1,0,obj) + }, + //最后一行加 + addlineAtBot(){ + let obj={} + this.dataSource.push(obj) + }, + deleteData(record){ + this.dataSource.splice(this.dataSource.indexOf(record),1) + }, + save(){ + postAction('/ota/otaBaCxKsjxtmccs/add',this.dataSource).then(res => { + console.log(res); + }) + } } } diff --git a/jero-web/src/views/otamanagement/vehicleregistration/index.vue b/jero-web/src/views/otamanagement/vehicleregistration/index.vue index 21b7eec3e..a7fdfc5fd 100644 --- a/jero-web/src/views/otamanagement/vehicleregistration/index.vue +++ b/jero-web/src/views/otamanagement/vehicleregistration/index.vue @@ -7,19 +7,19 @@
- {{$t('upgraderegistrationnumber')}} + {{ $t('upgraderegistrationnumber') }}
- +
- {{$t('noticebatch')}} + {{ $t('noticebatch') }}
- + @@ -29,10 +29,10 @@
- {{$t('producttrademark')}} + {{ $t('producttrademark') }}
- + @@ -43,10 +43,10 @@
- {{$t('productname')}} + {{ $t('productname') }}
- + @@ -65,10 +65,10 @@
- {{$t('productModel')}} + {{ $t('productModel') }}
- + @@ -77,91 +77,62 @@ - - {{$t('query')}} - {{$t('reset')}} - - {{ !toggleSearchStatus ? $t('open') : $t('away') }} - - - - + + {{ $t('query') }} + {{ $t('reset') }} + + {{ !toggleSearchStatus ? $t('open') : $t('away') }} + + + +
-
- - {{$t('createvehicleandfunctionrecords')}} +
+ + {{ $t('createvehicleandfunctionrecords') }}
-
- - {{$t('citeforrecord')}} +
+ + {{ $t('citeforrecord') }}
-
- - {{$t('datamaintenance')}} +
+ + {{ $t('datamaintenance') }}
-
- +
+
-
- - {{$t('templateDownload')}} +
+ + {{ $t('templateDownload') }}
- + @@ -178,13 +149,14 @@ export default { maintenance, ImportFile }, - mixins:[ResizeHeader, ResizeColumnProvide], + mixins: [ResizeHeader, ResizeColumnProvide], data() { return { //url传参严格按照当前命名 url: { list: '/lawsTechnologyEvaluation/lawsTechnologyEvaluationEO/page', - deleteBatch: '/lawsTechnologyEvaluation/lawsTechnologyEvaluationEO/deleteBatch' + deleteBatch: '/lawsTechnologyEvaluation/lawsTechnologyEvaluationEO/deleteBatch', + exportData: '' }, visible: false, loading: false, @@ -383,7 +355,7 @@ export default { }) }, // 引用备案 - citeforrecord(){ + citeforrecord() { }, // 创建车型 @@ -416,27 +388,27 @@ export default { downloadFile(this.url.exportData, text + '.xls', query, this.Deselect) }, // 结束升级 - endUpgrade(){ + endUpgrade() { this.$refs.upgradecompletionRef.addModel() }, // 查看 - detailclick(){ + detailclick() { }, // 维护 - maintenanceClick(row){ + maintenanceClick(row) { this.$refs.maintenanceRef.edit(row) }, // 数据维护 - maintenanceallClick(){ - if(this.selectedRowKeys.length < 1){ + maintenanceallClick() { + if (this.selectedRowKeys.length < 1) { this.$message.warning(this.$t('selectLeastOne')) - }else{ + } else { this.$refs.maintenanceRef.edit(this.selectedRowKeys) } }, // 模板下载 - handleModule(){ + handleModule() { downloadFile('params/paramsInfo/exportTemplate', this.$t('parameterTemplateExportName') + '.xlsx', {}) }, } diff --git a/jero-web/vue.config.js b/jero-web/vue.config.js index 8e9cb0b2d..2ddbd184f 100644 --- a/jero-web/vue.config.js +++ b/jero-web/vue.config.js @@ -102,6 +102,5 @@ module.exports = { } } }, - lintOnSave: undefined } From 279ca78e2b6651335a3c4ca721879da7fc9a8c34 Mon Sep 17 00:00:00 2001 From: yuekuo Date: Sat, 25 Mar 2023 12:00:47 +0800 Subject: [PATCH 291/645] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/basicInformation.vue | 41 ++- .../components/beupgradedonline.vue | 62 +++- .../vehicleinformation/components/other.vue | 29 +- .../components/recordparameters.vue | 275 +++++++++++------- .../components/safetyPrecautions.vue | 1 + .../components/upgradeRequirements.vue | 1 + .../components/upgradedonline.vue | 52 ++-- 7 files changed, 305 insertions(+), 156 deletions(-) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue index cd90629ce..9e79b9c0e 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue @@ -20,14 +20,11 @@ {{$t('selectTheVehicleTemplate')}}
- + + + + +
@@ -38,6 +35,7 @@
{ + if(res.code==200){ + this.selectList=[] + let obj={} + res.result.map(item=>{ + obj.id=item.id + obj.ggpc=item.ggpc + this.selectList.push(obj) + }) + } + }) + }, next(){ this.save() this.$emit('basicInformationForm') }, save(){ - postAction('/ota/otaBaCxJbxx/add',this.form).then( res => { + + postAction('/ota/otaBaCxJbxx/add',{otaId:this.otaId,...this.form}).then( res => { console.log(res); }) }, diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue index 6a017d7dd..50b8a68c9 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue @@ -23,11 +23,11 @@ style="margin-bottom: 20px" > - + - + {{ $t('yes') }} {{ $t('not') }} @@ -50,35 +50,35 @@ - + - + - + - + - + - + - + - + - + - + @@ -94,7 +94,7 @@
- {{$t('preservation')}} + {{$t('preservation')}} {{$t('last')}} {{$t('next')}}
@@ -115,7 +115,32 @@ return { dataSource: [ { - } + gnmc:'前向碰撞预警(FCW)' + }, + { + gnmc:'车道偏离预警(LDW)' + }, + { + gnmc:'百区监测(BSD)' + }, + { + gnmc:'驻员疲劳篮澳CDFM)' + }, + { + gnmc:'自动紧急制动(AEB)' + }, + { + gnmc:'自适应巡航控制(ACC)' + }, + { + gnmc:'自适应巡航控制(ACC)' + }, + { + gnmc:'智能泊车辅助(IPA)' + }, + { + gnmc:'交通拥堵辅助(TJA)' + }, ], loading: false, disable:false, @@ -283,10 +308,17 @@ } }) }, + save(){ + postAction('',{otaId:this.otaId,list:this.dataSource}).then(res =>{ + console.log(res); + }) + }, last(){ + this.save() this.$emit('beupgradedonlineup') }, next(){ + this.save() this.$emit('beupgradedonlinedown') }, uploadSuccess(data) { @@ -305,7 +337,7 @@ }, //中间加 addlineAtMid(record){ - let obj = {} + let obj = {gnmc:record.gnmc} this.dataSource.splice(this.dataSource.indexOf(record)+1,0,obj) }, //最后一行加 diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/other.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/other.vue index 8dd986423..fa475255b 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/other.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/other.vue @@ -1,17 +1,17 @@ \ No newline at end of file diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue index ac06d4c25..692e6053e 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue @@ -87,7 +87,9 @@
- {{$t('uploadattachment')}} + {{ (formInline.fileKey === 'null' || formInline.fileKey === '' || + formInline.fileKey == null) ? $t('clickUpload') : $t('viewUploadedFiles') + }}

注:附件包括测试项目清单、测试报告．测试标准或技术规范

    支持doc/docx/pdf格式,大小50M以内

@@ -114,6 +116,8 @@ import ImportFile from '@/components/ImportFileData/index' }, data() { return { + formInline: {}, + uploadName:'', url: { exportData: '/ota/otaBaCxKsjjsmccs/exportData', importZipUrl: '/ota/otaBaCxKsjjsmccs/importData',//导入 @@ -318,6 +322,18 @@ import ImportFile from '@/components/ImportFileData/index' } }) }, + clickButtonToUpload(item) { + this.$refs.uploadFile.perentHandleFunc() + this.$refs.uploadFile.visible = true + this.uploadName = item + getAction('sys/common/getFileInfos', { id: this.formInline[item] }).then((res) => { + if (res.success) { + this.$refs.uploadFile.perentHandleFunc(res.result) + } else { + this.$refs.uploadFile.perentHandleFunc() + } + }) + }, getData(){ let otaIdT=localStorage.getItem('otaIdT') if(otaIdT==null){ @@ -381,19 +397,17 @@ import ImportFile from '@/components/ImportFileData/index' this.$emit('beupgradedonlinedown') }, uploadSuccess(data) { - let attIdList = [] - if (data && data.length > 0) { - data.map(item => { - attIdList.push({ - id:item.id, - fileName:item.fileName - }) - }) - } - /** 赋值给当前对应的表单文件 */ - this.fileList.uploadName = attIdList - this.fileList.certifyingmaterials = this.$t('viewFile') - }, + let attIdList = [] + if (data && data.length > 0) { + data.map(item => { + attIdList.push(item.id || data.name) + }) + } + /** 赋值给当前对应的表单文件 */ + this.formInline[this.uploadName] = attIdList.join(',') + this.formInline = { ...this.formInline } + this.$refs.ruleForm.clearValidate(['fileKey']) + }, //中间加 addlineAtMid(record){ let obj = {gnmc:record.gnmc} diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue index 43302b99b..6b29fe8a2 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue @@ -24,10 +24,11 @@ + @change="update" + :placeholder="$t('PleaseSelect')" + :type="'select'" + :dictCode="record.dictCode" + :triggerChange="false"/> @@ -177,8 +178,10 @@ import ImportFile from '@/components/ImportFileData/index' // this.getList() this.getData() }, + methods: { // 模板下载 + handleModule() { downloadFile('ota/otaBaCxAqcs/exportTemplate', '车型及功能备案' + '.zip', {}) }, @@ -189,10 +192,11 @@ import ImportFile from '@/components/ImportFileData/index' } getAction('/ota/otaBaCxAqcs/queryByOtaId',{otaIdT:otaIdT,otaId:localStorage.getItem('otaId')}).then(res=>{ if(res.code == 200){ - this.dataSource[0].info = Number(res.result.bhjz) - this.dataSource[1].info =Number(res.result.fsxjz) - this.dataSource[2].info= Number(res.result.sjsbcs) - this.dataSource[3].info=Number(res.result.xxaqjz) + + this.dataSource[0].info = Number(res.result.bhjz) == 0 ? undefined :Number(res.result.bhjz) + this.dataSource[1].info =Number(res.result.fsxjz)== 0 ? undefined :Number(res.result.fsxjz) + this.dataSource[2].info= Number(res.result.sjsbcs)== 0 ? undefined :Number(res.result.sjsbcs) + this.dataSource[3].info=Number(res.result.xxaqjz)== 0 ? undefined :Number(res.result.xxaqjz) this.fileList.uploadName = res.result.zmclList this.fileList.certifyingmaterials = this.$t('viewFile') this.$refs.uploadFile.perentHandleFunc(this.fileList.uploadName) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue index b2a826a37..6b9091fd9 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue @@ -304,7 +304,7 @@ import ImportFile from '@/components/ImportFileData/index' } getAction('/ota/otaBaCxKsjxtmccs/queryByOtaId',{otaIdT:otaIdT,otaId:localStorage.getItem('otaId')}).then(res=>{ if(res.code==200){ - if(res.result.length==0){ + if(res.result.list.length==0){ this.dataSource= [ { xtlb:'动力系统', @@ -332,10 +332,10 @@ import ImportFile from '@/components/ImportFileData/index' }, ] }else{ - res.result.forEach(item =>{ + res.result.list.forEach(item =>{ item.sfksj =Number(item.sfksj) }) - this.dataSource=res.result + this.dataSource=res.result.list } } }) diff --git a/jero-web/src/views/otamanagement/vehicleregistration/index.vue b/jero-web/src/views/otamanagement/vehicleregistration/index.vue index 309ac2b59..b04be3ace 100644 --- a/jero-web/src/views/otamanagement/vehicleregistration/index.vue +++ b/jero-web/src/views/otamanagement/vehicleregistration/index.vue @@ -380,6 +380,7 @@ export default { // 创建车型 createvehicleandfunctionrecords() { localStorage.removeItem('otaId') + localStorage.removeItem('otaIdT') this.$router.push({ path: '/vehicleinformation', query: {} @@ -398,8 +399,16 @@ export default { downloadFile(this.url.exportData, text + '.zip', query, this.Deselect) }, // 查看 - detailclick() { - + detailclick(data) { + console.log('data',data); + localStorage.removeItem('otaIdT') + localStorage.removeItem('otaId') + localStorage.setItem('otaId',data.id) + console.log('data',data.id); + this.$router.push({ + path: '/vehicleinformation', + query: {} + }) }, // 维护 maintenanceClick(row) { From ded9572f2a1134e9717ced7ec46a7c798d10bc45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Sat, 25 Mar 2023 23:34:43 +0800 Subject: [PATCH 314/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/ota/enums/OtaModuleEnum.java | 46 ++++ .../jero/modules/ota/enums/OtaTitleEnum.java | 219 ++++++++++++++++++ .../impl/OtaBaCxJsfzbacsServiceImpl.java | 51 ++-- .../impl/OtaBaCxKsjjsmccsServiceImpl.java | 5 +- .../impl/OtaBaCxKsjxtmccsServiceImpl.java | 5 +- .../service/impl/OtaBaCxTxjlServiceImpl.java | 34 +++ .../service/impl/OtaBaSjLsjlServiceImpl.java | 91 ++++---- 7 files changed, 382 insertions(+), 69 deletions(-) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaModuleEnum.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaModuleEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaModuleEnum.java new file mode 100644 index 000000000..dd7505066 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaModuleEnum.java @@ -0,0 +1,46 @@ +package com.jero.modules.ota.enums; + +public enum OtaModuleEnum { + + CX_CXJBXX("车型基本信息", "1","1"), + CX_ZXSJYQ("在线升级要求", "1","1"), + CX_AQCS("安全措施", "1","1"), + CX_KSJDXTMCYCS("可升级的系统名称与参数", "1","1"), + CX_KZXSJDJSFZGNMCYCS("可在线升级的驾驶辅助功能名称与参数", "1","1"), + CX_JSFZXTJCBACS("驾驶辅助系统基础备案参数", "1","1"), + CX_QT("QT", "1","1"); + + String name; + String nameEN; + String value; + + private OtaModuleEnum(String name, String nameEN, String value) { + this.name = name; + this.nameEN = nameEN; + this.value = value; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getNameEN() { + return nameEN; + } + + public void setNameEN(String nameEN) { + this.nameEN = nameEN; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java new file mode 100644 index 000000000..41264b00b --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java @@ -0,0 +1,219 @@ +package com.jero.modules.ota.enums; + +public enum OtaTitleEnum { + + CPDJBH("cpdjbh", "产品登记编号"), + GGPC("ggpc", "公告批次"), + CPSB("cpsb", "产品商标"), + CPMC("cpmc", "产品名称"), + CPXH("cpxh", "产品型号"), + BAZT("bazt", "备案状态"), + BATJSJ("batjsj", "备案提交时间"), + CJSJ("cjsj", "创建时间"), + BZ("bz", "备注"), + CXMB("cxmb", "车型模板"), + QYMC("qymc", "企业名称"), + DJBH("djbh", "产品登记编号"), + CPLB("cplb", "产品类别"), + DLLX1("dllx1", "车辆动力类型1"), + DLLX2("dllx2", "车辆动力类型2"), + TXZD("txzd", "通信终端"), + CDOTASJ("cdotasj", "车端OTA升级管理系统"), + BHSJB("bhsjb", "保护升级包"), + BHCLBB("bhclbb", "保护车辆版本"), + CLGXNL("clgxnl", "车辆更新能力"), + CLSJTJ("clsjtj", "车辆升级条件"), + CLSJDL("clsjdl", "车辆升级所需电量"), + SJBHAQ("sjbhaq", "升级保护车辆安全"), + SJANTJ("sjantj", "升级所满足的安全条件"), + SJSBAQ("sjsbaq", "升级失败安全状态"), + SJGG("sjgg", "升级公告"), + SJZT("sjzt", "升级结果状态"), + ZMCL("zmcl", "证明材料"), + BHJZ("bhjz", "保护机制"), + FSXJZ("fsxjz", "防失效机制"), + SJSBCS("sjsbcs", "升级失败措施"), + XXAQJZ("xxaqjz", "信息安全机制"), + XTLB("xtlb", "系统类别"), + SFKSJ("sfksj", "是否可升级"), + SJBGCS("sjbgcs", "升级变更技术参数"), + TPT("tpt", "系统电子控制器架构拓扑图"), + KZQMC("kzqmc", "电子控制器名称"), + AQWZXDJ("aqwzxdj", "安全完整性等级"), + KZQSCQY("kzqscqy", "电子控制器生产企业"), + KZQXH("kzqxh", "电子控制器型号"), + YJBBXX("yjbbxx", "硬件版本信息"), + CSRJBBH("csrjbbh", "初始软件版本号"), + CSRJBWZSJ("csrjbwzsj", "初始软件包完整数据"), + SJSFYX("sjsfyx", "升级是否影响整车安全、节能、环保、防盗等"), + CZXTLX("czxtlx", "操作系统类型"), + CZXTSCQY("czxtscqy", "操作系统生产企业"), + CZXTBBH("czxtbbh", "操作系统版本号"), + GNMC("gnmc", "功能名称"), + PZQK("pzqk", "配置情况"), + JSZDHJB("jszdhjb", "驾驶自动化级别"), + SJGGCS("sjggcs", "升级可能变更的《公告》技术参数"), + GNMS("gnms", "功能描述"), + SYTJ("sytj", "适用条件"), + RJKFQY("rjkfqy", "软件开发企业"), + CSYZSJ("csyzsj", "初始软件包的完整性验证数据"), + FJ("fj", "附件"), + WLAQYQ_PZ("wlaqyqPz", "网络安全要求配置"), + WLAQYQ_SL("wlaqyqSl", "网络安全要求数量"), + WLAQYQ_BZWZ("wlaqyqBzwz", "网络安全要求布置位置"), + WLAQYQ_GGXH("wlaqyqGgxh", "网络安全要求规格型号"), + WLAQYQ_SCQY("wlaqyqScqy", "网络安全要求生产企业"), + HMBLD_PZ("hmbldPz", "毫米波雷达配置"), + HMBLD_SL("hmbldSl", "毫米波雷达数量"), + HMBLD_BZWZ("hmbldBzwz", "毫米波雷达布置位置"), + HMBLD_GGXH("hmbldGgxh", "毫米波雷达规格型号"), + HMBLD_SCQY("hmbldScqy", "毫米波雷达生产企业"), + CSBLD_PZ("csbldPz", "超声波雷达配置"), + CSBLD_SL("csbldSl", "超声波雷达数量"), + CSBLD_BZWZ("csbldBzwz", "超声波雷达布置位置"), + CSBLD_GGXH("csbldGgxh", "超声波雷达规格型号"), + CSBLD_SCQY("csbldScqy", "超声波雷达生产企业"), + SXTHS_PZ("sxthsPz", "摄像头倒车影像/(环视)配置"), + SXTHS_SL("sxthsSl", "摄像头倒车影像/(环视)数量"), + SXTHS_BZWZ("sxthsBzwz", "摄像头倒车影像/(环视)布置位置"), + SXTHS_GGXH("sxthsGgxh", "摄像头倒车影像/(环视)规格型号"), + SXTHS_SCQY("sxthsScqy", "摄像头倒车影像/(环视)生产企业"), + SXTDSD_PZ("sxtdsdPz", "摄像头单双多目配置"), + SXTDSD_SL("sxtdsdSl", "摄像头单双多目数量"), + SXTDSD_BZWZ("sxtdsdBzwz", "摄像头单双多目布置位置"), + SXTDSD_GGXH("sxtdsdGgxh", "摄像头单双多目规格型号"), + SXTDSD_SCQY("sxtdsdScqy", "摄像头单双多目生产企业"), + JSYJK_PZ("jsyjkPz", "驾驶员监控摄像头配置"), + JSYJK_SL("jsyjkSl", "驾驶员监控摄像头数量"), + JSYJK_BZWZ("jsyjkBzwz", "驾驶员监控摄像头布置位置"), + JSYJK_GGXH("jsyjkGgxh", "驾驶员监控摄像头规格型号"), + JSYJK_SCQY("jsyjkScqy", "驾驶员监控摄像头生产企业"), + JSYHW_PZ("jsyhwPz", "驾驶员监控红外传感器配置"), + JSYHW_SL("jsyhwSl", "驾驶员监控红外传感器数量"), + JSYHW_BZWZ("jsyhwBzwz", "驾驶员监控红外传感器布置位置"), + JSYHW_GGXH("jsyhwGgxh", "驾驶员监控红外传感器规格型号"), + JSYHW_SCQY("jsyhwScqy", "驾驶员监控红外传感器生产企业"), + CZWXDW_PZ("czwxdwPz", "车载卫星定位设备配置"), + CZWXDW_GGXH("czwxdwGgxh", "车载卫星定位设备规格型号"), + CZWXDW_SCQY("czwxdwScqy", "车载卫星定位设备生产企业"), + GXDH_PZ("gxdhPz", "惯性导航系统配置"), + GXDH_GGXH("gxdhGgxh", "惯性导航系统规格型号"), + GXDH_SCQY("gxdhScqy", "惯性导航系统生产企业"), + LSJ_PZ("lsjPz", "轮速计配置"), + LSJ_GGXH("lsjGgxh", "轮速计规格型号"), + LSJ_SCQY("lsjScqy", "轮速计生产企业"), + GJDDT_PZ("gjddtPz", "高精度地图配置"), + GJDDT_GGXH("gjddtGgxh", "高精度地图规格型号"), + GJDDT_SCQY("gjddtScqy", "高精度地图生产企业"), + DZWL_PZ("dzwlPz", "电子围栏配置"), + DZWL_DXXGCS("dzwlDxxgcs", "电子围栏"), + CZTX_PZ("cztxPz", "车载通信系统配置"), + CZTX_XTMC("cztx_xtmc", "车载通信系统系统名称"), + CZTX_GGXH("cztxGgxh", "车载通信系统规格型号"), + CZTX_SCQY("cztxScqy", "车载通信系统生产企业"), + CZTX_BBH("cztxBbh", "车载通信系统版本号"), + CZTX_KFQY("cztx_kfqy", "车载通信系统软件开发企业"), + JSFZCZJ_PZ("jsfzczjPz", "驾驶辅助功能操纵件配置"), + JSFZCZJ_MC("jsfzczjMc", "驾驶辅助功能操纵件名称"), + JSFZCZJ_YJXH("jsfzczjYjxh", "驾驶辅助功能操纵件硬件规格型号"), + JSFZCZJ_SCQY("jsfzczjScqy", "驾驶辅助功能操纵件生产企业"), + JSFZZSQ_PZ("jsfzzsqPz", "驾驶辅助功能指示器配置"), + JSFZZSQ_MC("jsfzzsqMc", "驾驶辅助功能指示器名称"), + JSFZZSQ_YJXH("jsfzzsqYjxh", "驾驶辅助功能指示器硬件规格型号"), + JSFZZSQ_SCQY("jsfzzsqScqy", "驾驶辅助功能指示器生产企业"), + FXPTSTS_PZ("fxptstsPz", "方向盘脱手提示器配置"), + FXPTSTS_MC("fxptstsMc", "方向盘脱手提示器名称"), + FXPTSTS_YJXH("fxptstsYjxh", "方向盘脱手提示器硬件规格型号"), + FXPTSTS_SCQY("fxptstsScqy", "方向盘脱手提示器生产企业"), + JSYZYLTS_PZ("jsyzyltsPz", "驾驶员注意力提醒指示器配置"), + JSYZYLTS_MC("jsyzyltsMc", "驾驶员注意力提醒指示器名称"), + JSYZYLTS_YJXH("jsyzyltsYjxh", "驾驶员注意力提醒指示器硬件规格型号"), + JSYZYLTS_SCQY("jsyzyltsScqy", "驾驶员注意力提醒指示器生产企业"), + DSSAD_PZ("dssadPz", "自动驾驶数据记录系统配置"), + DSSAD_GGXH("dssadGgxh", "自动驾驶数据记录系统规格型号"), + DSSAD_SCQY("dssadScqy", "自动驾驶数据记录系统生产企业"), + EDR_PZ("edrPz", "事件数据记录系统配置"), + EDR_GGXH("edrGgxh", "事件数据记录系统规格型号"), + EDR_SCQY("edrScqy", "事件数据记录系统生产企业"), + BJMC("bjmc", "部件名称"), + YJGGXH("yjggxh", "硬件规格型号"), + YJSCQY("yjscqy", "硬件生产企业"), + RJBB("rjbb", "软件版本"), + BZWZ("bzwz", "布置位置"), + SJBBHCS("sjbbhcs", "升级包保护措施"), + BABH("babh", "备案编号"), + BAPC("bapc", "备案批次"), + ZSL("zsl", "总数量"), + SCRQKS("scrqks", "生产日期开始"), + SCRQJS("scrqjs", "生产日期结束"), + VIN_LIST("vinList", "VIN码清单"), + SJMD("sjmd", "升级目的"), + SFBGCS("sfbgcs", "是否变更对应车型的《公告》技术参数"), + JSXNBH("jsxnbh", "是否涉及性能变化"), + FHGD("fhgd", "是否符合国家法律、行政法规、规章规定，以及道路机动车辆公告管理相关国家技术标准及安全技术条件等"), + ZDJSXG("zdjsxg", "是否涉及汽车自动驾驶功能相关升级"), + JRXXG("jrxxg", "兼容性评估相关"), + ZXSJ("zxsj", "如何执行升级"), + AQJZ("aqjz", "升级失败或中断后，车辆采取的安全机制"), + SFYXAQ("sfyxaq", "升级活动是否影响车辆安全"), + YHQR("yhqr", "升级活动是否提供用户确认选项"), + SJBCS("sjbcs", "升级包测试"), + AQKKX("aqkkx", "是杏已验证确认在线升级活动的安全性和可靠性"), + BGFJ("bgfj", "提供变更或扩展后的《公告》批次及证明材料"), + CLFJ("clfj", "提供证明材料"), + XTMC("xtmc", "系统名称"), + SJQBGCS("sjqbgcs", "升级前已变更《公告》参数的对应调整"), + SJHBGCS("sjhbgcs", "升级后已变更《公告》参数的对应调整"), + SJKZQMC("sjkzqmc", "升级的电子控制器名称"), + YJBB("yjbb", "适配的硬件版本"), + SJQRJBB("sjqrjbb", "软件版本号升级前"), + SJHRJBB("sjhrjbb", "软件版本号升级后"), + SJQCZXT("sjqczxt", "操作系统版本号升级前"), + SJHCZXT("sjhczxt", "操作系统版本号升级后"), + CSRJSJ("csrjsj", "初始软件包的完整性数据"), + SJBYZSJ("sjbyzsj", "升级包完整性验证数据"), + SJBDX("sjbdx", "升级包大小"), + SFCFSJ("sfcfsj", "是否差分升级"), + SJMDLX("sjmdlx", "升级目的类型"), + GNBGMS("gnbgms", "功能变更描述"), + SYTJBG("sytjbg", "适用条件变更"), + SJSJKZQ("sjsjkzq", "升级涉及的电子控制器"), + GXBH("gxbh", "由于软件升级活动而导致的车辆功能的任何变化"), + SJSJ("sjsj", "升级执行预计时间(分钟)"), + SJKY("sjky", "升级执行期问，车辆是否可用"), + SJBKYGN("sjbkygn", "升级执行期间不可用的车辆功能"), + ZDXX("zdxx", "帮助车辆用户安全执行升级的任何指导信息"), + SJSFCG("sjsfcg", "告知用户升级成功或失败"), + GZBG("gzbg", "告知实施的变更"), + GZSCNR("gzscnr", "告知了对用户手册的全部更新内容"), + GZYHFS("gzyhfs", "告知用户方式（可多选）"), + XGWJ("xgwj", "用户告知相关文件"), + RWMC("rwmc", "任务名称"), + SJFBSJ("sjfbsj", "升级发布时间"), + SJJZSJ("sjjzsj", "升级计划截止时间"); + + String name; + String value; + + OtaTitleEnum(String name, String value) { + this.name = name; + this.value = value; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java index 06ee62fc6..fcee47489 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java @@ -86,33 +86,38 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl bjMap = bj.getInnerMap(); - Field[] fields = OtaBaCxJsfzbacs.class.getDeclaredFields(); - for (Field field : fields) { - Object bjObj = bjMap.get(field.getName()); - if (null != bjObj) { - try { - field.setAccessible(true); - field.set(otaBaCxJsfzbacs, bjObj); - } catch (IllegalAccessException e) { - e.printStackTrace(); + if (ObjectUtils.isNotEmpty(bj)) { + Map bjMap = bj.getInnerMap(); + Field[] fields = OtaBaCxJsfzbacs.class.getDeclaredFields(); + for (Field field : fields) { + Object bjObj = bjMap.get(field.getName()); + if (null != bjObj) { + try { + field.setAccessible(true); + field.set(otaBaCxJsfzbacs, bjObj); + } catch (IllegalAccessException e) { + e.printStackTrace(); + } } } } + JSONArray cs = json.getJSONArray("cs"); - for (Object cdJson : cs) { - HashMap csMap = (HashMap) cdJson; - String csName = (String) csMap.get("key"); - String csValue = (String) csMap.get("val"); - if (null != csName) { - try { - Field field = OtaBaCxJsfzbacs.class.getDeclaredField(csName); - field.setAccessible(true); - field.set(otaBaCxJsfzbacs, csValue); - } catch (IllegalAccessException e) { - e.printStackTrace(); - } catch (NoSuchFieldException e) { - e.printStackTrace(); + if (ObjectUtils.isNotEmpty(cs)) { + for (Object cdJson : cs) { + HashMap csMap = (HashMap) cdJson; + String csName = (String) csMap.get("key"); + String csValue = (String) csMap.get("val"); + if (null != csName) { + try { + Field field = OtaBaCxJsfzbacs.class.getDeclaredField(csName); + field.setAccessible(true); + field.set(otaBaCxJsfzbacs, csValue); + } catch (IllegalAccessException e) { + e.printStackTrace(); + } catch (NoSuchFieldException e) { + e.printStackTrace(); + } } } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java index 03340dace..b40cdf332 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java @@ -48,11 +48,14 @@ public class OtaBaCxKsjjsmccsServiceImpl extends ServiceImpl implements IOtaBaCxTxjlService { + /** + * 添加填写历史 + * + * @param otaModuleEnum + * @param title + * @param oldStr + * @param newStr + */ + public void addHistory(OtaModuleEnum otaModuleEnum, String title, String oldStr, String newStr) { + OtaBaCxTxjl otaBaCxTxjl = new OtaBaCxTxjl(); + otaBaCxTxjl.setModule(otaModuleEnum.getName()); + otaBaCxTxjl.setContent("将" + title + "的" + oldStr + "改为" + newStr); + add(otaBaCxTxjl); + } + + /** + * 添加填写历史(表格) + * + * @param otaModuleEnum + * @param title + * @param number + * @param oldStr + * @param newStr + */ + public void addTableHistory(OtaModuleEnum otaModuleEnum, String title, String number, String oldStr, String newStr) { + OtaBaCxTxjl otaBaCxTxjl = new OtaBaCxTxjl(); + otaBaCxTxjl.setModule(otaModuleEnum.getName()); + otaBaCxTxjl.setContent("将" + title + "中" + number + "的" + oldStr + "改为" + newStr); + add(otaBaCxTxjl); + } + /** * 保存 * diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjLsjlServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjLsjlServiceImpl.java index 876c0deff..f3474dec1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjLsjlServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjLsjlServiceImpl.java @@ -1,29 +1,32 @@ package com.jero.modules.ota.service.impl; import com.jero.modules.ota.entity.OtaBaSjLsjl; +import com.jero.modules.ota.enums.OtaModuleEnum; import com.jero.modules.ota.mapper.OtaBaSjLsjlMapper; import com.jero.modules.ota.service.IOtaBaSjLsjlService; import org.springframework.stereotype.Service; + import java.util.List; import java.util.Date; + import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 升级备案-历史记录 * @Author: jero-boot - * @Date: 2023-03-17 + * @Date: 2023-03-17 * @Version: V1.0 */ @Service public class OtaBaSjLsjlServiceImpl extends ServiceImpl implements IOtaBaSjLsjlService { - - /** - * 保存 - * - * @param otaBaSjLsjl - * @return - */ - @Override + + /** + * 保存 + * + * @param otaBaSjLsjl + * @return + */ + @Override public void add(OtaBaSjLsjl otaBaSjLsjl) { Date now = new Date(); otaBaSjLsjl.setCreateTime(now); @@ -31,58 +34,58 @@ public class OtaBaSjLsjlServiceImpl extends ServiceImpl ids) { removeByIds(ids); } - /** - * 通过id查询 - * - * @param id - * @return - */ - @Override + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override public OtaBaSjLsjl queryById(String id) { return getById(id); } /** - * 列表查询 - * - * @return - */ - @Override + * 列表查询 + * + * @return + */ + @Override public List queryList() { return list(); } From 7f99dfa14e2862df0633e316d26b8e170a8b079c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Sun, 26 Mar 2023 01:20:43 +0800 Subject: [PATCH 315/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/ota/enums/OtaTitleEnum.java | 16 +- .../ota/service/IOtaBaCxTxjlService.java | 5 + .../service/impl/OtaBaCxJbxxServiceImpl.java | 164 ++++++++++-------- .../service/impl/OtaBaCxTxjlServiceImpl.java | 5 +- .../modules/ota/utils/ComparisonUtil.java | 59 +++++++ 5 files changed, 169 insertions(+), 80 deletions(-) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java index 41264b00b..2eb4d1e6e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java @@ -2,6 +2,7 @@ package com.jero.modules.ota.enums; public enum OtaTitleEnum { + CPDJBH("cpdjbh", "产品登记编号"), GGPC("ggpc", "公告批次"), CPSB("cpsb", "产品商标"), @@ -15,8 +16,8 @@ public enum OtaTitleEnum { QYMC("qymc", "企业名称"), DJBH("djbh", "产品登记编号"), CPLB("cplb", "产品类别"), - DLLX1("dllx1", "车辆动力类型1"), - DLLX2("dllx2", "车辆动力类型2"), + DLLX1("dllx1", "车辆动力类型"), + DLLX2("dllx2", "车辆动力类型"), TXZD("txzd", "通信终端"), CDOTASJ("cdotasj", "车端OTA升级管理系统"), BHSJB("bhsjb", "保护升级包"), @@ -216,4 +217,15 @@ public enum OtaTitleEnum { public void setValue(String value) { this.value = value; } + + public static String getVal(String name){ + String res = ""; + for (OtaTitleEnum e:values()) { + if(e.getName().equals(name)){ + res = e.getValue(); + break; + } + } + return res; + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxTxjlService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxTxjlService.java index 7af1c2060..cdc585a5a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxTxjlService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxTxjlService.java @@ -2,6 +2,9 @@ package com.jero.modules.ota.service; import com.jero.modules.ota.entity.OtaBaCxTxjl; import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.modules.ota.enums.OtaModuleEnum; +import org.apache.poi.ss.formula.functions.T; + import java.util.List; /** @@ -12,6 +15,8 @@ import java.util.List; */ public interface IOtaBaCxTxjlService extends IService { + public void addHistory(OtaModuleEnum otaModuleEnum, String title, String oldStr, String newStr); + /** * 保存 * diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java index e438757ac..f22841bdc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java @@ -4,9 +4,13 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.modules.ota.entity.OtaBaCxJbxx; import com.jero.modules.ota.entity.OtaBaCxList; +import com.jero.modules.ota.entity.OtaBaCxTxjl; +import com.jero.modules.ota.enums.OtaModuleEnum; import com.jero.modules.ota.mapper.OtaBaCxJbxxMapper; import com.jero.modules.ota.service.IOtaBaCxJbxxService; import com.jero.modules.ota.service.IOtaBaCxListService; +import com.jero.modules.ota.service.IOtaBaCxTxjlService; +import com.jero.modules.ota.utils.ComparisonUtil; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -19,110 +23,120 @@ import java.util.UUID; /** * @Description: 车型备案-车型基本信息 * @Author: jero-boot - * @Date: 2023-03-17 + * @Date: 2023-03-17 * @Version: V1.0 */ @Service public class OtaBaCxJbxxServiceImpl extends ServiceImpl implements IOtaBaCxJbxxService { - @Autowired - private IOtaBaCxListService otaBaCxListService; - /** - * 保存 - * - * @param otaBaCxJbxx - * @return - */ + @Autowired + private IOtaBaCxListService otaBaCxListService; + + @Autowired + private IOtaBaCxTxjlService otaBaCxTxjlService; + + /** + * 保存 + * + * @param otaBaCxJbxx + * @return + */ public OtaBaCxJbxx add(OtaBaCxJbxx otaBaCxJbxx) { - Date now = new Date(); - OtaBaCxList otaBaCxList; - if(StringUtils.isEmpty(otaBaCxJbxx.getOtaId())){ - //在保存的时候设置一个id 并返回前端 下次保存的时候判断是否为更新 - otaBaCxList = new OtaBaCxList(); - otaBaCxList.setId(UUID.randomUUID().toString().replace("-", "")); - otaBaCxList.updateData(otaBaCxJbxx); - otaBaCxListService.add(otaBaCxList); - otaBaCxJbxx.setOtaId(otaBaCxList.getId()); - otaBaCxJbxx.setCreateTime(now); - }else{ - otaBaCxList = otaBaCxListService.queryById(otaBaCxJbxx.getOtaId()); - otaBaCxList.updateData(otaBaCxJbxx); - otaBaCxListService.editById(otaBaCxList); - } + //对比填写记录用的 + OtaBaCxJbxx OtaBaCxJbxxOld = new OtaBaCxJbxx(); + Date now = new Date(); + OtaBaCxList otaBaCxList; + if (StringUtils.isEmpty(otaBaCxJbxx.getOtaId())) { + //在保存的时候设置一个id 并返回前端 下次保存的时候判断是否为更新 + otaBaCxList = new OtaBaCxList(); + otaBaCxList.setId(UUID.randomUUID().toString().replace("-", "")); + otaBaCxList.updateData(otaBaCxJbxx); + otaBaCxListService.add(otaBaCxList); + otaBaCxJbxx.setOtaId(otaBaCxList.getId()); + otaBaCxJbxx.setCreateTime(now); + } else { + OtaBaCxJbxxOld = this.getByOtaId(otaBaCxJbxx.getOtaId()); + otaBaCxList = otaBaCxListService.queryById(otaBaCxJbxx.getOtaId()); + otaBaCxList.updateData(otaBaCxJbxx); + otaBaCxListService.editById(otaBaCxList); + } otaBaCxJbxx.setUpdateTime(now); - saveOrUpdate(otaBaCxJbxx); - return otaBaCxJbxx; + saveOrUpdate(otaBaCxJbxx); + ComparisonUtil cu = new ComparisonUtil(); + List reList = cu.comparisonRecord(otaBaCxJbxx.getOtaId(), OtaModuleEnum.CX_CXJBXX, OtaBaCxJbxxOld, otaBaCxJbxx); + otaBaCxTxjlService.saveBatch(reList); + return otaBaCxJbxx; } - /** - * 更新 - * - * @param otaBaCxJbxx - * @return - */ - @Override + /** + * 更新 + * + * @param otaBaCxJbxx + * @return + */ + @Override public void editById(OtaBaCxJbxx otaBaCxJbxx) { - Date now = new Date(); + Date now = new Date(); otaBaCxJbxx.setUpdateTime(now); - saveOrUpdate(otaBaCxJbxx); + saveOrUpdate(otaBaCxJbxx); } - /** - * 通过id删除 - * - * @param id - * @return - */ - @Override + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override public void deleteById(String id) { removeById(id); } - /** - * 批量删除 - * - * @param ids - * @return - */ - @Override + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override public void deleteByIds(List ids) { removeByIds(ids); } - /** - * 通过id查询 - * - * @param id - * @return - */ - @Override + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override public OtaBaCxJbxx queryById(String id) { return getById(id); } /** - * 列表查询 - * - * @return - */ - @Override + * 列表查询 + * + * @return + */ + @Override public List queryList() { return list(); } - @Override - public OtaBaCxJbxx queryByOtaId(String otaId, String otaIdT){ - //判断是否保存过，否则查询模版数据回显 - OtaBaCxJbxx res = getByOtaId(otaId); - if(ObjectUtils.isEmpty(res)){ - res = getByOtaId(otaIdT); - } - return res; - } + @Override + public OtaBaCxJbxx queryByOtaId(String otaId, String otaIdT) { + //判断是否保存过，否则查询模版数据回显 + OtaBaCxJbxx res = getByOtaId(otaId); + if (ObjectUtils.isEmpty(res)) { + res = getByOtaId(otaIdT); + } + return res; + } - private OtaBaCxJbxx getByOtaId(String otaId) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(OtaBaCxJbxx::getOtaId, otaId); - return this.getOne(queryWrapper,false); - } + private OtaBaCxJbxx getByOtaId(String otaId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(OtaBaCxJbxx::getOtaId, otaId); + return this.getOne(queryWrapper, false); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxTxjlServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxTxjlServiceImpl.java index 50ce576f4..47b0365df 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxTxjlServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxTxjlServiceImpl.java @@ -3,9 +3,7 @@ package com.jero.modules.ota.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.modules.ota.entity.OtaBaCxTxjl; -import com.jero.modules.ota.entity.OtaBaSjLsjl; import com.jero.modules.ota.enums.OtaModuleEnum; -import com.jero.modules.ota.enums.OtaTitleEnum; import com.jero.modules.ota.mapper.OtaBaCxTxjlMapper; import com.jero.modules.ota.service.IOtaBaCxTxjlService; import org.springframework.stereotype.Service; @@ -22,6 +20,7 @@ import java.util.List; @Service public class OtaBaCxTxjlServiceImpl extends ServiceImpl implements IOtaBaCxTxjlService { + /** * 添加填写历史 * @@ -33,7 +32,7 @@ public class OtaBaCxTxjlServiceImpl extends ServiceImpl + */ +public class ComparisonUtil { + + public ComparisonUtil() { + } + + /** + * 对比字段并添加到记录 + */ + public List comparisonRecord(String otaId, OtaModuleEnum otaModuleEnum, T oldClazz, T newClazz) { + List resList = new ArrayList<>(); + + Field[] fields = newClazz.getClass().getDeclaredFields(); + for (Field field : fields) { + try { + String title = OtaTitleEnum.getVal(field.getName()); + if (ObjectUtils.isEmpty(title)) { + continue; + } + field.setAccessible(true); + Object newVal = field.get(newClazz); + Object oldVal = field.get(oldClazz); + String newStr = "空"; + if (ObjectUtils.isNotEmpty(newVal)) { + newStr = newVal.toString(); + } + String oldStr = "空"; + if (ObjectUtils.isNotEmpty(oldVal)) { + oldStr = oldVal.toString(); + } + if (!newStr.equals(oldStr)) { + OtaBaCxTxjl otaBaCxTxjl = new OtaBaCxTxjl(); + otaBaCxTxjl.setModule(otaModuleEnum.getName()); + otaBaCxTxjl.setContent("由" + title + "的" + oldStr + "改为" + newStr); + otaBaCxTxjl.setOtaId(otaId); + resList.add(otaBaCxTxjl); + } + } catch (IllegalAccessException e) { + e.printStackTrace(); + } + } + return resList; + } +} From 7f2843de3418cca243aaad83f96545a850c40b6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Sun, 26 Mar 2023 01:38:26 +0800 Subject: [PATCH 316/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E5=A1=AB=E5=86=99=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/modules/ota/enums/OtaModuleEnum.java | 2 +- .../ota/service/impl/OtaBaCxAqcsServiceImpl.java | 11 +++++++++++ .../service/impl/OtaBaCxJsfzbacsServiceImpl.java | 14 ++++++++++---- .../ota/service/impl/OtaBaCxQtServiceImpl.java | 11 +++++++++++ .../ota/service/impl/OtaBaCxZxsjyqServiceImpl.java | 14 +++++++++++++- 5 files changed, 46 insertions(+), 6 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaModuleEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaModuleEnum.java index dd7505066..61810a623 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaModuleEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaModuleEnum.java @@ -8,7 +8,7 @@ public enum OtaModuleEnum { CX_KSJDXTMCYCS("可升级的系统名称与参数", "1","1"), CX_KZXSJDJSFZGNMCYCS("可在线升级的驾驶辅助功能名称与参数", "1","1"), CX_JSFZXTJCBACS("驾驶辅助系统基础备案参数", "1","1"), - CX_QT("QT", "1","1"); + CX_QT("其他", "1","1"); String name; String nameEN; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java index e2312f09b..119ffe6b3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java @@ -5,10 +5,15 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.modules.ota.entity.AttachmentEO; import com.jero.modules.ota.entity.OtaBaCxAqcs; import com.jero.modules.ota.entity.OtaBaCxJbxx; +import com.jero.modules.ota.entity.OtaBaCxTxjl; +import com.jero.modules.ota.enums.OtaModuleEnum; import com.jero.modules.ota.mapper.OtaBaCxAqcsMapper; import com.jero.modules.ota.service.IOtaBaCxAqcsService; +import com.jero.modules.ota.service.IOtaBaCxTxjlService; +import com.jero.modules.ota.utils.ComparisonUtil; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -25,6 +30,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @Service public class OtaBaCxAqcsServiceImpl extends ServiceImpl implements IOtaBaCxAqcsService { + @Autowired + private IOtaBaCxTxjlService otaBaCxTxjlService; + /** * 保存 * @@ -50,6 +58,9 @@ public class OtaBaCxAqcsServiceImpl extends ServiceImpl reList = cu.comparisonRecord(otaBaCxAqcsOld.getOtaId(), OtaModuleEnum.CX_AQCS, otaBaCxAqcsOld, otaBaCxAqcs); + otaBaCxTxjlService.saveBatch(reList); } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java index fcee47489..b0c86a37f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java @@ -4,14 +4,14 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.jero.modules.ota.entity.OtaBaCxJsfzbacs; -import com.jero.modules.ota.entity.OtaBaCxKsjxtmccs; -import com.jero.modules.ota.entity.OtaBaCxLsjl; -import com.jero.modules.ota.entity.OtaBaCxSjmk; +import com.jero.modules.ota.entity.*; +import com.jero.modules.ota.enums.OtaModuleEnum; import com.jero.modules.ota.mapper.OtaBaCxJsfzbacsMapper; import com.jero.modules.ota.service.IOtaBaCxJsfzbacsService; import com.jero.modules.ota.service.IOtaBaCxLsjlService; import com.jero.modules.ota.service.IOtaBaCxSjmkService; +import com.jero.modules.ota.service.IOtaBaCxTxjlService; +import com.jero.modules.ota.utils.ComparisonUtil; import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -30,6 +30,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @Service public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl implements IOtaBaCxJsfzbacsService { + @Autowired + private IOtaBaCxTxjlService otaBaCxTxjlService; @Autowired private IOtaBaCxSjmkService OtaBaCxSjmkService; @@ -41,12 +43,16 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl reList = cu.comparisonRecord(otaId, OtaModuleEnum.CX_JSFZXTJCBACS, otaBaCxJsfzbacsOld, otaBaCxJsfzbacs); + otaBaCxTxjlService.saveBatch(reList); //处理控制器列表,先删除，后添加 OtaBaCxSjmkService.deleteByOtaId(otaId); JSONArray kzq = json.getJSONArray("kzq"); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxQtServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxQtServiceImpl.java index 788f6db95..0184fe595 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxQtServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxQtServiceImpl.java @@ -3,9 +3,14 @@ package com.jero.modules.ota.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.modules.ota.entity.OtaBaCxAqcs; import com.jero.modules.ota.entity.OtaBaCxQt; +import com.jero.modules.ota.entity.OtaBaCxTxjl; +import com.jero.modules.ota.enums.OtaModuleEnum; import com.jero.modules.ota.mapper.OtaBaCxQtMapper; import com.jero.modules.ota.service.IOtaBaCxQtService; +import com.jero.modules.ota.service.IOtaBaCxTxjlService; +import com.jero.modules.ota.utils.ComparisonUtil; import org.apache.commons.lang3.ObjectUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -22,6 +27,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @Service public class OtaBaCxQtServiceImpl extends ServiceImpl implements IOtaBaCxQtService { + @Autowired + private IOtaBaCxTxjlService otaBaCxTxjlService; + /** * 保存 * @@ -40,6 +48,9 @@ public class OtaBaCxQtServiceImpl extends ServiceImpl reList = cu.comparisonRecord(otaBaCxQt.getOtaId(), OtaModuleEnum.CX_QT, otaBaCxQtOld, otaBaCxQt); + otaBaCxTxjlService.saveBatch(reList); } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxZxsjyqServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxZxsjyqServiceImpl.java index 09fcc3796..9a6b9fd24 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxZxsjyqServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxZxsjyqServiceImpl.java @@ -5,11 +5,16 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.modules.ota.entity.AttachmentEO; import com.jero.modules.ota.entity.OtaBaCxJbxx; +import com.jero.modules.ota.entity.OtaBaCxTxjl; import com.jero.modules.ota.entity.OtaBaCxZxsjyq; +import com.jero.modules.ota.enums.OtaModuleEnum; import com.jero.modules.ota.mapper.OtaBaCxZxsjyqMapper; +import com.jero.modules.ota.service.IOtaBaCxTxjlService; import com.jero.modules.ota.service.IOtaBaCxZxsjyqService; +import com.jero.modules.ota.utils.ComparisonUtil; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -26,6 +31,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @Service public class OtaBaCxZxsjyqServiceImpl extends ServiceImpl implements IOtaBaCxZxsjyqService { + + @Autowired + private IOtaBaCxTxjlService otaBaCxTxjlService; /** * 保存 * @@ -34,9 +42,10 @@ public class OtaBaCxZxsjyqServiceImpl extends ServiceImpl reList = cu.comparisonRecord(otaBaCxZxsjyq.getOtaId(), OtaModuleEnum.CX_ZXSJYQ, otaBaCxZxsjyqOld, otaBaCxZxsjyq); + otaBaCxTxjlService.saveBatch(reList); } /** From 87a0bd651fa979c99d522bbd1e7f0c521f394581 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Sun, 26 Mar 2023 02:39:04 +0800 Subject: [PATCH 317/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E5=A1=AB=E5=86=99=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/ota/entity/OtaBaCxTxjl.java | 8 ++ .../impl/OtaBaCxJsfzbacsServiceImpl.java | 15 +-- .../impl/OtaBaCxKsjjsmccsServiceImpl.java | 14 +++ .../impl/OtaBaCxKsjxtmccsServiceImpl.java | 19 +++- .../modules/ota/utils/ComparisonUtil.java | 99 +++++++++++++++++-- 5 files changed, 139 insertions(+), 16 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxTxjl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxTxjl.java index 28daea52e..7f71a2b36 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxTxjl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxTxjl.java @@ -76,4 +76,12 @@ public class OtaBaCxTxjl implements Serializable { @ApiModelProperty(value = "填写内容") private String content; + public OtaBaCxTxjl() { + } + + public OtaBaCxTxjl(String otaId, String module, String content) { + this.otaId = otaId; + this.module = module; + this.content = content; + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java index b0c86a37f..607e6364f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java @@ -1,14 +1,16 @@ package com.jero.modules.ota.service.impl; -import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.jero.modules.ota.entity.*; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.modules.ota.entity.OtaBaCxJsfzbacs; +import com.jero.modules.ota.entity.OtaBaCxSjmk; +import com.jero.modules.ota.entity.OtaBaCxTxjl; import com.jero.modules.ota.enums.OtaModuleEnum; +import com.jero.modules.ota.enums.OtaTitleEnum; import com.jero.modules.ota.mapper.OtaBaCxJsfzbacsMapper; import com.jero.modules.ota.service.IOtaBaCxJsfzbacsService; -import com.jero.modules.ota.service.IOtaBaCxLsjlService; import com.jero.modules.ota.service.IOtaBaCxSjmkService; import com.jero.modules.ota.service.IOtaBaCxTxjlService; import com.jero.modules.ota.utils.ComparisonUtil; @@ -19,8 +21,6 @@ import org.springframework.stereotype.Service; import java.lang.reflect.Field; import java.util.*; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - /** * @Description: 车型备案-驾驶辅助系统基础备案参数 * @Author: jero-boot @@ -52,12 +52,15 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl reList = cu.comparisonRecord(otaId, OtaModuleEnum.CX_JSFZXTJCBACS, otaBaCxJsfzbacsOld, otaBaCxJsfzbacs); - otaBaCxTxjlService.saveBatch(reList); + //处理控制器列表,先删除，后添加 + List oldList = OtaBaCxSjmkService.queryByOtaId(otaId); OtaBaCxSjmkService.deleteByOtaId(otaId); JSONArray kzq = json.getJSONArray("kzq"); List sjmkList = parseKzqData(kzq, otaId); OtaBaCxSjmkService.saveBatch(sjmkList); + cu.comparisonListRecord(otaId, OtaModuleEnum.CX_JSFZXTJCBACS, OtaTitleEnum.BJMC.getName(), oldList, sjmkList); + otaBaCxTxjlService.saveBatch(reList); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java index b40cdf332..ea68bd088 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java @@ -5,9 +5,13 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.modules.ota.entity.*; +import com.jero.modules.ota.enums.OtaModuleEnum; +import com.jero.modules.ota.enums.OtaTitleEnum; import com.jero.modules.ota.mapper.OtaBaCxKsjjsmccsMapper; import com.jero.modules.ota.service.IOtaBaCxKsjjsmccsService; import com.jero.modules.ota.service.IOtaBaCxListService; +import com.jero.modules.ota.service.IOtaBaCxTxjlService; +import com.jero.modules.ota.utils.ComparisonUtil; import com.jero.modules.system.util.StringUtils; import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -31,6 +35,9 @@ public class OtaBaCxKsjjsmccsServiceImpl extends ServiceImpl newList = new ArrayList<>(); + List oldList; Date now = new Date(); String otaId = (String) json.get("otaId"); if (StringUtils.isNotEmpty(otaId)) { + oldList = getByOtaId(otaId); deleteByOtaId(otaId); JSONArray list = json.getJSONArray("list"); for (Object obj : list) { @@ -65,7 +75,11 @@ public class OtaBaCxKsjjsmccsServiceImpl extends ServiceImpl reList = cu.comparisonListRecord(otaId, OtaModuleEnum.CX_KZXSJDJSFZGNMCYCS, OtaTitleEnum.GNMC.getName(), oldList, newList); + otaBaCxTxjlService.saveBatch(reList); String fj = (String) json.get("fj"); if (StringUtils.isNotEmpty(fj)) { OtaBaCxList otaBaCxList = otaBaCxListService.queryById(otaId); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java index d6fd273b6..d6d260319 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java @@ -4,13 +4,14 @@ import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.jero.modules.ota.entity.OtaBaCxJbxx; -import com.jero.modules.ota.entity.OtaBaCxKsjjsmccs; -import com.jero.modules.ota.entity.OtaBaCxKsjxtmccs; -import com.jero.modules.ota.entity.OtaBaCxList; +import com.jero.modules.ota.entity.*; +import com.jero.modules.ota.enums.OtaModuleEnum; +import com.jero.modules.ota.enums.OtaTitleEnum; import com.jero.modules.ota.mapper.OtaBaCxKsjxtmccsMapper; import com.jero.modules.ota.service.IOtaBaCxKsjxtmccsService; import com.jero.modules.ota.service.IOtaBaCxListService; +import com.jero.modules.ota.service.IOtaBaCxTxjlService; +import com.jero.modules.ota.utils.ComparisonUtil; import com.jero.modules.system.util.StringUtils; import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -33,6 +34,9 @@ public class OtaBaCxKsjxtmccsServiceImpl extends ServiceImpl newList = new ArrayList<>(); + List oldList; Date now = new Date(); String otaId = (String) json.get("otaId"); if (StringUtils.isNotEmpty(otaId)) { + oldList = getByOtaId(otaId); deleteByOtaId(otaId); JSONArray list = json.getJSONArray("list"); for (Object obj : list) { @@ -67,7 +74,11 @@ public class OtaBaCxKsjxtmccsServiceImpl extends ServiceImpl reList = cu.comparisonListRecord(otaId, OtaModuleEnum.CX_KSJDXTMCYCS, OtaTitleEnum.XTLB.getName(), oldList, newList); + otaBaCxTxjlService.saveBatch(reList); String fj = (String) json.get("fj"); if (StringUtils.isNotEmpty(fj)) { OtaBaCxList otaBaCxList = otaBaCxListService.queryById(otaId); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java index 4ddafd7de..ca0d1b446 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java @@ -12,6 +12,7 @@ import java.util.List; /** * 对比新老数据，添加填写记录 + * * @param */ public class ComparisonUtil { @@ -24,7 +25,6 @@ public class ComparisonUtil { */ public List comparisonRecord(String otaId, OtaModuleEnum otaModuleEnum, T oldClazz, T newClazz) { List resList = new ArrayList<>(); - Field[] fields = newClazz.getClass().getDeclaredFields(); for (Field field : fields) { try { @@ -44,11 +44,8 @@ public class ComparisonUtil { oldStr = oldVal.toString(); } if (!newStr.equals(oldStr)) { - OtaBaCxTxjl otaBaCxTxjl = new OtaBaCxTxjl(); - otaBaCxTxjl.setModule(otaModuleEnum.getName()); - otaBaCxTxjl.setContent("由" + title + "的" + oldStr + "改为" + newStr); - otaBaCxTxjl.setOtaId(otaId); - resList.add(otaBaCxTxjl); + String content = "由" + title + "的" + oldStr + "改为" + newStr; + resList.add(new OtaBaCxTxjl(otaId, otaModuleEnum.getName(), content)); } } catch (IllegalAccessException e) { e.printStackTrace(); @@ -56,4 +53,94 @@ public class ComparisonUtil { } return resList; } + + public List comparisonListRecord(String otaId, OtaModuleEnum otaModuleEnum, String tableTitle, List oldList, List newList) { + List resList = new ArrayList<>(); + try { + for (T newObj : newList) { + if (ObjectUtils.isNotEmpty(newObj)) { + Field idField = newObj.getClass().getDeclaredField("id"); + Object id = idField.get(newObj); + if (ObjectUtils.isEmpty(id)) { + String content = "新增了一条" + newObj.getClass().getDeclaredField(tableTitle).get(newObj).toString(); + resList.add(new OtaBaCxTxjl(otaId, otaModuleEnum.getName(), content)); + Field[] fields = newObj.getClass().getDeclaredFields(); + for (Field field : fields) { + String title = OtaTitleEnum.getVal(field.getName()); + if (ObjectUtils.isEmpty(title)) { + continue; + } + field.setAccessible(true); + Object newVal = field.get(newObj); + String newStr = "空"; + if (ObjectUtils.isNotEmpty(newVal)) { + newStr = newVal.toString(); + } + content = "增加" + newObj.getClass().getDeclaredField(tableTitle).get(newObj).toString() + "中" + title + "为" + newStr; + resList.add(new OtaBaCxTxjl(otaId, otaModuleEnum.getName(), content)); + } + } else { + for (T oldObj : oldList) { + String oldId = idField.get(oldObj).toString(); + if (oldId.equals(id.toString())) { + resList.addAll(comparisonCertRecord(otaId, otaModuleEnum, tableTitle, newObj, oldObj)); + } + } + } + } + } + for (T oldObj : oldList) { + if (ObjectUtils.isNotEmpty(oldObj)) { + Field idField = oldObj.getClass().getDeclaredField("id"); + String oldId = idField.get(oldObj).toString(); + for (T newObj : newList) { + if (ObjectUtils.isNotEmpty(newObj)) { + Object newId = idField.get(newObj); + if (ObjectUtils.isNotEmpty(newObj) && oldId.equals(newId.toString())) { + break; + } + } + } + String content = "删除了" + oldObj.getClass().getDeclaredField(tableTitle).get(oldObj).toString(); + resList.add(new OtaBaCxTxjl(otaId, otaModuleEnum.getName(), content)); + } + } + } catch (IllegalAccessException | NoSuchFieldException e) { + e.printStackTrace(); + } + + return resList; + } + + + public List comparisonCertRecord(String otaId, OtaModuleEnum otaModuleEnum, String tableTitle, T oldClazz, T newClazz) { + List resList = new ArrayList<>(); + Field[] fields = newClazz.getClass().getDeclaredFields(); + for (Field field : fields) { + try { + String title = OtaTitleEnum.getVal(field.getName()); + if (ObjectUtils.isEmpty(title)) { + continue; + } + field.setAccessible(true); + Object newVal = field.get(newClazz); + Object oldVal = field.get(oldClazz); + String newStr = "空"; + if (ObjectUtils.isNotEmpty(newVal)) { + newStr = newVal.toString(); + } + String oldStr = "空"; + if (ObjectUtils.isNotEmpty(oldVal)) { + oldStr = oldVal.toString(); + } + if (!newStr.equals(oldStr)) { + String content = newVal.getClass().getDeclaredField(tableTitle).get(newVal).toString() + "的" + title + "由" + oldStr + "改为" + newStr; + resList.add(new OtaBaCxTxjl(otaId, otaModuleEnum.getName(), content)); + } + } catch (IllegalAccessException | NoSuchFieldException e) { + e.printStackTrace(); + } + } + return resList; + } } From 93b43444b82a159087c972e876b3a1a4d432032c Mon Sep 17 00:00:00 2001 From: yuekuo Date: Sun, 26 Mar 2023 10:40:33 +0800 Subject: [PATCH 318/645] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/beupgradedonline.vue | 86 +++++++++---------- .../components/recordparameters.vue | 3 +- .../components/safetyPrecautions.vue | 2 +- 3 files changed, 46 insertions(+), 45 deletions(-) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue index 692e6053e..007798e90 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue @@ -45,6 +45,7 @@ :placeholder="$t('PleaseSelect')" :type="'select'" :triggerChange="false" + :dictCode="record.dictCode" v-model="record.jszdhjb"/> @@ -124,31 +125,31 @@ import ImportFile from '@/components/ImportFileData/index' }, dataSource: [ { - gnmc:'前向碰撞预警(FCW)' + gnmc:'前向碰撞预警(FCW)', }, { - gnmc:'车道偏离预警(LDW)' + gnmc:'车道偏离预警(LDW)', }, { - gnmc:'百区监测(BSD)' + gnmc:'百区监测(BSD)', }, { - gnmc:'驻员疲劳篮澳CDFM)' + gnmc:'驻员疲劳篮澳CDFM)', }, { - gnmc:'自动紧急制动(AEB)' + gnmc:'自动紧急制动(AEB)', }, { - gnmc:'自适应巡航控制(ACC)' + gnmc:'自适应巡航控制(ACC)', }, { - gnmc:'自适应巡航控制(ACC)' + gnmc:'车道保持辅助(LKA)', }, { - gnmc:'智能泊车辅助(IPA)' + gnmc:'智能泊车辅助(IPA)', }, { - gnmc:'交通拥堵辅助(TJA)' + gnmc:'交通拥堵辅助(TJA)', }, ], loading: false, @@ -341,44 +342,43 @@ import ImportFile from '@/components/ImportFileData/index' } getAction('/ota/otaBaCxKsjjsmccs/queryByOtaId',{otaIdT:otaIdT,otaId:localStorage.getItem('otaId')}).then(res=>{ if(res.code==200){ - if(res.result.length==0){ - this.dataSource=[ - { - gnmc:'前向碰撞预警(FCW)' - }, - { - gnmc:'车道偏离预警(LDW)' - }, - { - gnmc:'百区监测(BSD)' - }, - { - gnmc:'驻员疲劳篮澳CDFM)' - }, - { - gnmc:'自动紧急制动(AEB)' - }, - { - gnmc:'自适应巡航控制(ACC)' - }, - { - gnmc:'自适应巡航控制(ACC)' - }, - { - gnmc:'智能泊车辅助(IPA)' - }, - { - gnmc:'交通拥堵辅助(TJA)' - }, - ] + if(res.result.list.length==0){ + this.dataSource=[ + { + gnmc:'前向碰撞预警(FCW)' + }, + { + gnmc:'车道偏离预警(LDW)' + }, + { + gnmc:'百区监测(BSD)' + }, + { + gnmc:'驻员疲劳篮澳CDFM)' + }, + { + gnmc:'自动紧急制动(AEB)' + }, + { + gnmc:'自适应巡航控制(ACC)' + }, + { + gnmc:'自适应巡航控制(ACC)' + }, + { + gnmc:'智能泊车辅助(IPA)' + }, + { + gnmc:'交通拥堵辅助(TJA)' + }, + ] }else{ - res.result.forEach(item =>{ + res.result.list.forEach(item =>{ item.pzqk =Number(item.pzqk) - }) - res.result.forEach(item =>{ item.sfksj =Number(item.sfksj) + item.jszdhjb=Number(item.jszdhjb)== 0?undefined:Number(item.jszdhjb) }) - this.dataSource=res.result + this.dataSource=res.result.list } } }) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue index c8d40b80f..3373a9158 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue @@ -887,7 +887,8 @@ export default { this.dataSource.forEach(item=>{ for(let key in res.result.bj){ - if(Number(res.result.bj[key])!=NaN &&Number(res.result.bj[key])!=0){ + if(Number(res.result.bj[key])!=NaN &&Number(res.result.bj[key])!=0 && key !=id){ + console.log(key); res.result.bj[key]=Number(res.result.bj[key]) } if(item.key==key){ diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue index 6b29fe8a2..a78535453 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue @@ -27,7 +27,7 @@ @change="update" :placeholder="$t('PleaseSelect')" :type="'select'" - :dictCode="record.dictCode" + dictCode="driving_automation_level" :triggerChange="false"/> From a3307e4ac27b18b6d46fd046912f1cb885a143d7 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Sun, 26 Mar 2023 10:55:13 +0800 Subject: [PATCH 319/645] =?UTF-8?q?ota=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/uploadFileOta/file.vue | 239 ++++++++++++++++++ .../components/basicInformation.vue | 13 +- .../components/beupgradedonline.vue | 26 +- .../vehicleinformation/components/other.vue | 3 + .../components/recordparameters.vue | 3 + .../components/safetyPrecautions.vue | 7 + .../components/upgradeRequirements.vue | 3 + .../components/upgradedonline.vue | 43 +++- .../vehicleregistration/index.vue | 4 +- 9 files changed, 320 insertions(+), 21 deletions(-) create mode 100644 jero-web/src/components/uploadFileOta/file.vue diff --git a/jero-web/src/components/uploadFileOta/file.vue b/jero-web/src/components/uploadFileOta/file.vue new file mode 100644 index 000000000..510dc1a4c --- /dev/null +++ b/jero-web/src/components/uploadFileOta/file.vue @@ -0,0 +1,239 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue index c3932b12d..4f78383d2 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue @@ -270,6 +270,9 @@ import { message } from 'ant-design-vue' localStorage.setItem('otaIdT',value) this.$forceUpdate() + if(this.$route.query.type == 1){ + return + } this.getData() }, // 模板下载 @@ -296,8 +299,10 @@ import { message } from 'ant-design-vue' }) }, getData(){ + if(this.$route.query.type == 1){ + return + } let otaIdT=localStorage.getItem('otaIdT') - console.log('!!!',otaIdT); if(otaIdT==null){ otaIdT='' } @@ -315,19 +320,19 @@ import { message } from 'ant-design-vue' this.form.cpsb=res.result.cpsb this.form.cpmc=res.result.cpmc this.form.cpxh=res.result.cpxh - this.form.dllx1=res.result.dllx1 - this.form.dllx2=res.result.dllx2 this.form.txzd=res.result.txzd this.form.cdotasj=res.result.cdotasj this.form.cxmb=this.form.ggpc+'-'+ this.form.cpmc+'-'+this.form.cpxh - console.log(res.result); if(res.result.dllx1 == null ){ res.result.dllx1 = undefined } if(res.result.dllx2 == null){ res.result.dllx2 = undefined } + this.form.dllx1=res.result.dllx1 + this.form.dllx2=res.result.dllx2 // this.changeSelect() + this.$forceUpdate() } }) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue index 007798e90..892f99db2 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue @@ -119,6 +119,7 @@ import ImportFile from '@/components/ImportFileData/index' return { formInline: {}, uploadName:'', + fileList:'', url: { exportData: '/ota/otaBaCxKsjjsmccs/exportData', importZipUrl: '/ota/otaBaCxKsjjsmccs/importData',//导入 @@ -375,16 +376,20 @@ import ImportFile from '@/components/ImportFileData/index' }else{ res.result.list.forEach(item =>{ item.pzqk =Number(item.pzqk) + }) + res.result.list.forEach(item =>{ item.sfksj =Number(item.sfksj) item.jszdhjb=Number(item.jszdhjb)== 0?undefined:Number(item.jszdhjb) }) this.dataSource=res.result.list + this.fileList = res.result.fj + this.$forceUpdate() } } }) }, save(){ - postAction('/ota/otaBaCxKsjjsmccs/add',{otaId:localStorage.getItem('otaId'),list:this.dataSource}).then(res =>{ + postAction('/ota/otaBaCxKsjjsmccs/add',{otaId:localStorage.getItem('otaId'),list:this.dataSource,fj:this.fileList}).then(res =>{ console.log(res); }) }, @@ -397,16 +402,15 @@ import ImportFile from '@/components/ImportFileData/index' this.$emit('beupgradedonlinedown') }, uploadSuccess(data) { - let attIdList = [] - if (data && data.length > 0) { - data.map(item => { - attIdList.push(item.id || data.name) - }) - } - /** 赋值给当前对应的表单文件 */ - this.formInline[this.uploadName] = attIdList.join(',') - this.formInline = { ...this.formInline } - this.$refs.ruleForm.clearValidate(['fileKey']) + let attIdList = [] + if (data && data.length > 0) { + data.map(item => { + attIdList.push(item.id || data.name) + }) + } + this.$forceUpdate() + // /** 赋值给当前对应的表单文件 */ + this.fileList = attIdList.join(',') }, //中间加 addlineAtMid(record){ diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/other.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/other.vue index ec0ca13c0..03c949871 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/other.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/other.vue @@ -51,6 +51,9 @@ export default { }, methods: { getData(){ + if(this.$route.query.type == 1){ + return + } let otaIdT=localStorage.getItem('otaIdT') if(otaIdT==null){ otaIdT='' diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue index 3373a9158..884ef6542 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue @@ -866,6 +866,9 @@ export default { downloadFile('ota/otaBaCxList/exportTemplate', '车型及功能备案' + '.zip', {}) }, getData(){ + if(this.$route.query.type == 1){ + return + } let otaIdT=localStorage.getItem('otaIdT') if(otaIdT==null){ otaIdT='' diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue index a78535453..f1ecd09e2 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue @@ -69,6 +69,7 @@ import ImportFile from '@/components/ImportFileData/index' { key: '1', zmcl:'', + info:'', aspect: this.$t('upgradepacketprotectionmeasures'), safetymeasure: this.$t('authenticityandintegrityprotectionmechanism'), relevantverification: 'havemeasures', @@ -78,6 +79,7 @@ import ImportFile from '@/components/ImportFileData/index' { key: '2', zmcl:'', + info:'', aspect: this.$t('otaupgradedsecuritymeasuresforvehicles'), safetymeasure: this.$t('failsafmechanism'), relevantverification: 'havemeasures', @@ -88,6 +90,7 @@ import ImportFile from '@/components/ImportFileData/index' key: '3', aspect: '', zmcl:'', + info:'', safetymeasure: this.$t('vehiclesafetyMeasuresafterUpgradefailure'), relevantverification: 'havemeasures', certifyingmaterials:'', @@ -97,6 +100,7 @@ import ImportFile from '@/components/ImportFileData/index' key: '4', aspect: '', zmcl:'', + info:'', safetymeasure: this.$t('informationsecuritymechanism'), relevantverification: 'havemeasures', certifyingmaterials:'', @@ -186,6 +190,9 @@ import ImportFile from '@/components/ImportFileData/index' downloadFile('ota/otaBaCxAqcs/exportTemplate', '车型及功能备案' + '.zip', {}) }, getData(){ + if(this.$route.query.type == 1){ + return + } let otaIdT=localStorage.getItem('otaIdT') if(otaIdT==null){ otaIdT='' diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue index 335b566a8..35c5f5d6c 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue @@ -205,6 +205,9 @@ export default { downloadFile('ota/otaBaCxZxsjyq/exportTemplate', '车型及功能备案' + '.zip', {}) }, getData(){ + if(this.$route.query.type == 1){ + return + } console.log(localStorage.getItem('otaId')); let otaIdT=localStorage.getItem('otaIdT') if(otaIdT==null){ diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue index 6b9091fd9..afc3b71c8 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue @@ -83,7 +83,10 @@
- {{$t('uploadattachment')}} + + {{ (fileList === 'null' || fileList === '' || + fileList == null) ? $t('uploadattachment') : $t('viewUploadedFiles') + }}

注:附件包括测试项目清单、测试报告．测试标准或技术规范

    支持doc/docx/pdf格式,大小50M以内

@@ -94,18 +97,21 @@ {{$t('next')}}
+
From 8fa2fd009210f361376e545a635b880a6822f83a Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Sun, 26 Mar 2023 14:22:37 +0800 Subject: [PATCH 327/645] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AF=BC=E5=85=A5=20=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auxiliaryupgradehavechanged.vue | 19 +- .../components/historicalrecord.vue | 291 +----------------- .../thetargetvehicleofthisupgrade.vue | 21 +- .../components/upgradehavechanged.vue | 19 +- .../components/upgradeimpactassessment.vue | 19 +- .../components/upgradetargetmodel.vue | 21 +- .../components/usernotification.vue | 21 +- .../components/basicInformation.vue | 2 +- .../components/beupgradedonline.vue | 2 +- .../components/recordparameters.vue | 2 +- .../components/safetyPrecautions.vue | 2 +- .../components/upgradeRequirements.vue | 2 +- .../components/upgradedonline.vue | 2 +- 13 files changed, 100 insertions(+), 323 deletions(-) diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue index 3b163c85e..3738deba4 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue @@ -3,10 +3,9 @@
- - {{$t('dataimport')}} +
-
+
{{$t('templateDownload')}}
@@ -73,13 +72,15 @@ @@ -150,7 +244,7 @@ export default { \ No newline at end of file diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue index ce070a87f..5121c9a8e 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue @@ -484,4 +484,8 @@ import uploadFileOta from '@/components/uploadFileOta/file' ::v-deep .ant-table-row-cell-ellipsis .ant-table-column-title { white-space: pre-wrap!important; } + ::v-deep .ant-table-row:first-child { + background: #fff !important; + opacity: 3.9 !important; + } \ No newline at end of file From a0d14af1f357fd159b7154d211f7e1b4d8ad377e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Sun, 26 Mar 2023 17:17:44 +0800 Subject: [PATCH 343/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/OtaBaSjSjxtbhController.java | 18 +++ .../ota/service/IOtaBaSjSjxtbhService.java | 2 + .../impl/OtaBaSjSjxtbhServiceImpl.java | 140 +++++++++++------- 3 files changed, 106 insertions(+), 54 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjxtbhController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjxtbhController.java index 9bff89950..b1c0a0d5f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjxtbhController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjxtbhController.java @@ -143,6 +143,24 @@ public class OtaBaSjSjxtbhController extends JeroController queryByOtaId(@RequestParam(name = "otaId", required = true) String otaId, + @RequestParam(name = "otaIdT", required = true) String otaIdT) { + JSONObject json = otaBaSjSjxtbhService.queryByOtaId(otaId, otaIdT); + if (json == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(json); + } + /** * 导出excel * diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjxtbhService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjxtbhService.java index 025659468..8814bb255 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjxtbhService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjxtbhService.java @@ -57,4 +57,6 @@ public interface IOtaBaSjSjxtbhService extends IService { * @return */ List queryList(); + + JSONObject queryByOtaId(String otaId, String otaIdT); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java index 002c5ddb7..4cbfc0f6c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java @@ -1,102 +1,134 @@ package com.jero.modules.ota.service.impl; +import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.modules.ota.entity.OtaBaCxKsjjsmccs; +import com.jero.modules.ota.entity.OtaBaCxList; import com.jero.modules.ota.entity.OtaBaSjSjxtbh; import com.jero.modules.ota.mapper.OtaBaSjSjxtbhMapper; import com.jero.modules.ota.service.IOtaBaSjSjxtbhService; import com.jero.modules.system.util.StringUtils; +import org.apache.commons.lang3.ObjectUtils; import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; import java.util.Date; + import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 升级备案-本次升级的系统名称与参数变化 * @Author: jero-boot - * @Date: 2023-03-17 + * @Date: 2023-03-17 * @Version: V1.0 */ @Service public class OtaBaSjSjxtbhServiceImpl extends ServiceImpl implements IOtaBaSjSjxtbhService { - /** - * 保存 - */ - @Override + /** + * 保存 + */ + @Override public void add(JSONObject json) { - Date now = new Date(); - String otaId = (String) json.get("otaId"); - List newList = new ArrayList<>(); - if (StringUtils.isNotEmpty(otaId)) { - JSONArray list = json.getJSONArray("list"); - for (Object obj : list) { - OtaBaSjSjxtbh bh = JSONObject.parseObject(obj.toString(),OtaBaSjSjxtbh.class); - bh.setOtaId(otaId); - bh.setCreateTime(now); - bh.setUpdateTime(now); - newList.add(bh); - } - } - saveOrUpdateBatch(newList); + Date now = new Date(); + String otaId = (String) json.get("otaId"); + List newList = new ArrayList<>(); + if (StringUtils.isNotEmpty(otaId)) { + deleteByOtaId(otaId); + JSONArray list = json.getJSONArray("list"); + for (Object obj : list) { + OtaBaSjSjxtbh bh = JSONObject.parseObject(obj.toString(), OtaBaSjSjxtbh.class); + bh.setOtaId(otaId); + bh.setCreateTime(now); + bh.setUpdateTime(now); + newList.add(bh); + } + } + saveOrUpdateBatch(newList); } - /** - * 更新 - * - * @param otaBaSjSjxtbh - * @return - */ - @Override + /** + * 更新 + * + * @param otaBaSjSjxtbh + * @return + */ + @Override public void editById(OtaBaSjSjxtbh otaBaSjSjxtbh) { - Date now = new Date(); + Date now = new Date(); otaBaSjSjxtbh.setUpdateTime(now); - saveOrUpdate(otaBaSjSjxtbh); + saveOrUpdate(otaBaSjSjxtbh); } - /** - * 通过id删除 - * - * @param id - * @return - */ - @Override + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override public void deleteById(String id) { removeById(id); } - /** - * 批量删除 - * - * @param ids - * @return - */ - @Override + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override public void deleteByIds(List ids) { removeByIds(ids); } - /** - * 通过id查询 - * - * @param id - * @return - */ - @Override + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override public OtaBaSjSjxtbh queryById(String id) { return getById(id); } /** - * 列表查询 - * - * @return - */ - @Override + * 列表查询 + * + * @return + */ + @Override public List queryList() { return list(); } + + @Override + public JSONObject queryByOtaId(String otaId, String otaIdT) { + List res = this.getByOtaId(otaId); + if (ObjectUtil.isEmpty(res)) { + res = getByOtaId(otaIdT); + } + JSONObject json = new JSONObject(); + json.put("list", res); + return json; + } + + private List getByOtaId(String otaId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(OtaBaSjSjxtbh::getOtaId, otaId); + return this.list(queryWrapper); + } + + public void deleteByOtaId(String otaId) { + List list = this.getByOtaId(otaId); + List ids = new ArrayList<>(); + for (OtaBaSjSjxtbh bh : list) { + ids.add(bh.getId()); + } + this.deleteByIds(ids); + } } From d07f1ed3208709ddccb422e6a39f7ae48b239c01 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Sun, 26 Mar 2023 17:26:56 +0800 Subject: [PATCH 344/645] =?UTF-8?q?=E4=BF=AE=E6=94=B967218?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vehicleinformation/components/other.vue | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/other.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/other.vue index 4f0a91e18..0002405fb 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/other.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/other.vue @@ -39,6 +39,7 @@ export default { confirmLoading: false, disabled: false, queryParam:{}, + flag:'', rules:{ sjbbhcs:[ { max: 500,message:'最多只能添加500个字符',trigger:'blur'} @@ -67,6 +68,7 @@ export default { save(){ this.$refs.ruleForm.validate( valid =>{ if (valid) { + this.flag = 1 postAction('/ota/otaBaCxQt/add',{otaId:localStorage.getItem('otaId'),...this.queryParam}).then(res=>{ console.log(res); this.$message.success(this.$t('SavedSuccessfully')) @@ -82,10 +84,13 @@ export default { }, submit(){ this.save() - this.$router.push({ - path: '/vehicleregistration', - query: {} - }) + if(this.flag == 1){ + this.$router.push({ + path: '/vehicleregistration', + query: {} + }) + } + }, }, From bd2f28dd66f90b334d3a5034b7057cc28ec3a3c9 Mon Sep 17 00:00:00 2001 From: yuekuo Date: Sun, 26 Mar 2023 18:01:04 +0800 Subject: [PATCH 345/645] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../thetargetvehicleofthisupgrade.vue | 21 +++- .../components/upgradehavechanged.vue | 111 ++++++++++++------ .../components/upgradeimpactassessment.vue | 97 ++++++++++++--- .../components/upgradetargetmodel.vue | 56 ++++----- 4 files changed, 196 insertions(+), 89 deletions(-) diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue index 7422158b3..bdbaf46d0 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue @@ -35,6 +35,7 @@
@@ -134,12 +135,21 @@ export default { otaId='' } getAction('/ota/otaBaSjSjmbcl/queryByOtaId',{otaIdT:otaIdT,otaId:otaId}).then(res=>{ - console.log(res); + if(res.code==200){ + this.formInline.zsl=res.result.zsl + this.formInline.vinList=res.result.vinList + this.formInline.dateofproduction=[] + this.formInline.dateofproduction.push(res.result.scrqks) + this.formInline.dateofproduction.push(res.result.scrqjs) + this.$forceUpdate() + + } }) }, save(){ let obj={} + obj.otaId=localStorage.getItem('otaId') obj.zsl = this.formInline.zsl if(this.formInline.dateofproduction){ obj.scrqks = this.formInline.dateofproduction[0] @@ -149,9 +159,9 @@ export default { obj.scrqjs ='' } - obj.VINcodelist = this.formInline.VINcodelist + obj.vinList = this.formInline.vinList postAction('/ota/otaBaSjSjmbcl/add',obj).then(res=>{ - console.log(res); + this.$message.success(this.$t('SavedSuccessfully')) }) }, next(){ @@ -162,6 +172,9 @@ export default { this.save() this.$emit('upgradeRequirementsup') }, + change(){ + this.$forceUpdate() + }, clickButtonToUpload(item) { this.$refs.uploadFile.perentHandleFunc() this.$refs.uploadFile.visible = true diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue index 52ab6db6b..b09c81b94 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue @@ -22,40 +22,54 @@ :columns="columns" style="margin-bottom: 20px" > - - - - {{ $t('yes') }} - {{ $t('not') }} - - - - - - {{ $t('yes') }} - {{ $t('not') }} - - - - - + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - {{$t('addcontroller')}} - {{$t('delete')}} + {{$t('addcontroller')}} + {{$t('delete')}}
@@ -85,8 +99,6 @@ export default { return { dataSource: [ { - key:1, - functionname:'ceshi', } ], loading: false, @@ -97,7 +109,9 @@ export default { align: 'left', dataIndex: 'systemname', ellipsis: true, - width: 170 + width: 170, + scopedSlots: { customRender: 'systemname' }, + }, { title: this.$t('adjustmentofchangedBulletinparameters'), @@ -136,77 +150,89 @@ export default { align: 'left', dataIndex: 'nameoftheupgradedelectroniccontroller', ellipsis: true, - width: 170 + width: 170, + scopedSlots: { customRender: 'nameoftheupgradedelectroniccontroller' }, + }, { title: this.$t('adaptivehardwareversion'), align: 'left', dataIndex: 'adaptivehardwareversion', ellipsis: true, - width: 170 + width: 170, + scopedSlots: { customRender: 'adaptivehardwareversion' }, }, { title: this.$t('beforethesoftwareversionupgraded'), align: 'left', dataIndex: 'beforethesoftwareversionupgraded', ellipsis: true, - width: 170 + width: 170, + scopedSlots: { customRender: 'beforethesoftwareversionupgraded' }, }, { title: this.$t('afterthesoftwareversionupgraded'), align: 'left', dataIndex: 'afterthesoftwareversionupgraded', ellipsis: true, - width: 170 + width: 170, + scopedSlots: { customRender: 'afterthesoftwareversionupgraded' }, }, { title: this.$t('beforetheOSversionupgraded'), align: 'left', dataIndex: 'beforetheOSversionupgraded', ellipsis: true, - width: 170 + width: 170, + scopedSlots: { customRender: 'beforetheOSversionupgraded' }, }, { title: this.$t('aftertheoperatingsystemversionupgraded'), align: 'left', dataIndex: 'aftertheoperatingsystemversionupgraded', ellipsis: true, - width: 170 + width: 170, + scopedSlots: { customRender: 'aftertheoperatingsystemversionupgraded' }, }, { title: this.$t('softwaredevelopmententerprise'), align: 'left', dataIndex: 'softwaredevelopmententerprise', ellipsis: true, - width: 170 + width: 170, + scopedSlots: { customRender: 'softwaredevelopmententerprise' }, }, { title: this.$t('initialpackageforintegrityinflammatorydata'), align: 'left', dataIndex: 'initialpackageforintegrityinflammatorydata', ellipsis: true, - width: 170 + width: 170, + scopedSlots: { customRender: 'initialpackageforintegrityinflammatorydata' }, }, { title: this.$t('upgradepackageintegrityverificationdata'), align: 'left', dataIndex: 'upgradepackageintegrityverificationdata', ellipsis: true, - width: 170 + width: 170, + scopedSlots: { customRender: 'upgradepackageintegrityverificationdata' }, }, { title: this.$t('upgradepackagesize'), align: 'left', dataIndex: 'upgradepackagesize', ellipsis: true, - width: 170 + width: 170, + scopedSlots: { customRender: 'upgradepackagesize' }, }, { title: this.$t('differentialupgradeornot'), align: 'left', dataIndex: 'differentialupgradeornot', ellipsis: true, - width: 170 + width: 170, + scopedSlots: { customRender: 'differentialupgradeornot' }, }, ] }, @@ -278,6 +304,13 @@ export default { next(){ this.$emit('upgradedonlinedown') }, + addlineAtBot(){ + let obj={} + this.dataSource.push(obj) + }, + deleteData(record){ + this.dataSource.splice(this.dataSource.indexOf(record),1) + }, uploadSuccess(data) { let attIdList = [] if (data && data.length > 0) { diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue index 7a51eb5b3..cba9b95c1 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue @@ -16,10 +16,13 @@ {{$t('upgradePurpose')}} - @@ -35,25 +38,25 @@ - + {{ $t('yes') }} {{ $t('not') }} - + {{ $t('yes') }} {{ $t('not') }} - + {{ $t('yes') }} {{ $t('not') }} - + {{ $t('yes') }} {{ $t('not') }} @@ -75,7 +78,7 @@
- + {{ $t('yes') }} {{ $t('not') }} @@ -84,40 +87,46 @@ + + + - - - - + {{ $t('yes') }} {{ $t('not') }} - + {{ $t('yes') }} {{ $t('not') }} - - + {{ $t('yes') }} {{ $t('not') }} @@ -129,7 +138,7 @@
- {{$t('preservation')}} + {{$t('preservation')}} {{$t('last')}} {{$t('next')}}
@@ -289,12 +298,27 @@ export default { scopedSlots: { customRender: 'operation' } } ], + form:{ + sjmd:'', + fhgd:1, + zdjsxg:2, + sfyxaq:2, + yhqr:1, + aqkkx:1, + zxsj:2, + aqjz:'2', + sjbcs:'3,4' + } } }, mounted() { // this.getList() + this.getData() }, methods: { + update(){ +this.$forceUpdate() + }, // 模板下载 handleModule() { downloadFile('ota/otaBaSjSjyxpg/exportTemplate', '升级影响评估' + '.zip', {}) @@ -339,10 +363,45 @@ export default { } }) }, + getData(){ + let otaIdT=localStorage.getItem('otaIdT') + if(otaIdT==null){ + otaIdT='' + } + let otaId=localStorage.getItem('otaId') + if(otaId==null){ + otaId='' + } + getAction('/ota/otaBaSjSjyxpg/queryByOtaId',{otaIdT:otaIdT,otaId:otaId}).then(res=>{ + if(res.code==200){ + this.form=res.result==null ? { + sjmd:'', + fhgd:1, + zdjsxg:2, + sfyxaq:2, + yhqr:1, + aqkkx:1, + zxsj:2, + aqjz:'2', + sjbcs:'3,4' + } : res.result + } + }) + }, + save(){ + + this.form.otaId=localStorage.getItem('otaId') + postAction('/ota/otaBaSjSjyxpg/add',this.form).then(res=>{ + this.$message.success(this.$t('SavedSuccessfully')) + console.log(res); + }) + }, last(){ + this.save() this.$emit('safetyPrecautionsup') }, next(){ + this.save() this.$emit('safetyPrecautionsdown') }, uploadSuccess(data) { diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue index 767ce71ac..586cc9396 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue @@ -19,7 +19,7 @@ {{$t('selectTheVehicleTemplate')}}
- + {{ item.cpdjbh }} @@ -76,12 +76,8 @@ {{$t('producttrademark')}}
- + +
@@ -91,12 +87,8 @@ {{$t('productname')}}
- + +
@@ -106,12 +98,8 @@ {{$t('productModel')}}
- + +
@@ -174,7 +162,9 @@ import ImportFile from '@/components/ImportFileData/index' return { confirmLoading: false, disabled: false, - form:{}, + form:{ + qymc:'安徽江淮汽车集团股份有限公司' + }, url: { exportData: '/ota/otaBaSjSjmbcx/exportData', importZipUrl: '/ota/otaBaSjSjmbcx/importData',//导入 @@ -204,14 +194,19 @@ import ImportFile from '@/components/ImportFileData/index' if(otaId==null){ otaId='' } - getAction('/ota/otaBaCxJbxx/queryByOtaId',{otaIdT:otaIdT,otaId:otaId}).then(res=>{ + getAction('/ota/otaBaSjSjmbcx/queryByOtaId',{otaIdT:otaIdT,otaId:otaId}).then(res=>{ if(res.code == 200){ - // this.form=res.result + this.form=res.result ==null?{}:res.result } }) }, save(){ - postAction('/ota/otaBaSjSjmbcx/add',this.form).then(res=>{ + let otaId=localStorage.getItem('otaId') + if(otaId==null){ + otaId='' + } + postAction('/ota/otaBaSjSjmbcx/add',{otaId:otaId,...this.form}).then(res=>{ + this.$message.success(this.$t('SavedSuccessfully')) localStorage.setItem('otaId', res.result.otaId) }) }, @@ -225,8 +220,7 @@ import ImportFile from '@/components/ImportFileData/index' this.selectListPc=[] res.result.forEach(item=>{ let obj={} - obj.id=item.id - obj.ggpc=item.ggpc + obj=item this.selectListPc.push(obj) }) } @@ -256,8 +250,16 @@ import ImportFile from '@/components/ImportFileData/index' } }, - changeId(value){ - this.$forceUpdate() + changeId(value,option){ + this.selectListPc.map(item=>{ + if(item.id==value){ + this.form.cpsb = item.cpsb + this.form.cpmc = item.cpmc + this.form.cpxh = item.cpxh + this.form.babh = item.cpdjbh + } + }) + this.$forceUpdate() }, update(){ this.$forceUpdate() From 5b71d6d19d85440b3ab7f91bdb3582d16d13ca0f Mon Sep 17 00:00:00 2001 From: yuekuo Date: Sun, 26 Mar 2023 18:05:01 +0800 Subject: [PATCH 346/645] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vehicleinformation/components/upgradeRequirements.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue index e73c5b7c5..5e3e7c5a2 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue @@ -291,6 +291,7 @@ export default { obj.zmclList = this.fileList.uploadName postAction('/ota/otaBaCxZxsjyq/add', obj).then(res => { console.log(res); + this.$message.success(this.$t('SavedSuccessfully')) }) }, last() { From 74b8efa19738dac0092e831dfed0ef29ae9b5026 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Mon, 27 Mar 2023 00:46:37 +0800 Subject: [PATCH 347/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SysDictServiceImpl.java | 2 +- .../ota/controller/OtaBaCxJbxxController.java | 22 +++ .../ota/controller/OtaBaCxListController.java | 3 - .../ota/service/IOtaBaCxJbxxService.java | 8 + .../service/impl/OtaBaCxJbxxServiceImpl.java | 84 +++++++++ .../service/impl/OtaBaCxListServiceImpl.java | 98 +--------- .../modules/ota/utils/ImportFileUtil.java | 169 ++++++++++++++++++ .../src/main/resources/application-dev.yml | 5 + 8 files changed, 297 insertions(+), 94 deletions(-) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ImportFileUtil.java diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java index b97383d94..24788b2a5 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java @@ -443,7 +443,7 @@ public class SysDictServiceImpl extends ServiceImpl impl @Override public String queryDictItemByValue(String code, String itemValue, String cut) { - String dictItemValue= sysDictMapper.queryDictTextByKey(code,itemValue); + String dictItemValue= sysDictMapper.queryDictKeyByText(code,itemValue); return dictItemValue; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJbxxController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJbxxController.java index ee7e0292b..4bacf2384 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJbxxController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJbxxController.java @@ -18,6 +18,7 @@ import com.jero.common.system.base.controller.JeroController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.ModelAndView; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -182,4 +183,25 @@ public class OtaBaCxJbxxController extends JeroController importData(@RequestParam(value = "file", required = false) MultipartFile file, + @RequestParam(value = "cut", required = false) String cut) throws Exception { + try { + this.otaBaCxJbxxService.importData(file, cut); + } catch (Exception e) { + e.printStackTrace(); + return Result.error(e.getMessage()); + } + return Result.OK("导入成功"); + } + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java index 299c6a205..6aee82684 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java @@ -189,7 +189,6 @@ public class OtaBaCxListController extends JeroController { List queryList(); OtaBaCxJbxx queryByOtaId(String otaId, String otaIdT); + + void exportTemplate(HttpServletResponse response, HttpServletRequest request); + + void importData(MultipartFile file, String cut); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java index 7dfe8bf32..672d2e660 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java @@ -1,5 +1,6 @@ package com.jero.modules.ota.service.impl; +import com.aliyuncs.utils.IOUtils; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.modules.ota.entity.OtaBaCxJbxx; @@ -11,12 +12,21 @@ import com.jero.modules.ota.service.IOtaBaCxJbxxService; import com.jero.modules.ota.service.IOtaBaCxListService; import com.jero.modules.ota.service.IOtaBaCxTxjlService; import com.jero.modules.ota.utils.ComparisonUtil; +import com.jero.modules.ota.utils.ImportFileUtil; import com.jero.modules.system.service.ISysDictService; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.poi.hssf.usermodel.HSSFWorkbook; +import org.apache.poi.ss.usermodel.*; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.*; import java.util.Date; import java.util.List; import java.util.UUID; @@ -39,6 +49,12 @@ public class OtaBaCxJbxxServiceImpl extends ServiceImpl fileList =ImportFileUtil.importZip(file,cut,uploadPath); - //解压缩 - String zipEntryName = ""; - if (str.equals("zip")) { - zipEntryName = FileUnZip.unZipFiles(path + File.separator + file.getOriginalFilename(), path); - - } else { -// zipEntryName = FileRarUtils.rarUnCompress(path + File.separator + file.getOriginalFilename(), path); - } - //判断压缩包下是否只有一个文件夹 - File fileTemp = new File(path); - int length = fileTemp.listFiles().length; - if (length > 2) { - //删除原上传文件 - FileUnZip.deleteDir(saveDirectory); - if (CutEnum.CN.getValue().equals(cut)) { - throw new JeroBootException("压缩包中必须有且仅有一个文件夹,请重新上传"); - } else { - throw new JeroBootException("There must be only one folder in the compressed package Please upload it again"); - } - - } - File fileNew = new File(zipEntryName); - List fileList = new ArrayList<>(); - for (File file1 : fileNew.listFiles()) { - log.error("压缩包中的文件：" + file1.getName()); - if (file1.getName().contains(".xls") || file1.getName().contains(".xlsx")) { - fileList.add(file1); - } - } - if (fileList.size() == 0) { - //删除原上传文件 - FileUnZip.deleteDir(saveDirectory); - if (CutEnum.CN.getValue().equals(cut)) { - throw new JeroBootException("压缩包根目录下没有excel作为导入数据,请重新上传"); - } else { - throw new JeroBootException("Excel does not exist in the root directory of the compressed package Please upload it again"); - } - } else if (fileList.size() > 1) { - //删除原上传文件 - FileUnZip.deleteDir(saveDirectory); - if (CutEnum.CN.getValue().equals(cut)) { - throw new JeroBootException("压缩包根目录下仅能存在一个excel为导入数据,请重新上传"); - } else { - throw new JeroBootException("Only one Excel file can be imported in the compressed package root directory. Please upload data again"); - } - } - } catch (IOException e) { - e.printStackTrace(); - } } @Override diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ImportFileUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ImportFileUtil.java new file mode 100644 index 000000000..c33a92dbd --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ImportFileUtil.java @@ -0,0 +1,169 @@ +package com.jero.modules.ota.utils; + +import com.aliyuncs.utils.IOUtils; +import com.jero.common.constant.enums.CutEnum; +import com.jero.common.exception.JeroBootException; +import com.jero.modules.split.common.FileUnZip; +import org.apache.commons.io.FileUtils; +import org.apache.poi.hssf.usermodel.HSSFWorkbook; +import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.CellType; +import org.apache.poi.ss.usermodel.Workbook; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; +import java.io.*; +import java.util.ArrayList; +import java.util.List; + +public class ImportFileUtil { + + public static File importFile(MultipartFile file, String cut, String uploadPath, String upLoadFileExt) { + File upLoadFile = null; + try { + int pos = file.getOriginalFilename().lastIndexOf("."); + String str = file.getOriginalFilename().substring(pos + 1).toLowerCase(); + String fileNameOrg = file.getOriginalFilename().substring(0, pos); + //判断上传文件必须是 + if (!str.equals(upLoadFileExt)) { + if (CutEnum.CN.getValue().equals(cut)) { + throw new JeroBootException("请上传" + upLoadFileExt + "格式的文件"); + } else { + throw new JeroBootException("Please upload a " + upLoadFileExt + " file"); + } + } + String path = uploadPath + File.separator + "modal" + File.separator + fileNameOrg + System.currentTimeMillis(); + File saveDirectory = new File(path); + if (!saveDirectory.isDirectory()) { + saveDirectory.mkdir(); + } + FileUtils.copyInputStreamToFile(file.getInputStream(), new File(path + File.separator + file.getOriginalFilename())); + upLoadFile = new File(path + File.separator + file.getOriginalFilename()); + } catch (IOException e) { + e.printStackTrace(); + } + return upLoadFile; + + } + + public static List importZip(MultipartFile file, String cut, String uploadPath) { + List fileList = new ArrayList<>(); + try { + int pos = file.getOriginalFilename().lastIndexOf("."); + String str = file.getOriginalFilename().substring(pos + 1).toLowerCase(); + String filenameorg = file.getOriginalFilename().substring(0, pos); + //判断上传文件必须是zip + if (!str.equals("zip") && !str.equals("rar")) { + if (CutEnum.CN.getValue().equals(cut)) { + throw new JeroBootException("请上传zip格式的文件或rar格式的文件"); + } else { + throw new JeroBootException("Please upload a zip file or rar file"); + } + } + String path = uploadPath + File.separator + "modal" + File.separator + filenameorg + System.currentTimeMillis(); + File saveDirectory = new File(path); + if (!saveDirectory.isDirectory()) { + saveDirectory.mkdir(); + } + FileUtils.copyInputStreamToFile(file.getInputStream(), new File(path + File.separator + file.getOriginalFilename())); + + //解压缩 + String zipEntryName = ""; + if (str.equals("zip") || str.equals("rar")) { + zipEntryName = FileUnZip.unZipFiles(path + File.separator + file.getOriginalFilename(), path); + } else { +// zipEntryName = FileRarUtils.rarUnCompress(path + File.separator + file.getOriginalFilename(), path); + } + //判断压缩包下是否只有一个文件夹 +// File fileTemp = new File(path); +// int length = fileTemp.listFiles().length; +// if (length > 2) { +// //删除原上传文件 +// FileUnZip.deleteDir(saveDirectory); +// if (CutEnum.CN.getValue().equals(cut)) { +// throw new JeroBootException("压缩包中必须有且仅有一个文件夹,请重新上传"); +// } else { +// throw new JeroBootException("There must be only one folder in the compressed package Please upload it again"); +// } +// +// } + File fileNew = new File(zipEntryName); + for (File file1 : fileNew.listFiles()) { + if (file1.getName().contains(".xls") || file1.getName().contains(".xlsx") || file1.isDirectory() + || file1.getName().contains(".docx") || file1.getName().contains(".doc")) { + fileList.add(file1); + } + } +// if (fileList.size() == 0) { +// //删除原上传文件 +// FileUnZip.deleteDir(saveDirectory); +// if (CutEnum.CN.getValue().equals(cut)) { +// throw new JeroBootException("压缩包根目录下没有excel作为导入数据,请重新上传"); +// } else { +// throw new JeroBootException("Excel does not exist in the root directory of the compressed package Please upload it again"); +// } +// } else if (fileList.size() > 1) { +// //删除原上传文件 +// FileUnZip.deleteDir(saveDirectory); +// if (CutEnum.CN.getValue().equals(cut)) { +// throw new JeroBootException("压缩包根目录下仅能存在一个excel为导入数据,请重新上传"); +// } else { +// throw new JeroBootException("Only one Excel file can be imported in the compressed package root directory. Please upload data again"); +// } +// } + } catch (IOException e) { + e.printStackTrace(); + } + return fileList; + } + + public static void exportTemplate(HttpServletResponse response, String templateFilePath) { + File template = new File(templateFilePath); + BufferedOutputStream os = null; + InputStream in = null; + try { + in = new FileInputStream(template); + response.setHeader("Content-disposition", "attachment;filename=" + template.getName()); + response.setContentType("application/octet-stream;charset=UTF-8"); + os = new BufferedOutputStream(response.getOutputStream()); + int len; + while ((len = in.read()) != -1) { + os.write(len); + os.flush(); + } + in.close(); + os.close(); + } catch (Exception e) { + throw new JeroBootException("下载文件失败，请重试"); + } finally { + IOUtils.closeQuietly(in); + IOUtils.closeQuietly(os); + } + } + + public static Workbook readExcel(File file) { + Workbook wb = null; + if (file == null) { + return null; + } + String extString = file.getName().substring(file.getName().lastIndexOf(".")); + InputStream is = null; + try { + is = new FileInputStream(file); + if (".xls".equals(extString)) { + return wb = new HSSFWorkbook(is); + } else if (".xlsx".equals(extString)) { + return wb = new XSSFWorkbook(is); + } + is.close(); + } catch (FileNotFoundException e) { + e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); + } finally { + IOUtils.closeQuietly(is); + } + return wb; + } +} 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..c8baa8421 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 @@ -475,3 +475,8 @@ Space: # appSecret: d3bf6e69-0726-42ee-91bd-0441a8f6ccdf # domainUrl: https://api-plm-portal.nioint.com/api/v1/plm-portal-middle-integration/integration/api/common/queryModelByModule +ota : + #OTA 模版下载路径 + templatePath: D://opt//ota//template// + uploadPath: D://opt//ota//upload// + From 0754af609c50ab0d8512ae8baad00186acdc14fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Mon, 27 Mar 2023 00:52:08 +0800 Subject: [PATCH 348/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ota/controller/OtaBaCxJbxxController.java | 8 +- .../ota/service/IOtaBaCxJbxxService.java | 74 +++++++++---------- .../service/impl/OtaBaCxJbxxServiceImpl.java | 7 +- 3 files changed, 46 insertions(+), 43 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJbxxController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJbxxController.java index 4bacf2384..34827abf4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJbxxController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJbxxController.java @@ -194,14 +194,16 @@ public class OtaBaCxJbxxController extends JeroController importData(@RequestParam(value = "file", required = false) MultipartFile file, - @RequestParam(value = "cut", required = false) String cut) throws Exception { + @RequestParam(value = "cut", required = false) String cut, + @RequestParam(value = "otaId", required = false) String otaId) throws Exception { + OtaBaCxJbxx res; try { - this.otaBaCxJbxxService.importData(file, cut); + res = this.otaBaCxJbxxService.importData(file, otaId, cut); } catch (Exception e) { e.printStackTrace(); return Result.error(e.getMessage()); } - return Result.OK("导入成功"); + return Result.OK(res); } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxJbxxService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxJbxxService.java index 08df90efc..a66b9e207 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxJbxxService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxJbxxService.java @@ -11,61 +11,61 @@ import java.util.List; /** * @Description: 车型备案-车型基本信息 * @Author: jero-boot - * @Date: 2023-03-17 + * @Date: 2023-03-17 * @Version: V1.0 */ public interface IOtaBaCxJbxxService extends IService { - /** - * 保存 - * - * @param otaBaCxJbxx - * @return - */ - OtaBaCxJbxx add(OtaBaCxJbxx otaBaCxJbxx); + /** + * 保存 + * + * @param otaBaCxJbxx + * @return + */ + OtaBaCxJbxx add(OtaBaCxJbxx otaBaCxJbxx); - /** - * 更新 - * - * @param otaBaCxJbxx - * @return - */ + /** + * 更新 + * + * @param otaBaCxJbxx + * @return + */ void editById(OtaBaCxJbxx otaBaCxJbxx); - /** - * 通过id删除 - * - * @param id - * @return - */ + /** + * 通过id删除 + * + * @param id + * @return + */ void deleteById(String id); - /** - * 批量删除 - * - * @param ids - * @return - */ + /** + * 批量删除 + * + * @param ids + * @return + */ void deleteByIds(List ids); - /** - * 通过id查询 - * - * @param id - * @return - */ + /** + * 通过id查询 + * + * @param id + * @return + */ OtaBaCxJbxx queryById(String id); /** - * 列表查询 - * - * @return - */ + * 列表查询 + * + * @return + */ List queryList(); OtaBaCxJbxx queryByOtaId(String otaId, String otaIdT); void exportTemplate(HttpServletResponse response, HttpServletRequest request); - void importData(MultipartFile file, String cut); + OtaBaCxJbxx importData(MultipartFile file, String otaId, String cut); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java index 672d2e660..fbd93af1e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java @@ -166,10 +166,11 @@ public class OtaBaCxJbxxServiceImpl extends ServiceImpl Date: Mon, 27 Mar 2023 01:17:18 +0800 Subject: [PATCH 349/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ota/controller/OtaBaCxJbxxController.java | 2 +- .../ota/service/IOtaBaCxJbxxService.java | 4 +- .../service/impl/OtaBaCxJbxxServiceImpl.java | 89 +++++++++++-------- 3 files changed, 54 insertions(+), 41 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJbxxController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJbxxController.java index 34827abf4..f6a90730a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJbxxController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJbxxController.java @@ -179,7 +179,7 @@ public class OtaBaCxJbxxController extends JeroController importExcel(HttpServletRequest request, HttpServletResponse response) { + public Result importExcel(HttpServletRequest request, HttpServletResponse response) throws Exception { return super.importExcel(request, response, OtaBaCxJbxx.class); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxJbxxService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxJbxxService.java index a66b9e207..7a4e5e3aa 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxJbxxService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxJbxxService.java @@ -65,7 +65,7 @@ public interface IOtaBaCxJbxxService extends IService { OtaBaCxJbxx queryByOtaId(String otaId, String otaIdT); - void exportTemplate(HttpServletResponse response, HttpServletRequest request); + void exportTemplate(HttpServletResponse response, HttpServletRequest request) throws Exception; - OtaBaCxJbxx importData(MultipartFile file, String otaId, String cut); + OtaBaCxJbxx importData(MultipartFile file, String otaId, String cut) throws Exception; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java index fbd93af1e..ec7dad81a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java @@ -3,6 +3,7 @@ package com.jero.modules.ota.service.impl; import com.aliyuncs.utils.IOUtils; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.exception.JeroBootException; import com.jero.modules.ota.entity.OtaBaCxJbxx; import com.jero.modules.ota.entity.OtaBaCxList; import com.jero.modules.ota.entity.OtaBaCxTxjl; @@ -166,14 +167,14 @@ public class OtaBaCxJbxxServiceImpl extends ServiceImpl= txzdStrs.length - 1) { + sb.append(sysDictService.queryDictItemByValue("communication_terminal", txzdStrs[i], cut)); + } else { + sb.append(sysDictService.queryDictItemByValue("communication_terminal", txzdStrs[i], cut)).append(","); + } + } + jbxx.setTxzd(sb.toString()); row = s.getRow(11); cell = row.getCell(1); jbxx.setCdotasj(getCellValue(cell, wb)); - } catch (Exception e) { - e.printStackTrace(); } return jbxx; } From e5ff47278edbf36dfdbc98d3fec5b7ebd8a67b27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Mon, 27 Mar 2023 01:56:13 +0800 Subject: [PATCH 350/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/OtaBaCxZxsjyqController.java | 50 ++++++++--- .../ota/service/IOtaBaCxZxsjyqService.java | 8 ++ .../service/impl/OtaBaCxJbxxServiceImpl.java | 30 +++---- .../impl/OtaBaCxZxsjyqServiceImpl.java | 89 +++++++++++++++++-- .../modules/ota/utils/ImportFileUtil.java | 30 ++++++- 5 files changed, 167 insertions(+), 40 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxZxsjyqController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxZxsjyqController.java index 35ed36890..573d8480a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxZxsjyqController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxZxsjyqController.java @@ -1,26 +1,27 @@ package com.jero.modules.ota.controller; -import java.util.Arrays; -import java.util.List; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import com.jero.common.api.vo.Result; -import com.jero.common.system.query.QueryGenerator; -import com.jero.modules.ota.entity.OtaBaCxZxsjyq; -import com.jero.modules.ota.service.IOtaBaCxZxsjyqService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.extern.slf4j.Slf4j; +import com.jero.common.api.vo.Result; +import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.base.controller.JeroController; +import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.ota.entity.OtaBaCxZxsjyq; +import com.jero.modules.ota.service.IOtaBaCxZxsjyqService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.ModelAndView; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import com.jero.common.aspect.annotation.AutoLog; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; +import java.util.List; /** @@ -183,4 +184,27 @@ public class OtaBaCxZxsjyqController extends JeroController importData(@RequestParam(value = "file", required = false) MultipartFile file, + @RequestParam(value = "cut", required = false) String cut, + @RequestParam(value = "otaId", required = false) String otaId) throws Exception { + OtaBaCxZxsjyq res; + try { + res = this.otaBaCxZxsjyqService.importData(file, otaId, cut); + } catch (Exception e) { + e.printStackTrace(); + return Result.error(e.getMessage()); + } + return Result.OK(res); + } + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxZxsjyqService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxZxsjyqService.java index ad8232b57..29f193a7b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxZxsjyqService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxZxsjyqService.java @@ -1,8 +1,12 @@ package com.jero.modules.ota.service; +import com.jero.modules.ota.entity.OtaBaCxJbxx; import com.jero.modules.ota.entity.OtaBaCxZxsjyq; import com.baomidou.mybatisplus.extension.service.IService; +import org.springframework.web.multipart.MultipartFile; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.util.List; /** @@ -61,4 +65,8 @@ public interface IOtaBaCxZxsjyqService extends IService { List queryList(); OtaBaCxZxsjyq queryByOtaId(String otaId, String otaIdT); + + void exportTemplate(HttpServletResponse response, HttpServletRequest request); + + OtaBaCxZxsjyq importData(MultipartFile file, String otaId, String cut) throws Exception; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java index ec7dad81a..13ca660d3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java @@ -174,14 +174,6 @@ public class OtaBaCxJbxxServiceImpl extends ServiceImpl implements IOtaBaCxZxsjyqService { + @Value(value = "${ota.templatePath}") + private String templatePath; + + @Value(value = "${ota.uploadPath}") + private String uploadPath; @Autowired private IOtaBaCxTxjlService otaBaCxTxjlService; @@ -150,4 +163,70 @@ public class OtaBaCxZxsjyqServiceImpl extends ServiceImpl upLoadFiles = ImportFileUtil.importZip(file, cut, uploadPath); + File attFile = null; + File upFile = null; + for (File f : upLoadFiles) { + if (f.isDirectory() && f.getName().equals("在线升级要求")) { + attFile = f; + } else if (f.getName().equals("在线升级要求.xlsx")) { + upFile = f; + } + } + if (null == upFile || null == attFile) { + throw new JeroBootException("请上传正确的文件"); + } + OtaBaCxZxsjyq otaBaCxZxsjyq = parseFile(upFile, cut); + otaBaCxZxsjyq.setOtaId(otaId); + add(otaBaCxZxsjyq); + return otaBaCxZxsjyq; + } + + private OtaBaCxZxsjyq parseFile(File upFile, String cut) throws Exception { + OtaBaCxZxsjyq otaBaCxZxsjyq = new OtaBaCxZxsjyq(); + Workbook wb = ImportFileUtil.readExcel(upFile); + Sheet s = wb.getSheetAt(0); + Row row = s.getRow(2); + Cell cell = row.getCell(2); + otaBaCxZxsjyq.setBhsjb(ImportFileUtil.getCellValueYesOrNo(cell, wb)); + row = s.getRow(3); + cell = row.getCell(2); + otaBaCxZxsjyq.setBhclbb(ImportFileUtil.getCellValueYesOrNo(cell, wb)); + row = s.getRow(4); + cell = row.getCell(2); + otaBaCxZxsjyq.setClgxnl(ImportFileUtil.getCellValueYesOrNo(cell, wb)); + row = s.getRow(5); + cell = row.getCell(2); + otaBaCxZxsjyq.setClsjtj(ImportFileUtil.getCellValueYesOrNo(cell, wb)); + row = s.getRow(6); + cell = row.getCell(2); + otaBaCxZxsjyq.setClsjdl(ImportFileUtil.getCellValueYesOrNo(cell, wb)); + row = s.getRow(7); + cell = row.getCell(2); + otaBaCxZxsjyq.setSjbhaq(ImportFileUtil.getCellValueYesOrNo(cell, wb)); + row = s.getRow(8); + cell = row.getCell(2); + otaBaCxZxsjyq.setSjantj(ImportFileUtil.getCellValueYesOrNo(cell, wb)); + row = s.getRow(9); + cell = row.getCell(2); + otaBaCxZxsjyq.setSjsbaq(ImportFileUtil.getCellValueYesOrNo(cell, wb)); + row = s.getRow(10); + cell = row.getCell(2); + otaBaCxZxsjyq.setSjgg(ImportFileUtil.getCellValueYesOrNo(cell, wb)); + row = s.getRow(11); + cell = row.getCell(2); + otaBaCxZxsjyq.setSjzt(ImportFileUtil.getCellValueYesOrNo(cell, wb)); + row = s.getRow(2); + cell = row.getCell(3); + otaBaCxZxsjyq.setZmcl(ImportFileUtil.getCellValue(cell, wb)); + return otaBaCxZxsjyq; + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ImportFileUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ImportFileUtil.java index c33a92dbd..2f4aa8054 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ImportFileUtil.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ImportFileUtil.java @@ -5,10 +5,10 @@ import com.jero.common.constant.enums.CutEnum; import com.jero.common.exception.JeroBootException; import com.jero.modules.split.common.FileUnZip; import org.apache.commons.io.FileUtils; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.poi.hssf.usermodel.HSSFWorkbook; -import org.apache.poi.ss.usermodel.Cell; -import org.apache.poi.ss.usermodel.CellType; -import org.apache.poi.ss.usermodel.Workbook; +import org.apache.poi.ss.usermodel.*; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.springframework.web.multipart.MultipartFile; @@ -166,4 +166,28 @@ public class ImportFileUtil { } return wb; } + + public static String getCellValue(Cell cell, Workbook workbook) throws Exception { + FormulaEvaluator evaluator = workbook.getCreationHelper().createFormulaEvaluator(); + DataFormatter formatter = new DataFormatter(); + //单元格不设置数字格式 + if (ObjectUtils.isNotEmpty(cell)) { + cell.setCellStyle(null); + return formatter.formatCellValue(cell, evaluator); + } + return ""; + } + + public static String getCellValueYesOrNo(Cell cell, Workbook workbook) throws Exception { + String res = ""; + String str = getCellValue(cell, workbook); + if (StringUtils.isNotEmpty(str)) { + if (str.equals("是")) { + res = "1"; + } else if (str.equals("否")) { + res = "2"; + } + } + return res; + } } From fec7516d8579ded88e5a293af4c73f935495d5cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Mon, 27 Mar 2023 02:34:19 +0800 Subject: [PATCH 351/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ota/controller/OtaBaCxAqcsController.java | 26 +++++++ .../ota/service/IOtaBaCxAqcsService.java | 7 ++ .../service/impl/OtaBaCxAqcsServiceImpl.java | 76 ++++++++++++++++++- .../service/impl/OtaBaCxJbxxServiceImpl.java | 20 +---- .../modules/ota/utils/ImportFileUtil.java | 20 +++++ 5 files changed, 129 insertions(+), 20 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxAqcsController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxAqcsController.java index dc27d6e5c..db5503637 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxAqcsController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxAqcsController.java @@ -8,6 +8,7 @@ import javax.servlet.http.HttpServletResponse; import com.jero.common.api.vo.Result; import com.jero.common.system.query.QueryGenerator; import com.jero.modules.ota.entity.OtaBaCxAqcs; +import com.jero.modules.ota.entity.OtaBaCxZxsjyq; import com.jero.modules.ota.service.IOtaBaCxAqcsService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -17,6 +18,7 @@ import com.jero.common.system.base.controller.JeroController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.ModelAndView; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -186,4 +188,28 @@ public class OtaBaCxAqcsController extends JeroController importData(@RequestParam(value = "file", required = false) MultipartFile file, + @RequestParam(value = "cut", required = false) String cut, + @RequestParam(value = "otaId", required = false) String otaId) throws Exception { + OtaBaCxAqcs res; + try { + res = this.otaBaCxAqcsService.importData(file, otaId, cut); + } catch (Exception e) { + e.printStackTrace(); + return Result.error(e.getMessage()); + } + return Result.OK(res); + } + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxAqcsService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxAqcsService.java index 48e66e4f2..7e4b92cd1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxAqcsService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxAqcsService.java @@ -2,7 +2,10 @@ package com.jero.modules.ota.service; import com.jero.modules.ota.entity.OtaBaCxAqcs; import com.baomidou.mybatisplus.extension.service.IService; +import org.springframework.web.multipart.MultipartFile; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.util.List; /** @@ -61,4 +64,8 @@ public interface IOtaBaCxAqcsService extends IService { List queryList(); OtaBaCxAqcs queryByOtaId(String otaId, String otaIdT); + + void exportTemplate(HttpServletResponse response, HttpServletRequest request); + + OtaBaCxAqcs importData(MultipartFile file, String otaId, String cut) throws Exception; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java index 9e57c2d38..8dc38038d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java @@ -2,25 +2,34 @@ package com.jero.modules.ota.service.impl; import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.jero.modules.ota.entity.AttachmentEO; -import com.jero.modules.ota.entity.OtaBaCxAqcs; -import com.jero.modules.ota.entity.OtaBaCxJbxx; -import com.jero.modules.ota.entity.OtaBaCxTxjl; +import com.jero.common.exception.JeroBootException; +import com.jero.modules.ota.entity.*; import com.jero.modules.ota.enums.OtaModuleEnum; import com.jero.modules.ota.mapper.OtaBaCxAqcsMapper; import com.jero.modules.ota.service.IOtaBaCxAqcsService; import com.jero.modules.ota.service.IOtaBaCxTxjlService; import com.jero.modules.ota.utils.ComparisonUtil; +import com.jero.modules.ota.utils.ImportFileUtil; import com.jero.modules.system.service.ISysDictService; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.apache.poi.ss.usermodel.Workbook; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import java.io.File; import java.util.List; import java.util.Date; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; /** * @Description: 车型备案-安全措施 @@ -30,6 +39,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; */ @Service public class OtaBaCxAqcsServiceImpl extends ServiceImpl implements IOtaBaCxAqcsService { + @Value(value = "${ota.templatePath}") + private String templatePath; + + @Value(value = "${ota.uploadPath}") + private String uploadPath; @Autowired private IOtaBaCxTxjlService otaBaCxTxjlService; @@ -146,4 +160,58 @@ public class OtaBaCxAqcsServiceImpl extends ServiceImpl upLoadFiles = ImportFileUtil.importZip(file, cut, uploadPath); + File attFile = null; + File upFile = null; + for (File f : upLoadFiles) { + if (f.isDirectory() && f.getName().equals("安全措施")) { + attFile = f; + } else if (f.getName().equals("安全措施.xlsx")) { + upFile = f; + } + } + if (null == upFile || null == attFile) { + throw new JeroBootException("请上传正确的文件"); + } + OtaBaCxAqcs aqcs = parseFile(upFile, cut); + aqcs.setOtaId(otaId); + add(aqcs); + return aqcs; + } + + private OtaBaCxAqcs parseFile(File upFile, String cut) throws Exception { + OtaBaCxAqcs aqcs = new OtaBaCxAqcs(); + Workbook wb = ImportFileUtil.readExcel(upFile); + Sheet s = wb.getSheetAt(0); + + Row row = s.getRow(2); + Cell cell = row.getCell(2); + aqcs.setBhjz(ImportFileUtil.getCellValueDict(cell, wb, "protection_mechanism", sysDictService, cut)); + + row = s.getRow(3); + cell = row.getCell(2); + aqcs.setFsxjz(ImportFileUtil.getCellValueDict(cell, wb, "fail_safe_mechanism", sysDictService, cut)); + + row = s.getRow(4); + cell = row.getCell(2); + aqcs.setSjsbcs(ImportFileUtil.getCellValueDict(cell, wb, "upgrade_failure", sysDictService, cut)); + + row = s.getRow(5); + cell = row.getCell(2); + aqcs.setXxaqjz(ImportFileUtil.getCellValueDict(cell, wb, "Information_security_mechanism", sysDictService, cut)); + + row = s.getRow(2); + cell = row.getCell(3); + aqcs.setZmcl(ImportFileUtil.getCellValue(cell, wb)); + + return aqcs; + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java index 13ca660d3..7507212fb 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java @@ -213,22 +213,10 @@ public class OtaBaCxJbxxServiceImpl extends ServiceImpl= txzdStrs.length - 1) { - sb.append(sysDictService.queryDictItemByValue("communication_terminal", txzdStrs[i], cut)); - } else { - sb.append(sysDictService.queryDictItemByValue("communication_terminal", txzdStrs[i], cut)).append(","); - } - } - jbxx.setTxzd(sb.toString()); - row = s.getRow(11); - cell = row.getCell(1); - jbxx.setCdotasj(ImportFileUtil.getCellValue(cell, wb)); - } + jbxx.setTxzd(ImportFileUtil.getCellValueDict(cell, wb, "communication_terminal", sysDictService, cut)); + row = s.getRow(11); + cell = row.getCell(1); + jbxx.setCdotasj(ImportFileUtil.getCellValue(cell, wb)); return jbxx; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ImportFileUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ImportFileUtil.java index 2f4aa8054..85f1cfbe3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ImportFileUtil.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ImportFileUtil.java @@ -4,6 +4,7 @@ import com.aliyuncs.utils.IOUtils; import com.jero.common.constant.enums.CutEnum; import com.jero.common.exception.JeroBootException; import com.jero.modules.split.common.FileUnZip; +import com.jero.modules.system.service.ISysDictService; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; @@ -190,4 +191,23 @@ public class ImportFileUtil { } return res; } + + public static String getCellValueDict(Cell cell, Workbook wb, String dictType, ISysDictService sysDictService, String cut) throws Exception { + String res = ""; + String str = ImportFileUtil.getCellValue(cell, wb); + if (StringUtils.isNotEmpty(str)) { + String[] strs = str.split(","); + StringBuilder sb = new StringBuilder(); + for (int i = 0; i < strs.length; i++) { + if (i >= strs.length - 1) { + sb.append(sysDictService.queryDictItemByValue(dictType, strs[i], cut)); + } else { + sb.append(sysDictService.queryDictItemByValue(dictType, strs[i], cut)).append(","); + } + } + res = sb.toString(); + } + return res; + } + } From 79eb093e61e406b62400bbe08c94408b1144c594 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Mon, 27 Mar 2023 03:28:20 +0800 Subject: [PATCH 352/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OtaBaCxKsjxtmccsController.java | 25 +++++ .../ota/service/IOtaBaCxKsjxtmccsService.java | 7 ++ .../impl/OtaBaCxJsfzbacsServiceImpl.java | 5 +- .../impl/OtaBaCxKsjjsmccsServiceImpl.java | 2 +- .../impl/OtaBaCxKsjxtmccsServiceImpl.java | 106 +++++++++++++++++- .../modules/ota/utils/ComparisonUtil.java | 10 +- 6 files changed, 147 insertions(+), 8 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxKsjxtmccsController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxKsjxtmccsController.java index 777960fc7..8aa33040d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxKsjxtmccsController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxKsjxtmccsController.java @@ -9,6 +9,7 @@ import com.alibaba.fastjson.JSONObject; import com.jero.common.api.vo.Result; import com.jero.common.system.query.QueryGenerator; import com.jero.modules.ota.entity.OtaBaCxKsjxtmccs; +import com.jero.modules.ota.entity.OtaBaCxZxsjyq; import com.jero.modules.ota.service.IOtaBaCxKsjxtmccsService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -18,6 +19,7 @@ import com.jero.common.system.base.controller.JeroController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.ModelAndView; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -186,4 +188,27 @@ public class OtaBaCxKsjxtmccsController extends JeroController importData(@RequestParam(value = "file", required = false) MultipartFile file, + @RequestParam(value = "cut", required = false) String cut, + @RequestParam(value = "otaId", required = false) String otaId) throws Exception { + try { + this.otaBaCxKsjxtmccsService.importData(file, otaId, cut); + } catch (Exception e) { + e.printStackTrace(); + return Result.error(e.getMessage()); + } + return Result.OK(); + } + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxKsjxtmccsService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxKsjxtmccsService.java index a33518354..a745b52b4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxKsjxtmccsService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxKsjxtmccsService.java @@ -3,7 +3,10 @@ package com.jero.modules.ota.service; import com.alibaba.fastjson.JSONObject; import com.jero.modules.ota.entity.OtaBaCxKsjxtmccs; import com.baomidou.mybatisplus.extension.service.IService; +import org.springframework.web.multipart.MultipartFile; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.util.List; /** @@ -61,4 +64,8 @@ public interface IOtaBaCxKsjxtmccsService extends IService { List queryList(); JSONObject queryByOtaId(String otaId, String otaIdT); + + void exportTemplate(HttpServletResponse response, HttpServletRequest request); + + void importData(MultipartFile file, String otaId, String cut) throws Exception; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java index b3ed65347..ad1f79ba7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java @@ -53,20 +53,19 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl reList = cu.comparisonRecord(otaId, OtaModuleEnum.CX_JSFZXTJCBACS, otaBaCxJsfzbacsOld, otaBaCxJsfzbacs, sysDictService); - + saveOrUpdate(otaBaCxJsfzbacs); //处理控制器列表,先删除，后添加 List oldList = OtaBaCxSjmkService.queryByOtaId(otaId); OtaBaCxSjmkService.deleteByOtaId(otaId); JSONArray kzq = json.getJSONArray("kzq"); List sjmkList = parseKzqData(kzq, otaId); + reList.addAll(cu.comparisonListRecord(otaId, OtaModuleEnum.CX_JSFZXTJCBACS, OtaTitleEnum.BJMC.getName(), oldList, sjmkList, sysDictService)); OtaBaCxSjmkService.saveOrUpdateBatch(sjmkList); - cu.comparisonListRecord(otaId, OtaModuleEnum.CX_JSFZXTJCBACS, OtaTitleEnum.BJMC.getName(), oldList, sjmkList, sysDictService); otaBaCxTxjlService.saveBatch(reList); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java index b87c37f44..2d8059e19 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java @@ -78,11 +78,11 @@ public class OtaBaCxKsjjsmccsServiceImpl extends ServiceImpl reList = cu.comparisonListRecord(otaId, OtaModuleEnum.CX_KZXSJDJSFZGNMCYCS, OtaTitleEnum.GNMC.getName(), oldList, newList, sysDictService); + saveOrUpdateBatch(newList); otaBaCxTxjlService.saveBatch(reList); String fj = (String) json.get("fj"); if (StringUtils.isNotEmpty(fj)) { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java index 3c968a234..179b957bf 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.jero.common.exception.JeroBootException; import com.jero.modules.ota.entity.*; import com.jero.modules.ota.enums.OtaModuleEnum; import com.jero.modules.ota.enums.OtaTitleEnum; @@ -12,16 +13,27 @@ import com.jero.modules.ota.service.IOtaBaCxKsjxtmccsService; import com.jero.modules.ota.service.IOtaBaCxListService; import com.jero.modules.ota.service.IOtaBaCxTxjlService; import com.jero.modules.ota.utils.ComparisonUtil; +import com.jero.modules.ota.utils.ImportFileUtil; import com.jero.modules.system.service.ISysDictService; import com.jero.modules.system.util.StringUtils; import org.apache.commons.lang3.ObjectUtils; +import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.apache.poi.ss.usermodel.Workbook; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import java.io.File; import java.lang.reflect.Field; import java.util.*; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; /** * @Description: 车型备案-可升级的系统名称参数 @@ -31,6 +43,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; */ @Service public class OtaBaCxKsjxtmccsServiceImpl extends ServiceImpl implements IOtaBaCxKsjxtmccsService { + @Value(value = "${ota.templatePath}") + private String templatePath; + + @Value(value = "${ota.uploadPath}") + private String uploadPath; @Autowired private IOtaBaCxListService otaBaCxListService; @@ -77,11 +94,11 @@ public class OtaBaCxKsjxtmccsServiceImpl extends ServiceImpl reList = cu.comparisonListRecord(otaId, OtaModuleEnum.CX_KSJDXTMCYCS, OtaTitleEnum.XTLB.getName(), oldList, newList, sysDictService); + saveOrUpdateBatch(newList); otaBaCxTxjlService.saveBatch(reList); String fj = (String) json.get("fj"); if (StringUtils.isNotEmpty(fj)) { @@ -181,4 +198,91 @@ public class OtaBaCxKsjxtmccsServiceImpl extends ServiceImpl upLoadFiles = ImportFileUtil.importZip(file, cut, uploadPath); + File attFile = null; + File upFile = null; + for (File f : upLoadFiles) { + if (f.isDirectory() && f.getName().equals("可在线升级的系统名称与参数")) { + attFile = f; + } else if (f.getName().equals("可在线升级的系统名称与参数.xlsx")) { + upFile = f; + } + } + if (null == upFile || null == attFile) { + throw new JeroBootException("请上传正确的文件"); + } + List oldList = getByOtaId(otaId); + List mccsList = parseFile(upFile, otaId, cut); + ComparisonUtil cu = new ComparisonUtil(); + List reList = cu.comparisonListRecord(otaId, OtaModuleEnum.CX_KSJDXTMCYCS, OtaTitleEnum.XTLB.getName(), oldList, mccsList, sysDictService); + deleteByOtaId(otaId); + saveOrUpdateBatch(mccsList); + otaBaCxTxjlService.saveBatch(reList); + } + + private List parseFile(File upFile, String otaId, String cut) throws Exception { + Date now = new Date(); + List mccsList = new ArrayList<>(); + Workbook wb = ImportFileUtil.readExcel(upFile); + Sheet s = wb.getSheetAt(0); + int rows = s.getPhysicalNumberOfRows(); + for (int i = 3; i < rows; i++) { + Row row = s.getRow(i); + Cell cell = row.getCell(0); + String str = ImportFileUtil.getCellValue(cell, wb); + OtaBaCxKsjxtmccs mssc = new OtaBaCxKsjxtmccs(); + if ("证明材料".equals(str)) { + //列表数据数量，在证明材料处结束 + OtaBaCxList otaBaCxList = otaBaCxListService.queryById(otaId); + if (ObjectUtils.isNotEmpty(otaBaCxList)) { + otaBaCxList.setZxsjxtfj(str); + otaBaCxListService.editById(otaBaCxList); + } + break; + } else { + mssc.setOtaId(otaId); + mssc.setXtlb(ImportFileUtil.getCellValue(cell, wb)); + cell = row.getCell(1); + mssc.setSfksj(ImportFileUtil.getCellValueYesOrNo(cell, wb)); + cell = row.getCell(2); + mssc.setSjbgcs(ImportFileUtil.getCellValue(cell, wb)); + cell = row.getCell(3); + mssc.setTpt(ImportFileUtil.getCellValue(cell, wb)); + cell = row.getCell(4); + mssc.setKzqmc(ImportFileUtil.getCellValue(cell, wb)); + cell = row.getCell(5); + mssc.setAqwzxdj(ImportFileUtil.getCellValue(cell, wb)); + cell = row.getCell(6); + mssc.setKzqscqy(ImportFileUtil.getCellValue(cell, wb)); + cell = row.getCell(7); + mssc.setKzqxh(ImportFileUtil.getCellValue(cell, wb)); + cell = row.getCell(8); + mssc.setYjbbxx(ImportFileUtil.getCellValue(cell, wb)); + cell = row.getCell(9); + mssc.setCsrjbbh(ImportFileUtil.getCellValue(cell, wb)); + cell = row.getCell(10); + mssc.setCsrjbwzsj(ImportFileUtil.getCellValue(cell, wb)); + cell = row.getCell(11); + mssc.setSjsfyx(ImportFileUtil.getCellValue(cell, wb)); + cell = row.getCell(12); + mssc.setCzxtlx(ImportFileUtil.getCellValue(cell, wb)); + cell = row.getCell(13); + mssc.setCzxtscqy(ImportFileUtil.getCellValue(cell, wb)); + cell = row.getCell(14); + mssc.setCzxtbbh(ImportFileUtil.getCellValue(cell, wb)); + mssc.setCreateTime(now); + mssc.setUpdateTime(now); + mccsList.add(mssc); + } + } + return mccsList; + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java index 14590deba..6a991d9f1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java @@ -54,7 +54,9 @@ public class ComparisonUtil { idField.setAccessible(true); Object id = idField.get(newObj); if (ObjectUtils.isEmpty(id)) { - String content = "新增了一条" + newObj.getClass().getDeclaredField(tableTitle).get(newObj).toString(); + Field tableField = newObj.getClass().getDeclaredField(tableTitle); + tableField.setAccessible(true); + String content = "新增了一条" + tableField.get(newObj).toString(); resList.add(new OtaBaCxTxjl(otaId, otaModuleEnum.getName(), content)); Field[] fields = newObj.getClass().getDeclaredFields(); for (Field field : fields) { @@ -70,7 +72,7 @@ public class ComparisonUtil { if (ObjectUtils.isNotEmpty(newVal)) { newStr = newVal.toString(); } - content = "增加" + newObj.getClass().getDeclaredField(tableTitle).get(newObj).toString() + "中" + title + "为" + newStr; + content = "增加" + tableField.get(newObj).toString() + "中" + title + "为" + newStr; resList.add(new OtaBaCxTxjl(otaId, otaModuleEnum.getName(), content)); } } else { @@ -134,7 +136,9 @@ public class ComparisonUtil { Object newVal = field.get(newClazz); String newTitleStr = "空"; if (ObjectUtils.isNotEmpty(newVal)) { - Object newTitleVal = newVal.getClass().getDeclaredField(tableTitle).get(newVal); + Field tableField = newVal.getClass().getDeclaredField(tableTitle); + tableField.setAccessible(true); + Object newTitleVal = tableField.get(newVal); if (ObjectUtils.isNotEmpty(newTitleVal)) { newTitleStr = newTitleVal.toString(); } From 631a56fd024e756c981ae1518962f3b6b015405b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Mon, 27 Mar 2023 03:46:16 +0800 Subject: [PATCH 353/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OtaBaCxKsjjsmccsController.java | 23 ++++ .../ota/service/IOtaBaCxKsjjsmccsService.java | 7 ++ .../impl/OtaBaCxKsjjsmccsServiceImpl.java | 104 ++++++++++++++++++ 3 files changed, 134 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxKsjjsmccsController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxKsjjsmccsController.java index 01b4585de..e130485b5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxKsjjsmccsController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxKsjjsmccsController.java @@ -18,6 +18,7 @@ import com.jero.common.system.base.controller.JeroController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.ModelAndView; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -186,4 +187,26 @@ public class OtaBaCxKsjjsmccsController extends JeroController importData(@RequestParam(value = "file", required = false) MultipartFile file, + @RequestParam(value = "cut", required = false) String cut, + @RequestParam(value = "otaId", required = false) String otaId) throws Exception { + try { + this.otaBaCxKsjjsmccsService.importData(file, otaId, cut); + } catch (Exception e) { + e.printStackTrace(); + return Result.error(e.getMessage()); + } + return Result.OK(); + } + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxKsjjsmccsService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxKsjjsmccsService.java index a716b4495..d4c232672 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxKsjjsmccsService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxKsjjsmccsService.java @@ -3,7 +3,10 @@ package com.jero.modules.ota.service; import com.alibaba.fastjson.JSONObject; import com.jero.modules.ota.entity.OtaBaCxKsjjsmccs; import com.baomidou.mybatisplus.extension.service.IService; +import org.springframework.web.multipart.MultipartFile; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.util.List; /** @@ -61,4 +64,8 @@ public interface IOtaBaCxKsjjsmccsService extends IService { List queryList(); JSONObject queryByOtaId(String otaId, String otaIdT); + + void exportTemplate(HttpServletResponse response, HttpServletRequest request); + + void importData(MultipartFile file, String otaId, String cut) throws Exception; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java index 2d8059e19..6526cea06 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.jero.common.exception.JeroBootException; import com.jero.modules.ota.entity.*; import com.jero.modules.ota.enums.OtaModuleEnum; import com.jero.modules.ota.enums.OtaTitleEnum; @@ -12,16 +13,27 @@ import com.jero.modules.ota.service.IOtaBaCxKsjjsmccsService; import com.jero.modules.ota.service.IOtaBaCxListService; import com.jero.modules.ota.service.IOtaBaCxTxjlService; import com.jero.modules.ota.utils.ComparisonUtil; +import com.jero.modules.ota.utils.ImportFileUtil; import com.jero.modules.system.service.ISysDictService; import com.jero.modules.system.util.StringUtils; import org.apache.commons.lang3.ObjectUtils; +import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.apache.poi.ss.usermodel.Workbook; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import java.io.File; import java.lang.reflect.Field; import java.util.*; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; /** @@ -33,6 +45,12 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @Service public class OtaBaCxKsjjsmccsServiceImpl extends ServiceImpl implements IOtaBaCxKsjjsmccsService { + @Value(value = "${ota.templatePath}") + private String templatePath; + + @Value(value = "${ota.uploadPath}") + private String uploadPath; + @Autowired private IOtaBaCxListService otaBaCxListService; @@ -180,4 +198,90 @@ public class OtaBaCxKsjjsmccsServiceImpl extends ServiceImpl upLoadFiles = ImportFileUtil.importZip(file, cut, uploadPath); + File attFile = null; + File upFile = null; + for (File f : upLoadFiles) { + if (f.isDirectory() && f.getName().equals("可在线升级的驾驶辅助功能名称与参数")) { + attFile = f; + } else if (f.getName().equals("可在线升级的驾驶辅助功能名称与参数.xlsx")) { + upFile = f; + } + } + if (null == upFile || null == attFile) { + throw new JeroBootException("请上传正确的文件"); + } + + List oldList = getByOtaId(otaId); + List mccsList = parseFile(upFile, otaId, cut); + ComparisonUtil cu = new ComparisonUtil(); + List reList = cu.comparisonListRecord(otaId, OtaModuleEnum.CX_KZXSJDJSFZGNMCYCS, OtaTitleEnum.GNMC.getName(), oldList, mccsList, sysDictService); + deleteByOtaId(otaId); + saveOrUpdateBatch(mccsList); + otaBaCxTxjlService.saveBatch(reList); + } + + private List parseFile(File upFile, String otaId, String cut) throws Exception { + Date now = new Date(); + List mccsList = new ArrayList<>(); + Workbook wb = ImportFileUtil.readExcel(upFile); + Sheet s = wb.getSheetAt(0); + int rows = s.getPhysicalNumberOfRows(); + for (int i = 3; i < rows; i++) { + Row row = s.getRow(i); + Cell cell = row.getCell(0); + String str = ImportFileUtil.getCellValue(cell, wb); + OtaBaCxKsjjsmccs mssc = new OtaBaCxKsjjsmccs(); + if ("证明材料".equals(str)) { + //列表数据数量，在证明材料处结束 + OtaBaCxList otaBaCxList = otaBaCxListService.queryById(otaId); + if (ObjectUtils.isNotEmpty(otaBaCxList)) { + otaBaCxList.setZxsjjsfj(str); + otaBaCxListService.editById(otaBaCxList); + } + break; + } else { + mssc.setOtaId(otaId); + mssc.setGnmc(ImportFileUtil.getCellValue(cell, wb)); + cell = row.getCell(1); + mssc.setPzqk(ImportFileUtil.getCellValueYesOrNo(cell, wb)); + cell = row.getCell(2); + mssc.setSfksj(ImportFileUtil.getCellValueYesOrNo(cell, wb)); + cell = row.getCell(3); + mssc.setJszdhjb(ImportFileUtil.getCellValue(cell, wb)); + cell = row.getCell(4); + mssc.setSjggcs(ImportFileUtil.getCellValue(cell, wb)); + cell = row.getCell(5); + mssc.setGnms(ImportFileUtil.getCellValue(cell, wb)); + cell = row.getCell(6); + mssc.setSytj(ImportFileUtil.getCellValue(cell, wb)); + cell = row.getCell(7); + mssc.setKzqmc(ImportFileUtil.getCellValue(cell, wb)); + cell = row.getCell(8); + mssc.setKzqscqy(ImportFileUtil.getCellValue(cell, wb)); + cell = row.getCell(9); + mssc.setKzqxh(ImportFileUtil.getCellValue(cell, wb)); + cell = row.getCell(10); + mssc.setYjbbxx(ImportFileUtil.getCellValue(cell, wb)); + cell = row.getCell(11); + mssc.setRjkfqy(ImportFileUtil.getCellValue(cell, wb)); + cell = row.getCell(12); + mssc.setCzxtbbh(ImportFileUtil.getCellValue(cell, wb)); + cell = row.getCell(13); + mssc.setCsyzsj(ImportFileUtil.getCellValue(cell, wb)); + mssc.setCreateTime(now); + mssc.setUpdateTime(now); + mccsList.add(mssc); + } + } + return mccsList; + } } From 26f0c5b2a0a79cb3522fb2eedc7ee9ea4ad7da59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Mon, 27 Mar 2023 04:04:20 +0800 Subject: [PATCH 354/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/OtaBaCxJsfzbacsController.java | 24 +++++++++++ .../ota/service/IOtaBaCxJsfzbacsService.java | 7 ++++ .../service/impl/OtaBaCxJbxxServiceImpl.java | 15 +++++-- .../impl/OtaBaCxJsfzbacsServiceImpl.java | 40 +++++++++++++++++++ 4 files changed, 83 insertions(+), 3 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJsfzbacsController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJsfzbacsController.java index e47925a95..d25c3563d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJsfzbacsController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJsfzbacsController.java @@ -18,6 +18,7 @@ import com.jero.common.system.base.controller.JeroController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.ModelAndView; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -184,4 +185,27 @@ public class OtaBaCxJsfzbacsController extends JeroController importData(@RequestParam(value = "file", required = false) MultipartFile file, + @RequestParam(value = "cut", required = false) String cut, + @RequestParam(value = "otaId", required = false) String otaId) throws Exception { + try { + this.otaBaCxJsfzbacsService.importData(file, otaId, cut); + } catch (Exception e) { + e.printStackTrace(); + return Result.error(e.getMessage()); + } + return Result.OK(); + } + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxJsfzbacsService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxJsfzbacsService.java index fffadf575..71172b045 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxJsfzbacsService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxJsfzbacsService.java @@ -3,7 +3,10 @@ package com.jero.modules.ota.service; import com.alibaba.fastjson.JSONObject; import com.jero.modules.ota.entity.OtaBaCxJsfzbacs; import com.baomidou.mybatisplus.extension.service.IService; +import org.springframework.web.multipart.MultipartFile; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.util.List; /** @@ -61,4 +64,8 @@ public interface IOtaBaCxJsfzbacsService extends IService { List queryList(); JSONObject queryByOtaId(String otaId, String otaIdT); + + void exportTemplate(HttpServletResponse response, HttpServletRequest request); + + void importData(MultipartFile file, String otaId, String cut) throws Exception; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java index 7507212fb..aef65ed64 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java @@ -163,13 +163,22 @@ public class OtaBaCxJbxxServiceImpl extends ServiceImpl upLoadFiles = ImportFileUtil.importZip(file, cut, uploadPath); + File upFile = null; + for (File f : upLoadFiles) { + if (f.getName().equals("可在线升级的系统名称与参数.xlsx")) { + upFile = f; + } + } + if (null == upFile) { + throw new JeroBootException("请上传正确的文件"); + } + OtaBaCxJbxx jbxx = parseFile(upFile, cut); jbxx.setOtaId(otaId); return add(jbxx); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java index ad1f79ba7..c0cb5daae 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.exception.JeroBootException; import com.jero.modules.ota.entity.OtaBaCxJsfzbacs; import com.jero.modules.ota.entity.OtaBaCxSjmk; import com.jero.modules.ota.entity.OtaBaCxTxjl; @@ -14,11 +15,17 @@ import com.jero.modules.ota.service.IOtaBaCxJsfzbacsService; import com.jero.modules.ota.service.IOtaBaCxSjmkService; import com.jero.modules.ota.service.IOtaBaCxTxjlService; import com.jero.modules.ota.utils.ComparisonUtil; +import com.jero.modules.ota.utils.ImportFileUtil; import com.jero.modules.system.service.ISysDictService; import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.File; import java.lang.reflect.Field; import java.util.*; @@ -31,6 +38,12 @@ import java.util.*; @Service public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl implements IOtaBaCxJsfzbacsService { + @Value(value = "${ota.templatePath}") + private String templatePath; + + @Value(value = "${ota.uploadPath}") + private String uploadPath; + @Autowired private IOtaBaCxTxjlService otaBaCxTxjlService; @@ -221,5 +234,32 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl upLoadFiles = ImportFileUtil.importZip(file, cut, uploadPath); + File upFile = null; + for (File f : upLoadFiles) { + if (f.getName().equals("驾驶辅助系统基础备案参数.xlsx")) { + upFile = f; + } + } + if (null == upFile) { + throw new JeroBootException("请上传正确的文件"); + } + JSONObject json = parseFile(upFile, otaId, cut); + } + + private JSONObject parseFile(File upFile, String otaId, String cut) { + JSONObject jsonObj = new JSONObject(); + jsonObj.put("otaId",otaId); + + + + return jsonObj; + } } From 13c4921cd516a423650b03d0cd2b729425a4fa95 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Mon, 27 Mar 2023 09:59:41 +0800 Subject: [PATCH 355/645] =?UTF-8?q?67149=20=E6=B3=95=E8=A7=84=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E5=A4=8D=E5=88=B6=E9=97=AE=E9=A2=98=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 --- .../service/impl/ProjectLawsInventoryEOServiceImpl.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 984e31674..3e095fe44 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -3732,11 +3732,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl Date: Mon, 27 Mar 2023 10:10:30 +0800 Subject: [PATCH 356/645] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95--?= =?UTF-8?q?=E8=BD=AC=E5=8A=9E;=20=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E9=80=80=E5=9B=9E=E5=8E=9F=E5=9B=A0=E5=BC=B9=E6=A1=86=20?= =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95-studio=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=90=88=E8=A7=84=E6=8A=A5=E5=91=8A=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 3 ++- jero-web/src/common/lang/zh-cn.js | 5 +++-- jero-web/src/components/SelectedBy/index.vue | 14 +++++++++++++- .../components/certificationList/index.vue | 3 ++- .../components/listOfRegulations.vue | 2 +- .../components/reviewedByThePersonInCharge.vue | 3 ++- 6 files changed, 23 insertions(+), 7 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 59bd1a70f..ceb06b6ac 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1713,5 +1713,6 @@ module.exports = { onlyDataWithListStatusDraftCanBeDeleted:'Only data with a list status of Draft can be deleted', implementationDateTwo:'Implementation Date', reasonForReturn:'Reason For Return', - pleaseFillInTheInformationTaskProcess:'Please fill in the information of the project interface person and responsible person before initiating the task process' + pleaseFillInTheInformationTaskProcess:'Please fill in the information of the project interface person and responsible person before initiating the task process', + complianceReporting:'Compliance Reporting', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index db8f12688..9126f3501 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1812,6 +1812,7 @@ module.exports = { implementationrecords:'故障处置措施和应急响应实施记录', onlyDataWithListStatusDraftCanBeDeleted:'只能删除清单状态为草稿的数据', implementationDateTwo:'实施日期', - reasonForReturn:'Reason For Return', - pleaseFillInTheInformationTaskProcess:'请填写工程接口人和责任人信息后再发起任务流程' + reasonForReturn:'退回原因', + pleaseFillInTheInformationTaskProcess:'请填写工程接口人和责任人信息后再发起任务流程', + complianceReporting:'合规报告', } \ No newline at end of file diff --git a/jero-web/src/components/SelectedBy/index.vue b/jero-web/src/components/SelectedBy/index.vue index 74ad7cb93..35711e606 100644 --- a/jero-web/src/components/SelectedBy/index.vue +++ b/jero-web/src/components/SelectedBy/index.vue @@ -47,6 +47,10 @@ title: { type: String, default: '' + }, + isSingleChoice: { + type: Boolean, + default: false } }, data() { @@ -98,6 +102,12 @@ this.visibleTree = false }, handleSubmit() { + if (this.isSingleChoice) { + if (this.userIds.length > 1) { + this.$message.warning(this.$t('onlyOnePersonCanBeSelected')) + return + } + } if (this.userIds && this.userIds.length > 0) { this.submitLoading = true this.$emit('SelectedByForm', this.userIds.join(',')) @@ -131,11 +141,13 @@ this.confirmLoading = true postAction('sys/user/queryDepartUserTreeList', { departId: this.departId, - json: gData + json: gData, + flag:'1' }).then((res) => { this.confirmLoading = false if (res.success) { this.gData = res.result + this.gData = [...this.gData] this.defaultExpandedKeys = [this.departId] this.visibleTree = true } else { diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue index daaef057c..463a8fa54 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -399,7 +399,8 @@ - + diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 4a68009ff..2080ff229 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -1357,7 +1357,7 @@ this.$message.warning(this.$t('OnlyOneSelected')) } else { let serialNumber = this.selectedRowKeysList[0].serialNumber - downloadFile(this.url.ExportReportUrl, this.$t('listOfRegulations') + this.$t('compliancereport') + '-' + serialNumber + '.docx', { id: selectedRowKeys.join(',') }) + downloadFile(this.url.ExportReportUrl, this.$t('listOfRegulations') + this.$t('complianceReporting') + '-' + serialNumber + '.docx', { id: selectedRowKeys.join(',') }) } }, diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue index 230759ce6..67f882593 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue @@ -88,7 +88,8 @@ - +
From a56140c446f8e94a92b8040c3999f98e5d22a5d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Mon, 27 Mar 2023 10:19:03 +0800 Subject: [PATCH 357/645] =?UTF-8?q?=20=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?= =?UTF-8?q?-=E6=9F=A5=E7=9C=8B=E7=BB=93=E6=9E=9C=E6=8A=A5=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/listOfRegulations.vue | 58 ++++++++++++++++++- 1 file changed, 57 insertions(+), 1 deletion(-) diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 2080ff229..ce68da751 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -502,6 +502,39 @@ + + + + + + {{ $t('See') }} + + + {{ $t('download') }} + + + + {{ $t('dataLoading') }} {{ $t('Submitting') }} @@ -2503,7 +2536,30 @@ }, viewFileClick(item) { this.$refs.viewFileModelRef.clickButtonToUpload(item) - } + }, + pdfPreview(fileQuery) { + let fileName = fileQuery.fileName + let index1 = fileName.lastIndexOf('.') + let index2 = fileName.length + let fileSuffix = fileName.substring(index1, index2) + if (fileSuffix == '.pdf') { + window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id + '&userName=' + this.userInfo().username)) + } else if (fileSuffix == '.docx' || fileSuffix == '.doc') { + let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix) + window.open(url, '_blank') + } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') { + let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix) + window.open(url, '_blank') + } else if (fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg') { + let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadImgUrl + '/' + fileQuery.id + fileSuffix) + window.open(url, '_blank') + } else { + downloadFile('/sys/common/downLoadFile', fileQuery.fileName, { id: fileQuery.id }) + } + }, + download(item) { + downloadFile('/sys/common/downLoadFile', item.fileName, { id: item.id, userName: this.userInfo().username }) + }, } } From 26d056256c46d5a7462e7b574a9216b1f34c6af3 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Mon, 27 Mar 2023 10:41:14 +0800 Subject: [PATCH 358/645] =?UTF-8?q?67169=20=E6=B3=95=E8=A7=84=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E5=AF=BC=E5=87=BA=E9=97=AE=E9=A2=98=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 --- .../entity/ProjectLawsInventoryEO.java | 18 +++++++------ .../entity/ProjectLawsInventoryEOEn.java | 25 +++++++++++++------ .../ProjectLawsInventoryEOServiceImpl.java | 2 ++ 3 files changed, 29 insertions(+), 16 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java index 009b2f163..c66e7ce3d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java @@ -86,7 +86,7 @@ public class ProjectLawsInventoryEO implements Serializable { private String inventoryAffirmStatus; @TableField(exist = false) - @Excel(name = "清单确认状态", width = 20) + // @Excel(name = "清单确认状态", width = 20) @ApiModelProperty(value = "清单确认状态名称") private String inventoryAffirmStatusName;//清单确认状态名称 @@ -96,7 +96,7 @@ public class ProjectLawsInventoryEO implements Serializable { @TableField(exist = false) @ApiModelProperty(value = "任务发布状态名称") - @Excel(name = "任务确认状态", width = 20) + // @Excel(name = "任务确认状态", width = 20) private String taskAffirmStatusName;//任务发布状态名称 /**适用地区*/ @@ -274,7 +274,7 @@ public class ProjectLawsInventoryEO implements Serializable { private String designRemark; /**prehomo确认-交付物类型*/ - @Excel(name = "交付物类型", width = 20,dicCode ="deliverable_template",groupName = "Pre-homo确认") +// @Excel(name = "交付物类型", width = 20,dicCode ="deliverable_template",groupName = "Pre-homo确认") @ApiModelProperty(value = "prehomo确认-1") ////@Dict(dicCode ="deliverable_template") private String prehomoDeliverableType; @@ -289,7 +289,7 @@ public class ProjectLawsInventoryEO implements Serializable { /**prehomo确认-交付物模板名称*/ @TableField(exist = false) - @Excel(name = "交付物模板", width = 20,groupName = "Pre-homo确认") +// @Excel(name = "交付物模板", width = 20,groupName = "Pre-homo确认") private String prehomoDeliverableTemplateName; /**prehomo确认-发起人角色*/ @@ -305,7 +305,7 @@ public class ProjectLawsInventoryEO implements Serializable { private String prehomoInitiatorId; /**prehomo确认-发起人名称*/ - @Excel(name = "发起人", width = 20,groupName = "Pre-homo确认") +// @Excel(name = "发起人", width = 20,groupName = "Pre-homo确认") @TableField(exist = false) private String prehomoInitiatorName; @@ -322,12 +322,12 @@ public class ProjectLawsInventoryEO implements Serializable { private String prehomoDutyId; /**prehomo确认-责任人名称*/ - @Excel(name = "责任人", width = 20,groupName = "Pre-homo确认") +// @Excel(name = "责任人", width = 20,groupName = "Pre-homo确认") @TableField(exist = false) private String prehomoDutyName; /**prehomo确认-截止时间*/ - @Excel(name = "截止时间", width = 20, format = "yyyy-MM-dd",groupName = "Pre-homo确认") +// @Excel(name = "截止时间", width = 20, format = "yyyy-MM-dd",groupName = "Pre-homo确认") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "prehomo确认-截止时间") @@ -337,7 +337,7 @@ public class ProjectLawsInventoryEO implements Serializable { private String prehomoDueDateString; //prehomo确认-交付物说明 - @Excel(name = "交付物说明", width = 20,groupName = "Pre-homo确认") +// @Excel(name = "交付物说明", width = 20,groupName = "Pre-homo确认") private String prehomoRemark; /**验证符合性确认-交付物类型*/ @@ -488,12 +488,14 @@ public class ProjectLawsInventoryEO implements Serializable { @ApiModelProperty(value = "设计符合性确认-流程状态") private String designFlowStatus; @TableField(exist = false) + @Excel(name = "流程状态", width = 20,groupName = "设计符合性确认") private String designFlowStatusName; /**验证符合性确认-流程状态*/ @ApiModelProperty(value = "验证符合性确认-流程状态") private String verifyFlowStatus; @TableField(exist = false) + @Excel(name = "流程状态", width = 20,groupName = "验证符合性确认") private String verifyFlowStatusName; /**验证符合性确认-流程实例id*/ diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEOEn.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEOEn.java index 9653db607..d380e7c48 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEOEn.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEOEn.java @@ -85,7 +85,7 @@ public class ProjectLawsInventoryEOEn implements Serializable { private String inventoryAffirmStatus; @TableField(exist = false) - @Excel(name = "List Confirmation Status", width = 30) +// @Excel(name = "List Confirmation Status", width = 30) @ApiModelProperty(value = "清单确认状态名称") private String inventoryAffirmStatusName;//清单确认状态名称 @@ -95,7 +95,7 @@ public class ProjectLawsInventoryEOEn implements Serializable { @TableField(exist = false) @ApiModelProperty(value = "任务发布状态名称") - @Excel(name = "Task Confirmation Status", width = 30) +// @Excel(name = "Task Confirmation Status", width = 30) private String taskAffirmStatusName;//任务发布状态名称 /**适用地区*/ @@ -245,7 +245,7 @@ public class ProjectLawsInventoryEOEn implements Serializable { private String designRemark; /**prehomo确认-交付物类型*/ - @Excel(name = "Deliverable Type", width = 25,dicCode ="deliverable_template",groupName = "Pre-homo Check") +// @Excel(name = "Deliverable Type", width = 25,dicCode ="deliverable_template",groupName = "Pre-homo Check") @ApiModelProperty(value = "prehomo确认-1") @Dict(dicCode ="deliverable_template") private String prehomoDeliverableType; @@ -256,7 +256,7 @@ public class ProjectLawsInventoryEOEn implements Serializable { /**prehomo确认-交付物模板名称*/ @TableField(exist = false) - @Excel(name = "Deliverable Template", width = 25,groupName = "Pre-homo Check") +// @Excel(name = "Deliverable Template", width = 25,groupName = "Pre-homo Check") private String prehomoDeliverableTemplateName; /**prehomo确认-发起人角色*/ @@ -269,7 +269,7 @@ public class ProjectLawsInventoryEOEn implements Serializable { private String prehomoInitiatorId; /**prehomo确认-发起人名称*/ - @Excel(name = "Reviewer", width = 25,groupName = "Pre-homo Check") +// @Excel(name = "Reviewer", width = 25,groupName = "Pre-homo Check") @TableField(exist = false) private String prehomoInitiatorName; @@ -283,12 +283,12 @@ public class ProjectLawsInventoryEOEn implements Serializable { private String prehomoDutyId; /**prehomo确认-责任人名称*/ - @Excel(name = "Assignee", width = 25,groupName = "Pre-homo Check") +// @Excel(name = "Assignee", width = 25,groupName = "Pre-homo Check") @TableField(exist = false) private String prehomoDutyName; /**prehomo确认-截止时间*/ - @Excel(name = "Due Date", width = 25, format = "yyyy-MM-dd",groupName = "Pre-homo Check") +// @Excel(name = "Due Date", width = 25, format = "yyyy-MM-dd",groupName = "Pre-homo Check") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "prehomo确认-截止时间") @@ -297,7 +297,7 @@ public class ProjectLawsInventoryEOEn implements Serializable { private String prehomoDueDateString; //prehomo确认-交付物说明 - @Excel(name = "Deliverable Description", width = 25,groupName = "Pre-homo Check") +// @Excel(name = "Deliverable Description", width = 25,groupName = "Pre-homo Check") private String prehomoRemark; /**验证符合性确认-交付物类型*/ @@ -411,5 +411,14 @@ public class ProjectLawsInventoryEOEn implements Serializable { @ApiModelProperty(value = "调取虚拟清单,虚拟清单中维护数据为空时,进行二次确认") private String flag; + /**设计符合性确认-流程状态*/ + @TableField(exist = false) + @Excel(name = "Process Status", width = 25,groupName = "Design Compliance Check") + private String designFlowStatusName; + + /**验证符合性确认-流程状态*/ + @TableField(exist = false) + @Excel(name = "Process Status", width = 25,groupName = "Validation Compliance Check") + private String verifyFlowStatusName; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 3e095fe44..3709ca323 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -5146,6 +5146,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl Date: Mon, 27 Mar 2023 10:50:29 +0800 Subject: [PATCH 359/645] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug67226=20=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=AF=BC=E5=85=A5=E4=BC=A0=E5=8F=82otaId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/upgradecompletion.vue | 10 ++-- .../auxiliaryupgradehavechanged.vue | 2 +- .../thetargetvehicleofthisupgrade.vue | 2 +- .../components/upgradehavechanged.vue | 2 +- .../components/upgradeimpactassessment.vue | 2 +- .../components/upgradetargetmodel.vue | 2 +- .../components/usernotification.vue | 2 +- .../upgradeactivityrecord/index.vue | 2 +- .../components/basicInformation.vue | 2 +- .../components/beupgradedonline.vue | 2 +- .../components/recordparameters.vue | 50 +++++++++---------- .../components/safetyPrecautions.vue | 2 +- .../components/upgradeRequirements.vue | 2 +- .../components/upgradedonline.vue | 2 +- .../vehicleinformation/index.vue | 2 +- 15 files changed, 42 insertions(+), 44 deletions(-) diff --git a/jero-web/src/views/otamanagement/upgradeactivity/components/upgradecompletion.vue b/jero-web/src/views/otamanagement/upgradeactivity/components/upgradecompletion.vue index 5743d2c61..c3bed400a 100644 --- a/jero-web/src/views/otamanagement/upgradeactivity/components/upgradecompletion.vue +++ b/jero-web/src/views/otamanagement/upgradeactivity/components/upgradecompletion.vue @@ -85,7 +85,7 @@ {{$t('cause') + (index+1)}}
- @@ -137,10 +137,8 @@ {{$t('implementationrecords')}}
- +
@@ -362,7 +360,7 @@ export default { width: calc(100% - 130px); display: inline-block; margin-top: 2px; - height: 40px; + min-height: 40px; margin-bottom: 24px; } diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue index 94d70de89..07f92fd14 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue @@ -210,7 +210,7 @@ export default { ], url: { exportData: '/ota/otaBaSjSjfzbh/exportData', - importZipUrl: '/ota/otaBaSjSjfzbh/importData',//导入 + importZipUrl: '/ota/otaBaSjSjfzbh/importData?otaId=' + localStorage.getItem('otaId'),//导入 }, } }, diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue index bdbaf46d0..161896a0e 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue @@ -113,7 +113,7 @@ export default { formInline:{}, url: { exportData: '/ota/otaBaSjSjmbcl/exportData', - importZipUrl: '/ota/otaBaSjSjmbcl/importData',//导入 + importZipUrl: '/ota/otaBaSjSjmbcl/importData?otaId=' + localStorage.getItem('otaId'),//导入 }, } }, diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue index 69ba8eaba..8a9ba250d 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue @@ -246,7 +246,7 @@ export default { ], url: { exportData: '/ota/otaBaSjSjxtbh/exportData', - importZipUrl: '/ota/otaBaSjSjxtbh/importData',//导入 + importZipUrl: '/ota/otaBaSjSjxtbh/importData?otaId=' + localStorage.getItem('otaId'),//导入 }, } }, diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue index cba9b95c1..14424544b 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue @@ -167,7 +167,7 @@ export default { ], url: { exportData: '/ota/otaBaSjSjyxpg/exportData', - importZipUrl: '/ota/otaBaSjSjyxpg/importData',//导入 + importZipUrl: '/ota/otaBaSjSjyxpg/importData?otaId=' + localStorage.getItem('otaId'),//导入 }, loading: false, disable:false, diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue index 586cc9396..28cdc7401 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue @@ -167,7 +167,7 @@ import ImportFile from '@/components/ImportFileData/index' }, url: { exportData: '/ota/otaBaSjSjmbcx/exportData', - importZipUrl: '/ota/otaBaSjSjmbcx/importData',//导入 + importZipUrl: '/ota/otaBaSjSjmbcx/importData?otaId=' + localStorage.getItem('otaId'),//导入 }, projectNameList1:['传统动力汽车','节能汽车','新能源汽车','其他'], projectNameList2:[], diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue index 3e4680d34..7b7d6f0b2 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue @@ -192,7 +192,7 @@ export default { formInline:{}, url: { exportData: '/ota/otaBaSjGgnrfs/exportData', - importZipUrl: '/ota/otaBaSjGgnrfs/importData',//导入 + importZipUrl: '/ota/otaBaSjGgnrfs/importData?otaId=' + localStorage.getItem('otaId'),//导入 }, } }, diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/index.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/index.vue index 24c13f9b2..76fc112de 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/index.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/index.vue @@ -53,7 +53,7 @@ class="table" :columns="columnshistory" :pagination="false" - :scroll="{x: '100%', y: 400}" + :scroll="{x: '100%', y: 'calc(100vh - 330px)'}" :data-source="dataSourcehistory" :loading="loading" > diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue index 8f5a15039..754c0b314 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue @@ -240,7 +240,7 @@ import { message } from 'ant-design-vue' formRules:[], url: { exportData: '/ota/otaBaCxJbxx/exportData', - importZipUrl: '/ota/otaBaCxJbxx/importData',//导入 + importZipUrl: '/ota/otaBaCxJbxx/importData?otaId=' + localStorage.getItem('otaId'),//导入 }, form:{ cxmb:undefined, diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue index 8e9e85708..5c9c59deb 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue @@ -125,7 +125,7 @@ import ImportFile from '@/components/ImportFileData/index' fileList:'', url: { exportData: '/ota/otaBaCxKsjjsmccs/exportData', - importZipUrl: '/ota/otaBaCxKsjjsmccs/importData',//导入 + importZipUrl: '/ota/otaBaCxKsjjsmccs/importData?otaId=' + localStorage.getItem('otaId'),//导入 }, dataSource: [ { diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue index 277fe7021..0c2bb82ca 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue @@ -15,81 +15,81 @@
{{$t('componentname')}} - {{$t('networksecurityrequirements')}} +   {{$t('networksecurityrequirements')}} - {{$t('millimeterwaveradar')}} +   {{$t('millimeterwaveradar')}} - {{$t('ultrasonicradar')}} +   {{$t('ultrasonicradar')}} - {{$t('camera')}} +   {{$t('camera')}} - {{$t('asternimage')}} +   {{$t('asternimage')}} - {{$t('Monocularbinocularmultiocular')}} +   {{$t('Monocularbinocularmultiocular')}} - {{$t('driverattentionmonitoringsystem')}} +   {{$t('driverattentionmonitoringsystem')}} - {{$t('driversurveillancecamera')}} +   {{$t('driversurveillancecamera')}} - {{$t('drivermonitoringinfraredsensor')}} +   {{$t('drivermonitoringinfraredsensor')}} - {{$t('positioningandnavigationsystem')}} +   {{$t('positioningandnavigationsystem')}} - {{$t('vehiclesatellitepositioningequipment')}} +   {{$t('vehiclesatellitepositioningequipment')}} - {{$t('inertialnavigationsystem')}} +   {{$t('inertialnavigationsystem')}} - {{$t('wheelspeedmeter')}} +   {{$t('wheelspeedmeter')}} - {{$t('highprecisionmap')}} +   {{$t('highprecisionmap')}} - {{$t('electronicfence')}} +   {{$t('electronicfence')}} - {{$t('vehiclecommunicationsystem')}} +   {{$t('vehiclecommunicationsystem')}} - {{$t('signalingdevices')}} +   {{$t('signalingdevices')}} - {{$t('driverassistancefunctioncontrols')}} +   {{$t('driverassistancefunctioncontrols')}} - {{$t('drivingassistancefunctionindicatorsignaldevice')}} +   {{$t('drivingassistancefunctionindicatorsignaldevice')}} - {{$t('steerinwheelreleaseindicatorsignaldevice')}} +   {{$t('steerinwheelreleaseindicatorsignaldevice')}} - {{$t('driverattentionindicatorsignaldevice')}} +   {{$t('driverattentionindicatorsignaldevice')}} - {{$t('automaticDrivingDataRecordingSystem')}} +   {{$t('automaticDrivingDataRecordingSystem')}} - {{$t('eventdatarecordingsystem')}} +   {{$t('eventdatarecordingsystem')}}
@@ -212,7 +212,7 @@
{{$t('ParameterName')}} - {{item.ParameterName}} +   {{item.ParameterName}}
@@ -295,7 +295,7 @@ export default { radioList:9, url: { exportData: '/ota/otaBaCxJsfzbacs/exportData', - importZipUrl: '/ota/otaBaCxJsfzbacs/importData',//导入 + importZipUrl: '/ota/otaBaCxJsfzbacs/importData?otaId=' + localStorage.getItem('otaId'),//导入 }, dataSource: [ { diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue index a4de6370e..398a0da8a 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue @@ -63,7 +63,7 @@ import ImportFile from '@/components/ImportFileData/index' return { url: { exportData: '/ota/otaBaCxAqcs/exportData', - importZipUrl: '/ota/otaBaCxAqcs/importData',//导入 + importZipUrl: '/ota/otaBaCxAqcs/importData?otaId=' + localStorage.getItem('otaId'),//导入 }, dataSource: [ { diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue index 5e3e7c5a2..7485d89bd 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue @@ -46,7 +46,7 @@ export default { return { url: { exportData: '/ota/otaBaCxZxsjyq/exportData', - importZipUrl: '/ota/otaBaCxZxsjyq/importData',//导入 + importZipUrl: '/ota/otaBaCxZxsjyq/importData?otaId=' + localStorage.getItem('otaId'),//导入 }, dataSource: [ { diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue index 5121c9a8e..09b03809d 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue @@ -120,7 +120,7 @@ import uploadFileOta from '@/components/uploadFileOta/file' return { url: { exportData: '/ota/otaBaCxKsjxtmccs/exportData', - importZipUrl: '/ota/otaBaCxKsjxtmccs/importData',//导入 + importZipUrl: '/ota/otaBaCxKsjxtmccs/importData?otaId=' + localStorage.getItem('otaId'),//导入 }, fileList:'', dataSource: [ diff --git a/jero-web/src/views/otamanagement/vehicleinformation/index.vue b/jero-web/src/views/otamanagement/vehicleinformation/index.vue index c91ca4f3b..503940a48 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/index.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/index.vue @@ -53,7 +53,7 @@ class="table" :columns="columnshistory" :pagination="false" - :scroll="{x: '100%', y: 400}" + :scroll="{x: '100%', y: 'calc(100vh - 330px)'}" :data-source="dataSourcehistory" :loading="loading" > From 546bc81c86453e238134e9acd089cb9f43d78e39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Mon, 27 Mar 2023 10:57:51 +0800 Subject: [PATCH 360/645] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=B8=AD=E5=BF=83-?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B3=95=E8=A7=84=E4=BB=BB=E5=8A=A1-?= =?UTF-8?q?=E8=8B=B1=E6=96=87=E7=89=88=E6=9C=AC-=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E5=88=97=E6=B2=A1=E6=9C=89=E5=AF=B9=E9=BD=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/circulationHistory.vue | 5 +++++ .../components/taskCirculationHistory.vue | 8 ++++++-- .../components/referenceDeliverablesList.vue | 18 +++++++++++++----- .../components/dealtWith.vue | 6 +++--- 4 files changed, 27 insertions(+), 10 deletions(-) diff --git a/jero-web/src/views/processCenter/components/circulationHistory.vue b/jero-web/src/views/processCenter/components/circulationHistory.vue index 285a5462e..8244fd372 100644 --- a/jero-web/src/views/processCenter/components/circulationHistory.vue +++ b/jero-web/src/views/processCenter/components/circulationHistory.vue @@ -47,18 +47,21 @@ title: this.$t('OperationNode'), dataIndex: 'name', align: 'left', + ellipsis: true, width:200, }, { title: this.$t('Operator'), dataIndex: 'assignee', align: 'left', + ellipsis: true, width:200, }, { title: this.$t('result'), dataIndex: 'approvalResult', align: 'left', + ellipsis: true, width:200, scopedSlots: { customRender: 'approvalResult' } }, @@ -66,6 +69,7 @@ title: this.$t('opinion'), dataIndex: 'approvalOpinion', align: 'left', + ellipsis: true, width:200, }, { @@ -73,6 +77,7 @@ dataIndex: 'createTime', align: 'left', width:200, + ellipsis: true, customRender: function(t, r, index) { return moment(t).format('YYYY-MM-DD HH:mm:ss') } diff --git a/jero-web/src/views/processCenter/components/taskCirculationHistory.vue b/jero-web/src/views/processCenter/components/taskCirculationHistory.vue index c0018a077..e0518337c 100644 --- a/jero-web/src/views/processCenter/components/taskCirculationHistory.vue +++ b/jero-web/src/views/processCenter/components/taskCirculationHistory.vue @@ -15,7 +15,7 @@ :data-source="dataSource" :columns="columns" > - + {{text}} @@ -49,18 +49,21 @@ title: this.$t('OperationNode'), dataIndex: 'name', align: 'left', + ellipsis: true, width: 470 }, { title: this.$t('Operator'), dataIndex: 'assignee', align: 'left', + ellipsis: true, width: 270 }, { title: this.$t('result'), dataIndex: 'reviewResult', align: 'left', + ellipsis: true, scopedSlots: { customRender: 'reviewResult' }, width: 270 }, @@ -68,14 +71,15 @@ title: this.$t('opinion'), dataIndex: 'approvalOpinion', align: 'left', + ellipsis: true, width: 270 }, { title: this.$t('operationTime'), dataIndex: 'createTime', align: 'left', + ellipsis: true, width: 200, - fixed: 'right' } ], downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download' diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/referenceDeliverablesList.vue b/jero-web/src/views/projectManagement/components/certificationList/components/referenceDeliverablesList.vue index 642b23e65..4098e6e3b 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/referenceDeliverablesList.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/referenceDeliverablesList.vue @@ -88,7 +88,7 @@ align: 'left', ellipsis: true, width: 223 - }, + } ], dataList: [], content: [], @@ -96,7 +96,7 @@ pageNo: 1, pageSize: 10, total: 0, - ids:'', + ids: '' } }, mounted() { @@ -165,19 +165,27 @@ }).then((res) => { if (res.success) { this.confirmLoading = false - this.$message.success(this.$t('OperationSuccessful')) + if (res.result) { + this.$message.warning(res.result) + } else { + this.$message.success(this.$t('OperationSuccessful')) + } this.visible = false this.selectedRowKeys = [] this.$emit('referenceDeliverablesListForm') } else { - this.$message.warning(this.$t('operationFailed')) + if (res.result) { + this.$message.warning(res.result) + } else { + this.$message.warning(this.$t('operationFailed')) + } this.confirmLoading = false } }) } else { this.$message.warning(this.$t('selectLeastOne')) } - }, + } } } diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue index a8fbd1fcf..f358d744f 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue @@ -78,7 +78,7 @@ dataIndex: 'projectName', ellipsis: true, scopedSlots: { customRender: 'RelatedItems' }, - width: 110 + width: 150 }, { title: this.$t('standardInformation'), @@ -121,7 +121,7 @@ align: 'left', dataIndex: 'endTime', ellipsis: true, - width: 110, + width: 160, scopedSlots: { customRender: 'endTime' } }, // { @@ -136,7 +136,7 @@ title: this.$t('operation'), align: 'left', fixed: 'right', - width: 80, + width: 120, scopedSlots: { customRender: 'operation' } } ], From d57248b15b6eafbc66497b4f7647d8ea5006a3f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Mon, 27 Mar 2023 11:03:24 +0800 Subject: [PATCH 361/645] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=B8=AD=E5=BF=83-?= =?UTF-8?q?=E8=BD=AC=E5=8A=9E=E6=97=B6-=E5=8F=AA=E8=83=BD=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E4=B8=80=E4=B8=AA=E4=BA=BA=EF=BC=9B=20=E8=B4=A3?= =?UTF-8?q?=E4=BB=BB=E4=BA=BA=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/listOfRegulations.vue | 18 ++++++++++++++---- .../components/SentList.vue | 4 ++-- .../components/dealtWith.vue | 4 ++-- .../components/doneList.vue | 4 ++-- 4 files changed, 20 insertions(+), 10 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index ce68da751..da433c8e8 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -1279,7 +1279,7 @@ isDisplay: false, flowType: 2, Sponsor: 'regulationOwnerName', - personLiable: 'designDutyName', + personLiable: 'designDutyIdName', typeOfDeliverables: 'designDeliverableTypeName', deliverableTemplate: 'designDeliverableTemplate', DueDate: 'designDueDate', @@ -1309,7 +1309,7 @@ flowType: 4, isDisplay: false, Sponsor: 'regulationOwnerName', - personLiable: 'verifyDutyName', + personLiable: 'verifyDutyIdName', typeOfDeliverables: 'verifyDeliverableTypeName', deliverableTemplate: 'verifyDeliverableTemplate', DueDate: 'verifyDueDate', @@ -1685,13 +1685,23 @@ let _this = this let selectedRowKeys = JSON.parse(JSON.stringify(_this.selectedRowKeys)) let isTrue + let content = [] for (let i = 0; i < this.dataSource.length; i++) { for (let j = 0; j < selectedRowKeys.length; j++) { if (this.dataSource[i].id == selectedRowKeys[j]) { - isTrue = true + content.push(this.dataSource[i]) } } } + for (let i = 0; i < content.length; i++) { + if (content[i].designFlowStatus == 'List to be released' && + content[i].verifyFlowStatus == 'List to be released') { + isTrue = false + + } else { + isTrue = true + } + } if (isTrue) { this.changeInterface(selectedRowKeys) } @@ -2559,7 +2569,7 @@ }, download(item) { downloadFile('/sys/common/downLoadFile', item.fileName, { id: item.id, userName: this.userInfo().username }) - }, + } } } diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue index 9c6ba1c7d..c547327ad 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue @@ -242,7 +242,7 @@ isDisplay: false, flowType: 2, Sponsor: 'regulationOwnerName', - personLiable: 'designDutyName', + personLiable: 'designDutyIdName', typeOfDeliverables: 'designDeliverableTypeName', deliverableTemplate: 'designDeliverableTemplate', DueDate: 'designDueDate', @@ -310,7 +310,7 @@ flowType: 4, isDisplay: false, Sponsor: 'regulationOwnerName', - personLiable: 'verifyDutyName', + personLiable: 'verifyDutyIdName', typeOfDeliverables: 'verifyDeliverableTypeName', deliverableTemplate: 'verifyDeliverableTemplate', DueDate: 'verifyDueDate', diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue index f358d744f..cf7ab0361 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue @@ -297,7 +297,7 @@ isDisplay: true, flowType: 2, Sponsor: 'regulationOwnerName', - personLiable: 'designDutyName', + personLiable: 'designDutyIdName', typeOfDeliverables: 'designDeliverableTypeName', deliverableTemplate: 'designDeliverableTemplate', DueDate: 'designDueDate', @@ -367,7 +367,7 @@ flowType: 4, isDisplay: true, Sponsor: 'regulationOwnerName', - personLiable: 'verifyDutyName', + personLiable: 'verifyDutyIdName', typeOfDeliverables: 'verifyDeliverableTypeName', deliverableTemplate: 'verifyDeliverableTemplate', DueDate: 'verifyDueDate', diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue index a6a52ff80..615696db6 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue @@ -237,7 +237,7 @@ isDisplay: false, flowType: 2, Sponsor: 'regulationOwnerName', - personLiable: 'designDutyName', + personLiable: 'designDutyIdName', typeOfDeliverables: 'designDeliverableTypeName', deliverableTemplate: 'designDeliverableTemplate', DueDate: 'designDueDate', @@ -304,7 +304,7 @@ flowType: 4, isDisplay: false, Sponsor: 'regulationOwnerName', - personLiable: 'verifyDutyName', + personLiable: 'verifyDutyIdName', typeOfDeliverables: 'verifyDeliverableTypeName', deliverableTemplate: 'verifyDeliverableTemplate', DueDate: 'verifyDueDate', From e7612a478c9cf1f7fb537f561766e9c2a3568804 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Mon, 27 Mar 2023 11:13:17 +0800 Subject: [PATCH 362/645] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=B8=AD=E5=BF=83-?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B3=95=E8=A7=84=E4=BB=BB=E5=8A=A1-?= =?UTF-8?q?=E5=8F=8D=E9=A6=88=E6=84=8F=E8=A7=81-=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=AE=BD=E5=BA=A6=E6=B2=A1=E6=9C=89=E5=9B=BA=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/processCenter/components/circulationHistory.vue | 2 +- .../processCenter/components/taskCirculationHistory.vue | 2 +- .../components/circulationHistory.vue | 8 +++++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/jero-web/src/views/processCenter/components/circulationHistory.vue b/jero-web/src/views/processCenter/components/circulationHistory.vue index 8244fd372..c852df760 100644 --- a/jero-web/src/views/processCenter/components/circulationHistory.vue +++ b/jero-web/src/views/processCenter/components/circulationHistory.vue @@ -11,7 +11,7 @@ ref="table" :loading="loading" :pagination="false" - :scroll="{x: true}" + :scroll="{x: '100%'}" :data-source="dataSource" :columns="columns" > diff --git a/jero-web/src/views/processCenter/components/taskCirculationHistory.vue b/jero-web/src/views/processCenter/components/taskCirculationHistory.vue index e0518337c..9496a5adc 100644 --- a/jero-web/src/views/processCenter/components/taskCirculationHistory.vue +++ b/jero-web/src/views/processCenter/components/taskCirculationHistory.vue @@ -11,7 +11,7 @@ :components="drag(columns,'columns')" :loading="loading" :pagination="false" - :scroll="{x: true}" + :scroll="{x: '100%'}" :data-source="dataSource" :columns="columns" > diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue index 6440c1f4d..a4fdce5b5 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue @@ -30,9 +30,10 @@
@@ -104,7 +105,7 @@ title: this.$t('Operator'), dataIndex: 'assignee', align: 'left', - width: 200, + width: 120, ellipsis: true }, { @@ -128,7 +129,7 @@ title: this.$t('resultofhandling'), dataIndex: 'operatorResultName', align: 'left', - width: 200, + width: 160, ellipsis: true, }, { @@ -246,6 +247,7 @@ \ No newline at end of file diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue index 922689d45..250e8cca1 100644 --- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue +++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue @@ -317,7 +317,7 @@ {{$t('submit')}}
- +
From 4d950e242e6aaba67cb1f4dd95775b1f063df69c Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Mon, 27 Mar 2023 15:11:54 +0800 Subject: [PATCH 384/645] bug67205 --- jero-web/src/components/uploadFileOta/file.vue | 12 +++++++++++- .../components/beupgradedonline.vue | 8 ++++---- .../components/safetyPrecautions.vue | 2 +- .../vehicleinformation/components/upgradedonline.vue | 4 ++-- .../otamanagement/vehicleregistration/index.vue | 2 +- 5 files changed, 19 insertions(+), 9 deletions(-) diff --git a/jero-web/src/components/uploadFileOta/file.vue b/jero-web/src/components/uploadFileOta/file.vue index 510dc1a4c..d61721059 100644 --- a/jero-web/src/components/uploadFileOta/file.vue +++ b/jero-web/src/components/uploadFileOta/file.vue @@ -34,7 +34,7 @@ export default { name: 'file', - props: ['disableds', 'disabled', 'thisFileUploadUrl', 'readonly', 'thisFileType', 'isUploadFile', 'isMultiple', 'restrictUploads', 'Uploadable'], + props: ['disableds', 'disabled','acceptcode', 'thisFileUploadUrl', 'readonly', 'thisFileType', 'isUploadFile', 'isMultiple', 'restrictUploads', 'Uploadable'], data() { return { visible: false, @@ -88,6 +88,16 @@ // let thisFileType = this.thisFileType.replace(/\s+/g, ""); console.log(file) this.fileTypeSatus = true + //根据格式拦截 + if(this.acceptcode){ + let fileNames = file.name.split('.') + let fileType = fileNames[fileNames.length - 1].toLocaleLowerCase() + let extList = this.acceptcode.split(',') + if (!extList.find((item) => item == fileType)) { + this.$message.error(this.$t('uploadOnly') + this.acceptcode + this.$t('type')) + return false + } + } if (this.isMultiple) { if ((this.myfileList && this.myfileList.length == 1) || this.myfileList && this.myfileList.length > 1) { this.$message.warning(this.$t('onlyOnefileUploaded')) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue index 8cf9c9cf3..6d1537b41 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue @@ -50,13 +50,13 @@ - + - + - + @@ -103,7 +103,7 @@ {{$t('last')}} {{$t('next')}}
- +
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue index 66653b1ed..2690dc4a0 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue @@ -47,7 +47,7 @@ {{$t('last')}} {{$t('next')}}
- +
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue index 9d3871bec..5f4f216e0 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue @@ -32,7 +32,7 @@ - + @@ -99,7 +99,7 @@ {{$t('next')}}
- +
diff --git a/jero-web/src/views/otamanagement/vehicleregistration/index.vue b/jero-web/src/views/otamanagement/vehicleregistration/index.vue index dd41cd958..84613bcec 100644 --- a/jero-web/src/views/otamanagement/vehicleregistration/index.vue +++ b/jero-web/src/views/otamanagement/vehicleregistration/index.vue @@ -104,7 +104,7 @@ {{ $t('datamaintenance') }}
- +
From 8cee573d994e0abc3058c1d662860ea9759e9c2c Mon Sep 17 00:00:00 2001 From: yuekuo Date: Mon, 27 Mar 2023 15:12:37 +0800 Subject: [PATCH 385/645] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/upgradetargetmodel.vue | 13 +++++++---- .../components/recordparameters.vue | 22 +++++++++++-------- 2 files changed, 22 insertions(+), 13 deletions(-) diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue index 28cdc7401..c77924cae 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue @@ -10,6 +10,7 @@ {{$t('templateDownload')}}
+ @@ -58,7 +59,7 @@
-
+
{{$t('Modelandfunctionrecord')}}
@@ -288,9 +289,9 @@ import ImportFile from '@/components/ImportFileData/index' font-weight: 500; font-size: 14px; margin-right: 16px; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; + // overflow: hidden; + // text-overflow: ellipsis; + // white-space: nowrap; height: 42px; line-height: 42px; margin-top: 3px; @@ -336,4 +337,8 @@ import ImportFile from '@/components/ImportFileData/index' .bootom-button{ text-align: center!important; } + .plus{ + margin-top: 5px; + line-height: 1.4 !important; + } \ No newline at end of file diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue index 7b337e867..f72635bab 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue @@ -1145,7 +1145,7 @@ button{ line-height: 50px; } .text-box-three{ - isplay: inline-block; + display: inline-block; float: left; border: #e8e8e8 solid 1px; width: 100%; @@ -1153,7 +1153,7 @@ button{ line-height: 250px; } .text-box-four{ - isplay: inline-block; + display: inline-block; float: left; border: #e8e8e8 solid 1px; width: 100%; @@ -1161,15 +1161,18 @@ button{ line-height: 600px; } .four-text-text{ - isplay: inline-block; + display: inline-block; float: left; border: #e8e8e8 solid 1px; width: 50%; height: 600px; - line-height: 600px; + line-height: 20px; + display: flex; + justify-content: center; + align-items: center; } .four-text{ - isplay: inline-block; + display: inline-block; float: left; border: #e8e8e8 solid 1px; width: 50%; @@ -1177,7 +1180,7 @@ button{ line-height: 150px; } .text-box-five{ - isplay: inline-block; + display: inline-block; float: left; border: #e8e8e8 solid 1px; width: 100%; @@ -1185,9 +1188,10 @@ button{ line-height: 100px; } span{ - overflow: hidden; /*超出部分隐藏*/ - text-overflow: ellipsis; /*超出部分省略号表示*/ - white-space: nowrap; + /* overflow: hidden; /*超出部分隐藏*/ + /* text-overflow: ellipsis; 超出部分省略号表示 */ + white-space: wrap; + /* word-wrap: normal; */ } .item-input{ margin-top: 9px; From fb45ce36c6a8d74a881d2001267b348884bb6570 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Mon, 27 Mar 2023 15:32:12 +0800 Subject: [PATCH 386/645] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95-?= =?UTF-8?q?=E6=92=A4=E5=9B=9E=E4=B8=8D=E7=AC=A6=E5=90=88=E7=9A=84=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E8=BF=9B=E8=A1=8C=E6=8F=90=E7=A4=BA;=20=E6=B3=95?= =?UTF-8?q?=E8=A7=84=E6=B8=85=E5=8D=95-=E6=B3=95=E8=A7=84=E5=B7=A5?= =?UTF-8?q?=E7=A8=8B=E5=B8=88-=E4=B8=8D=E5=A1=AB=E5=86=99=E7=AC=A6?= =?UTF-8?q?=E5=90=88=E6=80=A7=E6=B5=81=E7=A8=8B=E7=9A=84=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E8=AF=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 3 ++- .../projectManagement/components/listOfRegulations.vue | 6 ++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index b64ce7989..4731695af 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1719,4 +1719,5 @@ module.exports = { note:'Note: The attachment includes the list of test items and test report. Test standard or technical specification', format:'It supports doc/docx/pdf format and is less than 50M in size', cantTransferToYourself:"Can't transfer to yourself", + theDataYouInitiate:'The data you selected does not meet the process initiation criteria. Please recheck and initiate', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 1aa0154f3..3b05b3e70 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -77,7 +77,7 @@ module.exports = { yes: '是', not: '否', have:'有', - + notOnlyRz: '否', EnterValue: '请输入值', SavedQuery: '保存的查询', @@ -1821,4 +1821,5 @@ module.exports = { note:'注:附件包括测试项目清单、测试报告．测试标准或技术规范', format:'支持doc/docx/pdf格式,大小50M以内', cantTransferToYourself:"不能转办给自己", + theDataYouInitiate:'您所选的数据，均不符合流程发起条件，请重新检查后发起', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 8053df156..ac361119e 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -1528,7 +1528,7 @@ _this.selectedRowKeys = [] _this.getList() if (detailedWarningList && detailedWarningList.length > 0) { - this.promptInformation(detailedWarningList) + _this.promptInformation(detailedWarningList) } } else { _this.$message.warning(_this.$t('operationFailed')) @@ -2389,9 +2389,11 @@ _this.detailedWarningList.push( < div > { dataList[i].serialNumber + _this.$t('pleaseSelectTheDataverificationVerified') } < /div>) } + } if (this.requestsNum == 0) { - _this.promptInformation(_this.detailedWarningList) + this.$message.warning(_this.$t('theDataYouInitiate')) + // _this.promptInformation(_this.detailedWarningList) this.JTextLoading = false } }, From 2c87e4a12b7e392a5db22a4b0b74e8b7fe373fe4 Mon Sep 17 00:00:00 2001 From: yuekuo Date: Mon, 27 Mar 2023 15:32:52 +0800 Subject: [PATCH 387/645] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E5=A4=87=E6=A1=88=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/zh-cn.js | 8 +++--- .../auxiliaryupgradehavechanged.vue | 26 ++----------------- .../thetargetvehicleofthisupgrade.vue | 1 + .../components/upgradehavechanged.vue | 2 +- .../components/upgradeimpactassessment.vue | 17 ++++++++---- .../components/usernotification.vue | 5 +++- 6 files changed, 24 insertions(+), 35 deletions(-) diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 1aa0154f3..93b2e98a9 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1618,7 +1618,7 @@ module.exports = { thetargetvehicleofthisupgrade:'本次升级的目标车辆', upgradeimpactassessment:'升级影响评估', upgradehavechanged:'本次升级的系统名称与参数变化', - auxiliaryupgradehavechanged:'本次升级的架势辅助功能名称与参数变化', + auxiliaryupgradehavechanged:'本次升级的驾驶辅助功能名称与参数变化', usernotification:'用户告知内容及方式', informationaboutotherupgradetasks:'其他升级任务信息', totalquantity:'总数量（辆）', @@ -1735,7 +1735,7 @@ module.exports = { upgradeactivitiesaffectvehiclesafety:'升级活动是否影响车辆安全', upgradeactivityprovidesuserconfirmationoptions:'升级活动是否提供用户确认选项', upgradepackagetest:'升级包测试(可多选)', - reliabilityofonlineupgradeactivities:'是杏已验证确认在线升级活动的安全性和可靠性', + reliabilityofonlineupgradeactivities:'是否已验证确认在线升级活动的安全性和可靠性', adjustmentofchangedBulletinparameters:'已变更《公告》参数的对应调整（如有）', preupgrade:'升级前', afterupgrade:'升级后', @@ -1746,8 +1746,8 @@ module.exports = { beforetheOSversionupgraded:'操作系统版本号升级前', aftertheoperatingsystemversionupgraded:'操作系统版本号升级后', initialpackageforintegrityinflammatorydata:'初始软件包的完整性验证数据（需统一哈希算法并说明，例如SM3：d192e819d6990624f40e3585106ee134）', - upgradepackageintegrityverificationdata:'升级包完整性验证数据', - upgradepackagesize:'升级包大小', + upgradepackageintegrityverificationdata:'升级包完整性验证数据（需统一哈希算法并说明，例如SM3：d192e819d6990624f40e3585106ee134）', + upgradepackagesize:'升级包大小（MB）', differentialupgradeornot:'是否差分升级', upgradedestinationype:'升级目的类型', functionalchangedescription:'功能变更描述', diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue index 22bcac59c..04e659072 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue @@ -43,18 +43,13 @@ - - - - - - + {{$t('add')}} - {{$t('delete')}} + {{$t('delete')}}
@@ -155,23 +150,6 @@ export default { width: 170, scopedSlots: { customRender: 'upgradetheelectroniccontrollerinvolved' }, }, - { - title: this.$t('functiondescription'), - align: 'left', - dataIndex: 'functiondescription', - ellipsis: true, - width: 170, - scopedSlots: { customRender: 'functiondescription' }, - }, - { - title: this.$t('applicationconditions'), - align: 'left', - dataIndex: 'applicationconditions', - ellipsis: true, - width: 170, - scopedSlots: { customRender: 'applicationconditions' }, - }, - { title: this.$t('operation'), align: 'left', diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue index 161896a0e..379e1167e 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue @@ -79,6 +79,7 @@ formInline.VINcodelist == null) ? $t('clickUpload') : $t('viewUploadedFiles') }} +

支持cxv格式，大下20M以内，数量1-10个

diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue index 4193f643a..cd4a3a125 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue @@ -63,7 +63,7 @@ {{$t('addcontroller')}} - {{$t('delete')}} + {{$t('delete')}}
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue index 14424544b..6905c3bfe 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue @@ -478,8 +478,12 @@ this.$forceUpdate() border-bottom: none; vertical-align: top; overflow: hidden; /*超出部分隐藏*/ - text-overflow: ellipsis; /*超出部分省略号表示*/ - white-space: nowrap; + // text-overflow: ellipsis; /*超出部分省略号表示*/ + white-space: wrap; + display: flex; + // justify-content: center; + align-items: center; + line-height: 1.3; } //::v-deep .sider .ant-layout-sider .ant-layout-sider-dark{ // min-width: 723px !important; @@ -511,14 +515,17 @@ this.$forceUpdate() display: inline-block; width: 100%; height: 50px; - line-height: 50px; + line-height: 1.3; border: black solid 1px; vertical-align: top; border-right: none; border-bottom: none; overflow: hidden; /*超出部分隐藏*/ - text-overflow: ellipsis; /*超出部分省略号表示*/ - white-space: nowrap; + // text-overflow: ellipsis; /*超出部分省略号表示*/ + white-space: wrap; + display: flex; + // justify-content: center; + align-items: center; } .sider-span{ display: inline-block; diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue index 5a5717e53..58ccc5d5f 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue @@ -260,7 +260,10 @@ export default { display: flex; } - +h1{ + font-weight: 700; + font-style: 20px; +} .title-text-add { width: 440px; text-align: right; From 276fb7dd704e806a5fed5938dc0f131163c98fbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Mon, 27 Mar 2023 15:55:31 +0800 Subject: [PATCH 388/645] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95-?= =?UTF-8?q?=E6=92=A4=E5=9B=9E=E4=B8=8D=E7=AC=A6=E5=90=88=E7=9A=84=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E8=BF=9B=E8=A1=8C=E6=8F=90=E7=A4=BA;=20=E6=B3=95?= =?UTF-8?q?=E8=A7=84=E6=B8=85=E5=8D=95-=E6=B3=95=E8=A7=84=E5=B7=A5?= =?UTF-8?q?=E7=A8=8B=E5=B8=88-=E4=B8=8D=E5=A1=AB=E5=86=99=E7=AC=A6?= =?UTF-8?q?=E5=90=88=E6=80=A7=E6=B5=81=E7=A8=8B=E7=9A=84=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E8=AF=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 1 + .../components/certificationList/index.vue | 62 +++++++++++++------ .../components/listOfRegulations.vue | 21 ++++--- 4 files changed, 57 insertions(+), 28 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 4731695af..73cd82371 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1720,4 +1720,5 @@ module.exports = { format:'It supports doc/docx/pdf format and is less than 50M in size', cantTransferToYourself:"Can't transfer to yourself", theDataYouInitiate:'The data you selected does not meet the process initiation criteria. Please recheck and initiate', + dataWithProcessReleasedCannotBeReset:'Data with a process status of list to be released cannot be reset', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index a6a83d627..9369a1133 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1822,4 +1822,5 @@ module.exports = { format:'支持doc/docx/pdf格式,大小50M以内', cantTransferToYourself:"不能转办给自己", theDataYouInitiate:'您所选的数据，均不符合流程发起条件，请重新检查后发起', + dataWithProcessReleasedCannotBeReset:'流程状态为清单待发布的数据不能被重置', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue index 21166c48f..cf788bfe9 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -402,6 +402,7 @@ + {{ $t('Submitting') }} @@ -514,6 +515,7 @@ pageNo: 1, pageSize: 50, total: 0, + JTextLoading: false, CertificationColor: { 'Test passed': 'accordColor', 'Test failed': 'nonConformityColor', @@ -973,25 +975,49 @@ processResetClick() { let _this = this if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { - this.$confirm({ - content: _this.$t('confirmResetProcess'), - onOk() { - let idList = JSON.parse(JSON.stringify(_this.selectedRowKeys)) - postAction('/project/projectCertificationInventoryEO/resetFlow', { - ids: idList.join(','), - projectLibraryId: _this.$route.query.id, - operatorType: 'certificationInventoryStudioReset' - }).then((res) => { - if (res.success) { - _this.$message.success(_this.$t('OperationSuccessful')) - _this.selectedRowKeys = [] - _this.getList() - } else { - _this.$message.warning(res.message) - } - }) + let ids = [] + let notConditions = [] + for (let i = 0; i < this.selectedRowKeysList.length; i++) { + if (this.selectedRowKeysList[i].flowStatus == 'List to be released') { + notConditions.push(this.selectedRowKeysList[i].inspectionItem) + } else { + ids.push(this.selectedRowKeysList[i].id) } - }) + } + let data = '' + if (notConditions && notConditions.length > 0) { + data = this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('conditionsNotMet') + ',' + this.$t('dataWithProcessReleasedCannotBeReset') + } + if (ids && ids.length > 0) { + this.$confirm({ + content: _this.$t('confirmResetProcess'), + onOk() { + _this.JTextLoading = true + let idList = JSON.parse(JSON.stringify(_this.selectedRowKeys)) + postAction('/project/projectCertificationInventoryEO/resetFlow', { + ids: idList.join(','), + projectLibraryId: _this.$route.query.id, + operatorType: 'certificationInventoryStudioReset' + }).then((res) => { + if (res.success) { + _this.$message.success(_this.$t('OperationSuccessful')) + _this.selectedRowKeys = [] + _this.getList() + if (notConditions && notConditions.length > 0) { + _this.failedMessage(data) + } + _this.JTextLoading = false + } else { + _this.$message.warning(res.message) + _this.JTextLoading = false + } + }) + } + }) + } else { + this.failedMessage(data) + this.JTextLoading = false + } } else { this.$message.warning(this.$t('selectLeastOne')) } diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index ac361119e..7ab49a743 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -1689,19 +1689,20 @@ for (let i = 0; i < this.dataSource.length; i++) { for (let j = 0; j < selectedRowKeys.length; j++) { if (this.dataSource[i].id == selectedRowKeys[j]) { - content.push(this.dataSource[i]) + // content.push(this.dataSource[i]) + isTrue = true } } } - for (let i = 0; i < content.length; i++) { - if (content[i].designFlowStatus == 'List to be released' && - content[i].verifyFlowStatus == 'List to be released') { - isTrue = false - - } else { - isTrue = true - } - } + // for (let i = 0; i < content.length; i++) { + // if (content[i].designFlowStatus == 'List to be released' && + // content[i].verifyFlowStatus == 'List to be released') { + // isTrue = false + // + // } else { + // isTrue = true + // } + // } if (isTrue) { this.changeInterface(selectedRowKeys) } From 0e829b33040d11044d99909c553c9c23949b1d28 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Mon, 27 Mar 2023 16:05:27 +0800 Subject: [PATCH 389/645] bug 67300 bug 67307 bug 67303 --- .../components/maintenance.vue | 17 +++++++++--- .../otamanagement/upgradeactivity/index.vue | 4 +-- .../auxiliaryupgradehavechanged.vue | 2 +- .../thetargetvehicleofthisupgrade.vue | 2 +- .../components/upgradehavechanged.vue | 2 +- .../components/upgradeimpactassessment.vue | 2 +- .../components/upgradetargetmodel.vue | 2 +- .../components/usernotification.vue | 2 +- .../components/maintenance.vue | 26 +++++++++++++++---- .../vehicleregistration/index.vue | 6 ++--- 10 files changed, 45 insertions(+), 20 deletions(-) diff --git a/jero-web/src/views/otamanagement/upgradeactivity/components/maintenance.vue b/jero-web/src/views/otamanagement/upgradeactivity/components/maintenance.vue index 75237d8fc..0993686b4 100644 --- a/jero-web/src/views/otamanagement/upgradeactivity/components/maintenance.vue +++ b/jero-web/src/views/otamanagement/upgradeactivity/components/maintenance.vue @@ -41,7 +41,7 @@ :getCalendarContainer="(trigger) => trigger.parentNode" v-model="formInline.batjsj" :disabled="false" - style="width: 100%"/> + style="width: 90%"/>
@@ -52,9 +52,10 @@ {{$t('remarks')}}
- +
@@ -95,6 +96,9 @@ export default { trigger: 'change' } ], + bz: [ + { min: 1, max: 500, message: this.$t('cantExeed') + '500' + this.$t('characters'), trigger: 'blur' } + ] // listConfirmation: [ // { // required: true, @@ -154,6 +158,11 @@ export default { edit(row) { if(row instanceof Array){ this.ids = row.join(',') + this.formInline = { + bazt:undefined, + batjsj:'', + bz:'', + } }else{ this.formInline.bazt = row.bazt ? row.bazt : undefined this.formInline.batjsj = row.batjsj @@ -189,7 +198,7 @@ export default { }, handleCancel() { this.formInline = { - bazt:'', + bazt:undefined, batjsj:'', bz:'',} this.ids = '' @@ -274,7 +283,7 @@ export default { .box-input { display: inline-block; height: 38px; - width: 100%; + width: 90%; } .itemModel { diff --git a/jero-web/src/views/otamanagement/upgradeactivity/index.vue b/jero-web/src/views/otamanagement/upgradeactivity/index.vue index 7ac514e96..42ea1fcf1 100644 --- a/jero-web/src/views/otamanagement/upgradeactivity/index.vue +++ b/jero-web/src/views/otamanagement/upgradeactivity/index.vue @@ -111,7 +111,7 @@
+ :accept="'.zip'" @getList="getList"/>
- +
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue index 161896a0e..23fd852bf 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue @@ -3,7 +3,7 @@
- +
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue index 4193f643a..d9357c17f 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue @@ -3,7 +3,7 @@
- +
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue index 14424544b..2f91e3e28 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue @@ -3,7 +3,7 @@
- +
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue index c77924cae..bee003e7b 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue @@ -3,7 +3,7 @@
- +
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue index 5a5717e53..a226d99b5 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue @@ -3,7 +3,7 @@
- +
diff --git a/jero-web/src/views/otamanagement/vehicleregistration/components/maintenance.vue b/jero-web/src/views/otamanagement/vehicleregistration/components/maintenance.vue index 98267cd05..ddba93e87 100644 --- a/jero-web/src/views/otamanagement/vehicleregistration/components/maintenance.vue +++ b/jero-web/src/views/otamanagement/vehicleregistration/components/maintenance.vue @@ -20,6 +20,7 @@
@@ -40,7 +41,7 @@ format="YYYY-MM-DD" :getCalendarContainer="(trigger) => trigger.parentNode" v-model="formInline.batjsj" - style="width: 100%"/> + style="width: 90%"/>
@@ -51,9 +52,10 @@ {{$t('remarks')}}
- +
@@ -75,7 +77,7 @@ export default { visible: false, confirmLoading: false, formInline: { - bazt:'', + bazt:undefined, batjsj:'', bz:'', }, @@ -94,6 +96,9 @@ export default { trigger: 'change' } ], + bz: [ + { min: 1, max: 500, message: this.$t('cantExeed') + '500' + this.$t('characters'), trigger: 'blur' } + ] // designDeadline: [ // { // required: true, @@ -139,6 +144,11 @@ export default { edit(row) { if(row instanceof Array){ this.ids = row.join(',') + this.formInline = { + bazt:undefined, + batjsj:'', + bz:'', + } }else{ this.formInline.bazt = row.bazt ? row.bazt : undefined this.formInline.batjsj = row.batjsj @@ -172,9 +182,15 @@ export default { } }) }, + selectchange(value){ + this.$nextTick(() => { + this.formInline = { ...this.formInline } + this.$refs.ruleForm.validateField('bazt') + }) + }, handleCancel() { this.formInline = { - bazt:'', + bazt:undefined, batjsj:'', bz:'',} this.ids = '' @@ -259,7 +275,7 @@ export default { .box-input { display: inline-block; height: 38px; - width: 100%; + width: 90%; } .itemModel { diff --git a/jero-web/src/views/otamanagement/vehicleregistration/index.vue b/jero-web/src/views/otamanagement/vehicleregistration/index.vue index 84613bcec..9ddc8ef68 100644 --- a/jero-web/src/views/otamanagement/vehicleregistration/index.vue +++ b/jero-web/src/views/otamanagement/vehicleregistration/index.vue @@ -6,10 +6,10 @@
-
- {{ $t('upgraderegistrationnumber') }} +
+ {{ $t('registrationnumber') }}
-
From eafadad14f0f669c8c4bd4c700fe36f8ebb5fcdc Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Mon, 27 Mar 2023 16:08:19 +0800 Subject: [PATCH 390/645] =?UTF-8?q?66924=20=E8=AE=A4=E8=AF=81=E6=B8=85?= =?UTF-8?q?=E5=8D=95-=E6=96=B0=E5=A2=9E=E3=80=81=E8=B0=83=E5=8F=96?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=94=AF=E4=B8=80=E6=A0=A1=E9=AA=8C=EF=BC=8C?= =?UTF-8?q?=E4=B8=8E=E5=BD=93=E5=89=8D=E9=A1=B9=E7=9B=AE=E5=BA=93=E6=B3=95?= =?UTF-8?q?=E8=A7=84=E6=B8=85=E5=8D=95=E6=B3=95=E8=A7=84=E7=BC=96=E5=8F=B7?= =?UTF-8?q?=E5=AF=B9=E6=AF=94=E6=A0=A1=E9=AA=8C=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...rojectCertificationInventoryEOService.java | 8 + ...ctCertificationInventoryEOServiceImpl.java | 142 ++++++++++++++++-- 2 files changed, 135 insertions(+), 15 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java index 3a6b6e9e9..a9011b79f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java @@ -226,4 +226,12 @@ public interface IProjectCertificationInventoryEOService extends IService projectCertificationInventoryEOS,String templeteId,List userIdList,List userInfoList); + + /** + * 数据唯一校验。 + * @param projectCertificationInventoryEOList + * @param cut + * @return + */ + List dataUniqueCheck(List projectCertificationInventoryEOList, String cut,List result); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index 0d91c75d2..cc1ad52c3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -128,6 +128,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl batchAdd(JSONObject json) { + String cut = json.getString("cut"); + List result = new ArrayList<>(); + if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + result.add("添加成功！"); + }else { + result.add("Successfully added！"); + } try { String serialNumber = json.getString("serialNumber"); String wvtaId = json.getString("wvtaId"); String bussDocumentLibraryId = json.getString("bussDocumentLibraryId"); String projectLibraryId = json.getString("projectLibraryId"); + JSONArray dataList = json.getJSONArray("dataList"); List projectCertificationInventoryEOList = new ArrayList<>(); ProjectCertificationInventoryEO projectCertificationInventoryEO = null; @@ -310,13 +320,15 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl saveDataList = this.dataUniqueCheck(projectCertificationInventoryEOList,cut,result); - if(CollectionUtils.isNotEmpty(projectCertificationInventoryEOList)){ - this.saveBatch(projectCertificationInventoryEOList); + if(CollectionUtils.isNotEmpty(saveDataList)){ + this.saveBatch(saveDataList); LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); List projectCertificationInventoryLogEOList = new ArrayList<>(); - for (ProjectCertificationInventoryEO certificationInventoryEO : projectCertificationInventoryEOList) { + for (ProjectCertificationInventoryEO certificationInventoryEO : saveDataList) { StringBuilder contentCnSb = new StringBuilder(); contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" 添加了 "); contentCnSb.append("\"").append(certificationInventoryEO.getCategory()).append("\"").append(" "); @@ -343,7 +355,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl dataUniqueCheck(List projectCertificationInventoryEOList, String cut,List result) { + List pciSaveList = new ArrayList<>(); + + List allDataList = this.list(); + // 重复数据数组 + List duplicateDataList = allDataList.stream().filter(data -> { + boolean flag = false; + for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) { + boolean categoryFlag = StringUtils.equals(projectCertificationInventoryEO.getCategory(), data.getCategory()); + boolean inspectionItemFlag = StringUtils.equals(projectCertificationInventoryEO.getInspectionItem(), data.getInspectionItem()); + boolean configItemFlag = StringUtils.equals(projectCertificationInventoryEO.getConfigItem(), data.getConfigItem()); + boolean serialNumberFlag = StringUtils.equals(projectCertificationInventoryEO.getSerialNumber(), data.getSerialNumber()); + boolean dutyTerritoryFlag = StringUtils.equals(projectCertificationInventoryEO.getDutyTerritory(), data.getDutyTerritory()); + // 类别+检验项目+配置项+编号+责任领域 作为唯一检验 + if(categoryFlag && inspectionItemFlag && configItemFlag && serialNumberFlag && dutyTerritoryFlag){ + flag = true; + } + } + return flag; + }).collect(Collectors.toList()); + if(CollectionUtils.isNotEmpty(duplicateDataList)){ + if (StringUtils.equals(cut, CutEnum.CN.getValue())) { + result.add("您所选的数据中包含当前项目中已包含的条目信息，已为您过滤添加。"); + }else { + result.add("The data you have selected contains item information already included in the current project, which has been filtered and added for you."); + } + } + + // 过滤重复的数据 + pciSaveList = projectCertificationInventoryEOList.stream().filter(pciEO -> { + boolean flag = true; + for (ProjectCertificationInventoryEO allData : allDataList) { + boolean categoryFlag = StringUtils.equals(pciEO.getCategory(), allData.getCategory()); + boolean inspectionItemFlag = StringUtils.equals(pciEO.getInspectionItem(), allData.getInspectionItem()); + boolean configItemFlag = StringUtils.equals(pciEO.getConfigItem(), allData.getConfigItem()); + boolean serialNumberFlag = StringUtils.equals(pciEO.getSerialNumber(), allData.getSerialNumber()); + boolean dutyTerritoryFlag = StringUtils.equals(pciEO.getDutyTerritory(), allData.getDutyTerritory()); + // 类别+检验项目+配置项+编号+责任领域 作为唯一检验 + if(categoryFlag && inspectionItemFlag && configItemFlag && serialNumberFlag && dutyTerritoryFlag){ + flag = false; + break; + } + } + return flag; + }).collect(Collectors.toList()); + return pciSaveList; + } + @Override public void importDisposeData(List datas, String cut) { if(CollectionUtils.isNotEmpty(datas)){ @@ -2585,6 +2652,14 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl callAdd(JSONObject json) { + String cut = json.getString("cut"); + List result = new ArrayList<>(); + if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + result.add("调取成功!"); + }else { + result.add("Successfully retrieved!"); + } + String authDummyInventoryBaseId = json.getString("authDummyInventoryBaseId"); if(StringUtils.isEmpty(authDummyInventoryBaseId)){ throw new JeroBootException("请选择一个认证虚拟清单进行操作！"); @@ -2602,21 +2677,58 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl authDummyInventoryInfoEOList = this.authDummyInventoryInfoEOService.list(authDummyInfoQueryWrap); if(CollectionUtils.isNotEmpty(authDummyInventoryInfoEOList)){ - List projectCertificationInventoryEOList = new ArrayList<>(); - for (AuthDummyInventoryInfoEO authDummyInventoryInfoEO : authDummyInventoryInfoEOList) { - ProjectCertificationInventoryEO projectCertificationInventoryEOTemp = new ProjectCertificationInventoryEO(); - BeanUtils.copyProperties(authDummyInventoryInfoEO,projectCertificationInventoryEOTemp); + QueryWrapper lawsInventoryEOQueryWrap = new QueryWrapper<>(); + lawsInventoryEOQueryWrap.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectLibraryId); + List projectLawsInventoryEOList = this.projectLawsInventoryEOService.list(lawsInventoryEOQueryWrap); - projectCertificationInventoryEOTemp.setId(UUID.randomUUID().toString().replace("-", "")); - projectCertificationInventoryEOTemp.setProjectLibraryId(projectLibraryId); - projectCertificationInventoryEOTemp.setFlowStatus(CertificationInventoryFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()); - projectCertificationInventoryEOList.add(projectCertificationInventoryEOTemp); + List projectCertificationInventoryEOList = new ArrayList<>(); + + List noSerialNumberList = new ArrayList<>(); + + for (AuthDummyInventoryInfoEO authDummyInventoryInfoEO : authDummyInventoryInfoEOList) { + if(CollectionUtils.isEmpty(projectLawsInventoryEOList)){ + break; + } + + // 根据选择调取的数据法规编号，跟当前项目中 法规清单数据法规编号对比，如果有，则加入，如果没有，则不加入。 + List lawsInventoryEOListTemp = projectLawsInventoryEOList.stream().filter(lawsInventoryEO -> { + boolean flag = false; + if (StringUtils.equals(authDummyInventoryInfoEO.getSerialNumber(), lawsInventoryEO.getSerialNumber())) { + flag = true; + } + return flag; + }).collect(Collectors.toList()); + + if(CollectionUtils.isNotEmpty(lawsInventoryEOListTemp)){ + ProjectCertificationInventoryEO projectCertificationInventoryEOTemp = new ProjectCertificationInventoryEO(); + BeanUtils.copyProperties(authDummyInventoryInfoEO,projectCertificationInventoryEOTemp); + + projectCertificationInventoryEOTemp.setId(UUID.randomUUID().toString().replace("-", "")); + projectCertificationInventoryEOTemp.setProjectLibraryId(projectLibraryId); + projectCertificationInventoryEOTemp.setFlowStatus(CertificationInventoryFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()); + projectCertificationInventoryEOList.add(projectCertificationInventoryEOTemp); + }else { + noSerialNumberList.add(authDummyInventoryInfoEO.getSerialNumber()); + } } - this.saveBatch(projectCertificationInventoryEOList); + + + if(CollectionUtils.isNotEmpty(noSerialNumberList)){ + // 判断调取的数据中，是否有 在当前项目库法规清单中 没有的编号 + if (StringUtils.equals(cut, CutEnum.CN.getValue())) { + result.add("您所选的数据中包含当前项目中不包含的法规编号信息，已为您过滤添加。"); + }else { + result.add("The data you have selected contains regulatory number information that is not included in the current project, and has been filtered and added for you."); + } + } + + List saveDataList = this.dataUniqueCheck(projectCertificationInventoryEOList, cut, result); + + this.saveBatch(saveDataList); Date now = new Date(); //设置权限 先删后加 List adds = new ArrayList<>(); - for (ProjectCertificationInventoryEO pci: projectCertificationInventoryEOList) { + for (ProjectCertificationInventoryEO pci: saveDataList) { if (ObjectUtils.isNotEmpty(pci.getSdt())) { setProjectCertificationInventoryPermission(pci.getSdt(), pci.getProjectLibraryId(), pci.getId(), now, adds, ProjectUserLocationEnum.PROJECT_CERTIFICATION_INVENTORY_SDT.getValue()); } @@ -2629,7 +2741,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl Date: Mon, 27 Mar 2023 16:10:22 +0800 Subject: [PATCH 391/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ota/controller/OtaBaCxListController.java | 1 + .../ota/service/IOtaBaCxAqcsService.java | 3 + .../ota/service/IOtaBaCxJbxxService.java | 3 + .../ota/service/IOtaBaCxJsfzbacsService.java | 3 + .../ota/service/IOtaBaCxKsjjsmccsService.java | 3 + .../ota/service/IOtaBaCxKsjxtmccsService.java | 3 + .../ota/service/IOtaBaCxListService.java | 2 +- .../ota/service/IOtaBaCxZxsjyqService.java | 3 + .../service/impl/OtaBaCxAqcsServiceImpl.java | 6 ++ .../service/impl/OtaBaCxJbxxServiceImpl.java | 11 ++- .../impl/OtaBaCxJsfzbacsServiceImpl.java | 6 ++ .../impl/OtaBaCxKsjjsmccsServiceImpl.java | 8 +- .../impl/OtaBaCxKsjxtmccsServiceImpl.java | 5 ++ .../service/impl/OtaBaCxListServiceImpl.java | 47 +++++++--- .../impl/OtaBaCxZxsjyqServiceImpl.java | 6 ++ .../modules/ota/utils/ImportFileUtil.java | 90 ++++++------------- 16 files changed, 123 insertions(+), 77 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java index 6aee82684..76babb51b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java @@ -58,6 +58,7 @@ public class OtaBaCxListController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(otaBaCxList, req.getParameterMap()); + queryWrapper.orderByDesc("create_time"); Page page = new Page(pageNo, pageSize); IPage pageList = otaBaCxListService.page(page, queryWrapper); return Result.OK(pageList); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxAqcsService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxAqcsService.java index 7e4b92cd1..10614ff9d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxAqcsService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxAqcsService.java @@ -6,6 +6,7 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.io.File; import java.util.List; /** @@ -68,4 +69,6 @@ public interface IOtaBaCxAqcsService extends IService { void exportTemplate(HttpServletResponse response, HttpServletRequest request); OtaBaCxAqcs importData(MultipartFile file, String otaId, String cut) throws Exception; + + OtaBaCxAqcs parseFileList(List upLoadFiles, String otaId, String cut) throws Exception; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxJbxxService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxJbxxService.java index 7a4e5e3aa..4920bce97 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxJbxxService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxJbxxService.java @@ -6,6 +6,7 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.io.File; import java.util.List; /** @@ -68,4 +69,6 @@ public interface IOtaBaCxJbxxService extends IService { void exportTemplate(HttpServletResponse response, HttpServletRequest request) throws Exception; OtaBaCxJbxx importData(MultipartFile file, String otaId, String cut) throws Exception; + + OtaBaCxJbxx parseFileList(List upLoadFiles, String otaId, String cut) throws Exception; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxJsfzbacsService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxJsfzbacsService.java index 71172b045..eae2540f8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxJsfzbacsService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxJsfzbacsService.java @@ -7,6 +7,7 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.io.File; import java.util.List; /** @@ -68,4 +69,6 @@ public interface IOtaBaCxJsfzbacsService extends IService { void exportTemplate(HttpServletResponse response, HttpServletRequest request); void importData(MultipartFile file, String otaId, String cut) throws Exception; + + void parseFileList(List upLoadFiles, String otaId, String cut) throws Exception; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxKsjjsmccsService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxKsjjsmccsService.java index d4c232672..414f5cfad 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxKsjjsmccsService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxKsjjsmccsService.java @@ -7,6 +7,7 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.io.File; import java.util.List; /** @@ -68,4 +69,6 @@ public interface IOtaBaCxKsjjsmccsService extends IService { void exportTemplate(HttpServletResponse response, HttpServletRequest request); void importData(MultipartFile file, String otaId, String cut) throws Exception; + + void parseFileList(List upLoadFiles, String otaId, String cut) throws Exception; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxKsjxtmccsService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxKsjxtmccsService.java index a745b52b4..8fda6c543 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxKsjxtmccsService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxKsjxtmccsService.java @@ -7,6 +7,7 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.io.File; import java.util.List; /** @@ -68,4 +69,6 @@ public interface IOtaBaCxKsjxtmccsService extends IService { void exportTemplate(HttpServletResponse response, HttpServletRequest request); void importData(MultipartFile file, String otaId, String cut) throws Exception; + + void parseFileList(List upLoadFiles, String otaId, String cut) throws Exception; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxListService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxListService.java index a5363462a..1e87985e8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxListService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxListService.java @@ -68,7 +68,7 @@ public interface IOtaBaCxListService extends IService { void exportTemplate(HttpServletResponse response, HttpServletRequest request); - void importData(MultipartFile file, String cut); + void importData(MultipartFile file, String cut) throws Exception; void exportData(String otaId, HttpServletResponse response, HttpServletRequest request); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxZxsjyqService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxZxsjyqService.java index 29f193a7b..e049a150e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxZxsjyqService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxZxsjyqService.java @@ -7,6 +7,7 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.io.File; import java.util.List; /** @@ -69,4 +70,6 @@ public interface IOtaBaCxZxsjyqService extends IService { void exportTemplate(HttpServletResponse response, HttpServletRequest request); OtaBaCxZxsjyq importData(MultipartFile file, String otaId, String cut) throws Exception; + + OtaBaCxZxsjyq parseFileList(List upLoadFiles, String otaId, String cut) throws Exception; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java index 8dc38038d..7c17ee75a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java @@ -169,6 +169,12 @@ public class OtaBaCxAqcsServiceImpl extends ServiceImpl upLoadFiles = ImportFileUtil.importZip(file, cut, uploadPath); + OtaBaCxAqcs aqcs = parseFileList(upLoadFiles, otaId, cut); + return aqcs; + } + + @Override + public OtaBaCxAqcs parseFileList(List upLoadFiles, String otaId, String cut) throws Exception { File attFile = null; File upFile = null; for (File f : upLoadFiles) { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java index aef65ed64..28562bfea 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java @@ -169,9 +169,15 @@ public class OtaBaCxJbxxServiceImpl extends ServiceImpl upLoadFiles = ImportFileUtil.importZip(file, cut, uploadPath); + OtaBaCxJbxx jbxx = parseFileList(upLoadFiles, otaId, cut); + return jbxx; + } + + @Override + public OtaBaCxJbxx parseFileList(List upLoadFiles, String otaId, String cut) throws Exception { File upFile = null; for (File f : upLoadFiles) { - if (f.getName().equals("可在线升级的系统名称与参数.xlsx")) { + if (f.getName().equals("车型基本信息.xlsx")) { upFile = f; } } @@ -180,7 +186,8 @@ public class OtaBaCxJbxxServiceImpl extends ServiceImpl upLoadFiles = ImportFileUtil.importZip(file, cut, uploadPath); + parseFileList(upLoadFiles, otaId, cut); + + } + @Override + public void parseFileList(List upLoadFiles, String otaId, String cut) throws Exception { File upFile = null; for (File f : upLoadFiles) { if (f.getName().equals("驾驶辅助系统基础备案参数.xlsx")) { @@ -274,6 +279,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl parseList(File upFile, String otaId, String cut) throws Exception { Date now = new Date(); List sjmkList = new ArrayList<>(); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java index c10a5ea65..bf494f628 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java @@ -98,7 +98,7 @@ public class OtaBaCxKsjjsmccsServiceImpl extends ServiceImpl(); } ComparisonUtil cu = new ComparisonUtil(); @@ -210,6 +210,11 @@ public class OtaBaCxKsjjsmccsServiceImpl extends ServiceImpl upLoadFiles = ImportFileUtil.importZip(file, cut, uploadPath); + parseFileList(upLoadFiles, otaId, cut); + } + + @Override + public void parseFileList(List upLoadFiles, String otaId, String cut) throws Exception { File attFile = null; File upFile = null; for (File f : upLoadFiles) { @@ -230,6 +235,7 @@ public class OtaBaCxKsjjsmccsServiceImpl extends ServiceImpl parseFile(File upFile, String otaId, String cut) throws Exception { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java index 179b957bf..3c2d88456 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java @@ -207,6 +207,11 @@ public class OtaBaCxKsjxtmccsServiceImpl extends ServiceImpl upLoadFiles = ImportFileUtil.importZip(file, cut, uploadPath); + parseFileList(upLoadFiles, otaId, cut); + } + + @Override + public void parseFileList(List upLoadFiles, String otaId, String cut) throws Exception { File attFile = null; File upFile = null; for (File f : upLoadFiles) { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java index 7a2152831..708a8693b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java @@ -2,17 +2,14 @@ package com.jero.modules.ota.service.impl; import com.aliyuncs.utils.IOUtils; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.common.constant.enums.CutEnum; import com.jero.common.exception.JeroBootException; +import com.jero.modules.ota.entity.OtaBaCxJbxx; import com.jero.modules.ota.entity.OtaBaCxList; import com.jero.modules.ota.entity.OtaBaCxLsjl; import com.jero.modules.ota.mapper.OtaBaCxListMapper; -import com.jero.modules.ota.service.IOtaBaCxListService; -import com.jero.modules.ota.service.IOtaBaCxLsjlService; +import com.jero.modules.ota.service.*; import com.jero.modules.ota.utils.ImportFileUtil; -import com.jero.modules.split.common.FileUnZip; import com.jero.modules.system.util.StringUtils; -import org.apache.commons.io.FileUtils; import org.apache.ibatis.logging.Log; import org.apache.ibatis.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -22,9 +19,11 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.*; +import java.io.BufferedOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.InputStream; import java.text.SimpleDateFormat; -import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -44,6 +43,24 @@ public class OtaBaCxListServiceImpl extends ServiceImpl fileList =ImportFileUtil.importZip(file,cut,uploadPath); - + public void importData(MultipartFile file, String cut) throws Exception { + List fileList = ImportFileUtil.importZip(file, cut, uploadPath); + OtaBaCxJbxx jbxx = otaBaCxJbxxService.parseFileList(fileList, "", cut); + String otaId = jbxx.getOtaId(); + if (StringUtils.isNotEmpty(otaId)) { + otaBaCxZxsjyqService.parseFileList(fileList, otaId, cut); + otaBaCxAqcsService.parseFileList(fileList, otaId, cut); + otaBaCxKsjxtmccsService.parseFileList(fileList, otaId, cut); + otaBaCxKsjjsmccsService.parseFileList(fileList, otaId, cut); + otaBaCxJsfzbacsService.parseFileList(fileList, otaId, cut); + } else { + throw new JeroBootException("导入失败"); + } } @Override diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxZxsjyqServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxZxsjyqServiceImpl.java index dfe1ea201..73dcbce47 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxZxsjyqServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxZxsjyqServiceImpl.java @@ -172,6 +172,12 @@ public class OtaBaCxZxsjyqServiceImpl extends ServiceImpl upLoadFiles = ImportFileUtil.importZip(file, cut, uploadPath); + OtaBaCxZxsjyq otaBaCxZxsjyq = parseFileList(upLoadFiles, otaId, cut); + return otaBaCxZxsjyq; + } + + @Override + public OtaBaCxZxsjyq parseFileList(List upLoadFiles, String otaId, String cut) throws Exception { File attFile = null; File upFile = null; for (File f : upLoadFiles) { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ImportFileUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ImportFileUtil.java index 85f1cfbe3..46e896532 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ImportFileUtil.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ImportFileUtil.java @@ -48,73 +48,37 @@ public class ImportFileUtil { } - public static List importZip(MultipartFile file, String cut, String uploadPath) { + public static List importZip(MultipartFile file, String cut, String uploadPath) throws Exception { List fileList = new ArrayList<>(); - try { - int pos = file.getOriginalFilename().lastIndexOf("."); - String str = file.getOriginalFilename().substring(pos + 1).toLowerCase(); - String filenameorg = file.getOriginalFilename().substring(0, pos); - //判断上传文件必须是zip - if (!str.equals("zip") && !str.equals("rar")) { - if (CutEnum.CN.getValue().equals(cut)) { - throw new JeroBootException("请上传zip格式的文件或rar格式的文件"); - } else { - throw new JeroBootException("Please upload a zip file or rar file"); - } - } - String path = uploadPath + File.separator + "modal" + File.separator + filenameorg + System.currentTimeMillis(); - File saveDirectory = new File(path); - if (!saveDirectory.isDirectory()) { - saveDirectory.mkdir(); - } - FileUtils.copyInputStreamToFile(file.getInputStream(), new File(path + File.separator + file.getOriginalFilename())); - - //解压缩 - String zipEntryName = ""; - if (str.equals("zip") || str.equals("rar")) { - zipEntryName = FileUnZip.unZipFiles(path + File.separator + file.getOriginalFilename(), path); + int pos = file.getOriginalFilename().lastIndexOf("."); + String str = file.getOriginalFilename().substring(pos + 1).toLowerCase(); + String filenameorg = file.getOriginalFilename().substring(0, pos); + //判断上传文件必须是zip + if (!str.equals("zip") && !str.equals("rar")) { + if (CutEnum.CN.getValue().equals(cut)) { + throw new JeroBootException("请上传zip格式的文件或rar格式的文件"); } else { -// zipEntryName = FileRarUtils.rarUnCompress(path + File.separator + file.getOriginalFilename(), path); + throw new JeroBootException("Please upload a zip file or rar file"); } - //判断压缩包下是否只有一个文件夹 -// File fileTemp = new File(path); -// int length = fileTemp.listFiles().length; -// if (length > 2) { -// //删除原上传文件 -// FileUnZip.deleteDir(saveDirectory); -// if (CutEnum.CN.getValue().equals(cut)) { -// throw new JeroBootException("压缩包中必须有且仅有一个文件夹,请重新上传"); -// } else { -// throw new JeroBootException("There must be only one folder in the compressed package Please upload it again"); -// } -// -// } - File fileNew = new File(zipEntryName); - for (File file1 : fileNew.listFiles()) { - if (file1.getName().contains(".xls") || file1.getName().contains(".xlsx") || file1.isDirectory() - || file1.getName().contains(".docx") || file1.getName().contains(".doc")) { - fileList.add(file1); - } + } + String path = uploadPath + File.separator + "modal" + File.separator + filenameorg + System.currentTimeMillis(); + File saveDirectory = new File(path); + if (!saveDirectory.isDirectory()) { + saveDirectory.mkdir(); + } + FileUtils.copyInputStreamToFile(file.getInputStream(), new File(path + File.separator + file.getOriginalFilename())); + + //解压缩 + String zipEntryName = ""; + if (str.equals("zip")) { + zipEntryName = FileUnZip.unZipFiles(path + File.separator + file.getOriginalFilename(), path); + } + File fileNew = new File(path); + for (File file1 : fileNew.listFiles()) { + if (file1.getName().contains(".xls") || file1.getName().contains(".xlsx") || file1.isDirectory() + || file1.getName().contains(".docx") || file1.getName().contains(".doc")) { + fileList.add(file1); } -// if (fileList.size() == 0) { -// //删除原上传文件 -// FileUnZip.deleteDir(saveDirectory); -// if (CutEnum.CN.getValue().equals(cut)) { -// throw new JeroBootException("压缩包根目录下没有excel作为导入数据,请重新上传"); -// } else { -// throw new JeroBootException("Excel does not exist in the root directory of the compressed package Please upload it again"); -// } -// } else if (fileList.size() > 1) { -// //删除原上传文件 -// FileUnZip.deleteDir(saveDirectory); -// if (CutEnum.CN.getValue().equals(cut)) { -// throw new JeroBootException("压缩包根目录下仅能存在一个excel为导入数据,请重新上传"); -// } else { -// throw new JeroBootException("Only one Excel file can be imported in the compressed package root directory. Please upload data again"); -// } -// } - } catch (IOException e) { - e.printStackTrace(); } return fileList; } From 829f71fb287686d6db6d720ce7cced8dea2f9c95 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Mon, 27 Mar 2023 16:58:42 +0800 Subject: [PATCH 392/645] =?UTF-8?q?67051=20=E6=B3=95=E8=A7=84=E6=B8=85?= =?UTF-8?q?=E5=8D=95-=E6=9B=B4=E6=96=B0log=E5=85=A8=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectLawsInventoryEOServiceImpl.java | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index d47c120e1..0cde55614 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -590,7 +590,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl infoDiffEn = ListDiff.compareObject(dataListCopy.get(0),projectLawsInventoryEOCopy); //设置更新log -// setContentLog(infoDiff,contentLog,infoDiffEn,enContentLog,projectLawsInventoryEO.getProjectLibraryId()); + setContentLog(infoDiff,contentLog,infoDiffEn,enContentLog,projectLawsInventoryEO.getProjectLibraryId()); //验证用户是否是该法规上级 项目库的studio， 如果是，则同步更新流程 @@ -3752,14 +3752,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImple.getSerialNumber()).collect(Collectors.joining(",")); -// String contentLog = username+"复制了“"+serialNumber+"”"; -// String enContentLog = username+" copied “"+serialNumber+"”"; -// projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId,CutEnum.CN.getValue()); -// projectLawsInventoryLogEOService.updateLog(enContentLog, projectLibraryId,CutEnum.EN.getValue()); + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + String username = sysUser.getUsername(); + String projectLibraryId = projectLawsInventoryEOList.get(0).getProjectLibraryId(); + String serialNumber = projectLawsInventoryEOList.stream().map(e->e.getSerialNumber()).collect(Collectors.joining(",")); + String contentLog = username+"复制了“"+serialNumber+"”"; + String enContentLog = username+" copied “"+serialNumber+"”"; + projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId,CutEnum.CN.getValue()); + projectLawsInventoryLogEOService.updateLog(enContentLog, projectLibraryId,CutEnum.EN.getValue()); this.projectTaskInventoryEOService.saveBatch(projectTaskInventoryEOList); projectTaskInventoryEOList.forEach(taskInventory -> { this.initConditionAssessmentEO(taskInventory.getProjectLawsInventoryId()); @@ -4052,15 +4052,15 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl Date: Mon, 27 Mar 2023 17:10:18 +0800 Subject: [PATCH 393/645] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../otamanagement/upgradeactivity/index.vue | 21 ++++++++- .../informationaboutotherupgradetasks.vue | 44 ++++++++++++++++--- .../components/upgradeimpactassessment.vue | 7 ++- .../components/usernotification.vue | 28 +++++++++++- .../components/beupgradedonline.vue | 2 +- 5 files changed, 88 insertions(+), 14 deletions(-) diff --git a/jero-web/src/views/otamanagement/upgradeactivity/index.vue b/jero-web/src/views/otamanagement/upgradeactivity/index.vue index 42ea1fcf1..e144bf3b1 100644 --- a/jero-web/src/views/otamanagement/upgradeactivity/index.vue +++ b/jero-web/src/views/otamanagement/upgradeactivity/index.vue @@ -389,8 +389,25 @@ export default { }, // 引用备案 citeforrecord(){ - - }, + if( this.selectedRowKeys.length == 0 ){ + this.$message.warning(this.$t('selectLeastOne')) + }else{ + if ( this.selectedRowKeys.length > 1){ + this.$message.warning(this.$t('OnlyOneSelected')) + }else{ + localStorage.removeItem('otaIdT') + localStorage.removeItem('otaId') + localStorage.setItem('otaIdT',this.selectedRowKeys[0]) + if(localStorage.getItem('otaIdT')!=null){ + this.$router.push({ + path: '/upgradeactivityrecord', + query: { + type:1 + } + }) + } + } + }}, // 创建车型 createvehicleandfunctionrecords() { localStorage.removeItem('otaId') diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/informationaboutotherupgradetasks.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/informationaboutotherupgradetasks.vue index 37d33f836..bd736b171 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/informationaboutotherupgradetasks.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/informationaboutotherupgradetasks.vue @@ -12,7 +12,7 @@ + v-model.trim="queryParam.rwmc">
@@ -29,7 +29,7 @@ @change="dateChange({db_field_name:'updatereleasetime'})" format="YYYY-MM-DD" :getCalendarContainer="(trigger) => trigger.parentNode" - v-model="queryParam.updatereleasetime" + v-model="queryParam.sjfbsj" :disabled="false" style="width: 100%"/> @@ -48,7 +48,7 @@ @change="dateChange({db_field_name:'upgradeplanexpirationtime'})" format="YYYY-MM-DD" :getCalendarContainer="(trigger) => trigger.parentNode" - v-model="queryParam.upgradeplanexpirationtime" + v-model="queryParam.sjjzsj" :disabled="false" style="width: 100%"/> @@ -58,7 +58,7 @@
- {{$t('preservation')}} + {{$t('preservation')}} {{$t('last')}} {{$t('submit')}}
@@ -77,21 +77,51 @@ export default { return { confirmLoading: false, disabled: false, - queryParam:{} + queryParam:{ + sjjzsj:'' + } } }, mounted() { - + this.getData() }, methods: { + getData(){ + let otaIdT=localStorage.getItem('otaIdT') + if(otaIdT==null){ + otaIdT='' + } + let otaId=localStorage.getItem('otaId') + if(otaId==null){ + otaId='' + } + getAction('/ota/otaBaSjQtsjxx/queryByOtaId',{otaIdT:otaIdT,otaId:otaId}),then(res=>{ + if(res.code == 200){ + this.queryParam= res.result ==null ? {} :res.result + } + }) + }, + save(){ + let otaId = localStorage.getItem('otaId') + if(otaId == null || otaId == undefined){ + otaId='' + } + this.queryParam.otaId = otaId + postAction('/ota/otaBaSjQtsjxx/add' ,this.queryParam).then(res=>{ + this.$message.success(this.$t('SavedSuccessfully')) + console.log(res); + }) + }, + last(){ + this.save() this.$emit('otherup') }, dateChange(item) { this.formInline[item.db_field_name] = this.formInline[item.db_field_name] ? moment(this.formInline[item.db_field_name]).format('YYYY-MM-DD') : '' }, submit(){ - + this.$router.push('upgradeactivity') }, } } diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue index 3c081c5b6..d78323297 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue @@ -389,8 +389,11 @@ this.$forceUpdate() }) }, save(){ - - this.form.otaId=localStorage.getItem('otaId') + let otaId = localStorage.getItem('otaId') + if(otaId == null || otaId == undefined){ + otaId='' + } + this.form.otaId=otaId postAction('/ota/otaBaSjSjyxpg/add',this.form).then(res=>{ this.$message.success(this.$t('SavedSuccessfully')) console.log(res); diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue index ee2864893..7a9539fd0 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue @@ -178,6 +178,7 @@ import { getAction, postAction, deleteAction,downloadFile } from '@/api/manage' import ImportFile from '@/components/ImportFileData/index' import uploadFile from '@/components/uploadFile/file' import moment from 'moment' +import { post } from '../../../../common/lang/zh-cn' export default { name: 'basicInformation', @@ -197,7 +198,7 @@ export default { } }, mounted() { - + this.getData() }, methods: {// 模板下载 handleModule() { @@ -228,8 +229,31 @@ export default { } }) }, + getData(){ + let otaIdT=localStorage.getItem('otaIdT') + if(otaIdT==null){ + otaIdT='' + } + let otaId=localStorage.getItem('otaId') + if(otaId==null){ + otaId='' + } + getAction('/ota/otaBaSjGgnrfs/queryByOtaId',{otaIdT:otaIdT,otaId:otaId}),then(res=>{ + if(res.code == 200){ + this.formInline= res.result ==null ? {} :res.result + } + }) + }, save(){ - + let otaId = localStorage.getItem('otaId') + if(otaId == null || otaId == undefined){ + otaId='' + } + this.formInline.otaId = otaId + postAction('/ota/otaBaSjGgnrfs/add' ,this.formInline).then(res=>{ + this.$message.success(this.$t('SavedSuccessfully')) + console.log(res); + }) }, next(){ diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue index d3a2a4bd3..11ffac9e6 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue @@ -72,7 +72,7 @@ - + From 995130a9bdd1639d84f60f242b9325ff404a4a1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Mon, 27 Mar 2023 17:14:44 +0800 Subject: [PATCH 394/645] =?UTF-8?q?OTA=E7=AE=A1=E7=90=86=E5=B7=A5=E5=85=B7?= =?UTF-8?q?-=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 1 + .../components/auxiliaryupgradehavechanged.vue | 12 ++++++++---- .../components/thetargetvehicleofthisupgrade.vue | 12 ++++++------ .../components/upgradehavechanged.vue | 7 ++----- .../components/usernotification.vue | 1 + 6 files changed, 19 insertions(+), 15 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 73cd82371..eddd0a7a9 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1721,4 +1721,5 @@ module.exports = { cantTransferToYourself:"Can't transfer to yourself", theDataYouInitiate:'The data you selected does not meet the process initiation criteria. Please recheck and initiate', dataWithProcessReleasedCannotBeReset:'Data with a process status of list to be released cannot be reset', + noteone:'Note: CSV format is supported. The value is within 20M and the number is 1 to 10', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 9369a1133..456f5bb73 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1821,6 +1821,7 @@ module.exports = { note:'注:附件包括测试项目清单、测试报告．测试标准或技术规范', format:'支持doc/docx/pdf格式,大小50M以内', cantTransferToYourself:"不能转办给自己", + noteone:'注:支持CSV格式，大小20M以内，数量1-10个', theDataYouInitiate:'您所选的数据，均不符合流程发起条件，请重新检查后发起', dataWithProcessReleasedCannotBeReset:'流程状态为清单待发布的数据不能被重置', } \ No newline at end of file diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue index d6fc8f2b7..c664a3c94 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue @@ -43,9 +43,9 @@ - - - + + + {{$t('add')}} @@ -54,6 +54,10 @@
{{$t('uploadattachment')}} +
+

{{$t('note')}}

+

    {{$t('format')}}

+
{{$t('preservation')}} @@ -79,7 +83,7 @@ export default { return { dataSource: [ { - + } ], loading: false, diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue index 57d4712a5..3b8a3e96a 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue @@ -76,16 +76,16 @@ {{ (formInline.VINcodelist === 'null' || formInline.VINcodelist === '' || - formInline.VINcodelist == null) ? $t('clickUpload') : $t('viewUploadedFiles') + formInline.VINcodelist == null) ? $t('VINcodeupload') : $t('viewUploadedFiles') }} -

支持cxv格式，大下20M以内，数量1-10个

+

{{$t('noteone')}}

 - +
@@ -148,18 +148,18 @@ export default { }) }, save(){ - + let obj={} obj.otaId=localStorage.getItem('otaId') obj.zsl = this.formInline.zsl if(this.formInline.dateofproduction){ - obj.scrqks = this.formInline.dateofproduction[0] + obj.scrqks = this.formInline.dateofproduction[0] obj.scrqjs = this.formInline.dateofproduction[1] }else{ obj.scrqks='' obj.scrqjs ='' } - + obj.vinList = this.formInline.vinList postAction('/ota/otaBaSjSjmbcl/add',obj).then(res=>{ this.$message.success(this.$t('SavedSuccessfully')) diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue index ccf6ef607..4715ff8ba 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue @@ -66,9 +66,6 @@ {{$t('delete')}} -
- {{$t('uploadattachment')}} -
{{$t('preservation')}} {{$t('last')}} @@ -146,7 +143,7 @@ export default { ellipsis: true, width: 170, scopedSlots: { customRender: 'nameoftheupgradedelectroniccontroller' }, - + }, { title: this.$t('adaptivehardwareversion'), @@ -188,7 +185,7 @@ export default { width: 170, scopedSlots: { customRender: 'aftertheoperatingsystemversionupgraded' }, }, - + { title: this.$t('upgradepackageintegrityverificationdata'), align: 'left', diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue index ee2864893..d3e2be2b7 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue @@ -158,6 +158,7 @@ formInline.xgwj == null) ? $t('uploadattachment') : $t('viewUploadedFiles') }} +

{{$t('format')}}

From eddd8faa7c4eff8da5ec8d54e917ed6e2c2db862 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Mon, 27 Mar 2023 17:32:15 +0800 Subject: [PATCH 395/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/OtaBaCxAqcsServiceImpl.java | 21 ++++-- .../impl/OtaBaCxKsjxtmccsServiceImpl.java | 16 +++-- .../impl/OtaBaCxZxsjyqServiceImpl.java | 21 +++++- .../modules/ota/utils/ImportFileUtil.java | 66 +++++++++++++++++++ 4 files changed, 113 insertions(+), 11 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java index 7c17ee75a..832a0a33a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java @@ -3,6 +3,8 @@ package com.jero.modules.ota.service.impl; import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.common.exception.JeroBootException; +import com.jero.modules.oss.entity.OSSFile; +import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.ota.entity.*; import com.jero.modules.ota.enums.OtaModuleEnum; import com.jero.modules.ota.mapper.OtaBaCxAqcsMapper; @@ -51,6 +53,9 @@ public class OtaBaCxAqcsServiceImpl extends ServiceImpl list = ImportFileUtil.uploadFiles1(attFile, strs, ossFileService); + JSONArray obj = new JSONArray(); + for (OSSFile f : list) { + AttachmentEO aeo = new AttachmentEO(); + aeo.setId(f.getId()); + aeo.setFileName(f.getFileName()); + obj.add(aeo); + } + aqcs.setZmcl(obj.toString()); return aqcs; } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java index 3c2d88456..518cca7f6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java @@ -5,6 +5,8 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.common.exception.JeroBootException; +import com.jero.modules.oss.entity.OSSFile; +import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.ota.entity.*; import com.jero.modules.ota.enums.OtaModuleEnum; import com.jero.modules.ota.enums.OtaTitleEnum; @@ -58,6 +60,10 @@ public class OtaBaCxKsjxtmccsServiceImpl extends ServiceImpl oldList = getByOtaId(otaId); - List mccsList = parseFile(upFile, otaId, cut); + List mccsList = parseFile(upFile, attFile, otaId, cut); ComparisonUtil cu = new ComparisonUtil(); List reList = cu.comparisonListRecord(otaId, OtaModuleEnum.CX_KSJDXTMCYCS, OtaTitleEnum.XTLB.getName(), oldList, mccsList, sysDictService); deleteByOtaId(otaId); @@ -233,7 +239,7 @@ public class OtaBaCxKsjxtmccsServiceImpl extends ServiceImpl parseFile(File upFile, String otaId, String cut) throws Exception { + private List parseFile(File upFile, File attFile, String otaId, String cut) throws Exception { Date now = new Date(); List mccsList = new ArrayList<>(); Workbook wb = ImportFileUtil.readExcel(upFile); @@ -248,7 +254,8 @@ public class OtaBaCxKsjxtmccsServiceImpl extends ServiceImpl list = ImportFileUtil.uploadFiles1(attFile, strs, ossFileService); + JSONArray obj = new JSONArray(); + for (OSSFile f : list) { + AttachmentEO aeo = new AttachmentEO(); + aeo.setId(f.getId()); + aeo.setFileName(f.getFileName()); + obj.add(aeo); + } + otaBaCxZxsjyq.setZmcl(obj.toString()); return otaBaCxZxsjyq; } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ImportFileUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ImportFileUtil.java index 46e896532..20d21a7bb 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ImportFileUtil.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ImportFileUtil.java @@ -3,14 +3,18 @@ package com.jero.modules.ota.utils; import com.aliyuncs.utils.IOUtils; import com.jero.common.constant.enums.CutEnum; import com.jero.common.exception.JeroBootException; +import com.jero.modules.oss.entity.OSSFile; +import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.split.common.FileUnZip; import com.jero.modules.system.service.ISysDictService; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.http.entity.ContentType; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.*; import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import org.springframework.mock.web.MockMultipartFile; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; @@ -174,4 +178,66 @@ public class ImportFileUtil { return res; } + public static File findFile(File file, String fileName) throws Exception { + // 获取此地址中的所有文件以及文件夹(File[] list) + File[] listFiles = file.listFiles();// 获取此地址中的所有文件以及文件夹(File[] list) + for (File file1 : listFiles) {// 遍历数组 + // 判断当前的File对象是否为文件夹 + if (!file1.isDirectory()) { + String name = file1.getName(); + if (name.equals(fileName)) { + return file1; + } + } + } + return null; + } + + public static MultipartFile createMfileByFile(File file) { + MultipartFile mFile = null; + try { + FileInputStream fileInputStream = new FileInputStream(file); + String fileName = file.getName(); + fileName = fileName.substring((fileName.lastIndexOf(File.separator) + 1)); + mFile = new MockMultipartFile(fileName, fileName, ContentType.APPLICATION_OCTET_STREAM.toString(), fileInputStream); + } catch (Exception e) { + e.printStackTrace(); + } + return mFile; + } + + public static List uploadFiles1(File attFile, String[] strs, IOSSFileService ossFileService) throws Exception { + List res = new ArrayList<>(); + for (int i = 0; i < strs.length; i++) { + File file = ImportFileUtil.findFile(attFile, strs[i]); + if (null == file) { + throw new JeroBootException("找不到文件：" + strs[i]); + } + OSSFile ossFile = ossFileService.uploadLocalOfCos(ImportFileUtil.createMfileByFile(file), "", null, null); + if (ObjectUtils.isNotEmpty(ossFile)) { + res.add(ossFile); + } + } + return res; + } + + public static String uploadFiles(File attFile, String[] strs, IOSSFileService ossFileService) throws Exception { + String res = ""; + for (int i = 0; i < strs.length; i++) { + File file = ImportFileUtil.findFile(attFile, strs[i]); + if (null == file) { + throw new JeroBootException("找不到文件：" + strs[i]); + } + OSSFile ossFile = ossFileService.uploadLocalOfCos(ImportFileUtil.createMfileByFile(file), "", null, null); + if (ObjectUtils.isNotEmpty(ossFile)) { + if (i >= strs.length - 1) { + res += ossFile.getId(); + } else { + res += ossFile.getId() + ","; + } + } + } + return res; + } + } From 3a420fd65bcac3405bce1b1b1df4c758e2582265 Mon Sep 17 00:00:00 2001 From: yuekuo Date: Mon, 27 Mar 2023 17:54:43 +0800 Subject: [PATCH 396/645] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vehicleinformation/components/beupgradedonline.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue index 11ffac9e6..3b5c6947d 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue @@ -327,10 +327,10 @@ import ImportFile from '@/components/ImportFileData/index' gnmc:'车道偏离预警(LDW)' }, { - gnmc:'百区监测(BSD)' + gnmc:'盲区监测(BSD)' }, { - gnmc:'驻员疲劳篮澳CDFM)' + gnmc:'驾驶员疲劳检测(DFM)' }, { gnmc:'自动紧急制动(AEB)' From 3bc520511d9fe5aaef905d6b085278ca34a77ec8 Mon Sep 17 00:00:00 2001 From: yuekuo Date: Mon, 27 Mar 2023 17:59:02 +0800 Subject: [PATCH 397/645] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vehicleinformation/components/beupgradedonline.vue | 3 --- 1 file changed, 3 deletions(-) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue index 3b5c6947d..41ffbf0b9 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue @@ -338,9 +338,6 @@ import ImportFile from '@/components/ImportFileData/index' { gnmc:'自适应巡航控制(ACC)' }, - { - gnmc:'自适应巡航控制(ACC)' - }, { gnmc:'智能泊车辅助(IPA)' }, From ffd4744910333e5280573eca24e794c9d86a5210 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Mon, 27 Mar 2023 18:12:35 +0800 Subject: [PATCH 398/645] =?UTF-8?q?66890=20=E7=B3=BB=E7=BB=9F=E4=B8=AD?= =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E9=A2=86=E5=9F=9F=E5=AD=97=E6=AE=B5=E6=8C=89?= =?UTF-8?q?=E7=85=A7=E9=A6=96=E5=AD=97=E6=AF=8D=E9=A1=BA=E5=BA=8F=E6=8E=92?= =?UTF-8?q?=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/system/controller/SysDictController.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java index f8327a592..c0c478ecc 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java @@ -33,6 +33,7 @@ import com.jero.modules.utils.HanYuPinYinUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; @@ -186,6 +187,17 @@ public class SysDictController { ls = sysDictService.queryDictItemsByCode(dictCode); } + // 将结果集进行排序 + if (CollectionUtils.isNotEmpty(ls)) { + // 匿名比较器排序 + Collections.sort(ls, new Comparator() { + @Override + public int compare(DictModel p1, DictModel p2) { + return p1.getText().compareTo(p2.getText()); + } + }); + } + result.setSuccess(true); result.setResult(ls); log.debug(result.toString()); From 7b2cb60258c4f374542ba0fcf29c1372925d1d8c Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Mon, 27 Mar 2023 18:17:00 +0800 Subject: [PATCH 399/645] =?UTF-8?q?67336=20=E8=AE=A4=E8=AF=81=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E5=AE=9A=E6=97=B6=E5=8F=91=E6=B6=88=E6=81=AF=EF=BC=8C?= =?UTF-8?q?=E9=80=BE=E6=9C=9F=E7=9A=84=E6=8E=92=E9=99=A4=E6=8E=89=E5=BD=93?= =?UTF-8?q?=E5=A4=A9=E8=BF=87=E6=9C=9F=E7=9A=84=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/modules/project/job/CertificationInventoryJob.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/CertificationInventoryJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/CertificationInventoryJob.java index 5e157da83..93f199d22 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/CertificationInventoryJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/CertificationInventoryJob.java @@ -338,7 +338,7 @@ public class CertificationInventoryJob implements Job { // 只要早于当前日期都算逾期 boolean flag = false; if(data.getEndTime() != null){ - flag = (data.getEndTime().before(currentDate)); + flag = (data.getEndTime().before(currentDate) && !StringUtils.equals(currentDateStr, sdf.format(data.getEndTime()))); } return flag; }).collect(Collectors.toList()); From 43897960c78d4b2eb61c720e6166c37146230aa0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Mon, 27 Mar 2023 18:49:43 +0800 Subject: [PATCH 400/645] =?UTF-8?q?OTA=E7=AE=A1=E7=90=86=E5=B7=A5=E5=85=B7?= =?UTF-8?q?-=E8=BD=A6=E5=9E=8B=E5=8F=8A=E5=8A=9F=E8=83=BD=E5=A4=87?= =?UTF-8?q?=E6=A1=88-=E9=A9=BE=E9=A9=B6=E8=BE=85=E5=8A=A9=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E5=9F=BA=E7=A1=80=E5=A4=87=E6=A1=88=E5=8F=82=E6=95=B0?= =?UTF-8?q?-=E6=8D=A2=E8=A1=8C=E5=8F=8A=E8=BE=B9=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/recordparameters.vue | 62 ++++++++++++++----- 1 file changed, 46 insertions(+), 16 deletions(-) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue index f72635bab..b561b64a0 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue @@ -49,7 +49,7 @@   {{$t('positioningandnavigationsystem')}} - +   {{$t('vehiclesatellitepositioningequipment')}} @@ -69,7 +69,7 @@   {{$t('vehiclecommunicationsystem')}} - +   {{$t('signalingdevices')}} @@ -307,7 +307,7 @@ export default { fillincontent:this.$t('yesisselected'), }, { - key: 'jgldBzwz', + key: 'jgldBzwz', val:'', componentname: this.$t('networksecurityrequirements'), configuration: this.$t('ineffectiveupgrades'), @@ -887,7 +887,7 @@ export default { }) this.dataSourceList=res.result.kzq } - + this.dataSource.forEach(item=>{ for(let key in res.result.bj){ if(item.key==key){ @@ -895,7 +895,7 @@ export default { } } }) - + // res.result.bj.forEach(item=>{ // if(Number(item) !=NaN){ @@ -905,7 +905,7 @@ export default { this.query=res.result.bj } }) - + }, click(value){ this.fileList = value @@ -1060,6 +1060,7 @@ button{ display: inline-block; float: left; border: #e8e8e8 solid 1px; + border-right: none; width: 100%; height: 200px; line-height: 200px; @@ -1068,6 +1069,7 @@ button{ display: inline-block; float: left; border: #e8e8e8 solid 1px; + border-right: none; width: 100%; height: 100px; line-height: 100px; @@ -1076,6 +1078,7 @@ button{ display: inline-block; float: left; border: #e8e8e8 solid 1px; + border-right: none; width: 100%; height: 50px; line-height: 50px; @@ -1084,6 +1087,7 @@ button{ display: inline-block; float: left; border: #e8e8e8 solid 1px; + border-right: none; width: 100%; height: 250px; line-height: 250px; @@ -1092,6 +1096,7 @@ button{ display: inline-block; float: left; border: #e8e8e8 solid 1px; + border-right: none; width: 100%; height: 150px; line-height: 150px; @@ -1099,55 +1104,73 @@ button{ .text-box{ display: inline-block; float: left; - border: #e8e8e8 solid 1px; + /*border: #e8e8e8 solid 1px;*/ width: 100%; height: 400px; - line-height: 400px; + line-height: 20px; } .text-box-two{ display: inline-block; float: left; - border: #e8e8e8 solid 1px; + /*border: #e8e8e8 solid 1px;*/ width: 100%; height: 450px; - line-height: 450px; + line-height: 20px; } .text-text{ display: inline-block; float: left; border: #e8e8e8 solid 1px; + border-right: none; width: 50%; height: 400px; - line-height: 400px; + line-height: 20px; + display: flex; + justify-content: left; + align-items: center; } .text-text-two{ display: inline-block; float: left; border: #e8e8e8 solid 1px; + border-right: none; width: 50%; height: 200px; - line-height: 200px; + padding: 10px; + line-height: 20px; + display: flex; + justify-content: left; + align-items: center; } .text-text-three{ display: inline-block; float: left; border: #e8e8e8 solid 1px; + border-right: none; width: 50%; height: 100px; - line-height: 100px; + line-height: 20px; + display: flex; + justify-content: left; + align-items: center; } .text-text-five{ display: inline-block; float: left; border: #e8e8e8 solid 1px; + border-right: none; width: 50%; height: 50px; line-height: 50px; + display: flex; + justify-content: left; + align-items: center; } .text-box-three{ display: inline-block; float: left; border: #e8e8e8 solid 1px; + border-right: none; width: 100%; height: 250px; line-height: 250px; @@ -1155,7 +1178,7 @@ button{ .text-box-four{ display: inline-block; float: left; - border: #e8e8e8 solid 1px; + /*border: #e8e8e8 solid 1px;*/ width: 100%; height: 600px; line-height: 600px; @@ -1164,6 +1187,7 @@ button{ display: inline-block; float: left; border: #e8e8e8 solid 1px; + border-right: none; width: 50%; height: 600px; line-height: 20px; @@ -1175,14 +1199,20 @@ button{ display: inline-block; float: left; border: #e8e8e8 solid 1px; + border-right: none; width: 50%; height: 150px; - line-height: 150px; + display: flex; + line-height: 20px; + justify-content: left; + align-items: center; + padding: 10px; } .text-box-five{ display: inline-block; float: left; border: #e8e8e8 solid 1px; + border-right: none; width: 100%; height: 100px; line-height: 100px; @@ -1190,7 +1220,7 @@ button{ span{ /* overflow: hidden; /*超出部分隐藏*/ /* text-overflow: ellipsis; 超出部分省略号表示 */ - white-space: wrap; + white-space: normal; /* word-wrap: normal; */ } .item-input{ From 066deceadcb2c0f6cf3c9d1eb72d4f3d88c6b501 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Mon, 27 Mar 2023 18:52:46 +0800 Subject: [PATCH 401/645] =?UTF-8?q?OTA=E7=AE=A1=E7=90=86=E5=B7=A5=E5=85=B7?= =?UTF-8?q?-=E8=BD=A6=E5=9E=8B=E5=8F=8A=E5=8A=9F=E8=83=BD=E5=A4=87?= =?UTF-8?q?=E6=A1=88-=E9=A9=BE=E9=A9=B6=E8=BE=85=E5=8A=A9=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E5=9F=BA=E7=A1=80=E5=A4=87=E6=A1=88=E5=8F=82=E6=95=B0?= =?UTF-8?q?-=E6=8D=A2=E8=A1=8C=E5=8F=8A=E8=BE=B9=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/recordparameters.vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue index b561b64a0..077f9fd9d 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue @@ -1118,7 +1118,7 @@ button{ line-height: 20px; } .text-text{ - display: inline-block; + /*display: inline-block;*/ float: left; border: #e8e8e8 solid 1px; border-right: none; @@ -1130,7 +1130,7 @@ button{ align-items: center; } .text-text-two{ - display: inline-block; + /*display: inline-block;*/ float: left; border: #e8e8e8 solid 1px; border-right: none; @@ -1143,7 +1143,7 @@ button{ align-items: center; } .text-text-three{ - display: inline-block; + /*display: inline-block;*/ float: left; border: #e8e8e8 solid 1px; border-right: none; @@ -1155,7 +1155,7 @@ button{ align-items: center; } .text-text-five{ - display: inline-block; + /*display: inline-block;*/ float: left; border: #e8e8e8 solid 1px; border-right: none; @@ -1184,7 +1184,7 @@ button{ line-height: 600px; } .four-text-text{ - display: inline-block; + /*display: inline-block;*/ float: left; border: #e8e8e8 solid 1px; border-right: none; @@ -1196,7 +1196,7 @@ button{ align-items: center; } .four-text{ - display: inline-block; + /*display: inline-block;*/ float: left; border: #e8e8e8 solid 1px; border-right: none; From 448b5f73fe4766fdc13a3359f2f9f6f7683d39ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Mon, 27 Mar 2023 23:38:05 +0800 Subject: [PATCH 402/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ota/controller/OtaBaCxLsjlController.java | 1 + .../ota/controller/OtaBaCxTxjlController.java | 1 + .../ota/controller/OtaBaSjListController.java | 1 + .../ota/controller/OtaBaSjLsjlController.java | 1 + .../service/impl/OtaBaCxAqcsServiceImpl.java | 2 +- .../modules/ota/utils/ComparisonUtil.java | 24 +++++++++++-------- 6 files changed, 19 insertions(+), 11 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxLsjlController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxLsjlController.java index 3ea1ea7aa..15c0c3e2a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxLsjlController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxLsjlController.java @@ -53,6 +53,7 @@ public class OtaBaCxLsjlController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(otaBaCxLsjl, req.getParameterMap()); + queryWrapper.orderByDesc("create_time"); Page page = new Page(pageNo, pageSize); IPage pageList = otaBaCxLsjlService.page(page, queryWrapper); return Result.OK(pageList); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxTxjlController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxTxjlController.java index 39a914252..0f395f100 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxTxjlController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxTxjlController.java @@ -53,6 +53,7 @@ public class OtaBaCxTxjlController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(otaBaCxTxjl, req.getParameterMap()); + queryWrapper.orderByDesc("create_time"); Page page = new Page(pageNo, pageSize); IPage pageList = otaBaCxTxjlService.page(page, queryWrapper); return Result.OK(pageList); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java index b46297dca..c35f95389 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java @@ -54,6 +54,7 @@ public class OtaBaSjListController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(otaBaSjList, req.getParameterMap()); + queryWrapper.orderByDesc("create_time"); Page page = new Page(pageNo, pageSize); IPage pageList = otaBaSjListService.page(page, queryWrapper); return Result.OK(pageList); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjLsjlController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjLsjlController.java index a4f8a0dbc..e8d5cf35b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjLsjlController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjLsjlController.java @@ -53,6 +53,7 @@ public class OtaBaSjLsjlController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(otaBaSjLsjl, req.getParameterMap()); + queryWrapper.orderByDesc("create_time"); Page page = new Page(pageNo, pageSize); IPage pageList = otaBaSjLsjlService.page(page, queryWrapper); return Result.OK(pageList); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java index 832a0a33a..d77a727dd 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java @@ -86,7 +86,7 @@ public class OtaBaCxAqcsServiceImpl extends ServiceImpl reList = cu.comparisonRecord(otaBaCxAqcsOld.getOtaId(), OtaModuleEnum.CX_AQCS, otaBaCxAqcsOld, otaBaCxAqcs, sysDictService); + List reList = cu.comparisonRecord(otaBaCxAqcs.getOtaId(), OtaModuleEnum.CX_AQCS, otaBaCxAqcsOld, otaBaCxAqcs, sysDictService); otaBaCxTxjlService.saveBatch(reList); } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java index b2c244750..f50ccfbed 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java @@ -70,7 +70,7 @@ public class ComparisonUtil { Object newVal = field.get(newObj); String newStr = ""; if (ObjectUtils.isNotEmpty(newVal) && !field.getName().equals(tableField.getName())) { - newStr = newVal.toString(); + newStr = parseDictText(ote, field, newObj, sysDictService); content = tableField.get(newObj).toString() + "-" + title + "由'空'改为'" + newStr + "'"; resList.add(new OtaBaCxTxjl(otaId, otaModuleEnum.getName(), content)); } @@ -86,6 +86,7 @@ public class ComparisonUtil { } } for (T oldObj : oldList) { + boolean flag = true; if (ObjectUtils.isNotEmpty(oldObj)) { Field idField = oldObj.getClass().getDeclaredField("id"); idField.setAccessible(true); @@ -94,19 +95,22 @@ public class ComparisonUtil { if (ObjectUtils.isNotEmpty(newObj)) { Object newId = idField.get(newObj); if (ObjectUtils.isNotEmpty(newId) && oldId.equals(newId.toString())) { + flag = false; break; } } } - Field tableTitleField = oldObj.getClass().getDeclaredField(tableTitle); - tableTitleField.setAccessible(true); - Object tableTitleObj = tableTitleField.get(oldObj); - String tableTitleObjStr = "空"; - if (ObjectUtils.isNotEmpty(tableTitleObj)) { - tableTitleObjStr = tableTitleObj.toString(); + if (flag) { + Field tableTitleField = oldObj.getClass().getDeclaredField(tableTitle); + tableTitleField.setAccessible(true); + Object tableTitleObj = tableTitleField.get(oldObj); + String tableTitleObjStr = "空"; + if (ObjectUtils.isNotEmpty(tableTitleObj)) { + tableTitleObjStr = tableTitleObj.toString(); + } + String content = "删除了'" + tableTitleObjStr + "'"; + resList.add(new OtaBaCxTxjl(otaId, otaModuleEnum.getName(), content)); } - String content = "删除了'" + tableTitleObjStr + "'"; - resList.add(new OtaBaCxTxjl(otaId, otaModuleEnum.getName(), content)); } } } catch (IllegalAccessException | NoSuchFieldException e) { @@ -136,7 +140,7 @@ public class ComparisonUtil { Object newVal = field.get(newClazz); String newTitleStr = "空"; if (ObjectUtils.isNotEmpty(newVal)) { - Field tableField = newVal.getClass().getDeclaredField(tableTitle); + Field tableField = newClazz.getClass().getDeclaredField(tableTitle); tableField.setAccessible(true); Object newTitleVal = tableField.get(newVal); if (ObjectUtils.isNotEmpty(newTitleVal)) { From f23fb9e9dbbd1c259d5362c53db495b045f16a53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Mon, 27 Mar 2023 23:48:13 +0800 Subject: [PATCH 403/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ota/controller/OtaBaCxLsjlController.java | 279 +++++++++--------- .../service/impl/OtaBaCxLsjlServiceImpl.java | 1 + 2 files changed, 141 insertions(+), 139 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxLsjlController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxLsjlController.java index 15c0c3e2a..f68ee5540 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxLsjlController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxLsjlController.java @@ -4,6 +4,7 @@ import java.util.Arrays; import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + import com.jero.common.api.vo.Result; import com.jero.common.system.query.QueryGenerator; import com.jero.modules.ota.entity.OtaBaCxLsjl; @@ -22,164 +23,164 @@ import io.swagger.annotations.ApiOperation; import com.jero.common.aspect.annotation.AutoLog; - /** +/** * @Description: 车型备案-历史记录 * @Author: jero-boot - * @Date: 2023-03-17 + * @Date: 2023-03-17 * @Version: V1.0 */ -@Api(tags="车型备案-历史记录") +@Api(tags = "车型备案-历史记录") @RestController @RequestMapping("/ota/otaBaCxLsjl") @Slf4j public class OtaBaCxLsjlController extends JeroController { - @Autowired - private IOtaBaCxLsjlService otaBaCxLsjlService; - - /** - * 分页列表查询 - * - * @param otaBaCxLsjl - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @AutoLog(value = "车型备案-历史记录-分页列表查询") - @ApiOperation(value="车型备案-历史记录-分页列表查询", notes="车型备案-历史记录-分页列表查询") - @GetMapping(value = "/page") - public Result queryPageList(OtaBaCxLsjl otaBaCxLsjl, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(otaBaCxLsjl, req.getParameterMap()); - queryWrapper.orderByDesc("create_time"); - Page page = new Page(pageNo, pageSize); - IPage pageList = otaBaCxLsjlService.page(page, queryWrapper); - return Result.OK(pageList); - } + @Autowired + private IOtaBaCxLsjlService otaBaCxLsjlService; /** - * 列表查询 - * - * @return - */ - @AutoLog(value = "车型备案-历史记录-列表查询") - @ApiOperation(value="车型备案-历史记录-列表查询", notes="车型备案-历史记录-列表查询") - @GetMapping(value = "/list") - public Result> queryList() { - List list = otaBaCxLsjlService.queryList(); + * 分页列表查询 + * + * @param otaBaCxLsjl + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "车型备案-历史记录-分页列表查询") + @ApiOperation(value = "车型备案-历史记录-分页列表查询", notes = "车型备案-历史记录-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(OtaBaCxLsjl otaBaCxLsjl, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(otaBaCxLsjl, req.getParameterMap()); + queryWrapper.orderByDesc("create_time"); + Page page = new Page(pageNo, pageSize); + IPage pageList = otaBaCxLsjlService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "车型备案-历史记录-列表查询") + @ApiOperation(value = "车型备案-历史记录-列表查询", notes = "车型备案-历史记录-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = otaBaCxLsjlService.list(); return Result.OK(list); - } - - /** - * 添加 - * - * @param otaBaCxLsjl - * @return - */ - @AutoLog(value = "车型备案-历史记录-添加") - @ApiOperation(value="车型备案-历史记录-添加", notes="车型备案-历史记录-添加") - @PostMapping(value = "/add") - public Result add(@Validated @RequestBody OtaBaCxLsjl otaBaCxLsjl) { - otaBaCxLsjlService.add(otaBaCxLsjl); - return Result.OK("添加成功！"); - } - - /** - * 编辑 - * - * @param otaBaCxLsjl - * @return - */ - @AutoLog(value = "车型备案-历史记录-编辑") - @ApiOperation(value="车型备案-历史记录-编辑", notes="车型备案-历史记录-编辑") - @PutMapping(value = "/edit") - public Result edit(@Validated @RequestBody OtaBaCxLsjl otaBaCxLsjl) { - otaBaCxLsjlService.editById(otaBaCxLsjl); - return Result.OK("编辑成功!"); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @AutoLog(value = "车型备案-历史记录-通过id删除") - @ApiOperation(value="车型备案-历史记录-通过id删除", notes="车型备案-历史记录-通过id删除") - @DeleteMapping(value = "/delete") - public Result delete(@RequestParam(name="id",required=true) String id) { - otaBaCxLsjlService.deleteById(id); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @AutoLog(value = "车型备案-历史记录-批量删除") - @ApiOperation(value="车型备案-历史记录-批量删除", notes="车型备案-历史记录-批量删除") - @DeleteMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.otaBaCxLsjlService.deleteByIds(Arrays.asList(ids.split(","))); - return Result.OK("批量删除成功!"); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @AutoLog(value = "车型备案-历史记录-通过id查询") - @ApiOperation(value="车型备案-历史记录-通过id查询", notes="车型备案-历史记录-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name="id",required=true) String id) { - OtaBaCxLsjl otaBaCxLsjl = otaBaCxLsjlService.queryById(id); - if(otaBaCxLsjl==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(otaBaCxLsjl); - } - - /** - * 通过otaId查询 - * - * @param otaId - * @return - */ - @AutoLog(value = "车型备案-历史记录-通过otaId查询") - @ApiOperation(value="车型备案-历史记录-通过otaId查询", notes="车型备案-历史记录-通过otaId查询") - @GetMapping(value = "/queryByOtaId") - public Result queryByOtaId(@RequestParam(name="otaId",required=true) String otaId) { - List otaBaCxLsjlList = otaBaCxLsjlService.queryByOtaId(otaId); - if(otaBaCxLsjlList==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(otaBaCxLsjlList); - } + } /** - * 导出excel - * - * @param request - * @param otaBaCxLsjl - */ + * 添加 + * + * @param otaBaCxLsjl + * @return + */ + @AutoLog(value = "车型备案-历史记录-添加") + @ApiOperation(value = "车型备案-历史记录-添加", notes = "车型备案-历史记录-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody OtaBaCxLsjl otaBaCxLsjl) { + otaBaCxLsjlService.add(otaBaCxLsjl); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param otaBaCxLsjl + * @return + */ + @AutoLog(value = "车型备案-历史记录-编辑") + @ApiOperation(value = "车型备案-历史记录-编辑", notes = "车型备案-历史记录-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody OtaBaCxLsjl otaBaCxLsjl) { + otaBaCxLsjlService.editById(otaBaCxLsjl); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "车型备案-历史记录-通过id删除") + @ApiOperation(value = "车型备案-历史记录-通过id删除", notes = "车型备案-历史记录-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name = "id", required = true) String id) { + otaBaCxLsjlService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "车型备案-历史记录-批量删除") + @ApiOperation(value = "车型备案-历史记录-批量删除", notes = "车型备案-历史记录-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) { + this.otaBaCxLsjlService.deleteByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "车型备案-历史记录-通过id查询") + @ApiOperation(value = "车型备案-历史记录-通过id查询", notes = "车型备案-历史记录-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name = "id", required = true) String id) { + OtaBaCxLsjl otaBaCxLsjl = otaBaCxLsjlService.queryById(id); + if (otaBaCxLsjl == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(otaBaCxLsjl); + } + + /** + * 通过otaId查询 + * + * @param otaId + * @return + */ + @AutoLog(value = "车型备案-历史记录-通过otaId查询") + @ApiOperation(value = "车型备案-历史记录-通过otaId查询", notes = "车型备案-历史记录-通过otaId查询") + @GetMapping(value = "/queryByOtaId") + public Result queryByOtaId(@RequestParam(name = "otaId", required = true) String otaId) { + List otaBaCxLsjlList = otaBaCxLsjlService.queryByOtaId(otaId); + if (otaBaCxLsjlList == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(otaBaCxLsjlList); + } + + /** + * 导出excel + * + * @param request + * @param otaBaCxLsjl + */ @RequestMapping(value = "/exportXls") public ModelAndView exportXls(HttpServletRequest request, OtaBaCxLsjl otaBaCxLsjl) { return super.exportXls(request, otaBaCxLsjl, OtaBaCxLsjl.class, "车型备案-历史记录"); } /** - * 通过excel导入数据 - * - * @param request - * @param response - * @return - */ + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ @RequestMapping(value = "/importExcel", method = RequestMethod.POST) public Result importExcel(HttpServletRequest request, HttpServletResponse response) { return super.importExcel(request, response, OtaBaCxLsjl.class); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxLsjlServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxLsjlServiceImpl.java index 66a7184ed..41b20f07e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxLsjlServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxLsjlServiceImpl.java @@ -93,6 +93,7 @@ public class OtaBaCxLsjlServiceImpl extends ServiceImpl queryByOtaId(String otaId) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(OtaBaCxLsjl::getOtaId, otaId); + queryWrapper.orderByDesc(OtaBaCxLsjl::getCreateTime); List res = this.list(queryWrapper); return res; } From 3ec7893edac48c072ebcdcfbfba12bb3abb939cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Tue, 28 Mar 2023 00:13:46 +0800 Subject: [PATCH 404/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/OtaBaCxJsfzbacsServiceImpl.java | 38 +++++++-------- .../impl/OtaBaCxKsjxtmccsServiceImpl.java | 2 + .../modules/ota/utils/ImportFileUtil.java | 47 ++++++++++++------- 3 files changed, 51 insertions(+), 36 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java index fc68cc6da..3ff4f6d07 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java @@ -326,7 +326,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl uploadFiles1(File attFile, String[] strs, IOSSFileService ossFileService) throws Exception { List res = new ArrayList<>(); for (int i = 0; i < strs.length; i++) { - File file = ImportFileUtil.findFile(attFile, strs[i]); - if (null == file) { - throw new JeroBootException("找不到文件：" + strs[i]); - } - OSSFile ossFile = ossFileService.uploadLocalOfCos(ImportFileUtil.createMfileByFile(file), "", null, null); - if (ObjectUtils.isNotEmpty(ossFile)) { - res.add(ossFile); + if (StringUtils.isNotEmpty(strs[i])) { + File file = ImportFileUtil.findFile(attFile, strs[i]); + if (null == file) { + throw new JeroBootException("找不到文件：" + strs[i]); + } + OSSFile ossFile = ossFileService.uploadLocalOfCos(ImportFileUtil.createMfileByFile(file), "", null, null); + if (ObjectUtils.isNotEmpty(ossFile)) { + res.add(ossFile); + } } } return res; @@ -224,16 +235,18 @@ public class ImportFileUtil { public static String uploadFiles(File attFile, String[] strs, IOSSFileService ossFileService) throws Exception { String res = ""; for (int i = 0; i < strs.length; i++) { - File file = ImportFileUtil.findFile(attFile, strs[i]); - if (null == file) { - throw new JeroBootException("找不到文件：" + strs[i]); - } - OSSFile ossFile = ossFileService.uploadLocalOfCos(ImportFileUtil.createMfileByFile(file), "", null, null); - if (ObjectUtils.isNotEmpty(ossFile)) { - if (i >= strs.length - 1) { - res += ossFile.getId(); - } else { - res += ossFile.getId() + ","; + if (StringUtils.isNotEmpty(strs[i])) { + File file = ImportFileUtil.findFile(attFile, strs[i]); + if (null == file) { + throw new JeroBootException("找不到文件：" + strs[i]); + } + OSSFile ossFile = ossFileService.uploadLocalOfCos(ImportFileUtil.createMfileByFile(file), "", null, null); + if (ObjectUtils.isNotEmpty(ossFile)) { + if (i >= strs.length - 1) { + res += ossFile.getId(); + } else { + res += ossFile.getId() + ","; + } } } } From 899a50fd284fcbd55ef38c98f9118b23d9f977c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Tue, 28 Mar 2023 00:45:56 +0800 Subject: [PATCH 405/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/OtaBaCxKsjjsmccsServiceImpl.java | 13 ++++++++++--- .../service/impl/OtaBaCxKsjxtmccsServiceImpl.java | 6 +++--- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java index bf494f628..68e221205 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java @@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.common.exception.JeroBootException; +import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.ota.entity.*; import com.jero.modules.ota.enums.OtaModuleEnum; import com.jero.modules.ota.enums.OtaTitleEnum; @@ -60,6 +61,9 @@ public class OtaBaCxKsjjsmccsServiceImpl extends ServiceImpl oldList = getByOtaId(otaId); - List mccsList = parseFile(upFile, otaId, cut); + List mccsList = parseFile(upFile, attFile, otaId, cut); ComparisonUtil cu = new ComparisonUtil(); List reList = cu.comparisonListRecord(otaId, OtaModuleEnum.CX_KZXSJDJSFZGNMCYCS, OtaTitleEnum.GNMC.getName(), oldList, mccsList, sysDictService); deleteByOtaId(otaId); @@ -238,7 +242,7 @@ public class OtaBaCxKsjjsmccsServiceImpl extends ServiceImpl parseFile(File upFile, String otaId, String cut) throws Exception { + private List parseFile(File upFile, File attFile, String otaId, String cut) throws Exception { Date now = new Date(); List mccsList = new ArrayList<>(); Workbook wb = ImportFileUtil.readExcel(upFile); @@ -253,7 +257,10 @@ public class OtaBaCxKsjjsmccsServiceImpl extends ServiceImpl Date: Tue, 28 Mar 2023 02:46:21 +0800 Subject: [PATCH 406/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ota/controller/OtaBaCxListController.java | 6 +- .../ota/service/IOtaBaCxJbxxService.java | 2 + .../ota/service/IOtaBaCxListService.java | 76 ++++---- .../ota/service/IOtaBaCxZxsjyqService.java | 2 + .../service/impl/OtaBaCxJbxxServiceImpl.java | 43 +++++ .../service/impl/OtaBaCxListServiceImpl.java | 45 ++--- .../impl/OtaBaCxZxsjyqServiceImpl.java | 5 + .../modules/ota/utils/ImportFileUtil.java | 165 +++++++++++++++++- 8 files changed, 271 insertions(+), 73 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java index 76babb51b..35cba9c8e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java @@ -215,7 +215,11 @@ public class OtaBaCxListController extends JeroController { OtaBaCxJbxx importData(MultipartFile file, String otaId, String cut) throws Exception; OtaBaCxJbxx parseFileList(List upLoadFiles, String otaId, String cut) throws Exception; + + void exportData(File file, String otaId, String cut) throws Exception; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxListService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxListService.java index 1e87985e8..2d6663673 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxListService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxListService.java @@ -11,65 +11,65 @@ import java.util.List; /** * @Description: 车型及功能备案列表 * @Author: jero-boot - * @Date: 2023-03-17 + * @Date: 2023-03-17 * @Version: V1.0 */ public interface IOtaBaCxListService extends IService { - /** - * 保存 - * - * @param otaBaCxList - * @return - */ + /** + * 保存 + * + * @param otaBaCxList + * @return + */ void add(OtaBaCxList otaBaCxList); - /** - * 更新 - * - * @param otaBaCxList - * @return - */ + /** + * 更新 + * + * @param otaBaCxList + * @return + */ void editById(OtaBaCxList otaBaCxList); - /** - * 通过id删除 - * - * @param id - * @return - */ + /** + * 通过id删除 + * + * @param id + * @return + */ void deleteById(String id); - /** - * 批量删除 - * - * @param ids - * @return - */ + /** + * 批量删除 + * + * @param ids + * @return + */ void deleteByIds(List ids); - /** - * 通过id查询 - * - * @param id - * @return - */ + /** + * 通过id查询 + * + * @param id + * @return + */ OtaBaCxList queryById(String id); /** - * 列表查询 - */ + * 列表查询 + */ List queryList(); - /** - * 备案维护 - */ - void batchRecord(String ids, String bazt, String batjsj, String bz, String cut); + /** + * 备案维护 + */ + void batchRecord(String ids, String bazt, String batjsj, String bz, String cut); void exportTemplate(HttpServletResponse response, HttpServletRequest request); void importData(MultipartFile file, String cut) throws Exception; - void exportData(String otaId, HttpServletResponse response, HttpServletRequest request); + void exportData(String otaId, HttpServletResponse response, HttpServletRequest request) throws Exception; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxZxsjyqService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxZxsjyqService.java index e049a150e..1a9db6653 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxZxsjyqService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxZxsjyqService.java @@ -72,4 +72,6 @@ public interface IOtaBaCxZxsjyqService extends IService { OtaBaCxZxsjyq importData(MultipartFile file, String otaId, String cut) throws Exception; OtaBaCxZxsjyq parseFileList(List upLoadFiles, String otaId, String cut) throws Exception; + + void exportData(File file, String otaId, String cut) throws Exception; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java index 28562bfea..282f53525 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java @@ -236,5 +236,48 @@ public class OtaBaCxJbxxServiceImpl extends ServiceImpl importZip(MultipartFile file, String cut, String uploadPath) throws Exception { - List fileList = new ArrayList<>(); + public static File copyZip(MultipartFile file, String cut, String uploadPath) throws Exception { int pos = file.getOriginalFilename().lastIndexOf("."); String str = file.getOriginalFilename().substring(pos + 1).toLowerCase(); String filenameorg = file.getOriginalFilename().substring(0, pos); @@ -77,7 +83,12 @@ public class ImportFileUtil { if (str.equals("zip")) { zipEntryName = FileUnZip.unZipFiles(path + File.separator + file.getOriginalFilename(), path); } - File fileNew = new File(path); + return new File(path); + } + + public static List importZip(MultipartFile file, String cut, String uploadPath) throws Exception { + List fileList = new ArrayList<>(); + File fileNew = ImportFileUtil.copyZip(file, cut, uploadPath); for (File file1 : fileNew.listFiles()) { if (file1.getName().contains(".xls") || file1.getName().contains(".xlsx") || file1.isDirectory() || file1.getName().contains(".docx") || file1.getName().contains(".doc")) { @@ -112,7 +123,6 @@ public class ImportFileUtil { } public static Workbook readExcel(File file) { - Workbook wb = null; if (file == null) { return null; } @@ -121,9 +131,9 @@ public class ImportFileUtil { try { is = new FileInputStream(file); if (".xls".equals(extString)) { - return wb = new HSSFWorkbook(is); + return new HSSFWorkbook(is); } else if (".xlsx".equals(extString)) { - return wb = new XSSFWorkbook(is); + return new XSSFWorkbook(is); } is.close(); } catch (FileNotFoundException e) { @@ -133,7 +143,7 @@ public class ImportFileUtil { } finally { IOUtils.closeQuietly(is); } - return wb; + return null; } public static String getCellValue(Cell cell, Workbook workbook) throws Exception { @@ -202,6 +212,19 @@ public class ImportFileUtil { return null; } + public static File findFile(List file, String fileName) throws Exception { + for (File file1 : file) {// 遍历数组 + // 判断当前的File对象是否为文件夹 + if (!file1.isDirectory()) { + String name = file1.getName(); + if (name.equals(fileName)) { + return file1; + } + } + } + return null; + } + public static MultipartFile createMfileByFile(File file) { MultipartFile mFile = null; try { @@ -253,4 +276,130 @@ public class ImportFileUtil { return res; } + private static final int BUFFER_SIZE = 2 * 1024; + + /** + * 压缩成ZIP 方法1 + * + * @param srcDir 压缩文件夹路径 + * @param out 压缩文件输出流 + * @param KeepDirStructure 是否保留原来的目录结构,true:保留目录结构; + * false:所有文件跑到压缩包根目录下(注意：不保留目录结构可能会出现同名文件,会压缩失败) + * @throws RuntimeException 压缩失败会抛出运行时异常 + */ + public static void toZip(String srcDir, OutputStream out, boolean KeepDirStructure) + throws RuntimeException { + + long start = System.currentTimeMillis(); + ZipOutputStream zos = null; + try { + zos = new ZipOutputStream(out); + File sourceFile = new File(srcDir); + compress(sourceFile, zos, sourceFile.getName(), KeepDirStructure); + long end = System.currentTimeMillis(); + System.out.println("压缩完成，耗时：" + (end - start) + " ms"); + } catch (Exception e) { + throw new RuntimeException("zip error from ZipUtils", e); + } finally { + if (zos != null) { + try { + zos.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + + } + + /** + * 压缩成ZIP 方法2 + * + * @param srcFiles 需要压缩的文件列表 + * @param out 压缩文件输出流 + * @throws RuntimeException 压缩失败会抛出运行时异常 + */ + public static void toZip(List srcFiles, OutputStream out) throws RuntimeException { + long start = System.currentTimeMillis(); + ZipOutputStream zos = null; + try { + zos = new ZipOutputStream(out); + for (File srcFile : srcFiles) { + byte[] buf = new byte[BUFFER_SIZE]; + zos.putNextEntry(new ZipEntry(srcFile.getName())); + int len; + FileInputStream in = new FileInputStream(srcFile); + while ((len = in.read(buf)) != -1) { + zos.write(buf, 0, len); + } + zos.closeEntry(); + in.close(); + } + long end = System.currentTimeMillis(); + System.out.println("压缩完成，耗时：" + (end - start) + " ms"); + } catch (Exception e) { + throw new RuntimeException("zip error from ZipUtils", e); + } finally { + if (zos != null) { + try { + zos.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + } + + /** + * 递归压缩方法 + * + * @param sourceFile 源文件 + * @param zos zip输出流 + * @param name 压缩后的名称 + * @param KeepDirStructure 是否保留原来的目录结构,true:保留目录结构; + * false:所有文件跑到压缩包根目录下(注意：不保留目录结构可能会出现同名文件,会压缩失败) + * @throws Exception + */ + private static void compress(File sourceFile, ZipOutputStream zos, String name, + boolean KeepDirStructure) throws Exception { + byte[] buf = new byte[BUFFER_SIZE]; + if (sourceFile.isFile()) { + // 向zip输出流中添加一个zip实体，构造器中name为zip实体的文件的名字 + zos.putNextEntry(new ZipEntry(name)); + // copy文件到zip输出流中 + int len; + FileInputStream in = new FileInputStream(sourceFile); + while ((len = in.read(buf)) != -1) { + zos.write(buf, 0, len); + } + // Complete the entry + zos.closeEntry(); + in.close(); + } else { + File[] listFiles = sourceFile.listFiles(); + if (listFiles == null || listFiles.length == 0) { + // 需要保留原来的文件结构时,需要对空文件夹进行处理 + if (KeepDirStructure) { + // 空文件夹的处理 + zos.putNextEntry(new ZipEntry(name + "/")); + // 没有文件，不需要文件的copy + zos.closeEntry(); + } + + } else { + for (File file : listFiles) { + // 判断是否需要保留原来的文件结构 + if (KeepDirStructure) { + // 注意：file.getName()前面需要带上父文件夹的名字加一斜杠, + // 不然最后压缩包中就不能保留原来的文件结构,即：所有文件都跑到压缩包根目录下了 + compress(file, zos, name + "/" + file.getName(), KeepDirStructure); + } else { + compress(file, zos, file.getName(), KeepDirStructure); + } + + } + } + } + } } + From c68e1cd6def52ce0ff9342fa374a6e64f8f8ee53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Tue, 28 Mar 2023 04:00:24 +0800 Subject: [PATCH 407/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ota/service/IOtaBaCxAqcsService.java | 2 + .../ota/service/IOtaBaCxKsjjsmccsService.java | 2 + .../ota/service/IOtaBaCxKsjxtmccsService.java | 2 + .../ota/service/IOtaBaCxZxsjyqService.java | 2 +- .../service/impl/OtaBaCxAqcsServiceImpl.java | 47 ++++++++++ .../impl/OtaBaCxKsjjsmccsServiceImpl.java | 67 +++++++++++++ .../impl/OtaBaCxKsjxtmccsServiceImpl.java | 93 ++++++++++++++++++- .../service/impl/OtaBaCxListServiceImpl.java | 19 +++- .../impl/OtaBaCxZxsjyqServiceImpl.java | 59 +++++++++++- .../modules/ota/utils/ImportFileUtil.java | 47 ++++++++++ 10 files changed, 333 insertions(+), 7 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxAqcsService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxAqcsService.java index 10614ff9d..30fbd0593 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxAqcsService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxAqcsService.java @@ -71,4 +71,6 @@ public interface IOtaBaCxAqcsService extends IService { OtaBaCxAqcs importData(MultipartFile file, String otaId, String cut) throws Exception; OtaBaCxAqcs parseFileList(List upLoadFiles, String otaId, String cut) throws Exception; + + void exportData(File file, File attFile, String otaId, String cut) throws Exception; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxKsjjsmccsService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxKsjjsmccsService.java index 414f5cfad..857e3eb74 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxKsjjsmccsService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxKsjjsmccsService.java @@ -71,4 +71,6 @@ public interface IOtaBaCxKsjjsmccsService extends IService { void importData(MultipartFile file, String otaId, String cut) throws Exception; void parseFileList(List upLoadFiles, String otaId, String cut) throws Exception; + + void exportData(File file, File attFile, String otaId, String cut) throws Exception } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxKsjxtmccsService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxKsjxtmccsService.java index 8fda6c543..3a5133cd0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxKsjxtmccsService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxKsjxtmccsService.java @@ -71,4 +71,6 @@ public interface IOtaBaCxKsjxtmccsService extends IService { void importData(MultipartFile file, String otaId, String cut) throws Exception; void parseFileList(List upLoadFiles, String otaId, String cut) throws Exception; + + void exportData(File file, File attFile, String otaId, String cut) throws Exception; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxZxsjyqService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxZxsjyqService.java index 1a9db6653..f8e6cb910 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxZxsjyqService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxZxsjyqService.java @@ -73,5 +73,5 @@ public interface IOtaBaCxZxsjyqService extends IService { OtaBaCxZxsjyq parseFileList(List upLoadFiles, String otaId, String cut) throws Exception; - void exportData(File file, String otaId, String cut) throws Exception; + void exportData(File file, File attFile,String otaId, String cut) throws Exception; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java index d77a727dd..1cdd57027 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java @@ -3,6 +3,7 @@ package com.jero.modules.ota.service.impl; import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.common.exception.JeroBootException; +import com.jero.common.util.oss.CosBootUtil; import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.ota.entity.*; @@ -24,6 +25,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import java.io.File; +import java.io.InputStream; import java.util.List; import java.util.Date; @@ -233,4 +235,49 @@ public class OtaBaCxAqcsServiceImpl extends ServiceImpl attList = JSONArray.parseArray(attStr, AttachmentEO.class); + if (ObjectUtils.isNotEmpty(attList)) { + for (AttachmentEO aeo : attList) { + List ossFileList = ossFileService.getFileInfos(aeo.getId()); + for (OSSFile ossFile : ossFileList) { + String filePath = ossFile.getUrl(); + boolean b = CosBootUtil.doesObjectExist(filePath); + if (b) { + InputStream download = CosBootUtil.download(filePath); + ImportFileUtil.writeToLocal(attFile.getCanonicalPath() + "/" + ossFile.getFileName(), download); + sb.append(ossFile.getFileName()).append(","); + } + } + } + } + cell.setCellValue(sb.toString()); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java index 68e221205..9c3d2722e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java @@ -5,6 +5,8 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.common.exception.JeroBootException; +import com.jero.common.util.oss.CosBootUtil; +import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.ota.entity.*; import com.jero.modules.ota.enums.OtaModuleEnum; @@ -27,6 +29,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import java.io.File; +import java.io.InputStream; import java.lang.reflect.Field; import java.util.*; @@ -299,4 +302,68 @@ public class OtaBaCxKsjjsmccsServiceImpl extends ServiceImpl mccsList = this.getByOtaId(otaId); + Workbook wb = ImportFileUtil.readExcel(file); + Sheet s = wb.getSheetAt(0); + int startRow = 3; + for (OtaBaCxKsjjsmccs mccs : mccsList) { + Row row = s.getRow(startRow); + Cell cell = row.createCell(0); + cell.setCellValue(mccs.getGnmc()); + cell = row.createCell(1); + cell.setCellValue(ImportFileUtil.getCellValueYesOrNo(mccs.getPzqk())); + cell = row.createCell(2); + cell.setCellValue(ImportFileUtil.getCellValueYesOrNo(mccs.getSfksj())); + cell = row.createCell(3); + cell.setCellValue(mccs.getJszdhjb()); + cell = row.createCell(4); + cell.setCellValue(mccs.getSjggcs()); + cell = row.createCell(5); + cell.setCellValue(mccs.getGnms()); + cell = row.createCell(6); + cell.setCellValue(mccs.getSytj()); + cell = row.createCell(7); + cell.setCellValue(mccs.getKzqmc()); + cell = row.createCell(8); + cell.setCellValue(mccs.getKzqscqy()); + cell = row.createCell(9); + cell.setCellValue(mccs.getKzqxh()); + cell = row.createCell(10); + cell.setCellValue(mccs.getYjbbxx()); + cell = row.createCell(11); + cell.setCellValue(mccs.getRjkfqy()); + cell = row.createCell(12); + cell.setCellValue(mccs.getCzxtbbh()); + cell = row.createCell(13); + cell.setCellValue(mccs.getCsyzsj()); + } + Row row = s.getRow(startRow); + Cell cell = row.createCell(0); + cell.setCellValue("证明材料"); + cell = row.getCell(1); + OtaBaCxList otaBaCxList = otaBaCxListService.queryById(otaId); + if (ObjectUtils.isNotEmpty(otaBaCxList)) { + StringBuilder sb = new StringBuilder(); + String fj = otaBaCxList.getZxsjjsfj(); + if (StringUtils.isNotEmpty(fj)) { + String[] strs = fj.split(","); + for (String str : strs) { + List ossFileList = ossFileService.getFileInfos(str); + for (OSSFile ossFile : ossFileList) { + String filePath = ossFile.getUrl(); + boolean b = CosBootUtil.doesObjectExist(filePath); + if (b) { + InputStream download = CosBootUtil.download(filePath); + ImportFileUtil.writeToLocal(attFile.getCanonicalPath() + "/" + ossFile.getFileName(), download); + sb.append(ossFile.getFileName()).append(","); + } + } + } + cell.setCellValue(sb.toString()); + } + } + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java index c66e097fc..f4f3d2c04 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java @@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.common.exception.JeroBootException; +import com.jero.common.util.oss.CosBootUtil; import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.ota.entity.*; @@ -28,6 +29,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import java.io.File; +import java.io.InputStream; import java.lang.reflect.Field; import java.util.*; @@ -300,4 +302,93 @@ public class OtaBaCxKsjxtmccsServiceImpl extends ServiceImpl mccsList = this.getByOtaId(otaId); + Workbook wb = ImportFileUtil.readExcel(file); + Sheet s = wb.getSheetAt(0); + + int startRow = 3; + for (OtaBaCxKsjxtmccs mccs : mccsList) { + Row row = s.getRow(startRow); + Cell cell = row.createCell(0); + cell.setCellValue(mccs.getXtlb()); + + cell = row.createCell(1); + cell.setCellValue(ImportFileUtil.getCellValueYesOrNo(mccs.getSfksj())); + + cell = row.createCell(2); + cell.setCellValue(mccs.getSjbgcs()); + cell = row.createCell(3); + StringBuilder sb = new StringBuilder(); + String tptStr = mccs.getTpt(); + if (StringUtils.isNotEmpty(tptStr)) { + String[] strs = tptStr.split(","); + for (String str : strs) { + List ossFileList = ossFileService.getFileInfos(str); + for (OSSFile ossFile : ossFileList) { + String filePath = ossFile.getUrl(); + boolean b = CosBootUtil.doesObjectExist(filePath); + if (b) { + InputStream download = CosBootUtil.download(filePath); + ImportFileUtil.writeToLocal(attFile.getCanonicalPath() + "/" + ossFile.getFileName(), download); + sb.append(ossFile.getFileName()).append(","); + } + } + } + cell.setCellValue(sb.toString()); + } + cell = row.createCell(4); + cell.setCellValue(mccs.getKzqmc()); + cell = row.createCell(5); + cell.setCellValue(mccs.getAqwzxdj()); + cell = row.createCell(6); + cell.setCellValue(mccs.getKzqscqy()); + cell = row.createCell(7); + cell.setCellValue(mccs.getKzqxh()); + cell = row.createCell(8); + cell.setCellValue(mccs.getYjbbxx()); + cell = row.createCell(9); + cell.setCellValue(mccs.getCsrjbbh()); + cell = row.createCell(10); + cell.setCellValue(mccs.getCsrjbwzsj()); + cell = row.createCell(11); + cell.setCellValue(mccs.getSjsfyx()); + cell = row.createCell(12); + cell.setCellValue(mccs.getCzxtlx()); + cell = row.createCell(13); + cell.setCellValue(mccs.getCzxtscqy()); + cell = row.createCell(14); + cell.setCellValue(mccs.getCzxtbbh()); + startRow++; + } + Row row = s.getRow(startRow); + Cell cell = row.createCell(0); + cell.setCellValue("证明材料"); + cell = row.getCell(1); + OtaBaCxList otaBaCxList = otaBaCxListService.queryById(otaId); + if (ObjectUtils.isNotEmpty(otaBaCxList)) { + StringBuilder sb = new StringBuilder(); + String fj = otaBaCxList.getZxsjxtfj(); + if (StringUtils.isNotEmpty(fj)) { + String[] strs = fj.split(","); + for (String str : strs) { + List ossFileList = ossFileService.getFileInfos(str); + for (OSSFile ossFile : ossFileList) { + String filePath = ossFile.getUrl(); + boolean b = CosBootUtil.doesObjectExist(filePath); + if (b) { + InputStream download = CosBootUtil.download(filePath); + ImportFileUtil.writeToLocal(attFile.getCanonicalPath() + "/" + ossFile.getFileName(), download); + sb.append(ossFile.getFileName()).append(","); + } + } + } + cell.setCellValue(sb.toString()); + } + } + } + +} \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java index c7c31763c..5c02abaa9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java @@ -187,16 +187,27 @@ public class OtaBaCxListServiceImpl extends ServiceImpl attList = JSONArray.parseArray(attStr, AttachmentEO.class); + if (ObjectUtils.isNotEmpty(attList)) { + for (AttachmentEO aeo : attList) { + List ossFileList = ossFileService.getFileInfos(aeo.getId()); + for (OSSFile ossFile : ossFileList) { + String filePath = ossFile.getUrl(); + boolean b = CosBootUtil.doesObjectExist(filePath); + if (b) { + InputStream download = CosBootUtil.download(filePath); + ImportFileUtil.writeToLocal(attFile.getCanonicalPath() + "/" + ossFile.getFileName(), download); + sb.append(ossFile.getFileName()).append(","); + } + } + } + } + cell.setCellValue(sb.toString()); } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ImportFileUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ImportFileUtil.java index d5b017a1e..6855a6cec 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ImportFileUtil.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ImportFileUtil.java @@ -179,6 +179,18 @@ public class ImportFileUtil { return res; } + public static String getCellValueYesOrNo(String str) throws Exception { + String res = ""; + if (StringUtils.isNotEmpty(str)) { + if (str.equals("1")) { + res = "是"; + } else if (str.equals("2")) { + res = "否"; + } + } + return res; + } + public static String getCellValueDict(Cell cell, Workbook wb, String dictType, ISysDictService sysDictService, String cut) throws Exception { String res = ""; String str = ImportFileUtil.getCellValue(cell, wb); @@ -212,6 +224,21 @@ public class ImportFileUtil { return null; } + public static File findFoder(File file, String fileName) throws Exception { + // 获取此地址中的所有文件以及文件夹(File[] list) + File[] listFiles = file.listFiles();// 获取此地址中的所有文件以及文件夹(File[] list) + for (File file1 : listFiles) {// 遍历数组 + // 判断当前的File对象是否为文件夹 + if (file1.isDirectory()) { + String name = file1.getName(); + if (name.equals(fileName)) { + return file1; + } + } + } + return null; + } + public static File findFile(List file, String fileName) throws Exception { for (File file1 : file) {// 遍历数组 // 判断当前的File对象是否为文件夹 @@ -401,5 +428,25 @@ public class ImportFileUtil { } } } + + /** + * 将InputStream写入本地文件 + * + * @param input 输入流 + * @throws IOException IOException + */ + public static void writeToLocal(String path, InputStream input) + throws IOException { + int index; + byte[] bytes = new byte[1024]; + FileOutputStream downloadFile = new FileOutputStream(path); + while ((index = input.read(bytes)) != -1) { + downloadFile.write(bytes, 0, index); + downloadFile.flush(); + } + input.close(); + downloadFile.close(); + + } } From b9389860542a09eba7befe12afe896a83e7b4df3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Tue, 28 Mar 2023 04:42:48 +0800 Subject: [PATCH 408/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ota/service/IOtaBaCxJsfzbacsService.java | 2 + .../ota/service/IOtaBaCxKsjjsmccsService.java | 2 +- .../impl/OtaBaCxJsfzbacsServiceImpl.java | 284 ++++++++++++++++++ .../service/impl/OtaBaCxListServiceImpl.java | 3 + .../modules/ota/utils/ImportFileUtil.java | 14 +- 5 files changed, 303 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxJsfzbacsService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxJsfzbacsService.java index eae2540f8..96b487e1f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxJsfzbacsService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxJsfzbacsService.java @@ -71,4 +71,6 @@ public interface IOtaBaCxJsfzbacsService extends IService { void importData(MultipartFile file, String otaId, String cut) throws Exception; void parseFileList(List upLoadFiles, String otaId, String cut) throws Exception; + + void exportData(File file, String otaId, String cut) throws Exception; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxKsjjsmccsService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxKsjjsmccsService.java index 857e3eb74..b38a10abb 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxKsjjsmccsService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxKsjjsmccsService.java @@ -72,5 +72,5 @@ public interface IOtaBaCxKsjjsmccsService extends IService { void parseFileList(List upLoadFiles, String otaId, String cut) throws Exception; - void exportData(File file, File attFile, String otaId, String cut) throws Exception + void exportData(File file, File attFile, String otaId, String cut) throws Exception; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java index 3ff4f6d07..f1dbcf952 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java @@ -248,6 +248,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl upLoadFiles, String otaId, String cut) throws Exception { File upFile = null; @@ -577,4 +578,287 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl sjmkList = OtaBaCxSjmkService.queryByOtaId(otaId); + int startRow = 63; + for (OtaBaCxSjmk sjmk : sjmkList) { + row = s.getRow(startRow); + cell = row.createCell(0); + cell.setCellValue(sjmk.getBjmc()); + cell = row.createCell(1); + cell.setCellValue(ImportFileUtil.getCellValueYesOrNo(sjmk.getPzqk())); + cell = row.createCell(2); + cell.setCellValue(sjmk.getKzqmc()); + cell = row.createCell(3); + cell.setCellValue(sjmk.getYjggxh()); + cell = row.createCell(4); + cell.setCellValue(sjmk.getYjscqy()); + cell = row.createCell(5); + cell.setCellValue(sjmk.getRjbb()); + cell = row.createCell(6); + cell.setCellValue(sjmk.getRjkfqy()); + cell = row.createCell(7); + cell.setCellValue(sjmk.getBzwz()); + startRow++; + } + + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java index 5c02abaa9..130bdb9b5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java @@ -209,6 +209,9 @@ public class OtaBaCxListServiceImpl extends ServiceImpl Date: Tue, 28 Mar 2023 08:59:50 +0800 Subject: [PATCH 409/645] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95-?= =?UTF-8?q?=E6=92=A4=E5=9B=9E=E4=B8=8D=E7=AC=A6=E5=90=88=E7=9A=84=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E8=BF=9B=E8=A1=8C=E6=8F=90=E7=A4=BA;=20=E6=B3=95?= =?UTF-8?q?=E8=A7=84=E6=B8=85=E5=8D=95-=E6=B3=95=E8=A7=84=E5=B7=A5?= =?UTF-8?q?=E7=A8=8B=E5=B8=88-=E4=B8=8D=E5=A1=AB=E5=86=99=E7=AC=A6?= =?UTF-8?q?=E5=90=88=E6=80=A7=E6=B5=81=E7=A8=8B=E7=9A=84=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E8=AF=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 1 + .../components/listEditModel.vue | 172 +++++++++--------- 3 files changed, 88 insertions(+), 86 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index eddd0a7a9..c838f6ab1 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1721,5 +1721,6 @@ module.exports = { cantTransferToYourself:"Can't transfer to yourself", theDataYouInitiate:'The data you selected does not meet the process initiation criteria. Please recheck and initiate', dataWithProcessReleasedCannotBeReset:'Data with a process status of list to be released cannot be reset', + reasonForReturnOfDesignCompliance:'Reason for return of design compliance', noteone:'Note: CSV format is supported. The value is within 20M and the number is 1 to 10', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 456f5bb73..e7f0d6b48 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1824,4 +1824,5 @@ module.exports = { noteone:'注:支持CSV格式，大小20M以内，数量1-10个', theDataYouInitiate:'您所选的数据，均不符合流程发起条件，请重新检查后发起', dataWithProcessReleasedCannotBeReset:'流程状态为清单待发布的数据不能被重置', + reasonForReturnOfDesignCompliance:'设计符合性退回原因', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue index 888cc6781..3367d51f6 100644 --- a/jero-web/src/views/projectManagement/components/listEditModel.vue +++ b/jero-web/src/views/projectManagement/components/listEditModel.vue @@ -782,95 +782,95 @@
- - - +
+ {{$t('listConfirmationRejectionReason')}} +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+ + +
+
+ {{$t('rejectedBy')}} +
+
+ {{item.createBy ? item.createBy : '--'}} +
+
+ + +
+
+ {{$t('rejectionTime')}} +
+
+ {{item.rejectTime ? item.rejectTime : '--'}} +
+
+ + + + +
+
+ {{$t('rejectReason')}} +
+
+ {{item.rejectCause ? item.rejectCause : '--'}} +
+
+ + +
- - - +
+ {{$t('taskConfirmationRejectionReason')}} +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+ + +
+
+ {{$t('rejectedBy')}} +
+
+ {{item.createBy ? item.createBy : '--'}} +
+
+ + +
+
+ {{$t('rejectionTime')}} +
+
+ {{item.rejectTime ? item.rejectTime : '--'}} +
+
+ + + + +
+
+ {{$t('rejectReason')}} +
+
+ {{item.rejectCause ? item.rejectCause : '--'}} +
+
+ + +
From 89503ec389d5a48e8ace26fc796935a74b5eedcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Tue, 28 Mar 2023 09:11:55 +0800 Subject: [PATCH 410/645] =?UTF-8?q?=E8=B0=83=E5=8F=96-=E5=8B=BE=E9=80=89?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E4=B8=AD=E5=B7=B2=E7=BB=8F=E5=AD=98=E5=9C=A8?= =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=E7=9A=84=E6=8F=90=E7=A4=BA=E8=AF=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/transferListvirtal.vue | 481 +++++++++--------- 1 file changed, 248 insertions(+), 233 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/transferListvirtal.vue b/jero-web/src/views/projectManagement/components/certificationList/components/transferListvirtal.vue index a23a71c49..e9c82a9db 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/transferListvirtal.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/transferListvirtal.vue @@ -33,8 +33,8 @@ - - + + {{$t('query')}} {{$t('reset')}} @@ -52,18 +52,18 @@ :loading="loading"> - - - - - - - - - - - - + + + + + + + + + + + +
@@ -74,241 +74,256 @@ \ No newline at end of file From 3665b109f5b47fa29b19d4ab8ce626183baf01fa Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Tue, 28 Mar 2023 09:14:43 +0800 Subject: [PATCH 411/645] update --- .../impl/ProjectCertificationInventoryEOServiceImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index cc1ad52c3..3c130b781 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -804,6 +804,9 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl Date: Tue, 28 Mar 2023 09:20:58 +0800 Subject: [PATCH 412/645] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vehicleinformation/components/beupgradedonline.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue index 41ffbf0b9..ab3182be3 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue @@ -75,10 +75,10 @@ - + - + From 4495ffbaa1cc31301de6167da0a14691cd78eb71 Mon Sep 17 00:00:00 2001 From: yuekuo Date: Tue, 28 Mar 2023 09:32:02 +0800 Subject: [PATCH 413/645] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/basicInformation.vue | 28 ++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue index 82ae11e47..897b043fa 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue @@ -150,13 +150,6 @@ {{$t('Vehicledynamictype')}}
-
-
- {{$t('communicationTerminal')}} +
+ {{$t('communicationTerminal')}}
-
+
{{$t('otaUpgradeManagementSystem')}}
@@ -416,9 +409,9 @@ import { message } from 'ant-design-vue' font-weight: 500; font-size: 14px; margin-right: 16px; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; + // overflow: hidden; + // text-overflow: ellipsis; + // white-space: nowrap; height: 42px; line-height: 42px; margin-top: 3px; @@ -475,4 +468,13 @@ import { message } from 'ant-design-vue' color: red; margin-right: 3px; } +.plus{ + margin-top: 5px; + line-height: 1.4 !important; + } + .plus2{ + width: 134px; + margin-top: 5px; + line-height: 1.4 !important; + } \ No newline at end of file From 88d73ae906836fb5f0338144da6a43e0ab89120b Mon Sep 17 00:00:00 2001 From: yuekuo Date: Tue, 28 Mar 2023 09:45:01 +0800 Subject: [PATCH 414/645] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E5=90=8E=E5=AD=98?= =?UTF-8?q?=E6=94=BEid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/otamanagement/upgradeactivity/index.vue | 1 + .../vehicleinformation/components/basicInformation.vue | 1 + .../vehicleinformation/components/beupgradedonline.vue | 5 ++++- .../otamanagement/vehicleinformation/components/other.vue | 7 +++++-- .../vehicleinformation/components/recordparameters.vue | 7 +++++-- .../vehicleinformation/components/safetyPrecautions.vue | 5 ++++- .../vehicleinformation/components/upgradeRequirements.vue | 7 +++++-- .../vehicleinformation/components/upgradedonline.vue | 7 +++++-- 8 files changed, 30 insertions(+), 10 deletions(-) diff --git a/jero-web/src/views/otamanagement/upgradeactivity/index.vue b/jero-web/src/views/otamanagement/upgradeactivity/index.vue index e144bf3b1..1900bb800 100644 --- a/jero-web/src/views/otamanagement/upgradeactivity/index.vue +++ b/jero-web/src/views/otamanagement/upgradeactivity/index.vue @@ -450,6 +450,7 @@ export default { // 维护 maintenanceClick(row){ this.$refs.maintenanceRef.edit(row) + console.log(row); }, // 数据维护 maintenanceallClick(){ diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue index 897b043fa..8d130bb6f 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue @@ -364,6 +364,7 @@ import { message } from 'ant-design-vue' if(res.code == 200){ localStorage.setItem('otaId', res.result.otaId) this.$message.success(this.$t('SavedSuccessfully')) + this.getData() } }) } diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue index ab3182be3..0ac3c4c48 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue @@ -362,8 +362,11 @@ import ImportFile from '@/components/ImportFileData/index' }, save(){ postAction('/ota/otaBaCxKsjjsmccs/add',{otaId:localStorage.getItem('otaId'),list:this.dataSource,fj:this.fileList}).then(res =>{ - console.log(res); + if(res.code==200){ this.$message.success(this.$t('SavedSuccessfully')) + this.getData() + } + }) }, last(){ diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/other.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/other.vue index fec52fa31..ec37b9bc7 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/other.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/other.vue @@ -70,8 +70,11 @@ export default { if (valid) { this.flag = 1 postAction('/ota/otaBaCxQt/add',{otaId:localStorage.getItem('otaId'),...this.queryParam}).then(res=>{ - console.log(res); - this.$message.success(this.$t('SavedSuccessfully')) + if(res.code==200){ + this.$message.success(this.$t('SavedSuccessfully')) + this.getData() + } + }) } else { return false; diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue index 077f9fd9d..f4c4133b4 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue @@ -944,8 +944,11 @@ export default { cs:arr, kzq:this.dataSourceList }).then( res => { - console.log(res); - this.$message.success(this.$t('SavedSuccessfully')) + if(res.code==200){ + this.$message.success(this.$t('SavedSuccessfully')) + this.getData() + } + }) }, diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue index 2690dc4a0..1619acb2d 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue @@ -249,8 +249,11 @@ import ImportFile from '@/components/ImportFileData/index' obj.xxaqjz = this.dataSource[3].info obj.zmclList = this.fileList.uploadName postAction('/ota/otaBaCxAqcs/add',obj).then(res =>{ - console.log(res); + if(res.code==200){ this.$message.success(this.$t('SavedSuccessfully')) + this.getData() + } + }) }, last(){ diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue index 5dbb6bc44..e8986b7e6 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue @@ -295,8 +295,11 @@ export default { obj.sjzt = this.dataSource[9].relevantverification obj.zmclList = this.fileList.uploadName postAction('/ota/otaBaCxZxsjyq/add', obj).then(res => { - console.log(res); - this.$message.success(this.$t('SavedSuccessfully')) + if(res.code==200){ + this.$message.success(this.$t('SavedSuccessfully')) + this.getData() + } + }) }, last() { diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue index 5f4f216e0..1b0838b3e 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue @@ -457,8 +457,11 @@ import uploadFileOta from '@/components/uploadFileOta/file' }, save(){ postAction('/ota/otaBaCxKsjxtmccs/add',{otaId:localStorage.getItem('otaId'),list:this.dataSource,fj:this.fileList}).then(res => { - console.log(res); - this.$message.success(this.$t('SavedSuccessfully')) + if(res.code==200){ + this.$message.success(this.$t('SavedSuccessfully')) + this.getData() + } + }) } } From f53db1f6bce84ab993cae38807be1035cfdc5143 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Tue, 28 Mar 2023 09:46:37 +0800 Subject: [PATCH 415/645] =?UTF-8?q?OTA=E7=AE=A1=E7=90=86=E5=B7=A5=E5=85=B7?= =?UTF-8?q?-=E5=8D=87=E7=BA=A7=E6=B4=BB=E5=8A=A8=E5=A4=87=E6=A1=88-?= =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=BD=B1=E5=93=8D=E8=AF=84=E4=BC=B0-?= =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 2 ++ jero-web/src/common/lang/zh-cn.js | 2 ++ .../components/upgradeimpactassessment.vue | 19 ++++++++++++++----- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index c838f6ab1..8f052bcd8 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1723,4 +1723,6 @@ module.exports = { dataWithProcessReleasedCannotBeReset:'Data with a process status of list to be released cannot be reset', reasonForReturnOfDesignCompliance:'Reason for return of design compliance', noteone:'Note: CSV format is supported. The value is within 20M and the number is 1 to 10', + notetwo:'\n1. Provide the modified or expanded batch of "Announcement" and supporting materials;\n2. Verification materials shall be submitted to ensure that products meet the relevant requirements of national laws and regulations, technologies, standards and technical specifications;\n', + notethree:'Provide supporting materials', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index e7f0d6b48..afb84484e 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1825,4 +1825,6 @@ module.exports = { theDataYouInitiate:'您所选的数据，均不符合流程发起条件，请重新检查后发起', dataWithProcessReleasedCannotBeReset:'流程状态为清单待发布的数据不能被重置', reasonForReturnOfDesignCompliance:'设计符合性退回原因', + notetwo:'\n1、提供变更或扩展后的《公告》批次及证明材料;\n2、应提交验证材料，保障产品符合国家法律法规、技术、标准及技术规范等相关要求;\n', + notethree:'\n提供证明材料\n', } \ No newline at end of file diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue index d78323297..ef5679a0d 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue @@ -62,8 +62,10 @@ - - {{$t('uploadattachment')}} + + {{$t('uploadattachment')}} + {{$t('notetwo')}} + {{$t('format')}}
@@ -110,7 +112,7 @@ - + {{ $t('yes') }} {{ $t('not') }} @@ -133,7 +135,9 @@
- {{$t('uploadattachment')}} + {{$t('uploadattachment')}} + {{$t('notethree')}} + {{$t('format')}}
@@ -464,7 +468,7 @@ this.$forceUpdate() } ::v-deep .ant-layout-content { min-height: 60px; - line-height: 50px; + line-height: 20px; } //::v-deep > .ant-layout { // margin-bottom: 48px; @@ -542,4 +546,9 @@ this.$forceUpdate() height: 50px; margin-top: 8px; } +.spanone{ + white-space: pre-wrap; + padding: 0 45px; + display: flex; +} \ No newline at end of file From 149d47a73bbe987d6a6c28ae5824b48e3dae7d0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Tue, 28 Mar 2023 09:49:54 +0800 Subject: [PATCH 416/645] =?UTF-8?q?=E8=B0=83=E5=8F=96-=E5=8B=BE=E9=80=89?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E4=B8=AD=E5=B7=B2=E7=BB=8F=E5=AD=98=E5=9C=A8?= =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=E7=9A=84=E6=8F=90=E7=A4=BA=E8=AF=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/certificationList/index.vue | 12 ++++++------ .../components/listOfRegulations.vue | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue index cf788bfe9..4eac491a2 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -78,7 +78,7 @@
-
+
{{ $t('preservation') }}
@@ -333,7 +333,7 @@ @@ -189,6 +192,7 @@ export default { disabled: false, formInline: {}, confirmLoading: false, + acceptcode:'', projectNameList: [], DeliverableTreeList: [], rules: { @@ -302,6 +306,11 @@ export default { }) }, clickButtonToUpload(item) { + if(item == 'VINcodelist'){ + this.acceptcode = 'csv' + }else { + this.acceptcode = 'doc,docx,pdf' + } this.$refs.uploadFile.perentHandleFunc() this.$refs.uploadFile.visible = true this.uploadName = item diff --git a/jero-web/src/views/otamanagement/upgradeactivity/index.vue b/jero-web/src/views/otamanagement/upgradeactivity/index.vue index 1900bb800..9e0b371ed 100644 --- a/jero-web/src/views/otamanagement/upgradeactivity/index.vue +++ b/jero-web/src/views/otamanagement/upgradeactivity/index.vue @@ -288,7 +288,7 @@ export default { align: 'left', ellipsis: true, width: 170, - dataIndex: 'cjsj' + dataIndex: 'createTime' }, { title: this.$t('remarks'), diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue index c664a3c94..64ac09ad3 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue @@ -53,7 +53,11 @@
- {{$t('uploadattachment')}} + + {{ (fileList === 'null' || fileList === '' || + fileList == null) ? $t('uploadattachment') : $t('viewUploadedFiles') + }} +

{{$t('note')}}

    {{$t('format')}}

@@ -64,7 +68,7 @@ {{$t('last')}} {{$t('next')}}
- +
@@ -86,6 +90,7 @@ export default { } ], + fileList:'', loading: false, disable:false, columns: [ @@ -216,14 +221,39 @@ export default { } getAction('/ota/otaBaSjSjfzbh/queryByOtaId',{otaIdT:otaIdT,otaId:otaId}).then(res=>{ this.dataSource =res.result.list == null ? {} : res.result.list + this.fileList = res.result.fj }) }, save(){ - postAction('/ota/otaBaSjSjfzbh/add' ,{otaId:localStorage.getItem('otaId')== undefined ? '' :localStorage.getItem('otaId'),list:this.dataSource}).then(res=>{ + postAction('/ota/otaBaSjSjfzbh/add' ,{otaId:localStorage.getItem('otaId')== undefined ? '' :localStorage.getItem('otaId'),list:this.dataSource,fj:this.fileList}).then(res=>{ console.log(res); this.$message.success(this.$t('SavedSuccessfully')) }) }, + uploadSuccess(data) { + let attIdList = [] + if (data && data.length > 0) { + data.map(item => { + attIdList.push(item.id || data.name) + }) + } + this.$forceUpdate() + // /** 赋值给当前对应的表单文件 */ + this.fileList = attIdList.join(',') + // this.fileList.certifyingmaterials = this.$t('viewFile') + }, + clickButtonToUpload(current) { + this.$refs.uploadFile.perentHandleFunc() + this.$refs.uploadFile.visible = true + this.uploadName = current + getAction('sys/common/getFileInfos', { id: current }).then((res) => { + if (res.success) { + this.$refs.uploadFile.perentHandleFunc(res.result) + } else { + this.$refs.uploadFile.perentHandleFunc() + } + }) + }, last(){ this.save() this.$emit('beupgradedonlineup') @@ -239,20 +269,6 @@ export default { deleteData(record){ this.dataSource.splice(this.dataSource.indexOf(record),1) }, - uploadSuccess(data) { - let attIdList = [] - if (data && data.length > 0) { - data.map(item => { - attIdList.push({ - id:item.id, - fileName:item.fileName - }) - }) - } - /** 赋值给当前对应的表单文件 */ - this.fileList.uploadName = attIdList - this.fileList.certifyingmaterials = this.$t('viewFile') - }, } } diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue index 3b8a3e96a..64cd0d4a7 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue @@ -72,15 +72,15 @@
- + - {{ (formInline.VINcodelist === 'null' || formInline.VINcodelist === '' || - formInline.VINcodelist == null) ? $t('VINcodeupload') : $t('viewUploadedFiles') + @click="clickButtonToUpload('csv')"> + {{ (formInline.csv === 'null' || formInline.csv === '' || + formInline.csv == null) ? $t('VINcodeupload') : $t('viewUploadedFiles') }}

{{$t('noteone')}}

- +
@@ -139,6 +139,7 @@ export default { if(res.code==200){ this.formInline.zsl=res.result.zsl this.formInline.vinList=res.result.vinList + this.formInline.csv=res.result.csv this.formInline.dateofproduction=[] this.formInline.dateofproduction.push(res.result.scrqks) this.formInline.dateofproduction.push(res.result.scrqjs) @@ -152,6 +153,7 @@ export default { let obj={} obj.otaId=localStorage.getItem('otaId') obj.zsl = this.formInline.zsl + obj.csv = this.formInline.csv if(this.formInline.dateofproduction){ obj.scrqks = this.formInline.dateofproduction[0] obj.scrqjs = this.formInline.dateofproduction[1] @@ -188,6 +190,25 @@ export default { } }) }, + /** 上传文件的回调 */ + uploadSuccess(data) { + // console.log(data) + let attIdList = [] + if(data && data.length>0){ + data.map(item => { + attIdList.push(item.id || data.name) + }) + /** 赋值给当前对应的表单文件 */ + this.formInline.csv = attIdList.join(',') + this.formInline = { ...this.formInline } + // console.log('form',this.formInline) + }else{ + this.formInline.csv = '' + this.formInline = { ...this.formInline } + // console.log('form',this.formInline) + + } + }, } } diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue index ef5679a0d..482073698 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue @@ -146,7 +146,7 @@ {{$t('last')}} {{$t('next')}}
- +
@@ -331,7 +331,7 @@ this.$forceUpdate() this.$refs.uploadFile.perentHandleFunc() this.$refs.uploadFile.visible = true this.uploadName = item - getAction('sys/common/getFileInfos', { id: this.formInline[item] }).then((res) => { + getAction('sys/common/getFileInfos', { id: this.form[item] }).then((res) => { if (res.success) { this.$refs.uploadFile.perentHandleFunc(res.result) } else { @@ -339,33 +339,22 @@ this.$forceUpdate() } }) }, - getList() { - let queryParam = JSON.parse(JSON.stringify(this.queryParam)) - Object.keys(queryParam).forEach(val => { - if (queryParam[val] instanceof Array) { - queryParam[val] = queryParam[val].join(',') - } - }) - let query = { - pageNo: this.pageNo, - pageSize: this.pageSize, - ...queryParam + uploadSuccess(data) { + let attIdList = [] + if(data && data.length>0){ + data.map(item => { + attIdList.push(item.id || data.name) + }) + /** 赋值给当前对应的表单文件 */ + this.form[this.uploadName] = attIdList.join(',') + this.form = { ...this.form } + // console.log('form',this.formInline) + }else{ + this.form[this.uploadName] = '' + this.form = { ...this.form } + // console.log('form',this.formInline) + } - this.loading = true - getAction(this.url.list, query).then((res) => { - if (res.success) { - if (res.result.current > 1 && res.result.records.length == 0) { - this.pageNo = 1 - this.getList() - return - } - this.dataSource = res.result.records || [] - this.total = res.result.total - this.loading = false - } else { - this.loading = false - } - }) }, getData(){ let otaIdT=localStorage.getItem('otaIdT') @@ -411,20 +400,6 @@ this.$forceUpdate() this.save() this.$emit('safetyPrecautionsdown') }, - uploadSuccess(data) { - let attIdList = [] - if (data && data.length > 0) { - data.map(item => { - attIdList.push({ - id:item.id, - fileName:item.fileName - }) - }) - } - /** 赋值给当前对应的表单文件 */ - this.fileList.uploadName = attIdList - this.fileList.certifyingmaterials = this.$t('viewFile') - }, } } diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue index 65f16e1cb..6edfa5d44 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue @@ -170,7 +170,7 @@ {{$t('last')}} {{$t('next')}}
- +
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue index 1b0838b3e..23b599f46 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue @@ -311,6 +311,7 @@ import uploadFileOta from '@/components/uploadFileOta/file' if(otaIdT==null){ otaIdT='' } + let randomNum = Math.floor(Math.random()*99999999999+1) getAction('/ota/otaBaCxKsjxtmccs/queryByOtaId',{otaIdT:otaIdT,otaId:localStorage.getItem('otaId')}).then(res=>{ if(res.code==200){ if(res.result.list.length==0){ @@ -341,8 +342,9 @@ import uploadFileOta from '@/components/uploadFileOta/file' }, ] }else{ - res.result.list.forEach(item =>{ - item.sfksj =Number(item.sfksj) + res.result.list.forEach((item,index) =>{ + item.sfksj = Number(item.sfksj) + item.key = randomNum + index }) this.dataSource=res.result.list this.fileList = res.result.fj diff --git a/jero-web/src/views/otamanagement/vehicleregistration/index.vue b/jero-web/src/views/otamanagement/vehicleregistration/index.vue index 9ddc8ef68..2764a0ad4 100644 --- a/jero-web/src/views/otamanagement/vehicleregistration/index.vue +++ b/jero-web/src/views/otamanagement/vehicleregistration/index.vue @@ -256,7 +256,7 @@ export default { align: 'left', ellipsis: true, width: 170, - dataIndex: 'cjsj' + dataIndex: 'createTime' }, { title: this.$t('remarks'), From 6af09bd7b71f416d581001969c4244b7a6423157 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Tue, 28 Mar 2023 10:09:39 +0800 Subject: [PATCH 419/645] =?UTF-8?q?studio=E5=B1=95=E7=A4=BA=E6=B3=95?= =?UTF-8?q?=E8=A7=84=E5=B7=A5=E7=A8=8B=E5=B8=88=E9=A9=B3=E5=9B=9E=E5=8E=9F?= =?UTF-8?q?=E5=9B=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 3 ++- .../projectManagement/components/listEditModel.vue | 12 ++++++------ 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 4cd0f7d50..70c72fe15 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1726,4 +1726,5 @@ module.exports = { noteone:'Note: CSV format is supported. The value is within 20M and the number is 1 to 10', notetwo:'\n1. Provide the modified or expanded batch of "Announcement" and supporting materials;\n2. Verification materials shall be submitted to ensure that products meet the relevant requirements of national laws and regulations, technologies, standards and technical specifications;\n', notethree:'Provide supporting materials', + verifyComplianceConfirmReturnReason:'Verify compliance Confirm return reason', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 2bfb28112..f00638ad6 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1825,7 +1825,8 @@ module.exports = { notecsv:'注:支持CSV格式，大小20M以内', theDataYouInitiate:'您所选的数据，均不符合流程发起条件，请重新检查后发起', dataWithProcessReleasedCannotBeReset:'流程状态为清单待发布的数据不能被重置', - reasonForReturnOfDesignCompliance:'设计符合性退回原因', + reasonForReturnOfDesignCompliance:'设计符合性确认退回原因', notetwo:'\n1、提供变更或扩展后的《公告》批次及证明材料;\n2、应提交验证材料，保障产品符合国家法律法规、技术、标准及技术规范等相关要求;\n', notethree:'\n提供证明材料\n', + verifyComplianceConfirmReturnReason:'验证符合性确认退回原因', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue index 3367d51f6..9a4a571c8 100644 --- a/jero-web/src/views/projectManagement/components/listEditModel.vue +++ b/jero-web/src/views/projectManagement/components/listEditModel.vue @@ -782,11 +782,11 @@
-
- {{$t('listConfirmationRejectionReason')}} +
+ {{$t('reasonForReturnOfDesignCompliance')}}
-
@@ -827,11 +827,11 @@
-
- {{$t('taskConfirmationRejectionReason')}} +
+ {{$t('verifyComplianceConfirmReturnReason')}}
-
From 6366e5a0454b949a04aa04a5931e07b9ff6567ff Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Tue, 28 Mar 2023 10:10:21 +0800 Subject: [PATCH 420/645] =?UTF-8?q?67129=20studio=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93=E8=AE=A4=E8=AF=81=E5=B7=A5=E7=A8=8B?= =?UTF-8?q?=E5=B8=88=EF=BC=8C=E5=90=8C=E6=AD=A5=E5=BE=85=E5=8A=9E=E4=B8=AD?= =?UTF-8?q?=E5=BF=83=E8=AE=A4=E8=AF=81=E6=B5=81=E7=A8=8B=E5=BE=85=E5=8A=9E?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProjectLibraryBaseServiceImpl.java | 89 +++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java index 2dcf32327..275729a9d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java @@ -33,8 +33,11 @@ import com.jero.modules.system.service.ISysDictService; import com.jero.modules.system.service.ISysUserService; import com.jero.modules.system.service.impl.SysDictItemServiceImpl; import com.jero.modules.system.util.StringUtils; +import com.jero.modules.todoCenter.entity.ProcessInfoDetailEO; +import com.jero.modules.todoCenter.service.IProcessInfoDetailEOService; import com.jero.modules.top.entity.TopProjectEO; import com.jero.modules.top.service.ITopProjectEOService; +import com.jero.modules.wkflow.enums.FlowTypeEnum; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.poi.hssf.usermodel.HSSFSheet; @@ -147,6 +150,9 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl certificationEngineerIdList = Arrays.asList(projectLibraryBase.getCertificationEngineer().split(",")); + QueryWrapper pciQueryWrap = new QueryWrapper<>(); + pciQueryWrap.lambda().eq(ProjectCertificationInventoryEO::getProjectLibraryId, projectLibraryBase.getId()); + List pciEOList = this.projectCertificationInventoryEOService.list(pciQueryWrap); + + if(CollectionUtils.isNotEmpty(pciEOList)){ + // 清单待校核的数据 + List pciToBeCheckedList = pciEOList.stream().filter(pci -> { + boolean flag = false; + if(StringUtils.equals(pci.getFlowStatus(),CertificationInventoryFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())){ + flag = true; + } + return flag; + }).collect(Collectors.toList()); + // 如果该项目下清单待校核的数据不为空，给这些认证工程师分配待办任务。 + if(CollectionUtils.isNotEmpty(pciToBeCheckedList)){ + // 删除待办中心（是这个项目库的 pre-Homo流程的待办任务， 认证工程师接受任务节点的数据） + QueryWrapper pidRemoveWrap = new QueryWrapper<>(); + pidRemoveWrap.lambda().eq(ProcessInfoDetailEO::getProcessInfoId, projectLibraryBase.getId()); + pidRemoveWrap.lambda().eq(ProcessInfoDetailEO::getTaskDefinitionKey,CertificationFlowNodeEnum.RZGCSJSRW.getKey()); + pidRemoveWrap.lambda().eq(ProcessInfoDetailEO::getFlowType,FlowTypeEnum.CERTIFICATION_LC.getValue()); + this.processInfoDetailEOService.remove(pidRemoveWrap); + + // 给认证工程师分配任务 + List processInfoDetailEOList = new ArrayList<>(); + for (String userId : certificationEngineerIdList) { + ProcessInfoDetailEO processInfoDetailEO = new ProcessInfoDetailEO(); + processInfoDetailEO.setUserId(userId); + processInfoDetailEO.setTaskDefinitionKey(CertificationFlowNodeEnum.RZGCSJSRW.getKey()); + processInfoDetailEO.setCreateTime(new Date()); + processInfoDetailEO.setStatus(TaskStatusEnum.NOT_DONE.getValue()); + processInfoDetailEO.setProcessInfoId(projectLibraryBase.getId()); + processInfoDetailEO.setActiProcInstId(projectLibraryBase.getId()); + processInfoDetailEO.setFlowType(FlowTypeEnum.CERTIFICATION_LC.getValue()); + processInfoDetailEOList.add(processInfoDetailEO); + } + this.processInfoDetailEOService.saveBatch(processInfoDetailEOList); + } + + // 结果待提交的数据 + List pciToBeReviewEDList = pciEOList.stream().filter(pci -> { + boolean flag = false; + if(StringUtils.equals(pci.getFlowStatus(),CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue())){ + flag = true; + } + return flag; + }).collect(Collectors.toList()); + + if(CollectionUtils.isNotEmpty(pciToBeReviewEDList)){ + // 删除待办中心（是这个项目库的 pre-Homo流程的待办任务， 认证工程师审查 任务节点的数据） + QueryWrapper pidRemoveWrap = new QueryWrapper<>(); + pidRemoveWrap.lambda().eq(ProcessInfoDetailEO::getProcessInfoId, projectLibraryBase.getId()); + pidRemoveWrap.lambda().eq(ProcessInfoDetailEO::getTaskDefinitionKey,CertificationFlowNodeEnum.RZGCSSC.getKey()); + pidRemoveWrap.lambda().eq(ProcessInfoDetailEO::getFlowType,FlowTypeEnum.CERTIFICATION_LC.getValue()); + this.processInfoDetailEOService.remove(pidRemoveWrap); + + // 给认证工程师分配任务 + List processInfoDetailEOList = new ArrayList<>(); + for (String userId : certificationEngineerIdList) { + ProcessInfoDetailEO processInfoDetailEO = new ProcessInfoDetailEO(); + processInfoDetailEO.setUserId(userId); + processInfoDetailEO.setTaskDefinitionKey(CertificationFlowNodeEnum.RZGCSSC.getKey()); + processInfoDetailEO.setCreateTime(new Date()); + processInfoDetailEO.setStatus(TaskStatusEnum.NOT_DONE.getValue()); + processInfoDetailEO.setProcessInfoId(projectLibraryBase.getId()); + processInfoDetailEO.setActiProcInstId(projectLibraryBase.getId()); + processInfoDetailEO.setFlowType(FlowTypeEnum.CERTIFICATION_LC.getValue()); + processInfoDetailEOList.add(processInfoDetailEO); + } + this.processInfoDetailEOService.saveBatch(processInfoDetailEOList); + } + } + } + } + /** * 通过id删除 * From 3ec32f42a55750d9c40521953e50194879d8f3e9 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Tue, 28 Mar 2023 10:13:42 +0800 Subject: [PATCH 421/645] =?UTF-8?q?=E5=BD=B1=E5=93=8D=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E9=99=84=E4=BB=B6=E4=B8=8A=E4=BC=A0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/upgradeimpactassessment.vue | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue index 482073698..93721ad58 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue @@ -63,7 +63,12 @@ - {{$t('uploadattachment')}} + + {{ (form.bgfj === 'null' || form.bgfj === '' || + form.bgfj == null) ? $t('uploadattachment') : $t('viewUploadedFiles') + }} + {{$t('notetwo')}} {{$t('format')}} @@ -135,7 +140,12 @@
- {{$t('uploadattachment')}} + + {{ (form.clfj === 'null' || form.clfj === '' || + form.clfj == null) ? $t('uploadattachment') : $t('viewUploadedFiles') + }} + {{$t('notethree')}} {{$t('format')}}
From 13cf2379377a8e94c02f5f68fe022a26b0fbe7d0 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Tue, 28 Mar 2023 10:16:02 +0800 Subject: [PATCH 422/645] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E6=B4=BB=E5=8A=A8-?= =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../upgradeactivity/components/maintenance.vue | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/jero-web/src/views/otamanagement/upgradeactivity/components/maintenance.vue b/jero-web/src/views/otamanagement/upgradeactivity/components/maintenance.vue index 0993686b4..d02319143 100644 --- a/jero-web/src/views/otamanagement/upgradeactivity/components/maintenance.vue +++ b/jero-web/src/views/otamanagement/upgradeactivity/components/maintenance.vue @@ -20,6 +20,7 @@
@@ -77,7 +78,7 @@ export default { visible: false, confirmLoading: false, formInline: { - bazt:'', + bazt:undefined, batjsj:'', bz:'', }, @@ -196,6 +197,12 @@ export default { } }) }, + selectchange(value){ + this.$nextTick(() => { + this.formInline = { ...this.formInline } + this.$refs.ruleForm.validateField('bazt') + }) + }, handleCancel() { this.formInline = { bazt:undefined, From 188b3f2026c25732a8332c8ebb19c6ce6d38e60d Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Tue, 28 Mar 2023 10:24:28 +0800 Subject: [PATCH 423/645] bug 67183 --- .../vehicleinformation/components/basicInformation.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue index 8d130bb6f..ea2a96807 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue @@ -89,7 +89,7 @@ :max-length="500" :disabled="disabled" class="box-input" - :placeholder="$t('PleaseSelect')" + :placeholder="$t('pleaseEnter')" v-model="form.ggpc"> @@ -105,7 +105,7 @@ :max-length="500" :disabled="disabled" class="box-input" - :placeholder="$t('PleaseSelect')" + :placeholder="$t('pleaseEnter')" v-model="form.cpsb"> @@ -121,7 +121,7 @@ :max-length="500" :disabled="disabled" class="box-input" - :placeholder="$t('PleaseSelect')" + :placeholder="$t('pleaseEnter')" v-model="form.cpmc"> @@ -138,7 +138,7 @@ :max-length="500" :disabled="disabled" class="box-input" - :placeholder="$t('PleaseSelect')" + :placeholder="$t('pleaseEnter')" v-model="form.cpxh"> From 155ddde11f7146c7f8bf0b30e446bc7e5de25170 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Tue, 28 Mar 2023 10:30:01 +0800 Subject: [PATCH 424/645] bug 67198 --- .../vehicleinformation/components/safetyPrecautions.vue | 2 +- .../vehicleinformation/components/upgradeRequirements.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue index 1619acb2d..7d63c299b 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue @@ -207,7 +207,7 @@ import ImportFile from '@/components/ImportFileData/index' this.dataSource[2].info= res.result.sjsbcs this.dataSource[3].info= res.result.xxaqjz if(res.result.zmclList){ - console.log(this.dataSource[0].certifyingmaterials = this.$t('viewFile')) + this.dataSource[0].certifyingmaterials = this.$t('viewFile') } this.fileList.uploadName = res.result.zmclList this.$refs.uploadFile.perentHandleFunc(this.fileList.uploadName) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue index e8986b7e6..3e17a247a 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue @@ -229,7 +229,7 @@ export default { this.dataSource[8].relevantverification=Number(res.result.sjgg) this.dataSource[9].relevantverification=Number(res.result.sjzt) if(res.result.zmclList){ - console.log(this.dataSource[0].certifyingmaterials = this.$t('viewFile')) + this.dataSource[0].certifyingmaterials = this.$t('viewFile') } this.fileList.uploadName = res.result.zmclList this.$refs.uploadFile.perentHandleFunc(this.fileList.uploadName) From ea2d7aa166a061b772a33f192c4a97e5c9ac7546 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Tue, 28 Mar 2023 10:33:14 +0800 Subject: [PATCH 425/645] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E6=B8=85=E5=8D=95-=E7=BB=B4=E6=8A=A4=E6=B8=85=E5=8D=95-?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=88=97=E5=AE=BD=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../certificationListMaintenance.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue index 5b4fc7b9e..bf4f2b8dc 100644 --- a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue +++ b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue @@ -310,14 +310,14 @@ title: this.$t('configurationItem'), align: 'left', dataIndex: 'configItem', - width: 150, + width: 200, ellipsis: true }, { title: 'WVTA ID', align: 'left', dataIndex: 'wvtaId', - width: 150, + width: 200, ellipsis: true }, { @@ -338,14 +338,14 @@ title: this.$t('typeOfDeliverables'), align: 'left', dataIndex: 'deliverableTypeName', - width: 200, + width: 330, ellipsis: true }, { title: this.$t('operation'), align: 'left', fixed: 'right', - width: 200, + width: 250, scopedSlots: { customRender: 'operation' } } ], @@ -544,7 +544,7 @@ \ No newline at end of file From bc62a79e3e4552468f1c009786bd4b709c98184b Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Tue, 28 Mar 2023 11:58:19 +0800 Subject: [PATCH 434/645] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/auxiliaryupgradehavechanged.vue | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue index 95dddff3b..dac7607bd 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue @@ -99,7 +99,6 @@ export default { align: 'left', dataIndex: 'functionname', ellipsis: true, - width: 170, scopedSlots: { customRender: 'functionname' }, }, { @@ -140,7 +139,7 @@ export default { align: 'left', dataIndex: 'functionalchangedescription', ellipsis: true, - width: 170, + width: 230, scopedSlots: { customRender: 'functionalchangedescription' }, }, { @@ -148,7 +147,7 @@ export default { align: 'left', dataIndex: 'variationofapplicableconditions', ellipsis: true, - width: 170, + width: 230, scopedSlots: { customRender: 'variationofapplicableconditions' }, }, { @@ -156,7 +155,7 @@ export default { align: 'left', dataIndex: 'upgradetheelectroniccontrollerinvolved', ellipsis: true, - width: 170, + width: 230, scopedSlots: { customRender: 'upgradetheelectroniccontrollerinvolved' }, }, { From bbd076b7aa6d8d8abbbaae3c001b2eb0608d2f59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Tue, 28 Mar 2023 12:37:48 +0800 Subject: [PATCH 435/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E8=BD=A6=E8=BE=86=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/OtaBaSjSjyxpgController.java | 19 ++ .../ota/controller/OtaBaSjTxjlController.java | 170 ------------------ .../modules/ota/entity/OtaBaSjSjyxpg.java | 4 + .../jero/modules/ota/entity/OtaBaSjTxjl.java | 79 -------- .../jero/modules/ota/enums/OtaTitleEnum.java | 8 +- .../modules/ota/mapper/OtaBaSjTxjlMapper.java | 4 - .../ota/mapper/xml/OtaBaSjTxjlMapper.xml | 15 -- .../ota/service/IOtaBaSjSjyxpgService.java | 2 + .../ota/service/IOtaBaSjTxjlService.java | 61 ------- .../impl/OtaBaSjSjyxpgServiceImpl.java | 140 ++++++++++----- .../service/impl/OtaBaSjTxjlServiceImpl.java | 89 --------- 11 files changed, 122 insertions(+), 469 deletions(-) delete mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjTxjlController.java delete mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjTxjl.java delete mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaBaSjTxjlMapper.xml delete mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjTxjlService.java delete mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjTxjlServiceImpl.java diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjyxpgController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjyxpgController.java index 04b83dce4..1f173e37c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjyxpgController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjyxpgController.java @@ -6,6 +6,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.jero.common.api.vo.Result; import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.ota.entity.OtaBaCxAqcs; import com.jero.modules.ota.entity.OtaBaSjSjyxpg; import com.jero.modules.ota.service.IOtaBaSjSjyxpgService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -144,6 +145,24 @@ public class OtaBaSjSjyxpgController extends JeroController queryByOtaId(@RequestParam(name = "otaId", required = true) String otaId, + @RequestParam(name = "otaIdT", required = true) String otaIdT) { + OtaBaSjSjyxpg otaBaSjSjyxpg = otaBaSjSjyxpgService.queryByOtaId(otaId, otaIdT); + if (otaBaSjSjyxpg == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(otaBaSjSjyxpg); + } + /** * 导出excel * diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjTxjlController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjTxjlController.java deleted file mode 100644 index 787caa402..000000000 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjTxjlController.java +++ /dev/null @@ -1,170 +0,0 @@ -package com.jero.modules.ota.controller; - -import java.util.Arrays; -import java.util.List; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import com.jero.common.api.vo.Result; -import com.jero.common.system.query.QueryGenerator; -import com.jero.modules.ota.entity.OtaBaSjTxjl; -import com.jero.modules.ota.service.IOtaBaSjTxjlService; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.extern.slf4j.Slf4j; -import com.jero.common.system.base.controller.JeroController; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.ModelAndView; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import com.jero.common.aspect.annotation.AutoLog; - - - /** - * @Description: 车型升级-填写记录表 - * @Author: jero-boot - * @Date: 2023-03-25 - * @Version: V1.0 - */ -@Api(tags="车型升级-填写记录表") -@RestController -@RequestMapping("/ota/otaBaSjTxjl") -@Slf4j -public class OtaBaSjTxjlController extends JeroController { - @Autowired - private IOtaBaSjTxjlService otaBaSjTxjlService; - - /** - * 分页列表查询 - * - * @param otaBaSjTxjl - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @AutoLog(value = "车型升级-填写记录表-分页列表查询") - @ApiOperation(value="车型升级-填写记录表-分页列表查询", notes="车型升级-填写记录表-分页列表查询") - @GetMapping(value = "/page") - public Result queryPageList(OtaBaSjTxjl otaBaSjTxjl, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(otaBaSjTxjl, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = otaBaSjTxjlService.page(page, queryWrapper); - return Result.OK(pageList); - } - - /** - * 列表查询 - * - * @return - */ - @AutoLog(value = "车型升级-填写记录表-列表查询") - @ApiOperation(value="车型升级-填写记录表-列表查询", notes="车型升级-填写记录表-列表查询") - @GetMapping(value = "/list") - public Result> queryList() { - List list = otaBaSjTxjlService.queryList(); - return Result.OK(list); - } - - /** - * 添加 - * - * @param otaBaSjTxjl - * @return - */ - @AutoLog(value = "车型升级-填写记录表-添加") - @ApiOperation(value="车型升级-填写记录表-添加", notes="车型升级-填写记录表-添加") - @PostMapping(value = "/add") - public Result add(@Validated @RequestBody OtaBaSjTxjl otaBaSjTxjl) { - otaBaSjTxjlService.add(otaBaSjTxjl); - return Result.OK("添加成功！"); - } - - /** - * 编辑 - * - * @param otaBaSjTxjl - * @return - */ - @AutoLog(value = "车型升级-填写记录表-编辑") - @ApiOperation(value="车型升级-填写记录表-编辑", notes="车型升级-填写记录表-编辑") - @PutMapping(value = "/edit") - public Result edit(@Validated @RequestBody OtaBaSjTxjl otaBaSjTxjl) { - otaBaSjTxjlService.editById(otaBaSjTxjl); - return Result.OK("编辑成功!"); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @AutoLog(value = "车型升级-填写记录表-通过id删除") - @ApiOperation(value="车型升级-填写记录表-通过id删除", notes="车型升级-填写记录表-通过id删除") - @DeleteMapping(value = "/delete") - public Result delete(@RequestParam(name="id",required=true) String id) { - otaBaSjTxjlService.deleteById(id); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @AutoLog(value = "车型升级-填写记录表-批量删除") - @ApiOperation(value="车型升级-填写记录表-批量删除", notes="车型升级-填写记录表-批量删除") - @DeleteMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.otaBaSjTxjlService.deleteByIds(Arrays.asList(ids.split(","))); - return Result.OK("批量删除成功!"); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @AutoLog(value = "车型升级-填写记录表-通过id查询") - @ApiOperation(value="车型升级-填写记录表-通过id查询", notes="车型升级-填写记录表-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name="id",required=true) String id) { - OtaBaSjTxjl otaBaSjTxjl = otaBaSjTxjlService.queryById(id); - if(otaBaSjTxjl==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(otaBaSjTxjl); - } - - /** - * 导出excel - * - * @param request - * @param otaBaSjTxjl - */ - @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, OtaBaSjTxjl otaBaSjTxjl) { - return super.exportXls(request, otaBaSjTxjl, OtaBaSjTxjl.class, "车型升级-填写记录表"); - } - - /** - * 通过excel导入数据 - * - * @param request - * @param response - * @return - */ - @RequestMapping(value = "/importExcel", method = RequestMethod.POST) - public Result importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, OtaBaSjTxjl.class); - } - -} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjSjyxpg.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjSjyxpg.java index 6c0e4d141..a21dd644d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjSjyxpg.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjSjyxpg.java @@ -69,6 +69,7 @@ public class OtaBaSjSjyxpg implements Serializable { /**升级目的*/ @Excel(name = "升级目的", width = 15) @ApiModelProperty(value = "升级目的") + @Dict(dicCode = "uipgrade_purpose") private java.lang.String sjmd; /**是否变更对应车型的《公告》技术参数*/ @@ -99,11 +100,13 @@ public class OtaBaSjSjyxpg implements Serializable { /**如何执行升级*/ @Excel(name = "如何执行升级", width = 15) @ApiModelProperty(value = "如何执行升级") + @Dict(dicCode = "conditions_upgrades") private java.lang.String zxsj; /**升级失败或中断后，车辆采取的安全机制*/ @Excel(name = "升级失败或中断后，车辆采取的安全机制", width = 15) @ApiModelProperty(value = "升级失败或中断后，车辆采取的安全机制") + @Dict(dicCode = "upgrade_failed") private java.lang.String aqjz; /**升级活动是否影响车辆安全*/ @@ -119,6 +122,7 @@ public class OtaBaSjSjyxpg implements Serializable { /**升级包测试*/ @Excel(name = "升级包测试", width = 15) @ApiModelProperty(value = "升级包测试") + @Dict(dicCode = "package_test") private java.lang.String sjbcs; /**是杏已验证确认在线升级活动的安全性和可靠性*/ diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjTxjl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjTxjl.java deleted file mode 100644 index 95e5a0b0f..000000000 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjTxjl.java +++ /dev/null @@ -1,79 +0,0 @@ -package com.jero.modules.ota.entity; - -import java.io.Serializable; -import java.io.UnsupportedEncodingException; -import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; -import org.jeecgframework.poi.excel.annotation.Excel; -import com.jero.common.aspect.annotation.Dict; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; - - -/** - * @Description: 车型升级-填写记录表 - * @Author: jero-boot - * @Date: 2023-03-25 - * @Version: V1.0 - */ -@Data -@TableName("ota_ba_sj_txjl") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="ota_ba_sj_txjl对象", description="车型升级-填写记录表") -public class OtaBaSjTxjl implements Serializable { - private static final long serialVersionUID = 1L; - - /**主键*/ - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "主键") - private String id; - - /**创建人*/ - @ApiModelProperty(value = "创建人") - private String createBy; - - /**创建日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "创建日期") - private java.util.Date createTime; - - /**更新人*/ - @ApiModelProperty(value = "更新人") - private String updateBy; - - /**更新日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "更新日期") - private java.util.Date updateTime; - - /**所属部门*/ - @ApiModelProperty(value = "所属部门") - private String sysOrgCode; - - /**ota_id*/ - @Excel(name = "ota_id", width = 15) - @ApiModelProperty(value = "ota_id") - private String otaId; - - /**模块*/ - @Excel(name = "模块", width = 15) - @ApiModelProperty(value = "模块") - private String module; - - /**填写内容*/ - @Excel(name = "填写内容", width = 15) - @ApiModelProperty(value = "填写内容") - private String content; - -} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java index 85663f0cc..530dbbd81 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java @@ -156,17 +156,17 @@ public enum OtaTitleEnum { SCRQKS("scrqks", "生产日期开始", "0"), SCRQJS("scrqjs", "生产日期结束", "0"), VIN_LIST("vinList", "VIN码清单", "0"), - SJMD("sjmd", "升级目的", "0"), + SJMD("sjmd", "升级目的", "uipgrade_purpose"), SFBGCS("sfbgcs", "是否变更对应车型的《公告》技术参数", "0"), JSXNBH("jsxnbh", "是否涉及性能变化", "0"), FHGD("fhgd", "是否符合国家法律、行政法规、规章规定，以及道路机动车辆公告管理相关国家技术标准及安全技术条件等", "0"), ZDJSXG("zdjsxg", "是否涉及汽车自动驾驶功能相关升级", "0"), JRXXG("jrxxg", "兼容性评估相关", "0"), - ZXSJ("zxsj", "如何执行升级", "0"), - AQJZ("aqjz", "升级失败或中断后，车辆采取的安全机制", "0"), + ZXSJ("zxsj", "如何执行升级", "conditions_upgrades"), + AQJZ("aqjz", "升级失败或中断后，车辆采取的安全机制", "upgrade_failed"), SFYXAQ("sfyxaq", "升级活动是否影响车辆安全", "0"), YHQR("yhqr", "升级活动是否提供用户确认选项", "0"), - SJBCS("sjbcs", "升级包测试", "0"), + SJBCS("sjbcs", "升级包测试", "package_test"), AQKKX("aqkkx", "是杏已验证确认在线升级活动的安全性和可靠性", "0"), BGFJ("bgfj", "提供变更或扩展后的《公告》批次及证明材料", "0"), CLFJ("clfj", "提供证明材料", "0"), diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaBaSjTxjlMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaBaSjTxjlMapper.java index 2b7389246..a38e0268e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaBaSjTxjlMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaBaSjTxjlMapper.java @@ -1,9 +1,5 @@ package com.jero.modules.ota.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import com.jero.modules.ota.entity.OtaBaSjTxjl; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaBaSjTxjlMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaBaSjTxjlMapper.xml deleted file mode 100644 index d242861d6..000000000 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaBaSjTxjlMapper.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjyxpgService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjyxpgService.java index 84960ab7c..af9b71545 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjyxpgService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjyxpgService.java @@ -58,4 +58,6 @@ public interface IOtaBaSjSjyxpgService extends IService { * @return */ List queryList(); + + OtaBaSjSjyxpg queryByOtaId(String otaId, String otaIdT); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjTxjlService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjTxjlService.java deleted file mode 100644 index a06ff9d39..000000000 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjTxjlService.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.jero.modules.ota.service; - -import com.jero.modules.ota.entity.OtaBaSjTxjl; -import com.baomidou.mybatisplus.extension.service.IService; -import java.util.List; - -/** - * @Description: 车型升级-填写记录表 - * @Author: jero-boot - * @Date: 2023-03-25 - * @Version: V1.0 - */ -public interface IOtaBaSjTxjlService extends IService { - - /** - * 保存 - * - * @param otaBaSjTxjl - * @return - */ - void add(OtaBaSjTxjl otaBaSjTxjl); - - /** - * 更新 - * - * @param otaBaSjTxjl - * @return - */ - void editById(OtaBaSjTxjl otaBaSjTxjl); - - /** - * 通过id删除 - * - * @param id - * @return - */ - void deleteById(String id); - - /** - * 批量删除 - * - * @param ids - * @return - */ - void deleteByIds(List ids); - - /** - * 通过id查询 - * - * @param id - * @return - */ - OtaBaSjTxjl queryById(String id); - - /** - * 列表查询 - * - * @return - */ - List queryList(); -} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjyxpgServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjyxpgServiceImpl.java index 173368c86..06ac57f12 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjyxpgServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjyxpgServiceImpl.java @@ -1,89 +1,135 @@ package com.jero.modules.ota.service.impl; -import com.jero.modules.ota.entity.OtaBaSjSjyxpg; +import com.alibaba.fastjson.JSONArray; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.jero.modules.ota.entity.*; +import com.jero.modules.ota.enums.OtaModuleEnum; import com.jero.modules.ota.mapper.OtaBaSjSjyxpgMapper; +import com.jero.modules.ota.service.IOtaBaCxTxjlService; import com.jero.modules.ota.service.IOtaBaSjSjyxpgService; +import com.jero.modules.ota.utils.ComparisonUtil; +import com.jero.modules.system.service.ISysDictService; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; + import java.util.List; import java.util.Date; + import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 升级备案-升级影响评估 * @Author: jero-boot - * @Date: 2023-03-17 + * @Date: 2023-03-17 * @Version: V1.0 */ @Service public class OtaBaSjSjyxpgServiceImpl extends ServiceImpl implements IOtaBaSjSjyxpgService { - /** - * 保存 - * - * @param otaBaSjSjyxpg - * @return - */ - @Override + + @Autowired + private ISysDictService sysDictService; + + @Autowired + private IOtaBaCxTxjlService otaBaCxTxjlService; + + /** + * 保存 + * + * @param otaBaSjSjyxpg + * @return + */ + @Override public void add(OtaBaSjSjyxpg otaBaSjSjyxpg) { Date now = new Date(); - otaBaSjSjyxpg.setCreateTime(now); - otaBaSjSjyxpg.setUpdateTime(now); - save(otaBaSjSjyxpg); + if (null != otaBaSjSjyxpg) { + OtaBaSjSjyxpg otaBaSjSjyxpgOld = this.getByOtaId(otaBaSjSjyxpg.getOtaId()); + if (null != otaBaSjSjyxpgOld) { + otaBaSjSjyxpg.setId(otaBaSjSjyxpgOld.getId()); + } else { + otaBaSjSjyxpg.setCreateTime(now); + } + otaBaSjSjyxpg.setUpdateTime(now); + saveOrUpdate(otaBaSjSjyxpg); + ComparisonUtil cu = new ComparisonUtil(); + if (ObjectUtils.isEmpty(otaBaSjSjyxpgOld)) { + otaBaSjSjyxpgOld = new OtaBaSjSjyxpg(); + } + List reList = cu.comparisonRecord(otaBaSjSjyxpg.getOtaId(), OtaModuleEnum.SJ_SJYXPG, otaBaSjSjyxpgOld, otaBaSjSjyxpg, sysDictService); + otaBaCxTxjlService.saveBatch(reList); + } } - /** - * 更新 - * - * @param otaBaSjSjyxpg - * @return - */ - @Override + /** + * 更新 + * + * @param otaBaSjSjyxpg + * @return + */ + @Override public void editById(OtaBaSjSjyxpg otaBaSjSjyxpg) { - Date now = new Date(); + Date now = new Date(); otaBaSjSjyxpg.setUpdateTime(now); - saveOrUpdate(otaBaSjSjyxpg); + saveOrUpdate(otaBaSjSjyxpg); } - /** - * 通过id删除 - * - * @param id - * @return - */ - @Override + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override public void deleteById(String id) { removeById(id); } - /** - * 批量删除 - * - * @param ids - * @return - */ - @Override + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override public void deleteByIds(List ids) { removeByIds(ids); } - /** - * 通过id查询 - * - * @param id - * @return - */ - @Override + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override public OtaBaSjSjyxpg queryById(String id) { return getById(id); } /** - * 列表查询 - * - * @return - */ - @Override + * 列表查询 + * + * @return + */ + @Override public List queryList() { return list(); } + + @Override + public OtaBaSjSjyxpg queryByOtaId(String otaId, String otaIdT) { + OtaBaSjSjyxpg res = getByOtaId(otaId); + if (ObjectUtils.isEmpty(res)) { + res = getByOtaId(otaIdT); + } + return res; + } + + private OtaBaSjSjyxpg getByOtaId(String otaId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(OtaBaSjSjyxpg::getOtaId, otaId); + return this.getOne(queryWrapper, false); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjTxjlServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjTxjlServiceImpl.java deleted file mode 100644 index 9dff31734..000000000 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjTxjlServiceImpl.java +++ /dev/null @@ -1,89 +0,0 @@ -package com.jero.modules.ota.service.impl; - -import com.jero.modules.ota.entity.OtaBaSjTxjl; -import com.jero.modules.ota.mapper.OtaBaSjTxjlMapper; -import com.jero.modules.ota.service.IOtaBaSjTxjlService; -import org.springframework.stereotype.Service; -import java.util.List; -import java.util.Date; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -/** - * @Description: 车型升级-填写记录表 - * @Author: jero-boot - * @Date: 2023-03-25 - * @Version: V1.0 - */ -@Service -public class OtaBaSjTxjlServiceImpl extends ServiceImpl implements IOtaBaSjTxjlService { - - /** - * 保存 - * - * @param otaBaSjTxjl - * @return - */ - @Override - public void add(OtaBaSjTxjl otaBaSjTxjl) { - Date now = new Date(); - otaBaSjTxjl.setCreateTime(now); - otaBaSjTxjl.setUpdateTime(now); - save(otaBaSjTxjl); - } - - /** - * 更新 - * - * @param otaBaSjTxjl - * @return - */ - @Override - public void editById(OtaBaSjTxjl otaBaSjTxjl) { - Date now = new Date(); - otaBaSjTxjl.setUpdateTime(now); - saveOrUpdate(otaBaSjTxjl); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @Override - public void deleteById(String id) { - removeById(id); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @Override - public void deleteByIds(List ids) { - removeByIds(ids); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @Override - public OtaBaSjTxjl queryById(String id) { - return getById(id); - } - - /** - * 列表查询 - * - * @return - */ - @Override - public List queryList() { - return list(); - } -} From 984b535469230d63a05ca5ff5890a5046f2e890b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Tue, 28 Mar 2023 12:39:25 +0800 Subject: [PATCH 436/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E8=BD=A6=E8=BE=86=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/ota/mapper/OtaBaSjTxjlMapper.java | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaBaSjTxjlMapper.java diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaBaSjTxjlMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaBaSjTxjlMapper.java deleted file mode 100644 index a38e0268e..000000000 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaBaSjTxjlMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.jero.modules.ota.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * @Description: 车型升级-填写记录表 - * @Author: jero-boot - * @Date: 2023-03-25 - * @Version: V1.0 - */ -public interface OtaBaSjTxjlMapper extends BaseMapper { - -} From 6bad9e99fbc9d4f16e1172a1020474f1d8f2aeaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Tue, 28 Mar 2023 13:48:20 +0800 Subject: [PATCH 437/645] =?UTF-8?q?OTA=E8=BD=A6=E5=9E=8B-=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0-=E9=A9=BE=E9=A9=B6=E8=87=AA=E5=8A=A8=E5=8C=96?= =?UTF-8?q?=E7=BA=A7=E5=88=AB-=E4=B8=8B=E6=8B=89=E9=80=89=E5=AE=8C?= =?UTF-8?q?=E6=95=B4=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/tableCollection/index.vue | 2 +- .../vehicleinformation/components/beupgradedonline.vue | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index 5ac5ad696..9fe25a81e 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -8,7 +8,7 @@ rowKey="id" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :pagination="false" - :scroll="{x: '100%',y:'calc(100vh - 330px)'}" + :scroll="this.dataSource.length > 1 ? {x: '100%',y:'calc(100vh - 330px)'} : {x: '100%'}" :data-source="dataSource" :loading="loading" @change="tableOnChange" diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue index a5ee70c8c..7afccfac2 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue @@ -14,7 +14,7 @@ size="middle" :loading="loading" :pagination="false" - :scroll="{x: '100%',y:'calc(100vh - 140px)'}" + :scroll="this.dataSource.length > 1 ? {x: '100%',y:'calc(100vh - 140px)'} : {x: '100%'}" rowKey="id" bordered :data-source="dataSource" @@ -366,7 +366,7 @@ import ImportFile from '@/components/ImportFileData/index' this.$message.success(this.$t('SavedSuccessfully')) this.getData() } - + }) }, last(){ From 05b89d70ad51a812b2a375fa52194001ba556325 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Tue, 28 Mar 2023 13:56:59 +0800 Subject: [PATCH 438/645] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1-=E9=AA=8C=E8=AF=81=E7=AC=A6=E5=90=88?= =?UTF-8?q?=E6=80=A7=E7=A1=AE=E8=AE=A4=E7=9A=84=E6=B5=81=E7=A8=8B=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 1 + .../components/circulationHistory.vue | 41 ++++++++++++++++++- 3 files changed, 42 insertions(+), 1 deletion(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 68eb6e659..a112514e2 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -894,6 +894,7 @@ module.exports = { designComplianceReview: 'Design Compliance Confirmation', preHomeConfirmation: 'Pre-Homo Confirmation', verificationComplianceReview: 'Validation Compliance Confirmation', + verificationComplianceExamine:'Verification compliance examine', Deployment: 'Deploy', pleaseDesignConformityConfirmation: 'Please complete the data of design conformity confirmation', pleaseConfirmedByPrehomo: 'Please complete the data confirmed by Pre-Homo', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 80aea7039..4fde5dc19 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -910,6 +910,7 @@ module.exports = { designComplianceReview: '设计符合性确认', preHomeConfirmation: 'Pre-Homo确认', verificationComplianceReview: '验证符合性确认', + verificationComplianceExamine:'验证符合性审查', pleaseDesignConformityConfirmation: '请补全设计符合性确认的数据', pleaseConfirmedByPrehomo: '请补全 Pre-Homo确认的数据', pleaseConformityVerification: '请补全验证符合性确认的数据', diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue index 181c85c0a..ed8dc8238 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue @@ -94,7 +94,29 @@ 'To be tracked': 'trackedClass', 'NA': 'NAClass' }, - regulatoryCertificationTaskPlanList: [ + verifyList: [ + { + status: '1', + name: this.$t('initiatingProcess') + }, + { + status: '1', + name: this.$t('Taskresponsibilityrecognition') + }, + { + status: '1', + name: this.$t('verificationComplianceReview') + }, + { + status: '2', + name: this.$t('verificationComplianceExamine') + }, + { + status: '3', + name: this.$t('missionAccomplished') + } + ], + designList: [ { status: '1', name: this.$t('initiatingProcess') @@ -116,6 +138,7 @@ name: this.$t('missionAccomplished') } ], + regulatoryCertificationTaskPlanList: [], columns: [ { title: this.$t('Operator'), @@ -168,6 +191,7 @@ } }, mounted() { + console.log(this.queryProject) this.getList() }, methods: { @@ -180,6 +204,11 @@ if (res.success) { this.dataSource = res.result || [] if (this.dataSource.length > 0) { + if (this.queryProject.flowType == 4) { + this.regulatoryCertificationTaskPlanList = this.verifyList + } else { + this.regulatoryCertificationTaskPlanList = this.designList + } let taskData = this.dataSource[this.dataSource.length - 1] if (this.queryProject.TaskKey == 'fqlc') { this.regulatoryCertificationTaskPlanList.forEach(val => { @@ -211,6 +240,8 @@ val.status = '1' } else if (val.name == this.$t('designComplianceReview')) { val.status = '2' + } else if (val.name == this.$t('verificationComplianceReview')) { + val.status = '2' } else { val.status = '3' } @@ -227,6 +258,10 @@ val.status = '1' } else if (val.name == this.$t('designComplianceReviewAdmin')) { val.status = '1' + } else if (val.name == this.$t('verificationComplianceReview')) { + val.status = '1' + } else if (val.name == this.$t('verificationComplianceExamine')) { + val.status = '1' } else { val.status = '1' } @@ -239,8 +274,12 @@ val.status = '1' } else if (val.name == this.$t('designComplianceReview')) { val.status = '1' + } else if (val.name == this.$t('verificationComplianceReview')) { + val.status = '1' } else if (val.name == this.$t('designComplianceReviewAdmin')) { val.status = '2' + } else if (val.name == this.$t('verificationComplianceExamine')) { + val.status = '2' } else { val.status = '3' } From 1182d29f76252a26523803c65e1e6c060a8f030c Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Tue, 28 Mar 2023 13:58:14 +0800 Subject: [PATCH 439/645] bug 67372 --- .../auxiliaryupgradehavechanged.vue | 14 +++++------ .../informationaboutotherupgradetasks.vue | 1 + .../thetargetvehicleofthisupgrade.vue | 1 + .../components/upgradehavechanged.vue | 24 +++++++++---------- .../components/upgradetargetmodel.vue | 10 ++++---- .../components/usernotification.vue | 6 +++++ .../components/basicInformation.vue | 6 +++++ .../components/beupgradedonline.vue | 14 +++++------ .../components/recordparameters.vue | 14 +++++------ .../components/upgradedonline.vue | 22 ++++++++--------- 10 files changed, 63 insertions(+), 49 deletions(-) diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue index dac7607bd..874f7835b 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue @@ -23,25 +23,25 @@ style="margin-bottom: 20px" > - + - + - + - + - + - + - + diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/informationaboutotherupgradetasks.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/informationaboutotherupgradetasks.vue index b538c61fc..e6ed49fe3 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/informationaboutotherupgradetasks.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/informationaboutotherupgradetasks.vue @@ -13,6 +13,7 @@
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue index 0519e66a3..8f4b044d5 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue @@ -22,6 +22,7 @@
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue index 8199c7a35..3a72352db 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue @@ -23,42 +23,42 @@ style="margin-bottom: 20px" > - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue index fb73175b7..ab30dab77 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue @@ -41,7 +41,7 @@
- +
@@ -52,7 +52,7 @@
- +
@@ -77,7 +77,7 @@ {{$t('producttrademark')}}
- +
@@ -88,7 +88,7 @@ {{$t('productname')}}
- +
@@ -99,7 +99,7 @@ {{$t('productModel')}}
- +
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue index d0274ca19..3295454ca 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue @@ -23,6 +23,7 @@ @@ -37,6 +38,7 @@ @@ -51,6 +53,7 @@ @@ -65,6 +68,7 @@ @@ -79,6 +83,7 @@ @@ -93,6 +98,7 @@ diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue index c70335a05..e8a778c32 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue @@ -39,6 +39,7 @@ :disabled="disabled" class="box-input" :placeholder="$t('pleaseEnter')" + :title='form.qymc' v-model="form.qymc"> @@ -55,6 +56,7 @@ @@ -88,6 +90,7 @@ @@ -104,6 +107,7 @@ @@ -120,6 +124,7 @@ @@ -137,6 +142,7 @@ diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue index a5ee70c8c..f9ccf35fd 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue @@ -59,26 +59,26 @@ - + - + - + - + - + - + - + diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue index 4e307f165..62eddff5e 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue @@ -218,7 +218,7 @@
{{$t('fillincontent')}} - +
@@ -244,22 +244,22 @@ - + - + - + - + - + - + diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue index 42f9581cf..2ea022b96 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue @@ -43,37 +43,37 @@ - + - + - + - + - + - + - + - + - + - + - + From 42a278d4aa643a98754a189f08de8f0a7b3034af Mon Sep 17 00:00:00 2001 From: yuekuo Date: Tue, 28 Mar 2023 14:35:37 +0800 Subject: [PATCH 440/645] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E9=80=89=E9=A1=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vehicleinformation/components/recordparameters.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue index 4e307f165..c07c1a6f0 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue @@ -902,7 +902,7 @@ export default { // item=Number(item) // } // }) - this.query=res.result.bj + this.query=res.result.bj==null?{}:res.result.bj } }) From 67493ed84ce2251613aa57a4ea2b327b05236b6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Tue, 28 Mar 2023 15:07:17 +0800 Subject: [PATCH 441/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E8=BD=A6=E8=BE=86=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/ota/entity/OtaBaSjGgnrfs.java | 6 +++--- .../jero/modules/ota/entity/OtaBaSjSjyxpg.java | 18 +++++++++--------- .../service/impl/OtaBaCxAqcsServiceImpl.java | 3 +++ .../service/impl/OtaBaCxJbxxServiceImpl.java | 3 +++ .../impl/OtaBaCxJsfzbacsServiceImpl.java | 3 +++ .../impl/OtaBaCxKsjjsmccsServiceImpl.java | 3 +++ .../impl/OtaBaCxKsjxtmccsServiceImpl.java | 3 +++ .../ota/service/impl/OtaBaCxQtServiceImpl.java | 3 +++ .../service/impl/OtaBaSjSjmbclServiceImpl.java | 3 +++ .../service/impl/OtaBaSjSjmbcxServiceImpl.java | 3 +++ .../service/impl/OtaBaSjSjyxpgServiceImpl.java | 3 +++ 11 files changed, 39 insertions(+), 12 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjGgnrfs.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjGgnrfs.java index e30344cd0..bf9b04d3a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjGgnrfs.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjGgnrfs.java @@ -99,17 +99,17 @@ public class OtaBaSjGgnrfs implements Serializable { /**告知用户升级成功或失败*/ @Excel(name = "告知用户升级成功或失败", width = 15) @ApiModelProperty(value = "告知用户升级成功或失败") - private java.lang.String sjsfcg; + private java.lang.Integer sjsfcg; /**告知实施的变更*/ @Excel(name = "告知实施的变更", width = 15) @ApiModelProperty(value = "告知实施的变更") - private java.lang.String gzbg; + private java.lang.Integer gzbg; /**告知了对用户手册的全部更新内容*/ @Excel(name = "告知了对用户手册的全部更新内容", width = 15) @ApiModelProperty(value = "告知了对用户手册的全部更新内容") - private java.lang.String gzscnr; + private java.lang.Integer gzscnr; /**告知用户方式（可多选）*/ @Excel(name = "告知用户方式（可多选）", width = 15) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjSjyxpg.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjSjyxpg.java index a21dd644d..ba3534c99 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjSjyxpg.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjSjyxpg.java @@ -75,33 +75,33 @@ public class OtaBaSjSjyxpg implements Serializable { /**是否变更对应车型的《公告》技术参数*/ @Excel(name = "是否变更对应车型的《公告》技术参数", width = 15) @ApiModelProperty(value = "是否变更对应车型的《公告》技术参数") - private java.lang.String sfbgcs; + private java.lang.Integer sfbgcs; /**是否涉及性能变化*/ @Excel(name = "是否涉及性能变化", width = 15) @ApiModelProperty(value = "是否涉及性能变化") - private java.lang.String sjxnbh; + private java.lang.Integer sjxnbh; /**是否符合国家法律、行政法规、规章规定，以及道路机动车辆公告管理相关国家技术标准及安全技术条件等*/ @Excel(name = "是否符合国家法律、行政法规、规章规定，以及道路机动车辆公告管理相关国家技术标准及安全技术条件等", width = 15) @ApiModelProperty(value = "是否符合国家法律、行政法规、规章规定，以及道路机动车辆公告管理相关国家技术标准及安全技术条件等") - private java.lang.String fhgd; + private java.lang.Integer fhgd; /**是否涉及汽车自动驾驶功能相关升级*/ @Excel(name = "是否涉及汽车自动驾驶功能相关升级", width = 15) @ApiModelProperty(value = "是否涉及汽车自动驾驶功能相关升级") - private java.lang.String zdjsxg; + private java.lang.Integer zdjsxg; /**兼容性评估相关*/ @Excel(name = "兼容性评估相关", width = 15) @ApiModelProperty(value = "兼容性评估相关") - private java.lang.String jrxxg; + private java.lang.Integer jrxxg; /**如何执行升级*/ @Excel(name = "如何执行升级", width = 15) @ApiModelProperty(value = "如何执行升级") @Dict(dicCode = "conditions_upgrades") - private java.lang.String zxsj; + private java.lang.Integer zxsj; /**升级失败或中断后，车辆采取的安全机制*/ @Excel(name = "升级失败或中断后，车辆采取的安全机制", width = 15) @@ -112,12 +112,12 @@ public class OtaBaSjSjyxpg implements Serializable { /**升级活动是否影响车辆安全*/ @Excel(name = "升级活动是否影响车辆安全", width = 15) @ApiModelProperty(value = "升级活动是否影响车辆安全") - private java.lang.String sfyxaq; + private java.lang.Integer sfyxaq; /**升级活动是否提供用户确认选项*/ @Excel(name = "升级活动是否提供用户确认选项", width = 15) @ApiModelProperty(value = "升级活动是否提供用户确认选项") - private java.lang.String yhqr; + private java.lang.Integer yhqr; /**升级包测试*/ @Excel(name = "升级包测试", width = 15) @@ -128,7 +128,7 @@ public class OtaBaSjSjyxpg implements Serializable { /**是杏已验证确认在线升级活动的安全性和可靠性*/ @Excel(name = "是杏已验证确认在线升级活动的安全性和可靠性", width = 15) @ApiModelProperty(value = "是杏已验证确认在线升级活动的安全性和可靠性") - private java.lang.String aqkkx; + private java.lang.Integer aqkkx; /**提供变更或扩展后的《公告》批次及证明材料*/ @Excel(name = "提供变更或扩展后的《公告》批次及证明材料", width = 15) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java index 63696717d..a15d769fb 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java @@ -163,6 +163,9 @@ public class OtaBaCxAqcsServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(OtaBaCxAqcs::getOtaId, otaId); return this.getOne(queryWrapper, false); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java index 1dd502db9..50470134a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java @@ -156,6 +156,9 @@ public class OtaBaCxJbxxServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(OtaBaCxJbxx::getOtaId, otaId); return this.getOne(queryWrapper, false); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java index 706170a73..7b1643198 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java @@ -236,6 +236,9 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(OtaBaCxJsfzbacs::getOtaId, otaId); return this.getOne(queryWrapper, false); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java index 9c3d2722e..2e08de9a6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java @@ -195,6 +195,9 @@ public class OtaBaCxKsjjsmccsServiceImpl extends ServiceImpl getByOtaId(String otaId) { + if(org.apache.commons.lang3.StringUtils.isEmpty(otaId)){ + return null; + } LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(OtaBaCxKsjjsmccs::getOtaId, otaId); return this.list(queryWrapper); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java index 843ec4da0..fc1be2573 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java @@ -193,6 +193,9 @@ public class OtaBaCxKsjxtmccsServiceImpl extends ServiceImpl getByOtaId(String otaId) { + if(org.apache.commons.lang3.StringUtils.isEmpty(otaId)){ + return null; + } LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(OtaBaCxKsjxtmccs::getOtaId, otaId); return this.list(queryWrapper); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxQtServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxQtServiceImpl.java index bf26c78ac..73cbf9e59 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxQtServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxQtServiceImpl.java @@ -127,6 +127,9 @@ public class OtaBaCxQtServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(OtaBaCxQt::getOtaId, otaId); return this.getOne(queryWrapper, false); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java index d74075955..c45ce3849 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java @@ -131,6 +131,9 @@ public class OtaBaSjSjmbclServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(OtaBaSjSjmbcl::getOtaId, otaId); return this.getOne(queryWrapper, false); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java index 36d90192f..7d2ad60d2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java @@ -139,6 +139,9 @@ public class OtaBaSjSjmbcxServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(OtaBaSjSjmbcx::getOtaId, otaId); return this.getOne(queryWrapper, false); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjyxpgServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjyxpgServiceImpl.java index 06ac57f12..a71537d20 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjyxpgServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjyxpgServiceImpl.java @@ -128,6 +128,9 @@ public class OtaBaSjSjyxpgServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(OtaBaSjSjyxpg::getOtaId, otaId); return this.getOne(queryWrapper, false); From e2e1f35c8f172c50d6ac48be6a1046da957c8b93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Tue, 28 Mar 2023 15:09:31 +0800 Subject: [PATCH 442/645] =?UTF-8?q?=E5=9C=A8=E8=BD=AC=E5=8A=9E=E6=97=81?= =?UTF-8?q?=E5=9B=9E=E6=98=BE=E6=89=80=E9=80=89=E4=BA=BA=E5=91=98=20?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95--=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E7=9B=AE=E5=BD=95-=E6=B7=BB=E5=8A=A0=EF=BC=8C=E5=AD=97?= =?UTF-8?q?=E7=AC=A6=E9=95=BF=E5=BA=A6=E9=99=90=E5=88=B6=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/SelectedBy/index.vue | 15 ++- .../components/certificationDirectoryAdd.vue | 108 ++++++++++++------ .../reviewedByThePersonInCharge.vue | 10 +- 3 files changed, 93 insertions(+), 40 deletions(-) diff --git a/jero-web/src/components/SelectedBy/index.vue b/jero-web/src/components/SelectedBy/index.vue index 35711e606..13c9683ae 100644 --- a/jero-web/src/components/SelectedBy/index.vue +++ b/jero-web/src/components/SelectedBy/index.vue @@ -67,7 +67,8 @@ departId: '', defaultExpandedKeys: [], submitLoading: false, - visibleTree: false + visibleTree: false, + userName: [] } }, mounted() { @@ -110,7 +111,7 @@ } if (this.userIds && this.userIds.length > 0) { this.submitLoading = true - this.$emit('SelectedByForm', this.userIds.join(',')) + this.$emit('SelectedByForm', this.userIds.join(','),this.userName.join(',')) } else { this.$message.warning(this.$t('selectLeastOne')) } @@ -142,7 +143,7 @@ postAction('sys/user/queryDepartUserTreeList', { departId: this.departId, json: gData, - flag:'1' + flag: '1' }).then((res) => { this.confirmLoading = false if (res.success) { @@ -155,8 +156,14 @@ } }) }, - checkChange(e) { + checkChange(e, name) { + this.userName = [] this.userIds = e + if (name.checkedNodes && name.checkedNodes.length > 0) { + name.checkedNodes.forEach(res => { + this.userName.push(res.data.props.dataRef.title) + }) + } } } } diff --git a/jero-web/src/views/projectManagement/components/certificationDirectoryAdd.vue b/jero-web/src/views/projectManagement/components/certificationDirectoryAdd.vue index 59c7a4b5c..1179cf11d 100644 --- a/jero-web/src/views/projectManagement/components/certificationDirectoryAdd.vue +++ b/jero-web/src/views/projectManagement/components/certificationDirectoryAdd.vue @@ -10,14 +10,14 @@ :visible="visible" style="height: 100%;overflow: auto;padding-bottom: 53px;"> - +
{{$t('directoryName')}}
- + {{$t('batch')}}
- + {{$t('testReportLocation')}}
- + {{$t('explain')}}
- + { + this.$refs.ruleForm.clearValidate() + }) }, edit(val) { this.visible = true this.$nextTick(() => { this.formInline = val + this.$refs.ruleForm.clearValidate() }) }, handleCancel() { this.visible = false }, handleSubmit() { - if (!this.formInline.directoryName && !this.formInline.lot && !this.formInline.directoryFile && - !this.formInline.experimentFile && !this.formInline.detectionReportLocation && !this.formInline.explainInfo) { - this.$message.warning(this.$t('dataCannotEmpty')) - } else { - let Action - let url = '' - if (this.formInline.id) { - url = this.url.edit - Action = putAction - } else { - url = this.url.add - Action = postAction - } - let query = { - projectLibraryId: this.$route.query.id, - ...this.formInline - } - this.confirmLoading = true - Action(url, query).then((res) => { - if (res.success) { - this.$message.success(this.$t('OperationSuccessful')) - this.visible = false - this.confirmLoading = false - this.$emit('certificationDirectoryList') - } else { - this.confirmLoading = false - this.$message.warning(res.message) - } - }) - } + this.$refs.ruleForm.validate(valid => { + if (valid){ + if (!this.formInline.directoryName && !this.formInline.lot && !this.formInline.directoryFile && + !this.formInline.experimentFile && !this.formInline.detectionReportLocation && !this.formInline.explainInfo) { + this.$message.warning(this.$t('dataCannotEmpty')) + } else { + let Action + let url = '' + if (this.formInline.id) { + url = this.url.edit + Action = putAction + } else { + url = this.url.add + Action = postAction + } + let query = { + projectLibraryId: this.$route.query.id, + ...this.formInline + } + this.confirmLoading = true + Action(url, query).then((res) => { + if (res.success) { + this.$message.success(this.$t('OperationSuccessful')) + this.visible = false + this.confirmLoading = false + this.$emit('certificationDirectoryList') + } else { + this.confirmLoading = false + this.$message.warning(res.message) + } + }) + } + } + }) }, clickButtonToUpload(item) { this.$refs.uploadFile.perentHandleFunc() diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue index 82e7dcb05..8b31bb419 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue @@ -49,6 +49,9 @@ {{$t('turnToDo')}} + + {{this.formInline.dezrrSubmitUserName}} + @@ -184,16 +187,21 @@ } else { this.$refs.SelectedByRef.visible = false this.formInline.secondChargePersonUserId = '' + this.formInline.dezrrSubmitUserName = '' + this.formInline.dezrrSubmitUserId = '' } }, //转办接口 - SelectedByForm(userIds) { + SelectedByForm(userIds, name) { if (this.query.TaskKey == 'zrrtjjfw') { this.formInline.dezrrSubmitUserId = userIds } else { this.formInline.secondChargePersonUserId = userIds } + this.formInline.dezrrSubmitUserName = name + this.formInline = { ...this.formInline } this.$refs.SelectedByRef.visible = false + this.$refs.SelectedByRef.submitLoading = false }, submitNoRule(callBack) { callBack(this.formInline) From 5575134a499a6b4cea0956935243a77e442afab6 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Tue, 28 Mar 2023 15:10:51 +0800 Subject: [PATCH 443/645] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95-?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8E=86=E5=8F=B2=E5=AE=8C=E5=96=84=E3=80=82?= =?UTF-8?q?67009?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/service/ISysUserService.java | 8 + .../service/impl/SysUserServiceImpl.java | 15 + ...ctCertificationInventoryEOServiceImpl.java | 547 +++++++++++++----- 3 files changed, 436 insertions(+), 134 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java index 160d50570..fb1881817 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java @@ -311,4 +311,12 @@ public interface ISysUserService extends IService { * @return */ String getUserThirdIdByUserId(List sysUserList, String userId); + + /** + * 根据用户id，获取用户名 + * @param sysUserList + * @param userId + * @return + */ + String getUsernameByUserId(List sysUserList, String userId); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java index ef7fd2b2e..4f8cc64cb 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java @@ -782,4 +782,19 @@ public class SysUserServiceImpl extends ServiceImpl impl } return result; } + + @Override + public String getUsernameByUserId(List sysUserList, String userId) { + String result = ""; + if(CollectionUtils.isNotEmpty(sysUserList)){ + result = sysUserList.stream().filter(user -> { + boolean flag = false; + if (org.apache.commons.lang3.StringUtils.equals(userId, user.getId())) { + flag = true; + } + return flag; + }).map(SysUser::getUsername).collect(Collectors.joining(",")); + } + return result; + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index 3c130b781..bc470b601 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -220,8 +220,19 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl savePciLogParams = new HashMap<>(); + List editBeforePciList = new ArrayList<>(); + editBeforePciList.add(editBeforePciEo); + List editAfterPciList = new ArrayList<>(); + editAfterPciList.add(projectCertificationInventoryEO); + savePciLogParams.put("editBeforePciList",editBeforePciList); + savePciLogParams.put("editAfterPciList",editAfterPciList); + savePciLogParams.put("operatorType",OperatorTypeEnum.CERTIFICATION_INVENTORY_EDIT.getValue()); + this.saveProjectCertificationInventoryLog(savePciLogParams); - Date now = new Date(); + Date now = new Date(); projectCertificationInventoryEO.setUpdateTime(now); saveOrUpdate(projectCertificationInventoryEO); //设置权限 先删后加 @@ -325,32 +336,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl projectCertificationInventoryLogEOList = new ArrayList<>(); - for (ProjectCertificationInventoryEO certificationInventoryEO : saveDataList) { - StringBuilder contentCnSb = new StringBuilder(); - contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" 添加了 "); - contentCnSb.append("\"").append(certificationInventoryEO.getCategory()).append("\"").append(" "); - contentCnSb.append("\"").append(certificationInventoryEO.getInspectionItem()).append("\"").append(" "); - contentCnSb.append("\"").append(certificationInventoryEO.getConfigItem()).append("\"").append(" "); - contentCnSb.append("\"").append(certificationInventoryEO.getSerialNumber()).append("\"").append(" "); - - StringBuilder contentEnSb = new StringBuilder(); - contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" added "); - contentEnSb.append("\"").append(certificationInventoryEO.getCategory()).append("\"").append(" "); - contentEnSb.append("\"").append(certificationInventoryEO.getInspectionItem()).append("\"").append(" "); - contentEnSb.append("\"").append(certificationInventoryEO.getConfigItem()).append("\"").append(" "); - contentEnSb.append("\"").append(certificationInventoryEO.getSerialNumber()).append("\""); - - - ProjectCertificationInventoryLogEO projectCertificationInventoryLogEO = new ProjectCertificationInventoryLogEO(); - projectCertificationInventoryLogEO.setProjectCertificationInventoryId(certificationInventoryEO.getId()); - projectCertificationInventoryLogEO.setContentCn(contentCnSb.toString()); - projectCertificationInventoryLogEO.setContentEn(contentEnSb.toString()); - projectCertificationInventoryLogEOList.add(projectCertificationInventoryLogEO); - } - this.projectCertificationInventoryLogEOService.insertBatch(projectCertificationInventoryLogEOList); + this.saveProjectCertificationInventoryLog(saveDataList,OperatorTypeEnum.CERTIFICATION_INVENTORY_ADD.getValue()); } }catch (Exception ex){ throw new JeroBootException("添加失败！"); @@ -804,6 +790,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl projectCertificationInventoryLogEOList = new ArrayList<>(); for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) { projectCertificationInventoryEO.setFlowStatus(CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue()); - - String contentCn = "\"" + currentUser.getUsername() + "\"" +"审核退回"; - String contentEn = "\"" + currentUser.getUsername() + "\"" +" review and returned"; - ProjectCertificationInventoryLogEO projectCertificationInventoryLogEO = new ProjectCertificationInventoryLogEO(); - projectCertificationInventoryLogEO.setProjectCertificationInventoryId(projectCertificationInventoryEO.getId()); - projectCertificationInventoryLogEO.setContentCn(contentCn); - projectCertificationInventoryLogEO.setContentEn(contentEn); - projectCertificationInventoryLogEO.setOperatorType(OperatorTypeEnum.CERTIFICATION_INVENTORY_REVIEW_RETURNED.getValue()); - projectCertificationInventoryLogEOList.add(projectCertificationInventoryLogEO); } - if(CollectionUtils.isNotEmpty(projectCertificationInventoryLogEOList)){ - this.projectCertificationInventoryLogEOService.insertBatch(projectCertificationInventoryLogEOList); - } + this.saveProjectCertificationInventoryLog(projectCertificationInventoryEOList,OperatorTypeEnum.CERTIFICATION_INVENTORY_REVIEW_RETURNED.getValue()); ProjectLibraryBase projectLibraryBase = JSONObject.parseObject(JSONObject.toJSONString(json.get("projectLibraryBase")), ProjectLibraryBase.class); List dutyPersonIdList = projectCertificationInventoryEOList.stream().map(ProjectCertificationInventoryEO::getDutyPerson).distinct().collect(Collectors.toList()); @@ -1323,24 +1299,11 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl projectCertificationInventoryLogEOList = new ArrayList<>(); - for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) { projectCertificationInventoryEO.setFlowStatus(CertificationInventoryFlowStatusEnum.REVIEW_AND_PASS.getValue()); - - String contentCn = "\"" + currentUser.getUsername() + "\"" +"审核通过"; - String contentEn = "\"" + currentUser.getUsername() + "\"" +" pass the audit"; - ProjectCertificationInventoryLogEO projectCertificationInventoryLogEO = new ProjectCertificationInventoryLogEO(); - projectCertificationInventoryLogEO.setProjectCertificationInventoryId(projectCertificationInventoryEO.getId()); - projectCertificationInventoryLogEO.setContentCn(contentCn); - projectCertificationInventoryLogEO.setContentEn(contentEn); - projectCertificationInventoryLogEO.setOperatorType(OperatorTypeEnum.CERTIFICATION_INVENTORY_REVIEW_THROUGH.getValue()); - projectCertificationInventoryLogEOList.add(projectCertificationInventoryLogEO); } - if(CollectionUtils.isNotEmpty(projectCertificationInventoryLogEOList)){ - this.projectCertificationInventoryLogEOService.insertBatch(projectCertificationInventoryLogEOList); - } + this.saveProjectCertificationInventoryLog(projectCertificationInventoryEOList,OperatorTypeEnum.CERTIFICATION_INVENTORY_REVIEW_THROUGH.getValue()); ProjectLibraryBase projectLibraryBase = JSONObject.parseObject(JSONObject.toJSONString(json.get("projectLibraryBase")), ProjectLibraryBase.class); List dutyPersonIdList = projectCertificationInventoryEOList.stream().map(ProjectCertificationInventoryEO::getDutyPerson).distinct().collect(Collectors.toList()); @@ -1449,36 +1412,12 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl projectCertificationInventoryLogEOList = new ArrayList<>(); // 数据更新为结果待审查 for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) { projectCertificationInventoryEO.setFlowStatus(CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue()); - - String contentCn = ""; - String contentEn = ""; - if (StringUtils.equals(projectCertificationInventoryEO.getValueType(), SysCategoryValueTypeEnum.FILE.getValue())) { - String fileName = "N/A"; - if (StringUtils.isNotEmpty(projectCertificationInventoryEO.getDeliveryResult())) { - fileName = this.ossFileService.getFileInfos(projectCertificationInventoryEO.getDeliveryResult()).stream().map(OSSFile::getFileName).distinct().collect(Collectors.joining(",")); - } - contentCn = "\"" + currentUser.getUsername() + "\"" +"提交了附件 " + fileName; - contentEn = "\"" + currentUser.getUsername() + "\"" +" submitted attachment " + fileName; - }else { - String deliveryResult = (StringUtils.isNotEmpty(projectCertificationInventoryEO.getDeliveryResult()) ? projectCertificationInventoryEO.getDeliveryResult() : "N/A"); - contentCn = "\"" + currentUser.getUsername() + "\"" +"提交了交付结果为" + deliveryResult; - contentEn = "\"" + currentUser.getUsername() + "\"" +" submitted a delivery result of " + deliveryResult; - } - ProjectCertificationInventoryLogEO projectCertificationInventoryLogEO = new ProjectCertificationInventoryLogEO(); - projectCertificationInventoryLogEO.setProjectCertificationInventoryId(projectCertificationInventoryEO.getId()); - projectCertificationInventoryLogEO.setContentCn(contentCn); - projectCertificationInventoryLogEO.setContentEn(contentEn); - projectCertificationInventoryLogEO.setOperatorType(OperatorTypeEnum.CERTIFICATION_INVENTORY_DUTY_PERSON_SUBMIT_TASK.getValue()); - projectCertificationInventoryLogEOList.add(projectCertificationInventoryLogEO); } - if(CollectionUtils.isNotEmpty(projectCertificationInventoryLogEOList)){ - this.projectCertificationInventoryLogEOService.insertBatch(projectCertificationInventoryLogEOList); - } + this.saveProjectCertificationInventoryLog(projectCertificationInventoryEOList,OperatorTypeEnum.CERTIFICATION_INVENTORY_DUTY_PERSON_SUBMIT_TASK.getValue()); List certificationEngineers = this.sysUserService.querySysUserListByIdList(certificationEngineerList); @@ -1546,7 +1485,6 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl projectCertificationInventoryLogEOList = new ArrayList<>(); List processInfoDetailEOList = new ArrayList<>(); for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) { projectCertificationInventoryEO.setFlowStatus(CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()); @@ -1556,20 +1494,9 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl projectCertificationInventoryLogEOList = new ArrayList<>(); - for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) { projectCertificationInventoryEO.setFlowStatus(CertificationInventoryFlowStatusEnum.REFUSAL_OF_RESPONSIBLE_PERSON.getValue()); - - String contentCn = "\"" + currentUser.getUsername() + "\"" +"退回了任务信息"; - String contentEn = "\"" + currentUser.getUsername() + "\"" +" returned the task information"; - ProjectCertificationInventoryLogEO projectCertificationInventoryLogEO = new ProjectCertificationInventoryLogEO(); - projectCertificationInventoryLogEO.setProjectCertificationInventoryId(projectCertificationInventoryEO.getId()); - projectCertificationInventoryLogEO.setContentCn(contentCn); - projectCertificationInventoryLogEO.setContentEn(contentEn); - projectCertificationInventoryLogEO.setOperatorType(OperatorTypeEnum.CERTIFICATION_INVENTORY_DUTY_PERSON_REJECT_TASK.getValue()); - projectCertificationInventoryLogEOList.add(projectCertificationInventoryLogEO); } - if(CollectionUtils.isNotEmpty(projectCertificationInventoryLogEOList)){ - this.projectCertificationInventoryLogEOService.insertBatch(projectCertificationInventoryLogEOList); - } + this.saveProjectCertificationInventoryLog(projectCertificationInventoryEOList,OperatorTypeEnum.CERTIFICATION_INVENTORY_DUTY_PERSON_REJECT_TASK.getValue()); String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 @@ -1842,22 +1756,11 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl projectCertificationInventoryLogEOList = new ArrayList<>(); for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) { projectCertificationInventoryEO.setFlowStatus(CertificationInventoryFlowStatusEnum.CERTIFICATION_RETURNED.getValue()); + } - String contentCn = "\"" + currentUser.getUsername() + "\"" +"拒绝，流程退回至" + "\"" +studioEngineerUserInfo.get(0).getUsername()+"\""; - String contentEn = "\"" + currentUser.getUsername() + "\"" +" refuses, and the process returns to " + "\"" +studioEngineerUserInfo.get(0).getUsername()+"\""; - ProjectCertificationInventoryLogEO projectCertificationInventoryLogEO = new ProjectCertificationInventoryLogEO(); - projectCertificationInventoryLogEO.setProjectCertificationInventoryId(projectCertificationInventoryEO.getId()); - projectCertificationInventoryLogEO.setContentCn(contentCn); - projectCertificationInventoryLogEO.setContentEn(contentEn); - projectCertificationInventoryLogEO.setOperatorType(OperatorTypeEnum.CERTIFICATION_INVENTORY_RETURNED_STUDIO_TASK.getValue()); - projectCertificationInventoryLogEOList.add(projectCertificationInventoryLogEO); - } - if(CollectionUtils.isNotEmpty(projectCertificationInventoryLogEOList)){ - this.projectCertificationInventoryLogEOService.insertBatch(projectCertificationInventoryLogEOList); - } + this.saveProjectCertificationInventoryLog(projectCertificationInventoryEOList,OperatorTypeEnum.CERTIFICATION_INVENTORY_RETURNED_STUDIO_TASK.getValue()); Map standNameAndItemName = this.getStandNameAndItemName(projectCertificationInventoryEOList); String standName = (String) standNameAndItemName.get("standName"); @@ -1959,7 +1862,6 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl> certifycationInventoryListByDutyPersonMap = projectCertificationInventoryEOList.stream().collect(Collectors.groupingBy(ProjectCertificationInventoryEO::getDutyPerson)); try { - List projectCertificationInventoryLogEOList = new ArrayList<>(); // 给责任人分配待办中心的任务 List processInfoDetailEOList = new ArrayList<>(); for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) { @@ -1970,20 +1872,9 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl certificationEngineerIdList = Arrays.asList(projectLibraryBase.getCertificationEngineer().split(",")); + List certificationEngineerList = this.sysUserService.querySysUserListByIdList(certificationEngineerIdList); String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 @@ -2122,6 +2015,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.lambda().in(ProjectCertificationInventoryEO::getId,idList); + queryWrapper.lambda().ne(ProjectCertificationInventoryEO::getFlowStatus,CertificationInventoryFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()); List projectCertificationInventoryEOList = this.list(queryWrapper); // 根据结束时间进行排序，获取最近的时间，发消息时使用。 @@ -2144,7 +2038,6 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl updateWrap = new LambdaUpdateWrapper<>(); updateWrap.set(ProjectCertificationInventoryEO::getDeliveryResult,null); - // 流程重置，清空截止日期， 撤回不清空。 对应禅道问题：67048 if(StringUtils.equals(operatorType,OperatorTypeEnum.CERTIFICATION_INVENTORY_STUDIO_RESET.getValue())){ updateWrap.set(ProjectCertificationInventoryEO::getEndTime,null); @@ -2155,6 +2048,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl certificationEngineerList = this.sysUserService.querySysUserListByIdList(certificationEngineerIdList); if(CollectionUtils.isNotEmpty(certificationEngineerList)){ for (String certificationEngineerId : certificationEngineerIdList) { String thirdId = this.sysUserService.getUserThirdIdByUserId(certificationEngineerList,certificationEngineerId); @@ -3348,4 +3242,389 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl pciList,String operateType){ + if(CollectionUtils.isNotEmpty(pciList)){ + LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + String projectLibraryId = pciList.get(0).getProjectLibraryId(); + ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); + List studioEngineerUserInfo = this.sysUserService.querySysUserListByIdList(Arrays.asList(projectLibraryBase.getStudioEngineer().split(","))); + + List certificationEngineerIdList = Arrays.asList(projectLibraryBase.getCertificationEngineer().split(",")); + List certificationEngineerList = this.sysUserService.querySysUserListByIdList(certificationEngineerIdList); + String certificationEngineerUserNames = certificationEngineerList.stream().map(SysUser::getUsername).distinct().collect(Collectors.joining(",")); + + List pciLogEOList = new ArrayList<>(); + for (ProjectCertificationInventoryEO pci : pciList) { + StringBuilder contentCnSb = new StringBuilder(); + StringBuilder contentEnSb = new StringBuilder(); + if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_ADD.getValue())){ + contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" 添加了 "); + contentCnSb.append("\"").append(pci.getCategory()).append("\"").append(" "); + contentCnSb.append("\"").append(pci.getInspectionItem()).append("\"").append(" "); + contentCnSb.append("\"").append(pci.getConfigItem()).append("\"").append(" "); + contentCnSb.append("\"").append(pci.getSerialNumber()).append("\"").append(" "); + + contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" added "); + contentEnSb.append("\"").append(pci.getCategory()).append("\"").append(" "); + contentEnSb.append("\"").append(pci.getInspectionItem()).append("\"").append(" "); + contentEnSb.append("\"").append(pci.getConfigItem()).append("\"").append(" "); + contentEnSb.append("\"").append(pci.getSerialNumber()).append("\""); + } else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_STUDIO_ISSUE.getValue())){ + contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("发布了认证清单"); + contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" has published a certification list"); + } else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_REVIEW_RETURNED.getValue())){ + contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("审核退回"); + contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" review and returned"); + } else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_REVIEW_THROUGH.getValue())){ + contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("审核通过"); + contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" pass the audit"); + } else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_DUTY_PERSON_SUBMIT_TASK.getValue())){ + if (StringUtils.equals(pci.getValueType(), SysCategoryValueTypeEnum.FILE.getValue())) { + String fileName = "N/A"; + if (StringUtils.isNotEmpty(pci.getDeliveryResult())) { + fileName = this.ossFileService.getFileInfos(pci.getDeliveryResult()).stream().map(OSSFile::getFileName).distinct().collect(Collectors.joining(",")); + } + contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("提交了附件 ").append(fileName); + contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" submitted attachment ").append(fileName); + }else { + String deliveryResult = (StringUtils.isNotEmpty(pci.getDeliveryResult()) ? pci.getDeliveryResult() : "N/A"); + contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("提交了交付结果为").append(deliveryResult); + contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" submitted a delivery result of ").append(deliveryResult); + } + } else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_DUTY_PERSON_ACCEPT_TASK.getValue())){ + contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("接受了任务信息"); + contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" accepts the task information"); + } else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_DUTY_PERSON_REJECT_TASK.getValue())){ + contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("退回了任务信息"); + contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" returned the task information"); + } else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_RETURNED_STUDIO_TASK.getValue())){ + contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("拒绝，流程退回至") + .append("\"").append(studioEngineerUserInfo.get(0).getUsername()).append("\""); + contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" refuses, and the process returns to ") + .append("\"").append(studioEngineerUserInfo.get(0).getUsername()).append("\""); + } else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_INITIATING_TASK.getValue())){ + contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("发起了Pre-Homo流程"); + contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" initiates the Pre-Homo process"); + } else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_STUDIO_RESET.getValue())){ + contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("操作了流程重置功能"); + contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" has operated the process reset function"); + } else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_STUDIO_WITHDRAW.getValue())){ + contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("从").append("\"").append(certificationEngineerUserNames).append("\"撤回了流程"); + contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" withdrew the process from \"").append(certificationEngineerUserNames).append("\""); + } + + ProjectCertificationInventoryLogEO pciLogEO = new ProjectCertificationInventoryLogEO(); + pciLogEO.setProjectCertificationInventoryId(pci.getId()); + pciLogEO.setContentCn(contentCnSb.toString()); + pciLogEO.setContentEn(contentEnSb.toString()); + pciLogEO.setOperatorType(operateType); + pciLogEOList.add(pciLogEO); + } + + if(CollectionUtils.isNotEmpty(pciLogEOList)){ + this.projectCertificationInventoryLogEOService.insertBatch(pciLogEOList); + } + } + } + + /** + * 保存认证清单修改历史（编辑、批量设置专用） + * @param params + */ + public void saveProjectCertificationInventoryLog(Map params){ + LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + List editBeforePciList = (List) params.get("editBeforePciList"); + List editAfterPciList = (List) params.get("editAfterPciList"); + String operatorType = (String) params.get("operatorType"); + + if(CollectionUtils.isNotEmpty(editBeforePciList) && CollectionUtils.isNotEmpty(editAfterPciList)){ + List categoryList = this.sysCategoryService.list(); + List sysDictItems = this.sysDictItemServiceImpl.getBaseMapper().selectItemsAll(); + + List beforeSdtUserIdList = editBeforePciList.stream().map(ProjectCertificationInventoryEO::getSdt).distinct().collect(Collectors.toList()); + List beforeDutyPersonUserIdList = editBeforePciList.stream().map(ProjectCertificationInventoryEO::getDutyPerson).distinct().collect(Collectors.toList()); + + List afterSdtUserIdList = editAfterPciList.stream().map(ProjectCertificationInventoryEO::getSdt).distinct().collect(Collectors.toList()); + List afterDutyPersonUserIdList = editAfterPciList.stream().map(ProjectCertificationInventoryEO::getDutyPerson).distinct().collect(Collectors.toList()); + List userIdList = new ArrayList<>(); + userIdList.addAll(beforeSdtUserIdList); + userIdList.addAll(beforeDutyPersonUserIdList); + userIdList.addAll(afterSdtUserIdList); + userIdList.addAll(afterDutyPersonUserIdList); + List userList = this.sysUserService.querySysUserListByIdList(userIdList); + + List beforeDeliverableTemplateIdList = editBeforePciList.stream().map(ProjectCertificationInventoryEO::getDeliverableTemplate).distinct().collect(Collectors.toList()); + List afterDeliverableTemplateIdList = editAfterPciList.stream().map(ProjectCertificationInventoryEO::getDeliverableTemplate).distinct().collect(Collectors.toList()); + List allDeliverableTemplateIdList = new ArrayList<>(); + allDeliverableTemplateIdList.addAll(beforeDeliverableTemplateIdList); + allDeliverableTemplateIdList.addAll(afterDeliverableTemplateIdList); + List allDeliverableTemplateList = this.ossFileService.getFileInfos(allDeliverableTemplateIdList.stream().distinct().collect(Collectors.joining(","))); + + List pciLogEOList = new ArrayList<>(); + + for (ProjectCertificationInventoryEO editAfterPciEo : editAfterPciList) { + List editBeforePciListTemp = editBeforePciList.stream().filter(editBeforePciEo -> { + boolean flag = false; + if (StringUtils.equals(editAfterPciEo.getId(), editBeforePciEo.getId())) { + flag = true; + } + return flag; + }).collect(Collectors.toList()); + + if(CollectionUtils.isNotEmpty(editBeforePciListTemp)){ + boolean savePciLogFlag = false; + ProjectCertificationInventoryEO editBeforePciEo = editBeforePciListTemp.get(0); + + if(ObjectUtils.isNotEmpty(editBeforePciEo)){ + StringBuilder contentCnSb = new StringBuilder(); + contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("将"); + StringBuilder contentEnSb = new StringBuilder(); + contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" changes the "); + + if(!StringUtils.equals(editBeforePciEo.getWvtaId(),editAfterPciEo.getWvtaId())){ + contentCnSb.append("\"").append("WVTA ID").append("\" ") + .append(StringUtils.isNotEmpty(editBeforePciEo.getWvtaId()) ? editBeforePciEo.getWvtaId() : "空") + .append(" 修改为 ") + .append(StringUtils.isNotEmpty(editAfterPciEo.getWvtaId()) ? editAfterPciEo.getWvtaId() : "空") + .append(","); + + contentEnSb.append("\"").append("WVTA ID").append("\" ") + .append(StringUtils.isNotEmpty(editBeforePciEo.getWvtaId()) ? editBeforePciEo.getWvtaId() : "null") + .append(" to ") + .append(StringUtils.isNotEmpty(editAfterPciEo.getWvtaId()) ? editAfterPciEo.getWvtaId() : "null") + .append(","); + + savePciLogFlag = true; + } + if(!StringUtils.equals(editBeforePciEo.getCategory(),editAfterPciEo.getCategory())){ + contentCnSb.append("\"").append("类别").append("\" ") + .append(StringUtils.isNotEmpty(editBeforePciEo.getCategory()) ? editBeforePciEo.getCategory() : "空") + .append(" 修改为 ") + .append(StringUtils.isNotEmpty(editAfterPciEo.getCategory()) ? editAfterPciEo.getCategory() : "空") + .append(","); + + contentEnSb.append("\"").append("Category").append("\" ") + .append(StringUtils.isNotEmpty(editBeforePciEo.getCategory()) ? editBeforePciEo.getCategory() : "null") + .append(" to ") + .append(StringUtils.isNotEmpty(editAfterPciEo.getCategory()) ? editAfterPciEo.getCategory() : "null") + .append(","); + + savePciLogFlag = true; + } + if(!StringUtils.equals(editBeforePciEo.getInspectionItem(),editAfterPciEo.getInspectionItem())){ + contentCnSb.append("\"").append("检验项目").append("\" ") + .append(StringUtils.isNotEmpty(editBeforePciEo.getInspectionItem()) ? editBeforePciEo.getInspectionItem() : "空") + .append(" 修改为 ") + .append(StringUtils.isNotEmpty(editAfterPciEo.getInspectionItem()) ? editAfterPciEo.getInspectionItem() : "空") + .append(","); + + contentEnSb.append("\"").append("Inspection Items").append("\" ") + .append(StringUtils.isNotEmpty(editBeforePciEo.getInspectionItem()) ? editBeforePciEo.getInspectionItem() : "null") + .append(" to ") + .append(StringUtils.isNotEmpty(editAfterPciEo.getInspectionItem()) ? editAfterPciEo.getInspectionItem() : "null") + .append(","); + + savePciLogFlag = true; + } + if(!StringUtils.equals(editBeforePciEo.getConfigItem(),editAfterPciEo.getConfigItem())){ + contentCnSb.append("\"").append("配置项").append("\" ") + .append(StringUtils.isNotEmpty(editBeforePciEo.getConfigItem()) ? editBeforePciEo.getConfigItem() : "空") + .append(" 修改为 ") + .append(StringUtils.isNotEmpty(editAfterPciEo.getConfigItem()) ? editAfterPciEo.getConfigItem() : "空") + .append(","); + + contentEnSb.append("\"").append("Configuration Item").append("\" ") + .append(StringUtils.isNotEmpty(editBeforePciEo.getConfigItem()) ? editBeforePciEo.getConfigItem() : "null") + .append(" to ") + .append(StringUtils.isNotEmpty(editAfterPciEo.getConfigItem()) ? editAfterPciEo.getConfigItem() : "null") + .append(","); + + savePciLogFlag = true; + } + if(!StringUtils.equals(editBeforePciEo.getDutyTerritory(),editAfterPciEo.getDutyTerritory())){ + String beforeDutyTerritoryNameCn = this.sysDictItemService.disposeShowDictItemValue( + sysDictItems, + editBeforePciEo.getDutyTerritory(), + CutEnum.CN.getValue(), + ProjectInventoryFieldEnum.DUTY_TERRITORY.getValue() + ); + String beforeDutyTerritoryNameEn = this.sysDictItemService.disposeShowDictItemValue( + sysDictItems, + editBeforePciEo.getDutyTerritory(), + CutEnum.EN.getValue(), + ProjectInventoryFieldEnum.DUTY_TERRITORY.getValue() + ); + + String afterDutyTerritoryNameCn = this.sysDictItemService.disposeShowDictItemValue( + sysDictItems, + editAfterPciEo.getDutyTerritory(), + CutEnum.CN.getValue(), + ProjectInventoryFieldEnum.DUTY_TERRITORY.getValue() + ); + String afterDutyTerritoryNameEn = this.sysDictItemService.disposeShowDictItemValue( + sysDictItems, + editAfterPciEo.getDutyTerritory(), + CutEnum.EN.getValue(), + ProjectInventoryFieldEnum.DUTY_TERRITORY.getValue() + ); + + contentCnSb.append("\"").append("责任领域").append("\" ") + .append(StringUtils.isNotEmpty(beforeDutyTerritoryNameCn) ? beforeDutyTerritoryNameCn : "空") + .append(" 修改为 ") + .append(StringUtils.isNotEmpty(afterDutyTerritoryNameCn) ? afterDutyTerritoryNameCn : "空") + .append(","); + + contentEnSb.append("\"").append("Responsible Field").append("\" ") + .append(StringUtils.isNotEmpty(beforeDutyTerritoryNameEn) ? beforeDutyTerritoryNameEn : "null") + .append(" to ") + .append(StringUtils.isNotEmpty(afterDutyTerritoryNameEn) ? afterDutyTerritoryNameEn : "null") + .append(","); + + savePciLogFlag = true; + } + if(!StringUtils.equals(editBeforePciEo.getDeliverableType(),editAfterPciEo.getDeliverableType())){ + String beforeDeliverableTypeNameCn = this.getTreeName(CutEnum.CN.getValue(), categoryList, Arrays.asList(editBeforePciEo.getDeliverableType().split(","))); + String beforeDeliverableTypeNameEn = this.getTreeName(CutEnum.EN.getValue(), categoryList, Arrays.asList(editBeforePciEo.getDeliverableType().split(","))); + + String afterDeliverableTypeNameCn = this.getTreeName(CutEnum.CN.getValue(), categoryList, Arrays.asList(editAfterPciEo.getDeliverableType().split(","))); + String afterDeliverableTypeNameEn = this.getTreeName(CutEnum.EN.getValue(), categoryList, Arrays.asList(editAfterPciEo.getDeliverableType().split(","))); + + contentCnSb.append("\"").append("交付物类型").append("\" ") + .append(StringUtils.isNotEmpty(beforeDeliverableTypeNameCn) ? beforeDeliverableTypeNameCn : "空") + .append(" 修改为 ") + .append(StringUtils.isNotEmpty(afterDeliverableTypeNameCn) ? afterDeliverableTypeNameCn : "空") + .append(","); + + contentEnSb.append("\"").append("Deliverable Type").append("\" ") + .append(StringUtils.isNotEmpty(beforeDeliverableTypeNameEn) ? beforeDeliverableTypeNameEn : "null") + .append(" to ") + .append(StringUtils.isNotEmpty(afterDeliverableTypeNameEn) ? afterDeliverableTypeNameEn : "null") + .append(","); + + savePciLogFlag = true; + } + if(!StringUtils.equals(editBeforePciEo.getDeliverableTemplate(),editAfterPciEo.getDeliverableTemplate())){ + String[] beforeDeliverableTemplateArr = StringUtils.isNotEmpty(editBeforePciEo.getDeliverableTemplate()) ? editBeforePciEo.getDeliverableTemplate().split(",") : null; + String[] afterDeliverableTemplateArr = StringUtils.isNotEmpty(editAfterPciEo.getDeliverableTemplate()) ? editAfterPciEo.getDeliverableTemplate().split(",") : null; + + String beforeDeliverableTemplateName = allDeliverableTemplateList.stream().filter(file -> { + boolean flag = false; + if(beforeDeliverableTemplateArr != null){ + for (String beforeDeliverableTemplate : beforeDeliverableTemplateArr) { + if(StringUtils.equals(file.getId(),beforeDeliverableTemplate)){ + flag = true; + } + } + } + return flag; + }).map(OSSFile::getFileName).collect(Collectors.joining(",")); + + String afterDeliverableTemplateName = allDeliverableTemplateList.stream().filter(file -> { + boolean flag = false; + if(afterDeliverableTemplateArr != null){ + for (String afterDeliverableTemplate : afterDeliverableTemplateArr) { + if(StringUtils.equals(file.getId(),afterDeliverableTemplate)){ + flag = true; + } + } + } + return flag; + }).map(OSSFile::getFileName).collect(Collectors.joining(",")); + + contentCnSb.append("\"").append("交付物模板").append("\" ") + .append(StringUtils.isNotEmpty(beforeDeliverableTemplateName) ? beforeDeliverableTemplateName : "空") + .append(" 修改为 ") + .append(StringUtils.isNotEmpty(afterDeliverableTemplateName) ? afterDeliverableTemplateName : "空") + .append(","); + + contentEnSb.append("\"").append("Deliverable Template").append("\" ") + .append(StringUtils.isNotEmpty(beforeDeliverableTemplateName) ? beforeDeliverableTemplateName : "null") + .append(" to ") + .append(StringUtils.isNotEmpty(afterDeliverableTemplateName) ? afterDeliverableTemplateName : "null") + .append(","); + + savePciLogFlag = true; + } + if(!StringUtils.equals(editBeforePciEo.getSdt(),editAfterPciEo.getSdt())){ + String beforeSdtUserName = this.sysUserService.getUsernameByUserId(userList,editBeforePciEo.getSdt()); + String afterSdtUserName = this.sysUserService.getUsernameByUserId(userList,editAfterPciEo.getSdt()); + + contentCnSb.append("\"").append("工程接口人").append("\" ") + .append(StringUtils.isNotEmpty(beforeSdtUserName) ? beforeSdtUserName : "空") + .append(" 修改为 ") + .append(StringUtils.isNotEmpty(afterSdtUserName) ? afterSdtUserName : "空") + .append(","); + + contentEnSb.append("\"").append("Eng. Interface").append("\" ") + .append(StringUtils.isNotEmpty(beforeSdtUserName) ? beforeSdtUserName : "null") + .append(" to ") + .append(StringUtils.isNotEmpty(afterSdtUserName) ? afterSdtUserName : "null") + .append(","); + + savePciLogFlag = true; + } + String beforeEndTimeStr = ""; + if(editBeforePciEo.getEndTime() != null){ + beforeEndTimeStr = DateUtils.formatDate(editBeforePciEo.getEndTime()); + } + String afterEndTimeStr = ""; + if(editAfterPciEo.getEndTime() != null){ + afterEndTimeStr = DateUtils.formatDate(editAfterPciEo.getEndTime()); + } + if(!StringUtils.equals(beforeEndTimeStr,afterEndTimeStr)){ + contentCnSb.append("\"").append("截止日期").append("\" ") + .append(StringUtils.isNotEmpty(beforeEndTimeStr) ? beforeEndTimeStr : "空") + .append(" 修改为 ") + .append(StringUtils.isNotEmpty(afterEndTimeStr) ? afterEndTimeStr : "空") + .append(","); + + contentEnSb.append("\"").append("Due Date").append("\" ") + .append(StringUtils.isNotEmpty(beforeEndTimeStr) ? beforeEndTimeStr : "null") + .append(" to ") + .append(StringUtils.isNotEmpty(afterEndTimeStr) ? afterEndTimeStr : "null") + .append(","); + + savePciLogFlag = true; + } + if(!StringUtils.equals(editBeforePciEo.getDutyPerson(),editAfterPciEo.getDutyPerson())){ + String beforeDutyPersonUserName = this.sysUserService.getUsernameByUserId(userList,editBeforePciEo.getDutyPerson()); + String afterDutyPersonUserName = this.sysUserService.getUsernameByUserId(userList,editAfterPciEo.getDutyPerson()); + + contentCnSb.append("\"").append("责任人").append("\" ") + .append(StringUtils.isNotEmpty(beforeDutyPersonUserName) ? beforeDutyPersonUserName : "空") + .append(" 修改为 ") + .append(StringUtils.isNotEmpty(afterDutyPersonUserName) ? afterDutyPersonUserName : "空") + .append(","); + + contentEnSb.append("\"").append("Assignee").append("\" ") + .append(StringUtils.isNotEmpty(beforeDutyPersonUserName) ? beforeDutyPersonUserName : "null") + .append(" to ") + .append(StringUtils.isNotEmpty(afterDutyPersonUserName) ? afterDutyPersonUserName : "null") + .append(","); + + savePciLogFlag = true; + } + + if(savePciLogFlag){ + ProjectCertificationInventoryLogEO pciLogEO = new ProjectCertificationInventoryLogEO(); + pciLogEO.setProjectCertificationInventoryId(editAfterPciEo.getId()); + pciLogEO.setContentCn(contentCnSb.toString().substring(0,contentCnSb.toString().length()-1)); + pciLogEO.setContentEn(contentEnSb.toString().substring(0,contentEnSb.toString().length()-1)); + pciLogEO.setOperatorType(operatorType); + pciLogEOList.add(pciLogEO); + } + } + } + } + if(CollectionUtils.isNotEmpty(pciLogEOList)){ + this.projectCertificationInventoryLogEOService.insertBatch(pciLogEOList); + } + } + } } From 2adc1d2aaad6f7a6c669f22db9885cb03b011bb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Tue, 28 Mar 2023 15:15:52 +0800 Subject: [PATCH 444/645] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=99=84=E4=BB=B6?= =?UTF-8?q?=E5=A4=84=E7=9A=84=E5=A4=87=E6=B3=A8-=E5=89=8D=E6=AE=B5?= =?UTF-8?q?=E7=AC=A6=E5=8F=B7=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/zh-cn.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 4fde5dc19..3e270c66d 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1819,8 +1819,8 @@ module.exports = { pleaseFillInTheInformationTaskProcess:'请填写工程接口人和责任人信息后再发起任务流程', complianceReporting:'合规报告', youCanOnlySelectStatusClearSubmit:'只能选择流程状态为清单待提交的数据', - note:'注:附件包括测试项目清单、测试报告．测试标准或技术规范', - format:'支持doc/docx/pdf格式,大小50M以内', + note:'注:附件包括测试项目清单、测试报告、测试标准或技术规范', + format:'支持doc/docx/pdf格式，大小50M以内', cantTransferToYourself:"不能转办给自己", noteone:'注:支持CSV格式，大小20M以内，数量1-20个', notecsv:'注:支持CSV格式，大小20M以内', From a6ffee09730aff3d012979a154cad8d55edb4488 Mon Sep 17 00:00:00 2001 From: yuekuo Date: Tue, 28 Mar 2023 15:34:51 +0800 Subject: [PATCH 445/645] =?UTF-8?q?=E5=89=A9=E4=BD=99=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=AD=97=E6=95=B0=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/upgradecompletion.vue | 1 + .../otamanagement/upgradeactivity/index.vue | 2 +- .../thetargetvehicleofthisupgrade.vue | 2 ++ .../components/upgradehavechanged.vue | 2 +- .../components/upgradetargetmodel.vue | 20 +++++++++++++------ .../vehicleinformation/components/other.vue | 1 + 6 files changed, 20 insertions(+), 8 deletions(-) diff --git a/jero-web/src/views/otamanagement/upgradeactivity/components/upgradecompletion.vue b/jero-web/src/views/otamanagement/upgradeactivity/components/upgradecompletion.vue index fc745c5b1..ace445a90 100644 --- a/jero-web/src/views/otamanagement/upgradeactivity/components/upgradecompletion.vue +++ b/jero-web/src/views/otamanagement/upgradeactivity/components/upgradecompletion.vue @@ -243,6 +243,7 @@ export default { } this.record=record this.visible = true + this.confirmLoading = false this.formInline = {} this.formInline.dataList = [{}] this.$nextTick(() => { diff --git a/jero-web/src/views/otamanagement/upgradeactivity/index.vue b/jero-web/src/views/otamanagement/upgradeactivity/index.vue index 4f004085a..39f523d9c 100644 --- a/jero-web/src/views/otamanagement/upgradeactivity/index.vue +++ b/jero-web/src/views/otamanagement/upgradeactivity/index.vue @@ -447,7 +447,7 @@ export default { this.$refs.upgradecompletionRef.addModel(record,flag) }, // 查看 - detailclick(){ + detailclick(record){ }, // 维护 diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue index 8f4b044d5..0b3f3fd80 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue @@ -23,6 +23,7 @@ :disabled="disabled" v-model="formInline.zsl" :title='formInline.zsl' + :max-length="50" :placeholder="$t('PleaseSelect')">
@@ -145,6 +146,7 @@ export default { this.formInline.dateofproduction=[] this.formInline.dateofproduction.push(res.result.scrqks) this.formInline.dateofproduction.push(res.result.scrqjs) + this.formInline.id = res.result.vinList this.$forceUpdate() } diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue index 3a72352db..9f4830c36 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue @@ -57,7 +57,7 @@ - + diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue index ab30dab77..fa99ca385 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue @@ -41,7 +41,7 @@
- +
@@ -52,7 +52,7 @@
- +
@@ -77,7 +77,7 @@ {{$t('producttrademark')}}
- +
@@ -88,7 +88,7 @@ {{$t('productname')}}
- +
@@ -99,7 +99,7 @@ {{$t('productModel')}}
- +
@@ -197,7 +197,15 @@ import ImportFile from '@/components/ImportFileData/index' } getAction('/ota/otaBaSjSjmbcx/queryByOtaId',{otaIdT:otaIdT,otaId:otaId}).then(res=>{ if(res.code == 200){ - this.form=res.result ==null?{}:res.result + if(res.result==null){ + this.form=res.result + this.form.cxmb=undefined + this.form.bapc=undefined + this.form.dllx1=undefined + this.form.dllx2=undefined + }else{ + this.form=res.result + } } }) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/other.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/other.vue index ec37b9bc7..dc0c50501 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/other.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/other.vue @@ -11,6 +11,7 @@
From 51e28e97374c72e73d165a0fde698772a5801efc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Tue, 28 Mar 2023 15:54:19 +0800 Subject: [PATCH 446/645] =?UTF-8?q?=20=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?= =?UTF-8?q?-=E9=AA=8C=E8=AF=81=E7=AC=A6=E5=90=88=E6=80=A7=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E6=B5=81=E7=A8=8B=E6=B2=A1=E6=9C=89=E7=BB=93=E6=9D=9F?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 2 +- .../views/projectManagement/components/listOfRegulations.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index a112514e2..03b7480fb 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -619,7 +619,7 @@ module.exports = { Deliverables: 'Deliverables', personLiable: 'Assignee', PrehomoConfirmation: 'Pre-Homo Confirmation', - verificationAndConformityconfirmation: 'Validation Compliance Check ', + verificationAndConformityconfirmation: 'Validation Compliance Check', StandardImplementationDate: 'New Type Execution Date', regulatoryEngineer: 'Regulation Engineer', certifiedEngineer: 'Homo Engineer', diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 5c3de7460..b17221f55 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -1305,7 +1305,7 @@ actiProcInstId: row.verifyPId, projectTaskInventoryId: row.id, projectLibraryId: row.projectLibraryId, - TaskKey: row.taskDefinitionKey, + TaskKey: TaskKey, flowType: 4, isDisplay: false, Sponsor: 'regulationOwnerName', From f56574556f06e6f9aef34a17a5425c36f755e66d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Tue, 28 Mar 2023 15:54:43 +0800 Subject: [PATCH 447/645] =?UTF-8?q?=20=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?= =?UTF-8?q?-=E9=AA=8C=E8=AF=81=E7=AC=A6=E5=90=88=E6=80=A7=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E6=B5=81=E7=A8=8B=E6=B2=A1=E6=9C=89=E7=BB=93=E6=9D=9F?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/head/service/impl/HeadCustomEOServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java index 56c09a81f..1863e9935 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java @@ -248,7 +248,7 @@ public class HeadCustomEOServiceImpl extends ServiceImpl Date: Tue, 28 Mar 2023 15:55:35 +0800 Subject: [PATCH 448/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E8=BD=A6=E8=BE=86=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/OtaBaSjSjfzbhController.java | 26 +- .../controller/OtaBaSjSjxtbhController.java | 261 ++++++++++-------- .../jero/modules/ota/entity/OtaBaSjList.java | 6 + .../ota/service/IOtaBaSjSjfzbhService.java | 5 +- .../ota/service/IOtaBaSjSjxtbhService.java | 7 +- .../service/impl/OtaBaSjListServiceImpl.java | 2 + .../impl/OtaBaSjSjfzbhServiceImpl.java | 202 ++++++++++---- .../impl/OtaBaSjSjxtbhServiceImpl.java | 185 +++++++++---- 8 files changed, 466 insertions(+), 228 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjfzbhController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjfzbhController.java index 4a8903f7e..68f918d5c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjfzbhController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjfzbhController.java @@ -4,6 +4,8 @@ import java.util.Arrays; import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import com.alibaba.fastjson.JSONObject; import com.jero.common.api.vo.Result; import com.jero.common.system.query.QueryGenerator; import com.jero.modules.ota.entity.OtaBaSjSjfzbh; @@ -74,14 +76,12 @@ public class OtaBaSjSjfzbhController extends JeroController add(@Validated @RequestBody OtaBaSjSjfzbh otaBaSjSjfzbh) { - otaBaSjSjfzbhService.add(otaBaSjSjfzbh); + public Result add(@RequestBody JSONObject json) { + otaBaSjSjfzbhService.add(json); return Result.OK("添加成功！"); } @@ -144,6 +144,24 @@ public class OtaBaSjSjfzbhController extends JeroController queryByOtaId(@RequestParam(name = "otaId", required = true) String otaId, + @RequestParam(name = "otaIdT", required = true) String otaIdT) { + JSONObject json = otaBaSjSjfzbhService.queryByOtaId(otaId, otaIdT); + if (json == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(json); + } + /** * 导出excel * diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjxtbhController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjxtbhController.java index c5d8b249c..eda9826e8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjxtbhController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjxtbhController.java @@ -4,6 +4,8 @@ import java.util.Arrays; import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import com.alibaba.fastjson.JSONObject; import com.jero.common.api.vo.Result; import com.jero.common.system.query.QueryGenerator; import com.jero.modules.ota.entity.OtaBaSjSjxtbh; @@ -22,146 +24,165 @@ import io.swagger.annotations.ApiOperation; import com.jero.common.aspect.annotation.AutoLog; - /** +/** * @Description: 升级备案-本次升级的系统名称与参数变化 * @Author: jero-boot - * @Date: 2023-03-17 + * @Date: 2023-03-17 * @Version: V1.0 */ -@Api(tags="升级备案-本次升级的系统名称与参数变化") +@Api(tags = "升级备案-本次升级的系统名称与参数变化") @RestController @RequestMapping("/ota/otaBaSjSjxtbh") @Slf4j public class OtaBaSjSjxtbhController extends JeroController { - @Autowired - private IOtaBaSjSjxtbhService otaBaSjSjxtbhService; - - /** - * 分页列表查询 - * - * @param otaBaSjSjxtbh - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @AutoLog(value = "升级备案-本次升级的系统名称与参数变化-分页列表查询") - @ApiOperation(value="升级备案-本次升级的系统名称与参数变化-分页列表查询", notes="升级备案-本次升级的系统名称与参数变化-分页列表查询") - @GetMapping(value = "/page") - public Result queryPageList(OtaBaSjSjxtbh otaBaSjSjxtbh, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(otaBaSjSjxtbh, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = otaBaSjSjxtbhService.page(page, queryWrapper); - return Result.OK(pageList); - } + @Autowired + private IOtaBaSjSjxtbhService otaBaSjSjxtbhService; /** - * 列表查询 - * - * @return - */ - @AutoLog(value = "升级备案-本次升级的系统名称与参数变化-列表查询") - @ApiOperation(value="升级备案-本次升级的系统名称与参数变化-列表查询", notes="升级备案-本次升级的系统名称与参数变化-列表查询") - @GetMapping(value = "/list") - public Result> queryList() { + * 分页列表查询 + * + * @param otaBaSjSjxtbh + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "升级备案-本次升级的系统名称与参数变化-分页列表查询") + @ApiOperation(value = "升级备案-本次升级的系统名称与参数变化-分页列表查询", notes = "升级备案-本次升级的系统名称与参数变化-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(OtaBaSjSjxtbh otaBaSjSjxtbh, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(otaBaSjSjxtbh, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = otaBaSjSjxtbhService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "升级备案-本次升级的系统名称与参数变化-列表查询") + @ApiOperation(value = "升级备案-本次升级的系统名称与参数变化-列表查询", notes = "升级备案-本次升级的系统名称与参数变化-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { List list = otaBaSjSjxtbhService.queryList(); return Result.OK(list); - } - - /** - * 添加 - * - * @param otaBaSjSjxtbh - * @return - */ - @AutoLog(value = "升级备案-本次升级的系统名称与参数变化-添加") - @ApiOperation(value="升级备案-本次升级的系统名称与参数变化-添加", notes="升级备案-本次升级的系统名称与参数变化-添加") - @PostMapping(value = "/add") - public Result add(@Validated @RequestBody OtaBaSjSjxtbh otaBaSjSjxtbh) { - otaBaSjSjxtbhService.add(otaBaSjSjxtbh); - return Result.OK("添加成功！"); - } - - /** - * 编辑 - * - * @param otaBaSjSjxtbh - * @return - */ - @AutoLog(value = "升级备案-本次升级的系统名称与参数变化-编辑") - @ApiOperation(value="升级备案-本次升级的系统名称与参数变化-编辑", notes="升级备案-本次升级的系统名称与参数变化-编辑") - @PutMapping(value = "/edit") - public Result edit(@Validated @RequestBody OtaBaSjSjxtbh otaBaSjSjxtbh) { - otaBaSjSjxtbhService.editById(otaBaSjSjxtbh); - return Result.OK("编辑成功!"); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @AutoLog(value = "升级备案-本次升级的系统名称与参数变化-通过id删除") - @ApiOperation(value="升级备案-本次升级的系统名称与参数变化-通过id删除", notes="升级备案-本次升级的系统名称与参数变化-通过id删除") - @DeleteMapping(value = "/delete") - public Result delete(@RequestParam(name="id",required=true) String id) { - otaBaSjSjxtbhService.deleteById(id); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @AutoLog(value = "升级备案-本次升级的系统名称与参数变化-批量删除") - @ApiOperation(value="升级备案-本次升级的系统名称与参数变化-批量删除", notes="升级备案-本次升级的系统名称与参数变化-批量删除") - @DeleteMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.otaBaSjSjxtbhService.deleteByIds(Arrays.asList(ids.split(","))); - return Result.OK("批量删除成功!"); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @AutoLog(value = "升级备案-本次升级的系统名称与参数变化-通过id查询") - @ApiOperation(value="升级备案-本次升级的系统名称与参数变化-通过id查询", notes="升级备案-本次升级的系统名称与参数变化-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name="id",required=true) String id) { - OtaBaSjSjxtbh otaBaSjSjxtbh = otaBaSjSjxtbhService.queryById(id); - if(otaBaSjSjxtbh==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(otaBaSjSjxtbh); - } + } /** - * 导出excel - * - * @param request - * @param otaBaSjSjxtbh - */ + * 添加 + * + * @param otaBaSjSjxtbh + * @return + */ + @AutoLog(value = "升级备案-本次升级的系统名称与参数变化-添加") + @ApiOperation(value = "升级备案-本次升级的系统名称与参数变化-添加", notes = "升级备案-本次升级的系统名称与参数变化-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody JSONObject json) { + otaBaSjSjxtbhService.add(json); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param otaBaSjSjxtbh + * @return + */ + @AutoLog(value = "升级备案-本次升级的系统名称与参数变化-编辑") + @ApiOperation(value = "升级备案-本次升级的系统名称与参数变化-编辑", notes = "升级备案-本次升级的系统名称与参数变化-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody OtaBaSjSjxtbh otaBaSjSjxtbh) { + otaBaSjSjxtbhService.editById(otaBaSjSjxtbh); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "升级备案-本次升级的系统名称与参数变化-通过id删除") + @ApiOperation(value = "升级备案-本次升级的系统名称与参数变化-通过id删除", notes = "升级备案-本次升级的系统名称与参数变化-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name = "id", required = true) String id) { + otaBaSjSjxtbhService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "升级备案-本次升级的系统名称与参数变化-批量删除") + @ApiOperation(value = "升级备案-本次升级的系统名称与参数变化-批量删除", notes = "升级备案-本次升级的系统名称与参数变化-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) { + this.otaBaSjSjxtbhService.deleteByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "升级备案-本次升级的系统名称与参数变化-通过id查询") + @ApiOperation(value = "升级备案-本次升级的系统名称与参数变化-通过id查询", notes = "升级备案-本次升级的系统名称与参数变化-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name = "id", required = true) String id) { + OtaBaSjSjxtbh otaBaSjSjxtbh = otaBaSjSjxtbhService.queryById(id); + if (otaBaSjSjxtbh == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(otaBaSjSjxtbh); + } + + + /** + * 通过otaId查询 + * + * @param otaId + * @return + */ + @AutoLog(value = "升级备案-本次升级的系统名称与参数变化-通过otaId查询") + @ApiOperation(value = "升级备案-本次升级的系统名称与参数变化-通过otaId查询", notes = "升级备案-本次升级的系统名称与参数变化-通过otaId查询") + @GetMapping(value = "/queryByOtaId") + public Result queryByOtaId(@RequestParam(name = "otaId", required = true) String otaId, + @RequestParam(name = "otaIdT", required = true) String otaIdT) { + JSONObject json = otaBaSjSjxtbhService.queryByOtaId(otaId, otaIdT); + if (json == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(json); + } + + /** + * 导出excel + * + * @param request + * @param otaBaSjSjxtbh + */ @RequestMapping(value = "/exportXls") public ModelAndView exportXls(HttpServletRequest request, OtaBaSjSjxtbh otaBaSjSjxtbh) { return super.exportXls(request, otaBaSjSjxtbh, OtaBaSjSjxtbh.class, "升级备案-本次升级的系统名称与参数变化"); } /** - * 通过excel导入数据 - * - * @param request - * @param response - * @return - */ + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ @RequestMapping(value = "/importExcel", method = RequestMethod.POST) public Result importExcel(HttpServletRequest request, HttpServletResponse response) { return super.importExcel(request, response, OtaBaSjSjxtbh.class); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjList.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjList.java index e249c7865..73b8695d8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjList.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjList.java @@ -115,6 +115,12 @@ public class OtaBaSjList implements Serializable { @ApiModelProperty(value = "备注") private java.lang.String bz; + /**升级驾驶附件*/ + @Excel(name = "升级驾驶附件", width = 15) + @ApiModelProperty(value = "升级驾驶附件") + private java.lang.String sjjsfj; + + public void updateData(OtaBaSjSjmbcx otaBaSjSjmbcx) { this.cpdjbh = otaBaSjSjmbcx.getBabh(); this.ggpc = otaBaSjSjmbcx.getBapc(); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjfzbhService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjfzbhService.java index 024e8e4a7..06182eeb4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjfzbhService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjfzbhService.java @@ -1,5 +1,6 @@ package com.jero.modules.ota.service; +import com.alibaba.fastjson.JSONObject; import com.jero.modules.ota.entity.OtaBaSjSjfzbh; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -18,7 +19,7 @@ public interface IOtaBaSjSjfzbhService extends IService { * @param otaBaSjSjfzbh * @return */ - void add(OtaBaSjSjfzbh otaBaSjSjfzbh); + void add(JSONObject json); /** * 更新 @@ -58,4 +59,6 @@ public interface IOtaBaSjSjfzbhService extends IService { * @return */ List queryList(); + + JSONObject queryByOtaId(String otaId, String otaIdT); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjxtbhService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjxtbhService.java index ae2126667..8814bb255 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjxtbhService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjxtbhService.java @@ -1,5 +1,6 @@ package com.jero.modules.ota.service; +import com.alibaba.fastjson.JSONObject; import com.jero.modules.ota.entity.OtaBaSjSjxtbh; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -15,10 +16,8 @@ public interface IOtaBaSjSjxtbhService extends IService { /** * 保存 * - * @param otaBaSjSjxtbh - * @return */ - void add(OtaBaSjSjxtbh otaBaSjSjxtbh); + void add(JSONObject json); /** * 更新 @@ -58,4 +57,6 @@ public interface IOtaBaSjSjxtbhService extends IService { * @return */ List queryList(); + + JSONObject queryByOtaId(String otaId, String otaIdT); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java index 96f67b750..a8c408a30 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java @@ -29,6 +29,8 @@ public class OtaBaSjListServiceImpl extends ServiceImpl implements IOtaBaSjSjfzbhService { - /** - * 保存 - * - * @param otaBaSjSjfzbh - * @return - */ - @Override - public void add(OtaBaSjSjfzbh otaBaSjSjfzbh) { + @Autowired + private IOtaBaSjListService otaBaSjListService; + + @Autowired + private IOtaBaCxTxjlService otaBaCxTxjlService; + + @Autowired + private ISysDictService sysDictService; + + @Autowired + private IOSSFileService ossFileService; + + /** + * 保存 + * + */ + @Override + public void add(JSONObject json) { + List newList = new ArrayList<>(); + List oldList; Date now = new Date(); - otaBaSjSjfzbh.setCreateTime(now); - otaBaSjSjfzbh.setUpdateTime(now); - save(otaBaSjSjfzbh); + String otaId = (String) json.get("otaId"); + if (StringUtils.isNotEmpty(otaId)) { + oldList = getByOtaId(otaId); + deleteByOtaId(otaId); + JSONArray list = json.getJSONArray("list"); + for (Object obj : list) { + Map objMap = (HashMap) obj; + OtaBaSjSjfzbh otaBaSjSjfzbh = new OtaBaSjSjfzbh(); + Field[] fields = OtaBaSjSjfzbh.class.getDeclaredFields(); + for (Field field : fields) { + if (field.getName().equals("createTime") || field.getName().equals("updateTime")) { + continue; + } + Object bjObj = objMap.get(field.getName()); + if (null != bjObj) { + try { + field.setAccessible(true); + field.set(otaBaSjSjfzbh, bjObj.toString()); + } catch (IllegalAccessException e) { + e.printStackTrace(); + } + } + } + otaBaSjSjfzbh.setOtaId(otaId); + otaBaSjSjfzbh.setCreateTime(now); + otaBaSjSjfzbh.setUpdateTime(now); + newList.add(otaBaSjSjfzbh); + } + if (ObjectUtils.isEmpty(oldList)) { + oldList = new ArrayList<>(); + } + ComparisonUtil cu = new ComparisonUtil(); + List reList = cu.comparisonListRecord(otaId, OtaModuleEnum.SJ_SJJSMCBH, OtaTitleEnum.GNMC.getName(), oldList, newList, sysDictService); + saveOrUpdateBatch(newList); + otaBaCxTxjlService.saveBatch(reList); + String fj = (String) json.get("fj"); + if (StringUtils.isNotEmpty(fj)) { + OtaBaSjList otaBaSjList = otaBaSjListService.queryById(otaId); + if (ObjectUtils.isNotEmpty(otaBaSjList)) { + otaBaSjList.setSjjsfj(fj); + otaBaSjListService.editById(otaBaSjList); + } + } + } } - /** - * 更新 - * - * @param otaBaSjSjfzbh - * @return - */ - @Override + public void deleteByOtaId(String otaId) { + List list = this.getByOtaId(otaId); + List ids = new ArrayList<>(); + for (OtaBaSjSjfzbh bh : list) { + ids.add(bh.getId()); + } + this.deleteByIds(ids); + } + + /** + * 更新 + * + * @param otaBaSjSjfzbh + * @return + */ + @Override public void editById(OtaBaSjSjfzbh otaBaSjSjfzbh) { - Date now = new Date(); + Date now = new Date(); otaBaSjSjfzbh.setUpdateTime(now); - saveOrUpdate(otaBaSjSjfzbh); + saveOrUpdate(otaBaSjSjfzbh); } - /** - * 通过id删除 - * - * @param id - * @return - */ - @Override + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override public void deleteById(String id) { removeById(id); } - /** - * 批量删除 - * - * @param ids - * @return - */ - @Override + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override public void deleteByIds(List ids) { removeByIds(ids); } - /** - * 通过id查询 - * - * @param id - * @return - */ - @Override + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override public OtaBaSjSjfzbh queryById(String id) { return getById(id); } /** - * 列表查询 - * - * @return - */ - @Override + * 列表查询 + * + * @return + */ + @Override public List queryList() { return list(); } + + @Override + public JSONObject queryByOtaId(String otaId, String otaIdT) { + List res = this.getByOtaId(otaId); + if (ObjectUtil.isEmpty(res)) { + res = getByOtaId(otaIdT); + } + JSONObject json = new JSONObject(); + json.put("list", res); + OtaBaSjList otaBaSjList = otaBaSjListService.queryById(otaId); + if (ObjectUtils.isNotEmpty(otaBaSjList) && ObjectUtils.isNotEmpty(otaBaSjList.getSjjsfj())) { + json.put("fj", otaBaSjList.getSjjsfj()); + } + return json; + } + + private List getByOtaId(String otaId) { + if (org.apache.commons.lang3.StringUtils.isEmpty(otaId)) { + return null; + } + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(OtaBaSjSjfzbh::getOtaId, otaId); + return this.list(queryWrapper); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java index 51f8dfb1a..f32a78641 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java @@ -1,89 +1,174 @@ package com.jero.modules.ota.service.impl; -import com.jero.modules.ota.entity.OtaBaSjSjxtbh; +import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.jero.modules.oss.service.IOSSFileService; +import com.jero.modules.ota.entity.*; +import com.jero.modules.ota.enums.OtaModuleEnum; +import com.jero.modules.ota.enums.OtaTitleEnum; import com.jero.modules.ota.mapper.OtaBaSjSjxtbhMapper; +import com.jero.modules.ota.service.IOtaBaCxTxjlService; import com.jero.modules.ota.service.IOtaBaSjSjxtbhService; +import com.jero.modules.ota.utils.ComparisonUtil; +import com.jero.modules.system.service.ISysDictService; +import com.jero.modules.system.util.StringUtils; +import org.apache.commons.lang3.ObjectUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.List; -import java.util.Date; + +import java.lang.reflect.Field; +import java.util.*; + import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 升级备案-本次升级的系统名称与参数变化 * @Author: jero-boot - * @Date: 2023-03-17 + * @Date: 2023-03-17 * @Version: V1.0 */ @Service public class OtaBaSjSjxtbhServiceImpl extends ServiceImpl implements IOtaBaSjSjxtbhService { + @Autowired + private IOtaBaCxTxjlService otaBaCxTxjlService; - /** - * 保存 - * - * @param otaBaSjSjxtbh - * @return - */ - @Override - public void add(OtaBaSjSjxtbh otaBaSjSjxtbh) { + @Autowired + private ISysDictService sysDictService; + + @Autowired + private IOSSFileService ossFileService; + + /** + * 保存 + */ + @Override + public void add(JSONObject json) { + List newList = new ArrayList<>(); + List oldList; Date now = new Date(); - otaBaSjSjxtbh.setCreateTime(now); - otaBaSjSjxtbh.setUpdateTime(now); - save(otaBaSjSjxtbh); + String otaId = (String) json.get("otaId"); + if (StringUtils.isNotEmpty(otaId)) { + oldList = getByOtaId(otaId); + deleteByOtaId(otaId); + JSONArray list = json.getJSONArray("list"); + for (Object obj : list) { + Map objMap = (HashMap) obj; + OtaBaSjSjxtbh otaBaSjSjxtbh = new OtaBaSjSjxtbh(); + Field[] fields = OtaBaSjSjxtbh.class.getDeclaredFields(); + for (Field field : fields) { + if (field.getName().equals("createTime") || field.getName().equals("updateTime")) { + continue; + } + Object bjObj = objMap.get(field.getName()); + if (null != bjObj) { + try { + field.setAccessible(true); + field.set(otaBaSjSjxtbh, bjObj.toString()); + } catch (IllegalAccessException e) { + e.printStackTrace(); + } + } + } + otaBaSjSjxtbh.setOtaId(otaId); + otaBaSjSjxtbh.setCreateTime(now); + otaBaSjSjxtbh.setUpdateTime(now); + newList.add(otaBaSjSjxtbh); + } + if (ObjectUtils.isEmpty(oldList)) { + oldList = new ArrayList<>(); + } + ComparisonUtil cu = new ComparisonUtil(); + List reList = cu.comparisonListRecord(otaId, OtaModuleEnum.SJ_SJXTMCBH, OtaTitleEnum.XTMC.getName(), oldList, newList, sysDictService); + saveOrUpdateBatch(newList); + otaBaCxTxjlService.saveBatch(reList); + } } - /** - * 更新 - * - * @param otaBaSjSjxtbh - * @return - */ - @Override + public void deleteByOtaId(String otaId) { + List list = this.getByOtaId(otaId); + List ids = new ArrayList<>(); + for (OtaBaSjSjxtbh bh : list) { + ids.add(bh.getId()); + } + this.deleteByIds(ids); + } + + + /** + * 更新 + * + * @param otaBaSjSjxtbh + * @return + */ + @Override public void editById(OtaBaSjSjxtbh otaBaSjSjxtbh) { - Date now = new Date(); + Date now = new Date(); otaBaSjSjxtbh.setUpdateTime(now); - saveOrUpdate(otaBaSjSjxtbh); + saveOrUpdate(otaBaSjSjxtbh); } - /** - * 通过id删除 - * - * @param id - * @return - */ - @Override + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override public void deleteById(String id) { removeById(id); } - /** - * 批量删除 - * - * @param ids - * @return - */ - @Override + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override public void deleteByIds(List ids) { removeByIds(ids); } - /** - * 通过id查询 - * - * @param id - * @return - */ - @Override + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override public OtaBaSjSjxtbh queryById(String id) { return getById(id); } /** - * 列表查询 - * - * @return - */ - @Override + * 列表查询 + * + * @return + */ + @Override public List queryList() { return list(); } + + @Override + public JSONObject queryByOtaId(String otaId, String otaIdT) { + List res = this.getByOtaId(otaId); + if (ObjectUtil.isEmpty(res)) { + res = getByOtaId(otaIdT); + } + JSONObject json = new JSONObject(); + json.put("list", res); + return json; + } + + private List getByOtaId(String otaId) { + if (org.apache.commons.lang3.StringUtils.isEmpty(otaId)) { + return null; + } + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(OtaBaSjSjxtbh::getOtaId, otaId); + return this.list(queryWrapper); + } } From c7f004f018e182dafe03e0186f3a1b1cf4aaca79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Tue, 28 Mar 2023 16:06:29 +0800 Subject: [PATCH 449/645] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95-?= =?UTF-8?q?=E8=8B=B1=E6=96=87=E7=89=88-=E5=88=97=E8=A1=A8=E7=9A=84?= =?UTF-8?q?=E8=A1=A8=E5=A4=B4=E5=A4=AA=E5=AE=BD=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../virtualList/components/virtualListDetails.vue | 3 +++ .../projectManagement/components/listOfRegulations.vue | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue index c3715d10a..1643704b2 100644 --- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue +++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue @@ -1612,6 +1612,9 @@ /deep/ .ant-table-column-title { font-weight: bold !important; } + ::v-deep .ant-table-thead > tr > th .ant-table-header-column { + max-width: none !important; + } \ No newline at end of file diff --git a/jero-web/src/views/otamanagement/upgradeactivity/components/upgradecompletion.vue b/jero-web/src/views/otamanagement/upgradeactivity/components/upgradecompletion.vue index ace445a90..8c21d9b2a 100644 --- a/jero-web/src/views/otamanagement/upgradeactivity/components/upgradecompletion.vue +++ b/jero-web/src/views/otamanagement/upgradeactivity/components/upgradecompletion.vue @@ -114,10 +114,7 @@
- - - - + @@ -125,7 +122,7 @@ formInline.VINcodelist == null) ? $t('clickUpload') : $t('viewUploadedFiles') }} -

{{$t('format')}}

+

{{$t('format')}}
diff --git a/jero-web/src/views/otamanagement/upgradeactivity/index.vue b/jero-web/src/views/otamanagement/upgradeactivity/index.vue index 39f523d9c..1c60bf1eb 100644 --- a/jero-web/src/views/otamanagement/upgradeactivity/index.vue +++ b/jero-web/src/views/otamanagement/upgradeactivity/index.vue @@ -119,6 +119,12 @@ {{$t('templateDownload')}}
+
+ + {{$t('gnxtwh')}} +
+ @@ -174,6 +181,7 @@ + + \ No newline at end of file diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue index fb6045b3d..5e791007d 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue @@ -10,59 +10,30 @@ {{$t('templateDownload')}}
- - - - {{$t('upgradePurpose')}} - - - - - - - - {{$t('impactassessmentofupgradeactivities')}} - - - {{$t('correspondingvehicletype')}} - {{$t('technicalperformancechanges')}} - {{$t('technicalstandardsandsafetytechnicalconditions')}} - {{$t('autoautonomousdrivingfunction')}} - - - - - {{ $t('yes') }} - {{ $t('not') }} - - - - - {{ $t('yes') }} - {{ $t('not') }} - - - - - {{ $t('yes') }} - {{ $t('not') }} - - - - - {{ $t('yes') }} - {{ $t('not') }} - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{{$t('upgradePurpose')}} + +
{{$t('impactassessmentofupgradeactivities')}}{{$t('correspondingvehicletype')}} + + {{ $t('yes') }} + {{ $t('not') }} + + {{ (form.bgfj === 'null' || form.bgfj === '' || @@ -71,86 +42,121 @@ {{$t('notetwo')}} {{$t('format')}} - - -
-
- {{$t('vehiclepriortothereleaseoftheupgrade')}} - {{$t('conditionsareupgradesperformed')}} - {{$t('upgradefailureorinterruption')}} - {{$t('upgradeactivitiesaffectvehiclesafety')}} - {{$t('upgradeactivityprovidesuserconfirmationoptions')}} - {{$t('upgradepackagetest')}} - {{$t('reliabilityofonlineupgradeactivities')}} -
-
- - - {{ $t('yes') }} - {{ $t('not') }} - - - - - - - - - - - {{ $t('yes') }} - {{ $t('not') }} - - - - - {{ $t('yes') }} - {{ $t('not') }} - - - - - - - - {{ $t('yes') }} - {{ $t('not') }} - - -
-
+
{{$t('technicalperformancechanges')}} + + {{ $t('yes') }} + {{ $t('not') }} + +
{{$t('technicalstandardsandsafetytechnicalconditions')}} + + {{ $t('yes') }} + {{ $t('not') }} + +
{{$t('autoautonomousdrivingfunction')}} + + {{ $t('yes') }} + {{ $t('not') }} + +
{{$t('vehiclepriortothereleaseoftheupgrade')}} + + {{ $t('yes') }} + {{ $t('not') }} + + {{ (form.clfj === 'null' || form.clfj === '' || form.clfj == null) ? $t('uploadattachment') : $t('viewUploadedFiles') }} - {{$t('notethree')}} + {{$t('notetwo')}} {{$t('format')}} - - - +
{{$t('conditionsareupgradesperformed')}} + +
{{$t('upgradefailureorinterruption')}} + +
{{$t('upgradeactivitiesaffectvehiclesafety')}} + + {{ $t('yes') }} + {{ $t('not') }} + +
{{$t('upgradeactivityprovidesuserconfirmationoptions')}} + + {{ $t('yes') }} + {{ $t('not') }} + +
{{$t('upgradepackagetest')}} + +
{{$t('reliabilityofonlineupgradeactivities')}} + + {{ $t('yes') }} + {{ $t('not') }} + +
{{$t('preservation')}} {{$t('last')}} @@ -426,6 +432,7 @@ this.$forceUpdate() .bootom-button{ text-align: center!important; + margin-top: 40px; } .text-operation{ From 06b6428cc7ce0c1ffc2bd95a1215e19e0a7f22b5 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Wed, 29 Mar 2023 11:46:49 +0800 Subject: [PATCH 496/645] =?UTF-8?q?67523=20=E6=B3=95=E8=A7=84=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E6=9D=83=E9=99=90?= =?UTF-8?q?=EF=BC=8C=E6=B3=95=E8=A7=84=E3=80=81=E6=8E=A5=E5=8F=A3=E4=BA=BA?= =?UTF-8?q?=E3=80=81=E8=AE=BE=E8=AE=A1=E6=88=96=E9=AA=8C=E8=AF=81=E8=B4=A3?= =?UTF-8?q?=E4=BB=BB=E4=BA=BA=20=20=E5=8F=AA=E8=A6=81=E6=9C=89=E4=B8=AA?= =?UTF-8?q?=E4=B8=80=E5=8C=85=E5=90=AB=E6=99=AE=E9=80=9A=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=B0=B1=E5=8F=AF=E4=BB=A5=E7=9C=8B=E5=88=B0=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProjectLawsInventoryEOServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 4b6431dae..14b4bc427 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -1117,7 +1117,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl{ queryWrapper.eq("regulation_owner_id",currentUser.getId()). - or().eq("homologation_engineer_id",currentUser.getId()); + or().eq("engineering_interface_person",currentUser.getId()). + or().eq("design_duty_id",currentUser.getId()). + or().eq("verify_duty_id",currentUser.getId()); }); } List result = super.baseMapper.selectList(projectLawsInventoryEOQueryWrapper); From f61e48f4390967caeec09b9736f7eb25bb48de98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Wed, 29 Mar 2023 12:47:04 +0800 Subject: [PATCH 497/645] =?UTF-8?q?=E5=85=A8=E5=B1=80=E6=90=9C=E7=B4=A2-?= =?UTF-8?q?=E6=B8=85=E7=A9=BA=E4=BD=8D=E7=BD=AE=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/AssignedBy/index.vue | 4 ++-- jero-web/src/components/AssignedByHomo/index.vue | 4 ++-- .../src/components/ParameterLibraryAdd/index.vue | 4 ++-- jero-web/src/components/SplitSearch/index.vue | 10 +++++----- jero-web/src/components/currencySearch/index.vue | 12 ++++++------ jero-web/src/components/search/index.vue | 6 +++--- jero-web/src/components/searchaloneorcfile/index.vue | 10 +++++----- jero-web/src/components/searchalonesplit/index.vue | 12 ++++++------ jero-web/src/components/searchalonetext/index.vue | 10 +++++----- jero-web/src/views/dashboard/customContentList.vue | 4 ++-- .../src/views/documentManage/collection/index.vue | 4 ++-- .../src/views/documentManage/subscribtion/index.vue | 4 ++-- .../src/views/documentManage/tags/dialog/DicList.vue | 3 ++- .../views/documentManage/tags/tabs/TagContent.vue | 4 ++-- .../src/views/documentManage/tags/tabs/TagItem.vue | 4 ++-- .../components/initiateComparison.vue | 10 ++++------ .../views/documentTools/documentComparison/index.vue | 2 +- .../components/RetrieveFilesList.vue | 8 ++++---- .../documentTools/documentTranslation/index.vue | 10 +++++----- .../searchCenter/components/DocumentLibrary.vue | 5 ++--- .../searchCenter/components/problemKnowledgeBase.vue | 5 ++--- .../virtualList/components/addModel.vue | 12 ++++++------ .../virtualList/components/transferList.vue | 4 ++-- .../src/views/documentTools/virtualList/index.vue | 4 ++-- .../views/otamanagement/upgradeactivity/index.vue | 12 ++++++------ .../otamanagement/vehicleregistration/index.vue | 12 ++++++------ .../src/views/parameter/ParameterTemplate/index.vue | 4 ++-- .../src/views/parameter/escalationlibrary/index.vue | 4 ++-- .../src/views/parameter/managementdetails/index.vue | 6 +++--- .../src/views/parameter/parameterexport/index.vue | 4 ++-- jero-web/src/views/parameter/parameterlist/index.vue | 4 ++-- .../components/TaskParameterCollection.vue | 4 ++-- .../components/referenceDeliverablesList.vue | 4 ++-- .../certificationList/components/transferList.vue | 4 ++-- .../components/listOfRelevantPersonnel.vue | 8 ++++---- .../projectManagement/components/nonConformance.vue | 4 ++-- .../projectManagement/components/transferList.vue | 4 ++-- .../projectManagement/dialog/ParameterTemplate.vue | 4 ++-- .../dialog/ParameterTemplateAdd.vue | 4 ++-- .../dialog/ProjectCollectionParameters.vue | 4 ++-- .../projectManagement/dialog/parametercolumn.vue | 4 ++-- .../views/projectManagement/projectLibrary/index.vue | 6 +++--- .../projectNonConformance/index.vue | 6 +++--- .../projectStatusBoard/components/TaskPlanList.vue | 4 ++-- .../projectManagement/projectStatusBoard/index.vue | 4 ++-- .../views/regulationsKanban/components/addModel.vue | 4 ++-- jero-web/src/views/system/DictList.vue | 4 ++-- jero-web/src/views/system/RoleUserList.vue | 4 ++-- jero-web/src/views/system/UserAnnouncementList.vue | 4 ++-- jero-web/src/views/system/UserList.vue | 6 +++--- jero-web/src/views/system/modules/DeptUserInfo.vue | 4 ++-- .../views/toDoCenter/projectParameterTasks/index.vue | 4 ++-- .../toDoCenter/projectRegulationTasks/index.vue | 8 ++++---- .../toDoCenter/regulatoryAssessmentTasks/index.vue | 4 ++-- .../components/transferList.vue | 8 ++++---- .../src/views/virtualAuthenticationList/index.vue | 4 ++-- .../certificationListMaintenance.vue | 9 ++++----- 57 files changed, 162 insertions(+), 166 deletions(-) diff --git a/jero-web/src/components/AssignedBy/index.vue b/jero-web/src/components/AssignedBy/index.vue index 0346fa84c..cd5d2c05b 100644 --- a/jero-web/src/components/AssignedBy/index.vue +++ b/jero-web/src/components/AssignedBy/index.vue @@ -23,8 +23,8 @@ - {{ $t('query') }} - {{ $t('reset') }} + {{ $t('reset') }} + {{ $t('query') }} diff --git a/jero-web/src/components/AssignedByHomo/index.vue b/jero-web/src/components/AssignedByHomo/index.vue index 1e5cce5f5..67cebc36f 100644 --- a/jero-web/src/components/AssignedByHomo/index.vue +++ b/jero-web/src/components/AssignedByHomo/index.vue @@ -23,8 +23,8 @@ - {{ $t('query') }} - {{ $t('reset') }} + {{ $t('reset') }} + {{ $t('query') }} diff --git a/jero-web/src/components/ParameterLibraryAdd/index.vue b/jero-web/src/components/ParameterLibraryAdd/index.vue index 4d972d944..3d409a54e 100644 --- a/jero-web/src/components/ParameterLibraryAdd/index.vue +++ b/jero-web/src/components/ParameterLibraryAdd/index.vue @@ -46,8 +46,8 @@ - {{ $t('query') }} - {{ $t('reset') }} + {{ $t('reset') }} + {{ $t('query') }} diff --git a/jero-web/src/components/SplitSearch/index.vue b/jero-web/src/components/SplitSearch/index.vue index 077aa9be9..615a561d3 100644 --- a/jero-web/src/components/SplitSearch/index.vue +++ b/jero-web/src/components/SplitSearch/index.vue @@ -138,12 +138,12 @@ - {{$t('query')}} + + {{ !toggleSearchStatus ? $t('open') : $t('away') }} + + {{$t('reset')}} - - {{ !toggleSearchStatus ? $t('open') : $t('away') }} - - + {{$t('query')}} diff --git a/jero-web/src/components/currencySearch/index.vue b/jero-web/src/components/currencySearch/index.vue index fd3adad5c..b295f13b0 100644 --- a/jero-web/src/components/currencySearch/index.vue +++ b/jero-web/src/components/currencySearch/index.vue @@ -135,12 +135,12 @@ - {{$t('query')}} - {{$t('reset')}} - - {{ !toggleSearchStatus ? $t('open') : $t('away') }} - - + + {{ !toggleSearchStatus ? $t('open') : $t('away') }} + + + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/components/search/index.vue b/jero-web/src/components/search/index.vue index 5b2671df5..af43a52be 100644 --- a/jero-web/src/components/search/index.vue +++ b/jero-web/src/components/search/index.vue @@ -174,12 +174,12 @@ - {{$t('query')}} - {{$t('reset')}} - + {{ !toggleSearchStatus ? $t('open') : $t('away') }} + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/components/searchaloneorcfile/index.vue b/jero-web/src/components/searchaloneorcfile/index.vue index 4a65293a5..0daf05a31 100644 --- a/jero-web/src/components/searchaloneorcfile/index.vue +++ b/jero-web/src/components/searchaloneorcfile/index.vue @@ -138,12 +138,12 @@ - {{$t('query')}} + + {{ !toggleSearchStatus ? $t('open') : $t('away') }} + + {{$t('reset')}} - - {{ !toggleSearchStatus ? $t('open') : $t('away') }} - - + {{$t('query')}} diff --git a/jero-web/src/components/searchalonesplit/index.vue b/jero-web/src/components/searchalonesplit/index.vue index 38ac47cf7..ddae1f6b6 100644 --- a/jero-web/src/components/searchalonesplit/index.vue +++ b/jero-web/src/components/searchalonesplit/index.vue @@ -138,12 +138,12 @@ - {{$t('query')}} - {{$t('reset')}} - - {{ !toggleSearchStatus ? $t('open') : $t('away') }} - - + + {{ !toggleSearchStatus ? $t('open') : $t('away') }} + + + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/components/searchalonetext/index.vue b/jero-web/src/components/searchalonetext/index.vue index 273281bf0..a2d3fa013 100644 --- a/jero-web/src/components/searchalonetext/index.vue +++ b/jero-web/src/components/searchalonetext/index.vue @@ -138,12 +138,12 @@ - {{$t('query')}} + + {{ !toggleSearchStatus ? $t('open') : $t('away') }} + + {{$t('reset')}} - - {{ !toggleSearchStatus ? $t('open') : $t('away') }} - - + {{$t('query')}} diff --git a/jero-web/src/views/dashboard/customContentList.vue b/jero-web/src/views/dashboard/customContentList.vue index 5f2d5fc4f..1954acee0 100644 --- a/jero-web/src/views/dashboard/customContentList.vue +++ b/jero-web/src/views/dashboard/customContentList.vue @@ -17,8 +17,8 @@ - {{$t('query')}} - {{$t('reset')}} + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/views/documentManage/collection/index.vue b/jero-web/src/views/documentManage/collection/index.vue index f1f2e44e6..541994b2e 100644 --- a/jero-web/src/views/documentManage/collection/index.vue +++ b/jero-web/src/views/documentManage/collection/index.vue @@ -40,8 +40,8 @@ - {{$t('query')}} - {{$t('reset')}} + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/views/documentManage/subscribtion/index.vue b/jero-web/src/views/documentManage/subscribtion/index.vue index 17a47a1ee..7c384187b 100644 --- a/jero-web/src/views/documentManage/subscribtion/index.vue +++ b/jero-web/src/views/documentManage/subscribtion/index.vue @@ -39,8 +39,8 @@ - {{$t('query')}} - {{$t('reset')}} + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/views/documentManage/tags/dialog/DicList.vue b/jero-web/src/views/documentManage/tags/dialog/DicList.vue index 1dbc4c4ac..41307da80 100644 --- a/jero-web/src/views/documentManage/tags/dialog/DicList.vue +++ b/jero-web/src/views/documentManage/tags/dialog/DicList.vue @@ -9,8 +9,8 @@
- {{$t('query')}} {{$t('reset')}} + {{$t('query')}}
@@ -561,6 +561,7 @@ .form-btn { .form-btn-search { + margin-left: 8px; margin-right: 10px; } } diff --git a/jero-web/src/views/documentManage/tags/tabs/TagContent.vue b/jero-web/src/views/documentManage/tags/tabs/TagContent.vue index 74bcfe483..0ffbbeeb4 100644 --- a/jero-web/src/views/documentManage/tags/tabs/TagContent.vue +++ b/jero-web/src/views/documentManage/tags/tabs/TagContent.vue @@ -14,8 +14,8 @@ - {{$t('query')}} - {{$t('reset')}} + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/views/documentManage/tags/tabs/TagItem.vue b/jero-web/src/views/documentManage/tags/tabs/TagItem.vue index 2ab6a362e..9958043f2 100644 --- a/jero-web/src/views/documentManage/tags/tabs/TagItem.vue +++ b/jero-web/src/views/documentManage/tags/tabs/TagItem.vue @@ -33,8 +33,8 @@ - {{$t('query')}} - {{$t('reset')}} + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue b/jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue index ad0dbe1b0..c91b754a3 100644 --- a/jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue +++ b/jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue @@ -35,9 +35,8 @@ - {{$t('query')}} - {{$t('reset')}} + {{$t('reset')}} + {{$t('query')}} @@ -90,9 +89,8 @@ - {{$t('query')}} - {{$t('reset')}} + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/views/documentTools/documentComparison/index.vue b/jero-web/src/views/documentTools/documentComparison/index.vue index f0b81da41..f7e13f6ec 100644 --- a/jero-web/src/views/documentTools/documentComparison/index.vue +++ b/jero-web/src/views/documentTools/documentComparison/index.vue @@ -34,8 +34,8 @@ - {{$t('query')}} {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/views/documentTools/documentTranslation/components/RetrieveFilesList.vue b/jero-web/src/views/documentTools/documentTranslation/components/RetrieveFilesList.vue index bcf9093fb..3f30dc402 100644 --- a/jero-web/src/views/documentTools/documentTranslation/components/RetrieveFilesList.vue +++ b/jero-web/src/views/documentTools/documentTranslation/components/RetrieveFilesList.vue @@ -34,12 +34,12 @@ - {{$t('query')}} - {{$t('reset')}} - {{ !toggleSearchStatus ? $t('open') : $t('away') }} - + {{ !toggleSearchStatus ? $t('open') : $t('away') }} + + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/views/documentTools/documentTranslation/index.vue b/jero-web/src/views/documentTools/documentTranslation/index.vue index 29779bb19..1ffb73b44 100644 --- a/jero-web/src/views/documentTools/documentTranslation/index.vue +++ b/jero-web/src/views/documentTools/documentTranslation/index.vue @@ -47,12 +47,12 @@ - {{$t('query')}} - {{$t('reset')}} - {{ !toggleSearchStatus ? $t('open') : $t('away') }} - - + {{ !toggleSearchStatus ? $t('open') : $t('away') }} + + + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue b/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue index 3d8924c97..cc26a0fa5 100644 --- a/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue +++ b/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue @@ -61,9 +61,8 @@
- {{$t('query')}} - {{$t('reset')}} - + {{$t('reset')}} + {{$t('query')}}
diff --git a/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue b/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue index 39fe20342..d8e6c8ae8 100644 --- a/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue +++ b/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue @@ -29,9 +29,8 @@
- {{$t('query')}} - {{$t('reset')}} - + {{$t('reset')}} + {{$t('query')}}
diff --git a/jero-web/src/views/documentTools/virtualList/components/addModel.vue b/jero-web/src/views/documentTools/virtualList/components/addModel.vue index 95e9b29d8..a4ff4f8aa 100644 --- a/jero-web/src/views/documentTools/virtualList/components/addModel.vue +++ b/jero-web/src/views/documentTools/virtualList/components/addModel.vue @@ -45,15 +45,15 @@ - - {{$t('query')}} - {{$t('reset')}} - + {{ !toggleSearchStatus ? $t('open') : $t('away') }} + {{$t('reset')}} + {{$t('query')}} + diff --git a/jero-web/src/views/documentTools/virtualList/components/transferList.vue b/jero-web/src/views/documentTools/virtualList/components/transferList.vue index 3198cb9d6..beabfc3e7 100644 --- a/jero-web/src/views/documentTools/virtualList/components/transferList.vue +++ b/jero-web/src/views/documentTools/virtualList/components/transferList.vue @@ -23,8 +23,8 @@ - {{$t('query')}} - {{$t('reset')}} + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/views/documentTools/virtualList/index.vue b/jero-web/src/views/documentTools/virtualList/index.vue index cad27a2b7..06ba96031 100644 --- a/jero-web/src/views/documentTools/virtualList/index.vue +++ b/jero-web/src/views/documentTools/virtualList/index.vue @@ -25,8 +25,8 @@ - {{$t('query')}} - {{$t('reset')}} + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/views/otamanagement/upgradeactivity/index.vue b/jero-web/src/views/otamanagement/upgradeactivity/index.vue index 9fcf1bc8a..d947ca94f 100644 --- a/jero-web/src/views/otamanagement/upgradeactivity/index.vue +++ b/jero-web/src/views/otamanagement/upgradeactivity/index.vue @@ -78,12 +78,12 @@ - {{$t('query')}} - {{$t('reset')}} - + {{ !toggleSearchStatus ? $t('open') : $t('away') }} - + + {{$t('reset')}} + {{$t('query')}} @@ -147,7 +147,7 @@ @click="detailclick(record)">{{$t('See')}} {{$t('maintenance')}} - + {{$t('endUpgrade')}} - {{ $t('query') }} - {{ $t('reset') }} - + {{ !toggleSearchStatus ? $t('open') : $t('away') }} + {{ $t('reset') }} + {{ $t('query') }} @@ -374,10 +374,10 @@ export default { } }) } - - } + } - + } + }, // 创建车型 createvehicleandfunctionrecords() { diff --git a/jero-web/src/views/parameter/ParameterTemplate/index.vue b/jero-web/src/views/parameter/ParameterTemplate/index.vue index 205ff409c..4d8a7997e 100644 --- a/jero-web/src/views/parameter/ParameterTemplate/index.vue +++ b/jero-web/src/views/parameter/ParameterTemplate/index.vue @@ -25,8 +25,8 @@ - {{$t('query')}} - {{$t('reset')}} + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/views/parameter/escalationlibrary/index.vue b/jero-web/src/views/parameter/escalationlibrary/index.vue index b7aa496dd..13527dda3 100644 --- a/jero-web/src/views/parameter/escalationlibrary/index.vue +++ b/jero-web/src/views/parameter/escalationlibrary/index.vue @@ -23,8 +23,8 @@ - {{$t('query')}} - {{$t('reset')}} + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/views/parameter/managementdetails/index.vue b/jero-web/src/views/parameter/managementdetails/index.vue index 66d960461..2b8cea82a 100644 --- a/jero-web/src/views/parameter/managementdetails/index.vue +++ b/jero-web/src/views/parameter/managementdetails/index.vue @@ -74,12 +74,12 @@ - {{$t('query')}} - {{$t('reset')}} - + {{ !toggleSearchStatus ? $t('open') : $t('away') }} + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/views/parameter/parameterexport/index.vue b/jero-web/src/views/parameter/parameterexport/index.vue index 9a806dbcd..e30099472 100644 --- a/jero-web/src/views/parameter/parameterexport/index.vue +++ b/jero-web/src/views/parameter/parameterexport/index.vue @@ -25,8 +25,8 @@ - {{$t('query')}} - {{$t('reset')}} + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/views/parameter/parameterlist/index.vue b/jero-web/src/views/parameter/parameterlist/index.vue index 872d44561..2ffda150a 100644 --- a/jero-web/src/views/parameter/parameterlist/index.vue +++ b/jero-web/src/views/parameter/parameterlist/index.vue @@ -34,8 +34,8 @@ - {{$t('query')}} - {{$t('reset')}} + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue index b10d1013b..da03e081c 100644 --- a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue +++ b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue @@ -14,8 +14,8 @@ - {{$t('query')}} - {{$t('reset')}} + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/referenceDeliverablesList.vue b/jero-web/src/views/projectManagement/components/certificationList/components/referenceDeliverablesList.vue index 4a299abd8..f9fa721ef 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/referenceDeliverablesList.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/referenceDeliverablesList.vue @@ -23,8 +23,8 @@ - {{$t('query')}} - {{$t('reset')}} + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/transferList.vue b/jero-web/src/views/projectManagement/components/certificationList/components/transferList.vue index 25ccd69f9..f1fda8f8b 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/transferList.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/transferList.vue @@ -24,8 +24,8 @@ - {{$t('query')}} - {{$t('reset')}} + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue b/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue index 5879a3959..1cf7194cd 100644 --- a/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue +++ b/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue @@ -68,13 +68,13 @@ - {{$t('query')}} - {{$t('reset')}} - + {{ !toggleSearchStatus ? $t('open') : $t('away') }} + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/views/projectManagement/components/nonConformance.vue b/jero-web/src/views/projectManagement/components/nonConformance.vue index 1371c11a3..e097b6f4b 100644 --- a/jero-web/src/views/projectManagement/components/nonConformance.vue +++ b/jero-web/src/views/projectManagement/components/nonConformance.vue @@ -34,8 +34,8 @@ - {{$t('query')}} - {{$t('reset')}} + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/views/projectManagement/components/transferList.vue b/jero-web/src/views/projectManagement/components/transferList.vue index 232174545..2c77137b0 100644 --- a/jero-web/src/views/projectManagement/components/transferList.vue +++ b/jero-web/src/views/projectManagement/components/transferList.vue @@ -23,8 +23,8 @@ - {{$t('query')}} - {{$t('reset')}} + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/views/projectManagement/dialog/ParameterTemplate.vue b/jero-web/src/views/projectManagement/dialog/ParameterTemplate.vue index 556ddceeb..ea671769a 100644 --- a/jero-web/src/views/projectManagement/dialog/ParameterTemplate.vue +++ b/jero-web/src/views/projectManagement/dialog/ParameterTemplate.vue @@ -28,8 +28,8 @@ - {{ $t('query') }} - {{ $t('reset') }} + {{ $t('reset') }} + {{ $t('query') }} diff --git a/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue b/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue index 486fe5b67..76c193aeb 100644 --- a/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue +++ b/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue @@ -136,8 +136,8 @@ - {{ $t('query') }} - {{ $t('reset') }} + {{ $t('reset') }} + {{ $t('query') }} diff --git a/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue b/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue index 064bbf6df..a4bcebb6d 100644 --- a/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue +++ b/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue @@ -84,8 +84,8 @@ - {{ $t('query') }} - {{ $t('reset') }} + {{ $t('reset') }} + {{ $t('query') }} diff --git a/jero-web/src/views/projectManagement/dialog/parametercolumn.vue b/jero-web/src/views/projectManagement/dialog/parametercolumn.vue index ff56161e1..43395bb1d 100644 --- a/jero-web/src/views/projectManagement/dialog/parametercolumn.vue +++ b/jero-web/src/views/projectManagement/dialog/parametercolumn.vue @@ -45,8 +45,8 @@
- {{ $t('query') }} - {{ $t('reset') }} + {{ $t('reset') }} + {{ $t('query') }} diff --git a/jero-web/src/views/projectManagement/projectLibrary/index.vue b/jero-web/src/views/projectManagement/projectLibrary/index.vue index 6047a5216..fe8b22da4 100644 --- a/jero-web/src/views/projectManagement/projectLibrary/index.vue +++ b/jero-web/src/views/projectManagement/projectLibrary/index.vue @@ -102,12 +102,12 @@ - {{$t('query')}} - {{$t('reset')}} - + {{ !toggleSearchStatus ? $t('open') : $t('away') }} + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/views/projectManagement/projectNonConformance/index.vue b/jero-web/src/views/projectManagement/projectNonConformance/index.vue index e94228121..d72393dd9 100644 --- a/jero-web/src/views/projectManagement/projectNonConformance/index.vue +++ b/jero-web/src/views/projectManagement/projectNonConformance/index.vue @@ -130,12 +130,12 @@ - {{$t('query')}} - {{$t('reset')}} - + {{ !toggleSearchStatus ? $t('open') : $t('away') }} + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/views/projectManagement/projectStatusBoard/components/TaskPlanList.vue b/jero-web/src/views/projectManagement/projectStatusBoard/components/TaskPlanList.vue index 3f5e7e577..62a7b57ce 100644 --- a/jero-web/src/views/projectManagement/projectStatusBoard/components/TaskPlanList.vue +++ b/jero-web/src/views/projectManagement/projectStatusBoard/components/TaskPlanList.vue @@ -80,9 +80,9 @@ - {{ $t('query') }} - {{ $t('reset') }} + {{ $t('query') }} diff --git a/jero-web/src/views/projectManagement/projectStatusBoard/index.vue b/jero-web/src/views/projectManagement/projectStatusBoard/index.vue index fe8ef3d12..57c25a03a 100644 --- a/jero-web/src/views/projectManagement/projectStatusBoard/index.vue +++ b/jero-web/src/views/projectManagement/projectStatusBoard/index.vue @@ -36,9 +36,9 @@ - {{ $t('query') }} - {{ $t('reset') }} + {{ $t('query') }} diff --git a/jero-web/src/views/regulationsKanban/components/addModel.vue b/jero-web/src/views/regulationsKanban/components/addModel.vue index 46500f82b..88d5bc1be 100644 --- a/jero-web/src/views/regulationsKanban/components/addModel.vue +++ b/jero-web/src/views/regulationsKanban/components/addModel.vue @@ -52,8 +52,8 @@ - {{ $t('query') }} - {{ $t('reset') }} + {{ $t('reset') }} + {{ $t('query') }} diff --git a/jero-web/src/views/system/DictList.vue b/jero-web/src/views/system/DictList.vue index 91503bbb7..0ff139f8e 100644 --- a/jero-web/src/views/system/DictList.vue +++ b/jero-web/src/views/system/DictList.vue @@ -34,8 +34,8 @@ - {{$t('query')}} - {{$t('reset')}} + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/views/system/RoleUserList.vue b/jero-web/src/views/system/RoleUserList.vue index 55514965f..f53732a59 100644 --- a/jero-web/src/views/system/RoleUserList.vue +++ b/jero-web/src/views/system/RoleUserList.vue @@ -16,8 +16,8 @@ - {{$t('query')}} - {{$t('reset')}} + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/views/system/UserAnnouncementList.vue b/jero-web/src/views/system/UserAnnouncementList.vue index b8edf2afe..0dc986d12 100644 --- a/jero-web/src/views/system/UserAnnouncementList.vue +++ b/jero-web/src/views/system/UserAnnouncementList.vue @@ -35,9 +35,9 @@ - {{ $t('query') }} - {{ $t('reset') }} + {{ $t('query') }} diff --git a/jero-web/src/views/system/UserList.vue b/jero-web/src/views/system/UserList.vue index 991784e40..96615f565 100644 --- a/jero-web/src/views/system/UserList.vue +++ b/jero-web/src/views/system/UserList.vue @@ -81,12 +81,12 @@ - {{$t('query')}} - {{$t('reset')}} - + {{ toggleSearchStatus ? $t('away') : $t('open') }} + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/views/system/modules/DeptUserInfo.vue b/jero-web/src/views/system/modules/DeptUserInfo.vue index 166aba2f5..aae13301b 100644 --- a/jero-web/src/views/system/modules/DeptUserInfo.vue +++ b/jero-web/src/views/system/modules/DeptUserInfo.vue @@ -12,8 +12,8 @@ - {{$t('query')}} - {{$t('reset')}} + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/views/toDoCenter/projectParameterTasks/index.vue b/jero-web/src/views/toDoCenter/projectParameterTasks/index.vue index f9f974792..6953e3448 100644 --- a/jero-web/src/views/toDoCenter/projectParameterTasks/index.vue +++ b/jero-web/src/views/toDoCenter/projectParameterTasks/index.vue @@ -23,8 +23,8 @@ - {{$t('query')}} - {{$t('reset')}} + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue index 6b7901469..43f97efa6 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue @@ -65,12 +65,12 @@ - {{$t('query')}} - {{$t('reset')}} - + {{ !toggleSearchStatus ? $t('open') : $t('away') }} - + + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/index.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/index.vue index 7849db357..602685ad6 100644 --- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/index.vue +++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/index.vue @@ -34,8 +34,8 @@ - {{$t('query')}} - {{$t('reset')}} + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/views/virtualAuthenticationList/components/transferList.vue b/jero-web/src/views/virtualAuthenticationList/components/transferList.vue index 25ccd69f9..21e1569fe 100644 --- a/jero-web/src/views/virtualAuthenticationList/components/transferList.vue +++ b/jero-web/src/views/virtualAuthenticationList/components/transferList.vue @@ -24,10 +24,10 @@ - {{$t('query')}} - {{$t('reset')}} - - + {{$t('reset')}} + {{$t('query')}} + +
diff --git a/jero-web/src/views/virtualAuthenticationList/index.vue b/jero-web/src/views/virtualAuthenticationList/index.vue index 44e465822..45293970d 100644 --- a/jero-web/src/views/virtualAuthenticationList/index.vue +++ b/jero-web/src/views/virtualAuthenticationList/index.vue @@ -25,8 +25,8 @@ - {{$t('query')}} - {{$t('reset')}} + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue index bf4f2b8dc..ddc60716c 100644 --- a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue +++ b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue @@ -82,13 +82,12 @@ - {{$t('query')}} - {{$t('reset')}} - + {{ !toggleSearchStatus ? $t('open') : $t('away') }} - + + {{$t('reset')}} + {{$t('query')}} From 3c6ad9619084b36f7c39010a6c763ab5faed54aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Wed, 29 Mar 2023 13:40:21 +0800 Subject: [PATCH 498/645] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E5=8F=8A=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=A4=87=E6=A1=88-=E5=8F=AF=E5=9C=A8=E7=BA=BF?= =?UTF-8?q?=E5=8D=87=E7=BA=A7=E7=9A=84=E7=B3=BB=E7=BB=9F=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E4=B8=8E=E5=8F=82=E6=95=B0-=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vehicleinformation/components/upgradedonline.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue index 888fd051c..b364d98c4 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue @@ -88,10 +88,10 @@ fileList == null) ? $t('uploadattachment') : $t('viewUploadedFiles') }}
-

注:附件包括测试项目清单、测试报告．测试标准或技术规范

-

    支持doc/docx/pdf格式,大小50M以内

+

{{ $t('note') }}

+

    {{ $t('format') }}

- +
{{$t('preservation')}} @@ -463,7 +463,7 @@ import uploadFileOta from '@/components/uploadFileOta/file' this.$message.success(this.$t('SavedSuccessfully')) this.getData() } - + }) } } From 269bdebe803120d8dc6d1fd4218a1d980c642599 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Wed, 29 Mar 2023 13:44:08 +0800 Subject: [PATCH 499/645] bug 67476 --- .../vehicleinformation/components/safetyPrecautions.vue | 2 +- .../vehicleinformation/components/upgradeRequirements.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue index 7d63c299b..1c3e59dde 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue @@ -206,7 +206,7 @@ import ImportFile from '@/components/ImportFileData/index' // this.dataSource[2].info= Number(res.result.sjsbcs)== 0 ? undefined :Number(res.result.sjsbcs) this.dataSource[2].info= res.result.sjsbcs this.dataSource[3].info= res.result.xxaqjz - if(res.result.zmclList){ + if(res.result.zmclList.length != 0){ this.dataSource[0].certifyingmaterials = this.$t('viewFile') } this.fileList.uploadName = res.result.zmclList diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue index 3e17a247a..779877220 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue @@ -228,7 +228,7 @@ export default { this.dataSource[7].relevantverification=Number(res.result.sjsbaq) this.dataSource[8].relevantverification=Number(res.result.sjgg) this.dataSource[9].relevantverification=Number(res.result.sjzt) - if(res.result.zmclList){ + if(res.result.zmclList.length != 0){ this.dataSource[0].certifyingmaterials = this.$t('viewFile') } this.fileList.uploadName = res.result.zmclList From 578a5667138bfe2fd3741034827dd7d3d4eb3eb0 Mon Sep 17 00:00:00 2001 From: yuekuo Date: Wed, 29 Mar 2023 14:15:06 +0800 Subject: [PATCH 500/645] =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/upgradetargetmodel.vue | 38 ++++++++++++++++--- 1 file changed, 32 insertions(+), 6 deletions(-) diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue index 80899ab2f..ef5d10f6f 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue @@ -12,7 +12,7 @@
- +
@@ -37,11 +37,14 @@
+ * {{$t('upgraderecordnumber')}}
-
+
- + + +
@@ -60,9 +63,10 @@
+ * {{$t('Modelandfunctionrecord')}}
- + {{ item.ggpc }} @@ -174,6 +178,14 @@ import ImportFile from '@/components/ImportFileData/index' projectNameList2:[], selectListPc:[], selectListMb:[], + rules:{ + babh:[ + { required:true,message:this.$t('upgraderecordnumber')+this.$t('cannotEmpty'),trigger:'blur'} + ], + bapc:[ + { required:true,message:this.$t('Modelandfunctionrecord')+this.$t('cannotEmpty'),trigger:'change'} + ] + } } }, mounted() { @@ -230,17 +242,27 @@ import ImportFile from '@/components/ImportFileData/index' if(otaId==null){ otaId='' } - postAction('/ota/otaBaSjSjmbcx/add',{otaId:otaId,...this.form}).then(res=>{ + this.$refs.ruleForm.validate(valid=>{ + if(valid){ + postAction('/ota/otaBaSjSjmbcx/add',{otaId:otaId,...this.form}).then(res=>{ if(res.code==200){ localStorage.setItem('otaId', res.result.otaId) this.$message.success(this.$t('SavedSuccessfully')) this.getData() } }) + } + }) + }, next(){ this.save() - this.$emit('basicInformationForm') + this.$refs.ruleForm.validate(valid=>{ + if(valid){ + this.$emit('basicInformationForm') + }}) + + }, getSelect(){ getAction('/ota/otaBaCxList/list').then(res=>{ @@ -368,4 +390,8 @@ import ImportFile from '@/components/ImportFileData/index' margin-top: 5px; line-height: 1.4 !important; } + .Required { + color: red; + margin-right: 3px; +} \ No newline at end of file From 4d57ad1ffbc810fb562f72bd1c0b918ae6a002d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Wed, 29 Mar 2023 14:19:17 +0800 Subject: [PATCH 501/645] =?UTF-8?q?=20OTA=E8=BD=A6=E5=9E=8B-=E9=A9=BE?= =?UTF-8?q?=E9=A9=B6=E8=BE=85=E5=8A=A9=E7=B3=BB=E7=BB=9F=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E5=A4=87=E6=A1=88=E5=8F=82=E6=95=B0-=E5=A1=AB=E5=86=99?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E5=AD=97=E6=AE=B5=E6=94=B9=E4=B8=BA=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vehicleinformation/components/recordparameters.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue index 2a74c0dcf..9d0fee01e 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue @@ -93,7 +93,7 @@
- {{$t('fillincontent')}} + {{$t('configuration')}} {{ $t('yes') }} @@ -948,7 +948,7 @@ export default { this.$message.success(this.$t('SavedSuccessfully')) this.getData() } - + }) }, From ef570e5ddd07dd068c085e6293558dfd3eac2941 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Wed, 29 Mar 2023 14:21:14 +0800 Subject: [PATCH 502/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E8=BD=A6=E8=BE=86=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ota/controller/OtaBaCxListController.java | 31 ++++- .../ota/controller/OtaBaSjListController.java | 12 +- .../jero/modules/ota/entity/OtaBaSjList.java | 118 ++++++++++++------ .../service/impl/OtaBaCxListServiceImpl.java | 2 +- .../service/impl/OtaBaSjJssjServiceImpl.java | 35 ++++-- .../impl/OtaBaSjSjmbcxServiceImpl.java | 1 + .../impl/OtaBaSjSjxtbhServiceImpl.java | 2 +- .../modules/ota/utils/ComparisonUtil.java | 2 +- 8 files changed, 145 insertions(+), 58 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java index 35cba9c8e..c1ff0530c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java @@ -1,6 +1,7 @@ package com.jero.modules.ota.controller; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -8,11 +9,13 @@ import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.extRepo.entity.ExtRepoData; import com.jero.modules.ota.entity.OtaBaCxList; import com.jero.modules.ota.service.IOtaBaCxListService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -57,9 +60,33 @@ public class OtaBaCxListController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(otaBaCxList, req.getParameterMap()); - queryWrapper.orderByDesc("create_time"); Page page = new Page(pageNo, pageSize); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + // 文件名称模糊查询 + String cpdjbh = req.getParameter("cpdjbh"); + if (StringUtils.isNotBlank(cpdjbh)) { + cpdjbh = cpdjbh.replace("%", "\\%"); + queryWrapper.like(OtaBaCxList::getCpdjbh, cpdjbh); + } + + String ggpc = req.getParameter("ggpc"); + if (StringUtils.isNotBlank(ggpc)) { + ggpc = ggpc.replace("%", "\\%"); + queryWrapper.like(OtaBaCxList::getGgpc, ggpc); + } + + String cpsb = req.getParameter("cpsb"); + if (StringUtils.isNotBlank(cpsb)) { + cpsb = cpsb.replace("%", "\\%"); + queryWrapper.like(OtaBaCxList::getCpsb, cpsb); + } + + String cpmc = req.getParameter("cpmc"); + if (StringUtils.isNotBlank(cpmc)) { + cpmc = cpmc.replace("%", "\\%"); + queryWrapper.like(OtaBaCxList::getCpmc, cpmc); + } + queryWrapper.orderByDesc(OtaBaCxList::getCreateTime); IPage pageList = otaBaCxListService.page(page, queryWrapper); return Result.OK(pageList); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java index d6dff0bc6..344eafb8c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java @@ -1,5 +1,6 @@ package com.jero.modules.ota.controller; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -176,11 +177,12 @@ public class OtaBaSjListController extends JeroController batchRecord(@RequestParam(name = "ids", required = true) String ids, - @RequestParam(name = "bazt", required = true) String bazt, - @RequestParam(name = "batjsj", required = true) String batjsj, - @RequestParam(name = "bz", required = true) String bz, - @RequestParam(name = "cut") String cut) { + public Result batchRecord(@RequestBody JSONObject json) { + String ids = json.getString("ids"); + String bazt = json.getString("bazt"); + String batjsj = json.getString("batjsj"); + String bz = json.getString("bz"); + String cut = json.getString("cut"); otaBaSjListService.batchRecord(ids, bazt, batjsj, bz, cut); return Result.OK("备案维护成功!"); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjList.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjList.java index 73b8695d8..dc0e38564 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjList.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjList.java @@ -3,6 +3,7 @@ package com.jero.modules.ota.entity; import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.math.BigDecimal; + import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -21,105 +22,146 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; /** * @Description: 升级备案-升级活动备案列表 * @Author: jero-boot - * @Date: 2023-03-17 + * @Date: 2023-03-17 * @Version: V1.0 */ @Data @TableName("ota_ba_sj_list") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -@ApiModel(value="ota_ba_sj_list对象", description="升级备案-升级活动备案列表") +@ApiModel(value = "ota_ba_sj_list对象", description = "升级备案-升级活动备案列表") public class OtaBaSjList implements Serializable { private static final long serialVersionUID = 1L; - /**主键*/ - @TableId(type = IdType.ASSIGN_ID) + /** + * 主键 + */ + @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value = "主键") private java.lang.String id; - /**创建人*/ + /** + * 创建人 + */ @ApiModelProperty(value = "创建人") private java.lang.String createBy; - /**创建日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + /** + * 创建日期 + */ + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "创建日期") private java.util.Date createTime; - /**更新人*/ + /** + * 更新人 + */ @ApiModelProperty(value = "更新人") private java.lang.String updateBy; - /**更新日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + /** + * 更新日期 + */ + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "更新日期") private java.util.Date updateTime; - /**所属部门*/ + /** + * 所属部门 + */ @ApiModelProperty(value = "所属部门") private java.lang.String sysOrgCode; - /**otaId*/ - @Excel(name = "otaId", width = 15) + /** + * otaId + */ + @Excel(name = "otaId", width = 15) @ApiModelProperty(value = "otaId") private java.lang.String otaId; - /**产品登记编号*/ - @Excel(name = "产品登记编号", width = 15) + /** + * 产品登记编号 + */ + @Excel(name = "产品登记编号", width = 15) @ApiModelProperty(value = "产品登记编号") private java.lang.String cpdjbh; - /**公告批次*/ - @Excel(name = "公告批次", width = 15) + /** + * 公告批次 + */ + @Excel(name = "公告批次", width = 15) @ApiModelProperty(value = "公告批次") private java.lang.String ggpc; - /**产品商标*/ - @Excel(name = "产品商标", width = 15) + /** + * 产品商标 + */ + @Excel(name = "产品商标", width = 15) @ApiModelProperty(value = "产品商标") private java.lang.String cpsb; - /**产品名称*/ - @Excel(name = "产品名称", width = 15) + /** + * 产品名称 + */ + @Excel(name = "产品名称", width = 15) @ApiModelProperty(value = "产品名称") private java.lang.String cpmc; - /**产品型号*/ - @Excel(name = "产品型号", width = 15) + /** + * 产品型号 + */ + @Excel(name = "产品型号", width = 15) @ApiModelProperty(value = "产品型号") private java.lang.String cpxh; - /**备案状态*/ - @Excel(name = "备案状态", width = 15) + /** + * 备案状态 + */ + @Excel(name = "备案状态", width = 15) @ApiModelProperty(value = "备案状态") + @Dict(dicCode = "recordstatus") private java.lang.String bazt; - /**备案提交时间*/ - @Excel(name = "备案提交时间", width = 15, format = "yyyy-MM-dd") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") + /** + * 备案提交时间 + */ + @Excel(name = "备案提交时间", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") @ApiModelProperty(value = "备案提交时间") private java.util.Date batjsj; - /**创建时间*/ - @Excel(name = "创建时间", width = 15, format = "yyyy-MM-dd") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") + /** + * 创建时间 + */ + @Excel(name = "创建时间", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") @ApiModelProperty(value = "创建时间") private java.util.Date cjsj; - /**备注*/ - @Excel(name = "备注", width = 15) + /** + * 备注 + */ + @Excel(name = "备注", width = 15) @ApiModelProperty(value = "备注") private java.lang.String bz; - /**升级驾驶附件*/ + /** + * 升级驾驶附件 + */ @Excel(name = "升级驾驶附件", width = 15) @ApiModelProperty(value = "升级驾驶附件") private java.lang.String sjjsfj; + /** + * 升级状态(0:升级中;1:升级结束) + */ + @Excel(name = "升级状态", width = 15) + @ApiModelProperty(value = "升级状态") + private java.lang.String sjzt; public void updateData(OtaBaSjSjmbcx otaBaSjSjmbcx) { this.cpdjbh = otaBaSjSjmbcx.getBabh(); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java index 130bdb9b5..f32cfaf19 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java @@ -9,8 +9,8 @@ import com.jero.modules.ota.entity.OtaBaCxLsjl; import com.jero.modules.ota.mapper.OtaBaCxListMapper; import com.jero.modules.ota.service.*; import com.jero.modules.ota.utils.ImportFileUtil; -import com.jero.modules.system.util.StringUtils; import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.ibatis.logging.Log; import org.apache.ibatis.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjJssjServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjJssjServiceImpl.java index 73a45b937..ea06cd006 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjJssjServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjJssjServiceImpl.java @@ -2,19 +2,18 @@ package com.jero.modules.ota.service.impl; import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.jero.modules.ota.entity.AttachmentEO; -import com.jero.modules.ota.entity.OtaBaCxAqcs; -import com.jero.modules.ota.entity.OtaBaSjJssj; -import com.jero.modules.ota.entity.OtaBaSjJssjyy; +import com.jero.modules.ota.entity.*; import com.jero.modules.ota.mapper.OtaBaSjJssjMapper; import com.jero.modules.ota.service.IOtaBaCxTxjlService; import com.jero.modules.ota.service.IOtaBaSjJssjService; import com.jero.modules.ota.service.IOtaBaSjJssjyyService; +import com.jero.modules.ota.service.IOtaBaSjListService; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; import java.util.Date; @@ -32,6 +31,8 @@ public class OtaBaSjJssjServiceImpl extends ServiceImpl yyList = new ArrayList<>(); + for (OtaBaSjJssjyy yy : otaBaSjJssj.getList()) { + yy.setOtaId(otaBaSjJssj.getOtaId()); + yyList.add(yy); + } + otaBaSjJssjyyService.saveBatch(yyList); + } } /** @@ -111,9 +125,10 @@ public class OtaBaSjJssjServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(OtaBaSjJssj::getOtaId, otaId); OtaBaSjJssj res = this.getOne(queryWrapper, false); - - List list = otaBaSjJssjyyService.queryByOtaId(otaId); - res.setList(list); + if (ObjectUtils.isNotEmpty(res)) { + List list = otaBaSjJssjyyService.queryByOtaId(otaId); + res.setList(list); + } return res; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java index 6891f3cbb..5686e1c91 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java @@ -78,6 +78,7 @@ public class OtaBaSjSjmbcxServiceImpl extends ServiceImpl(); } ComparisonUtil cu = new ComparisonUtil(); - List reList = cu.comparisonListRecord(otaId, OtaModuleEnum.SJ_SJXTMCBH, OtaTitleEnum.SJKZQMC.getName(), oldList, newList, sysDictService); + List reList = cu.comparisonListRecord(otaId, OtaModuleEnum.SJ_SJXTMCBH, OtaTitleEnum.XTMC.getName(), oldList, newList, sysDictService); saveOrUpdateBatch(newList); otaBaCxTxjlService.saveBatch(reList); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java index 4abaa3d70..441ad993d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java @@ -59,7 +59,7 @@ public class ComparisonUtil { tableField.setAccessible(true); String tableFieldStr = "空"; Object tableFieldObj = tableField.get(newObj); - if (ObjectUtils.isNotEmpty(tableFieldStr)) { + if (ObjectUtils.isNotEmpty(tableFieldObj)) { tableFieldStr = tableFieldObj.toString(); } String content = "新增了一条'" + tableFieldStr + "'"; From 462b0b8f83ef853feb481ec315bd7f2eddb09f04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Wed, 29 Mar 2023 14:22:49 +0800 Subject: [PATCH 503/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E8=BD=A6=E8=BE=86=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/jero/modules/ota/utils/ComparisonUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java index 441ad993d..257d5b1a0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java @@ -77,7 +77,7 @@ public class ComparisonUtil { String newStr = ""; if (ObjectUtils.isNotEmpty(newVal) && !field.getName().equals(tableField.getName())) { newStr = parseDictText(ote, field, newObj, sysDictService); - content = tableField.get(newObj).toString() + "-" + title + "由'空'改为'" + newStr + "'"; + content = tableFieldStr + "-" + title + "由'空'改为'" + newStr + "'"; resList.add(new OtaBaCxTxjl(otaId, otaModuleEnum.getName(), content)); } } From 387c4e036ea200827271f0a7e7ff362c3e04d541 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Wed, 29 Mar 2023 14:22:50 +0800 Subject: [PATCH 504/645] =?UTF-8?q?ota=E6=96=87=E4=BB=B6=E5=A4=A7=E5=B0=8F?= =?UTF-8?q?=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 1 + jero-web/src/components/uploadFile/file.vue | 11 ++++++++++- .../components/auxiliaryupgradehavechanged.vue | 2 +- .../components/thetargetvehicleofthisupgrade.vue | 2 +- .../components/upgradeimpactassessment.vue | 2 +- .../components/usernotification.vue | 2 +- .../components/beupgradedonline.vue | 2 +- .../components/safetyPrecautions.vue | 2 +- .../components/upgradeRequirements.vue | 2 +- .../vehicleinformation/components/upgradedonline.vue | 2 +- 11 files changed, 20 insertions(+), 9 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 6307e5a29..4f0c90365 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1739,4 +1739,5 @@ module.exports = { verifyConformanceConfirmation:'Verify conformance confirmation', designConformanceVerification:'Design conformance verification', nomorethan:'No more than 10', + uploadedfilelarger:'The uploaded file is larger than 50 MB', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 52bc1eeed..aaa978cf2 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1841,4 +1841,5 @@ module.exports = { verifyConformanceConfirmation:'验证符合性确认', designConformanceVerification:'设计符合性确认', nomorethan:'不能超过10个', + uploadedfilelarger:'文件大于50M', } \ No newline at end of file diff --git a/jero-web/src/components/uploadFile/file.vue b/jero-web/src/components/uploadFile/file.vue index 457ab1346..747211830 100644 --- a/jero-web/src/components/uploadFile/file.vue +++ b/jero-web/src/components/uploadFile/file.vue @@ -34,7 +34,7 @@ export default { name: 'file', - props: ['disableds', 'disabled', 'thisFileUploadUrl','acceptcode', 'readonly', 'thisFileType', 'isUploadFile', 'isMultiple', 'restrictUploads', 'Uploadable'], + props: ['disableds', 'disabled', 'thisFileUploadUrl','size' ,'acceptcode', 'readonly', 'thisFileType', 'isUploadFile', 'isMultiple', 'restrictUploads', 'Uploadable'], data() { return { visible: false, @@ -98,6 +98,15 @@ return false } } + // 根据大小拦截 + if(this.size){ + const isLt2KB = file.size / 1024 /1024 < this.size + let name = file.name + if (!isLt2KB) { + this.$message.error(name + this.$t('uploadedfilelarger')) + return false + } + } if (this.isMultiple) { if ((this.myfileList && this.myfileList.length == 1) || this.myfileList && this.myfileList.length > 1) { this.$message.warning(this.$t('onlyOnefileUploaded')) diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue index 68c4443a4..a3b7a1546 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue @@ -68,7 +68,7 @@ {{$t('last')}} {{$t('next')}}
- +
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue index 2215482c4..67b396f2d 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue @@ -83,7 +83,7 @@ }}

{{$t('noteone')}}

- +
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue index 5e791007d..e7ec6ed0c 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue @@ -162,7 +162,7 @@ {{$t('last')}} {{$t('next')}}
- +
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue index 10413d2a0..79f27f620 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue @@ -182,7 +182,7 @@ {{$t('last')}} {{$t('next')}}
- +
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue index df3be5491..57d84655e 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue @@ -103,7 +103,7 @@ {{$t('last')}} {{$t('next')}}
- +
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue index 1c3e59dde..54953b5d8 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue @@ -47,7 +47,7 @@ {{$t('last')}} {{$t('next')}}
- +
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue index 779877220..70cdeba6a 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue @@ -34,7 +34,7 @@ {{ $t('last') }} {{ $t('next') }}
- +
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue index b364d98c4..53849ae28 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue @@ -99,7 +99,7 @@ {{$t('next')}}
- +
From 8515c72396e9a49f18113d57a71d7ab0dd0ee023 Mon Sep 17 00:00:00 2001 From: yuekuo Date: Wed, 29 Mar 2023 14:27:30 +0800 Subject: [PATCH 505/645] =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../upgradeactivityrecord/components/upgradetargetmodel.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue index ef5d10f6f..591c724e9 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue @@ -244,6 +244,11 @@ import ImportFile from '@/components/ImportFileData/index' } this.$refs.ruleForm.validate(valid=>{ if(valid){ + this.selectListPc.map(item=>{ + if(item.id==this.form.bapc){ + this.form.bapc=item.ggpc + } + }) postAction('/ota/otaBaSjSjmbcx/add',{otaId:otaId,...this.form}).then(res=>{ if(res.code==200){ localStorage.setItem('otaId', res.result.otaId) From 6208f593210a854409f42b988961fb93e03c3085 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Wed, 29 Mar 2023 14:42:14 +0800 Subject: [PATCH 506/645] =?UTF-8?q?=E7=BB=93=E6=9D=9F=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=B6=88=E5=A4=B1=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/otamanagement/upgradeactivity/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/otamanagement/upgradeactivity/index.vue b/jero-web/src/views/otamanagement/upgradeactivity/index.vue index d947ca94f..dfaff90fc 100644 --- a/jero-web/src/views/otamanagement/upgradeactivity/index.vue +++ b/jero-web/src/views/otamanagement/upgradeactivity/index.vue @@ -149,9 +149,9 @@ @click="maintenanceClick(record)">{{$t('maintenance')}} {{$t('endUpgrade')}} + @click="endUpgrade(record , '0')" v-if="record.sjzt == '0' && record.bazt=='4'">{{$t('endUpgrade')}} {{$t('upgradecompletion')}} + @click="endUpgrade(record , '1')" v-if="record.sjzt == '1'">{{$t('upgradecompletion')}} {{$t('export')}} Date: Wed, 29 Mar 2023 14:51:40 +0800 Subject: [PATCH 507/645] =?UTF-8?q?66949=20=E8=AE=A4=E8=AF=81=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E6=94=B6=E9=9B=86-=E5=A1=AB=E5=86=99=E4=BA=BA?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9=EF=BC=8C?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=BF=85=E5=A1=AB=E6=A0=A1=E9=AA=8C=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParamsCollectManifestEOServiceImpl.java | 208 +++++++++++++++++- 1 file changed, 199 insertions(+), 9 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 101213375..715725108 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 @@ -4007,6 +4007,14 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl targetConfigDataRemoveWrap = new QueryWrapper<>(); + targetConfigDataRemoveWrap.lambda().eq(ParamsConfigDataEO::getParamsConfigId, paramsConfigDataEO.getParamsConfigId()); + targetConfigDataRemoveWrap.lambda().eq(ParamsConfigDataEO::getParamsCollectManifestId, paramsConfigDataEO.getParamsCollectManifestId()); + this.paramsConfigDataEOService.remove(targetConfigDataRemoveWrap); + } + // 批量新增参数项 Boolean isSuccess = paramsConfigDataEOService.saveOrUpdateBatch(configDataList); @@ -5416,7 +5424,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl 1) { + resultMap = validatePull(configMap.get(key), controlValues, value.split("#")[1], isMust, true, cut); + errorMsg += (String) resultMap.get("errorMsg"); + countError += (int) resultMap.get("countError"); + configDataEO.setPullData(value.split("#")[1]); + + resultMap = validateText(configMap.get(key), controlVerify, value.split("#")[0], ParamsIsMustEnum.NO.getValue(), "1000", cut); + errorMsg += (String) resultMap.get("errorMsg"); + countError += (int) resultMap.get("countError"); + configDataEO.setTextData(value.split("#")[0]); + + } else if (value.split("#").length == 1 && value.endsWith("#")) { + resultMap = validateText(configMap.get(key), controlVerify, value.split("#")[0], ParamsIsMustEnum.NO.getValue(), "1000", cut); + errorMsg += (String) resultMap.get("errorMsg"); + countError += (int) resultMap.get("countError"); + configDataEO.setTextData(value.split("#")[0]); + } + } } } else if (ControlTypeEnum.TEXT_PULL_MORE.getValue().equals(controlType)) { // 校验必填 - if (ParamsIsMustEnum.YES.getValue().equals(isMust) && StringUtils.isEmpty(value)) { + /*if (ParamsIsMustEnum.YES.getValue().equals(isMust) && StringUtils.isEmpty(value)) { if (CutEnum.CN.getValue().equals(cut)) { errorMsg += configMap.get(key) + "为必填项,不能为空；"; } else { @@ -5511,11 +5549,39 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl 1) { + resultMap = validatePull(configMap.get(key), controlValues, value.split("#")[1], isMust, false, cut); + errorMsg += (String) resultMap.get("errorMsg"); + countError += (int) resultMap.get("countError"); + configDataEO.setPullData(value.split("#")[1]); + + resultMap = validateText(configMap.get(key), controlVerify, value.split("#")[0], ParamsIsMustEnum.NO.getValue(), "1000", cut); + errorMsg += (String) resultMap.get("errorMsg"); + countError += (int) resultMap.get("countError"); + configDataEO.setTextData(value.split("#")[0]); + } else if (value.split("#").length == 1 && value.endsWith("#")) { + resultMap = validateText(configMap.get(key), controlVerify, value.split("#")[0], ParamsIsMustEnum.NO.getValue(), "1000", cut); + errorMsg += (String) resultMap.get("errorMsg"); + countError += (int) resultMap.get("countError"); + configDataEO.setTextData(value.split("#")[0]); + } + } + } } else if (ControlTypeEnum.TEXT_FILE.getValue().equals(controlType)) { // 校验必填 - if (ParamsIsMustEnum.YES.getValue().equals(isMust) && StringUtils.isEmpty(value)) { + /*if (ParamsIsMustEnum.YES.getValue().equals(isMust) && StringUtils.isEmpty(value)) { if (CutEnum.CN.getValue().equals(cut)) { errorMsg += configMap.get(key) + "为必填项,不能为空；"; } else { @@ -5551,11 +5617,40 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl 1) { + resultMap = validateText(configMap.get(key), controlVerify, value.split("#")[0], isMust, "1000", cut); + errorMsg += (String) resultMap.get("errorMsg"); + countError += (int) resultMap.get("countError"); + configDataEO.setTextData(value.split("#")[0]); + + resultMap = validateFile(configMap.get(key), unzipfilepath, value.split("#")[1], ParamsIsMustEnum.NO.getValue(), cut); + errorMsg += (String) resultMap.get("errorMsg"); + countError += (int) resultMap.get("countError"); + configDataEO.setFileConnectId(value.split("#")[1]); + } else if (value.split("#").length == 1 && value.endsWith("#")) { + resultMap = validateText(configMap.get(key), controlVerify, value.split("#")[0], isMust, "1000", cut); + errorMsg += (String) resultMap.get("errorMsg"); + countError += (int) resultMap.get("countError"); + configDataEO.setTextData(value.split("#")[0]); + } + } } } else if (ControlTypeEnum.PULL_SINGLE_FILE.getValue().equals(controlType)) { // 校验必填 - if (ParamsIsMustEnum.YES.getValue().equals(isMust) && StringUtils.isEmpty(value)) { + /*if (ParamsIsMustEnum.YES.getValue().equals(isMust) && StringUtils.isEmpty(value)) { if (CutEnum.CN.getValue().equals(cut)) { errorMsg += configMap.get(key) + "为必填项,不能为空；"; } else { @@ -5590,11 +5685,40 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl 1) { + resultMap = validatePull(configMap.get(key), controlValues, value.split("#")[0], isMust, true, cut); + errorMsg += (String) resultMap.get("errorMsg"); + countError += (int) resultMap.get("countError"); + configDataEO.setPullData(value.split("#")[0]); + + resultMap = validateFile(configMap.get(key), unzipfilepath, value.split("#")[1], ParamsIsMustEnum.NO.getValue(), cut); + errorMsg += (String) resultMap.get("errorMsg"); + countError += (int) resultMap.get("countError"); + configDataEO.setFileConnectId(value.split("#")[1]); + } else if (value.split("#").length == 1 && value.endsWith("#")) { + resultMap = validatePull(configMap.get(key), controlValues, value.split("#")[0], isMust, true, cut); + errorMsg += (String) resultMap.get("errorMsg"); + countError += (int) resultMap.get("countError"); + configDataEO.setPullData(value.split("#")[0]); + } + } } } else if (ControlTypeEnum.PULL_MORE_FILE.getValue().equals(controlType)) { // 校验必填 - if (ParamsIsMustEnum.YES.getValue().equals(isMust) && StringUtils.isEmpty(value)) { + /*if (ParamsIsMustEnum.YES.getValue().equals(isMust) && StringUtils.isEmpty(value)) { if (CutEnum.CN.getValue().equals(cut)) { errorMsg += configMap.get(key) + "为必填项,不能为空；"; } else { @@ -5630,11 +5754,40 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl 1) { + resultMap = validatePull(configMap.get(key), controlValues, value.split("#")[0], isMust, false, cut); + errorMsg += (String) resultMap.get("errorMsg"); + countError += (int) resultMap.get("countError"); + configDataEO.setPullData(value.split("#")[0]); + + resultMap = validateFile(configMap.get(key), unzipfilepath, value.split("#")[1], ParamsIsMustEnum.NO.getValue(), cut); + errorMsg += (String) resultMap.get("errorMsg"); + countError += (int) resultMap.get("countError"); + configDataEO.setFileConnectId(value.split("#")[1]); + } else if (value.split("#").length == 1 && value.endsWith("#")) { + resultMap = validatePull(configMap.get(key), controlValues, value.split("#")[0], isMust, false, cut); + errorMsg += (String) resultMap.get("errorMsg"); + countError += (int) resultMap.get("countError"); + configDataEO.setPullData(value.split("#")[0]); + } + } } } else if (ControlTypeEnum.TEXT_PULL_SINGLE_FILE.getValue().equals(controlType)) { // 校验必填 - if (ParamsIsMustEnum.YES.getValue().equals(isMust) && StringUtils.isEmpty(value)) { + /*if (ParamsIsMustEnum.YES.getValue().equals(isMust) && StringUtils.isEmpty(value)) { if (CutEnum.CN.getValue().equals(cut)) { errorMsg += configMap.get(key) + "为必填项,不能为空；"; } else { @@ -5689,6 +5842,42 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl 1) { + resultMap = validatePull(configMap.get(key), controlValues, value.split("#")[1], isMust, true, cut); + errorMsg += (String) resultMap.get("errorMsg"); + countError += (int) resultMap.get("countError"); + configDataEO.setPullData(value.split("#")[1]); + + resultMap = validateText(configMap.get(key), controlVerify, value.split("#")[0], ParamsIsMustEnum.NO.getValue(), "1000", cut); + errorMsg += (String) resultMap.get("errorMsg"); + countError += (int) resultMap.get("countError"); + configDataEO.setTextData(value.split("#")[0]); + + if (!value.endsWith("#")) { //3 + resultMap = validateFile(configMap.get(key), unzipfilepath, value.split("#")[2], ParamsIsMustEnum.NO.getValue(), cut); + errorMsg += (String) resultMap.get("errorMsg"); + countError += (int) resultMap.get("countError"); + configDataEO.setFileConnectId(value.split("#")[2]); + } + } else if (value.split("#").length == 1 && value.endsWith("#")) { + resultMap = validateText(configMap.get(key), controlVerify, value.split("#")[0], ParamsIsMustEnum.NO.getValue(), "1000", cut); + errorMsg += (String) resultMap.get("errorMsg"); + countError += (int) resultMap.get("countError"); + configDataEO.setTextData(value.split("#")[0]); + } + } } } else { @@ -5701,9 +5890,10 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl 0) { From 435cc74e0898a0e7eb70135282cb1d8bc516a7dc Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Wed, 29 Mar 2023 15:04:05 +0800 Subject: [PATCH 508/645] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=94=B6=E9=9B=86=E5=A1=AB=E5=86=99=E4=BA=BA=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=AE=8C=E5=96=84=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ParamsCollectManifestEOServiceImpl.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 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 715725108..a8deb64c5 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 @@ -4007,11 +4007,11 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl paramsCollectManifestIdList = configDataList.stream().map(ParamsConfigDataEO::getParamsCollectManifestId).distinct().collect(Collectors.toList()); + for (String paramsCollectManifestId : paramsCollectManifestIdList) { // 删除之前的参数项 QueryWrapper targetConfigDataRemoveWrap = new QueryWrapper<>(); - targetConfigDataRemoveWrap.lambda().eq(ParamsConfigDataEO::getParamsConfigId, paramsConfigDataEO.getParamsConfigId()); - targetConfigDataRemoveWrap.lambda().eq(ParamsConfigDataEO::getParamsCollectManifestId, paramsConfigDataEO.getParamsCollectManifestId()); + targetConfigDataRemoveWrap.lambda().eq(ParamsConfigDataEO::getParamsCollectManifestId, paramsCollectManifestId); this.paramsConfigDataEOService.remove(targetConfigDataRemoveWrap); } @@ -5893,7 +5893,10 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl 0) { From 886127274a31514e9ed335725179f9bb2d23e922 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Wed, 29 Mar 2023 15:05:56 +0800 Subject: [PATCH 509/645] =?UTF-8?q?67249=20=E6=96=87=E6=A1=A3=E5=BA=93?= =?UTF-8?q?=E5=AF=BC=E5=85=A5-=E5=88=86=E9=98=B6=E6=AE=B5=E5=AE=9E?= =?UTF-8?q?=E6=96=BD=E8=AF=A6=E6=83=85-=E6=B3=95=E8=A7=84=E7=BC=96?= =?UTF-8?q?=E5=8F=B7=E5=AD=97=E6=AE=B5=E9=95=BF=E5=BA=A6=E9=99=90=E5=88=B6?= =?UTF-8?q?=E6=94=B9=E4=B8=BA200?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BussDocumentLibraryEOServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index 2976585cf..eb79ea948 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -5963,11 +5963,11 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl"); if(phasedImplDetailsArr.length >= 1){ String standNumberOrClause = phasedImplDetailsArr[0]; - if (StringUtils.isNotBlank(standNumberOrClause) && standNumberOrClause.length() > 100) { + if (StringUtils.isNotBlank(standNumberOrClause) && standNumberOrClause.length() > 200) { if(CutEnum.CN.getValue().equals(cut)){ - errorMsg += "分阶段实施详情-法规编号/条款不能超过" + 100 + "个字符, "; + errorMsg += "分阶段实施详情-法规编号/条款不能超过" + 200 + "个字符, "; }else{ - errorMsg += "Details of the phased implementation standNumberOrClause Can not be more than " + 100 + " char, "; + errorMsg += "Details of the phased implementation standNumberOrClause Can not be more than " + 200 + " char, "; } countError++; }else { From 1d9244367573571492f775a2d36b594865f6a212 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Wed, 29 Mar 2023 15:35:56 +0800 Subject: [PATCH 510/645] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=A1=B9=E6=94=B6=E9=9B=86=E6=B8=85=E5=8D=95-=E6=8E=A7?= =?UTF-8?q?=E4=BB=B6=E7=B1=BB=E5=9E=8B=E4=B8=BA=E6=96=87=E6=9C=AC-?= =?UTF-8?q?=E6=8E=A7=E4=BB=B6=E6=A0=A1=E9=AA=8C=E4=B8=BA=E4=B8=AD=E6=96=87?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=8E=A7=E4=BB=B6=E5=8F=AF=E4=BB=A5=E8=BE=93?= =?UTF-8?q?=E5=85=A5=E6=95=B0=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/CollectionType/index.vue | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/jero-web/src/components/CollectionType/index.vue b/jero-web/src/components/CollectionType/index.vue index f1749be35..21fee26a9 100644 --- a/jero-web/src/components/CollectionType/index.vue +++ b/jero-web/src/components/CollectionType/index.vue @@ -30,7 +30,7 @@ @@ -283,7 +283,7 @@ :maxLength="1000" :disabled="itemval.isLock == '1' ? true: false" :placeholder="$t('pleaseEnter')+$t('chinese')" - @input="onInput" + @input="onInput(itemval.dataValue,item,index1)" onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\u4E00-\u9FA5]/g,''))" v-model="itemval.dataValue"/>
@@ -405,7 +405,7 @@
@@ -730,7 +730,7 @@ :disabled="itemval.isLock == '1' ? true: false" :maxLength="1000" :placeholder="$t('pleaseEnter')+$t('chinese')" - @input="onInput" + @input="onInput(itemval.dataValue,item,index1)" onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\u4E00-\u9FA5]/g,''))" v-model="itemval.dataValue"/>
@@ -917,14 +917,14 @@ } }) }, - onInput(r) { - let value = r.target.value - r.target.value = value.replace(/[^\u4e00-\u9fa5]/g, '') - this.detailDateList.forEach((item) => { - if (item.controlVerify == '2') { - item.dataValue = r.target.value - } - }) + onInput(r, item, index) { + let value = r.replace(/[^\u4e00-\u9fa5]/g, '') + this.detailDate.paramsConfigData[item][index].dataValue = value + // this.detailDateList.forEach((item) => { + // if (item.controlVerify == '2') { + // item.dataValue = value + // } + // }) }, uploadSuccess(data) { let attIdList = [] From 9e3c47e4f1f56d282b7e8a35857133d22574e1ba Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Wed, 29 Mar 2023 15:37:16 +0800 Subject: [PATCH 511/645] =?UTF-8?q?67243=20=E6=96=87=E6=A1=A3=E5=BA=93-?= =?UTF-8?q?=E5=AF=BC=E5=85=A5-=E5=88=86=E9=98=B6=E6=AE=B5=E5=AE=9E?= =?UTF-8?q?=E6=96=BD=E8=AF=A6=E6=83=85=E5=A2=9E=E5=8A=A0=E5=BF=85=E5=A1=AB?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BussDocumentLibraryEOServiceImpl.java | 59 +++++++++++++------ 1 file changed, 42 insertions(+), 17 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index eb79ea948..dfc132eed 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -5269,10 +5269,10 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl list = new LinkedList<>(); @@ -5960,14 +5960,21 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl phasedImplDetailsList = Arrays.asList(value.split("#")); for (String phasedImplDetails : phasedImplDetailsList) { PhasedImplementationDetailsEO phasedImplementationDetailsEO = new PhasedImplementationDetailsEO(); - String[] phasedImplDetailsArr = phasedImplDetails.split("

"); + String[] phasedImplDetailsArr = phasedImplDetails.split(""); if(phasedImplDetailsArr.length >= 1){ String standNumberOrClause = phasedImplDetailsArr[0]; - if (StringUtils.isNotBlank(standNumberOrClause) && standNumberOrClause.length() > 200) { + if(StringUtils.isEmpty(standNumberOrClause)){ + if(CutEnum.CN.getValue().equals(cut)){ + errorMsg += "分阶段实施详情-法规编号/条款不能为空, "; + }else{ + errorMsg += "Phased Implementation Details - Regulation No./clause cannot be empty,"; + } + countError++; + } else if (StringUtils.isNotBlank(standNumberOrClause) && standNumberOrClause.length() > 200) { if(CutEnum.CN.getValue().equals(cut)){ errorMsg += "分阶段实施详情-法规编号/条款不能超过" + 200 + "个字符, "; }else{ - errorMsg += "Details of the phased implementation standNumberOrClause Can not be more than " + 200 + " char, "; + errorMsg += "Phased Implementation Details - Regulation No./clause Can not be more than " + 200 + " char, "; } countError++; }else { @@ -5976,6 +5983,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl= 2){ String implementationTypeName = phasedImplDetailsArr[1]; + if(StringUtils.isNotEmpty(implementationTypeName)){ String[] implementationTypeNameArr = implementationTypeName.split(","); ImplementationTypeEnum[] implementationTypeEnums = ImplementationTypeEnum.values(); @@ -5993,30 +6001,47 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl= 3){ - Date implementationDate = null; - try { - implementationDate = DateUtils.parseDate(phasedImplDetailsArr[2], "yyyy-MM-dd"); - } catch (ParseException e) { - e.printStackTrace(); - } - if(implementationDate == null){ + String implementationDateStr = phasedImplDetailsArr[2]; + if(StringUtils.isEmpty(implementationDateStr)){ if(CutEnum.CN.getValue().equals(cut)){ - errorMsg += "分阶段实施详情-实施日期格式错误，正确格式为'yyyy-MM-dd', "; + errorMsg += "分阶段实施详情-实施日期不能为空, "; }else{ - errorMsg += "Details of the phased implementation implementationDate format is incorrect. The correct format is 'yyyy-MM-dd', "; + errorMsg += "Phased Implementation Details - Implementation Date cannot be empty,"; } countError++; }else { - phasedImplementationDetailsEO.setImplementationDate(implementationDate); + Date implementationDate = null; + try { + implementationDate = DateUtils.parseDate(phasedImplDetailsArr[2], "yyyy-MM-dd"); + } catch (ParseException e) { + e.printStackTrace(); + } + if(implementationDate == null){ + if(CutEnum.CN.getValue().equals(cut)){ + errorMsg += "分阶段实施详情-实施日期格式错误，正确格式为'yyyy-MM-dd', "; + }else{ + errorMsg += "Phased Implementation Details - implementationDate format is incorrect. The correct format is 'yyyy-MM-dd', "; + } + countError++; + }else { + phasedImplementationDetailsEO.setImplementationDate(implementationDate); + } } } if(phasedImplDetailsArr.length >= 4){ @@ -6025,7 +6050,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl Date: Wed, 29 Mar 2023 15:41:57 +0800 Subject: [PATCH 512/645] =?UTF-8?q?OTA=E8=BD=A6=E5=9E=8B-=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0-=E6=95=B0=E6=8D=AE=E7=A9=BA=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/recordparameters.vue | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue index 9d0fee01e..fc0b2d14b 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue @@ -49,8 +49,8 @@   {{$t('positioningandnavigationsystem')}} - -   {{$t('vehiclesatellitepositioningequipment')}} + + {{$t('vehiclesatellitepositioningequipment')}}   {{$t('inertialnavigationsystem')}} @@ -70,19 +70,19 @@ -   {{$t('signalingdevices')}} + {{$t('signalingdevices')}} -   {{$t('driverassistancefunctioncontrols')}} + {{$t('driverassistancefunctioncontrols')}} -   {{$t('drivingassistancefunctionindicatorsignaldevice')}} + {{$t('drivingassistancefunctionindicatorsignaldevice')}} -   {{$t('steerinwheelreleaseindicatorsignaldevice')}} + {{$t('steerinwheelreleaseindicatorsignaldevice')}} -   {{$t('driverattentionindicatorsignaldevice')}} + {{$t('driverattentionindicatorsignaldevice')}} From ec879f53b53fc832406eafc7e18bd4debf36e121 Mon Sep 17 00:00:00 2001 From: yuekuo Date: Wed, 29 Mar 2023 15:46:50 +0800 Subject: [PATCH 513/645] 67229 --- .../vehicleinformation/components/basicInformation.vue | 1 - jero-web/src/views/otamanagement/vehicleregistration/index.vue | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue index e8a778c32..dd8bfcfee 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue @@ -281,7 +281,6 @@ import { message } from 'ant-design-vue' localStorage.removeItem('otaIdT') localStorage.setItem('otaIdT',value) - this.$forceUpdate() this.getData() }, // 模板下载 diff --git a/jero-web/src/views/otamanagement/vehicleregistration/index.vue b/jero-web/src/views/otamanagement/vehicleregistration/index.vue index af337a5f0..c3b9810aa 100644 --- a/jero-web/src/views/otamanagement/vehicleregistration/index.vue +++ b/jero-web/src/views/otamanagement/vehicleregistration/index.vue @@ -385,7 +385,7 @@ export default { localStorage.removeItem('otaIdT') this.$router.push({ path: '/vehicleinformation', - query: {} + query: { type:1} }) }, viewProcessClick(row) { From ae76a8983a56a93e3424bc34b41a26b324dd6381 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Wed, 29 Mar 2023 15:57:39 +0800 Subject: [PATCH 514/645] =?UTF-8?q?67329=20=E8=AE=A4=E8=AF=81=E6=B8=85?= =?UTF-8?q?=E5=8D=95-=E5=BC=95=E7=94=A8=E4=BA=A4=E4=BB=98=E7=89=A9?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectCertificationInventoryEOServiceImpl.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index 9266877f8..f003acfa6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -3854,6 +3854,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl noCiteInspectionItem = new ArrayList<>(); for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) { + String deliveryResult = ""; for (ProjectCertificationInventoryEO citeProjectCertificationInventoryEO : citeProjectCertificationInventoryEOList) { // 匹配数据 类别、检验项目、配置项、标准编号、交付物类型完全一致，并且数据的状态为 审查完成 boolean flag = ( @@ -3863,13 +3864,17 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl Date: Wed, 29 Mar 2023 16:03:28 +0800 Subject: [PATCH 515/645] =?UTF-8?q?67262=20=E6=96=87=E6=A1=A3=E5=BA=93-?= =?UTF-8?q?=E8=8B=B1=E6=96=87=E7=89=88=E6=A8=A1=E6=9D=BF=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?-=E5=B7=A5=E4=BD=9C=E8=A1=A8=E5=90=8D=E7=A7=B0=E6=98=AF?= =?UTF-8?q?=E4=B8=AD=E6=96=87=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BussDocumentLibraryEOServiceImpl.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index dfc132eed..c12829455 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -5076,6 +5076,13 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl map, HttpServletResponse response, HttpServletRequest request) { OutputStream os = null; HSSFWorkbook workbook = new HSSFWorkbook(); + String cut = (String) map.get("cut"); + String sheetName = ""; + if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + sheetName = "文档库导入模板"; + }else { + sheetName = "Document LibraryImport Template"; + } String fileOriName = "文档库导入模板.xls"; String filePath = uploadpath + File.separator + fileOriName; try { @@ -5086,7 +5093,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl Date: Wed, 29 Mar 2023 16:08:17 +0800 Subject: [PATCH 516/645] =?UTF-8?q?OTA=E8=BD=A6=E5=9E=8B-=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0-=E6=95=B0=E6=8D=AE=E7=A9=BA=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/recordparameters.vue | 57 ++++++++++++------- 1 file changed, 37 insertions(+), 20 deletions(-) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue index fc0b2d14b..d5b38ab0f 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue @@ -15,58 +15,58 @@

{{$t('componentname')}} -   {{$t('networksecurityrequirements')}} + {{$t('networksecurityrequirements')}} -   {{$t('millimeterwaveradar')}} + {{$t('millimeterwaveradar')}} -   {{$t('ultrasonicradar')}} + {{$t('ultrasonicradar')}} -   {{$t('camera')}} + {{$t('camera')}} -   {{$t('asternimage')}} + {{$t('asternimage')}} -   {{$t('Monocularbinocularmultiocular')}} + {{$t('Monocularbinocularmultiocular')}} -   {{$t('driverattentionmonitoringsystem')}} + {{$t('driverattentionmonitoringsystem')}} -   {{$t('driversurveillancecamera')}} + {{$t('driversurveillancecamera')}} -   {{$t('drivermonitoringinfraredsensor')}} + {{$t('drivermonitoringinfraredsensor')}} - -   {{$t('positioningandnavigationsystem')}} + + {{$t('positioningandnavigationsystem')}} {{$t('vehiclesatellitepositioningequipment')}} -   {{$t('inertialnavigationsystem')}} + {{$t('inertialnavigationsystem')}} -   {{$t('wheelspeedmeter')}} + {{$t('wheelspeedmeter')}} -   {{$t('highprecisionmap')}} + {{$t('highprecisionmap')}} -   {{$t('electronicfence')}} + {{$t('electronicfence')}} -   {{$t('vehiclecommunicationsystem')}} + {{$t('vehiclecommunicationsystem')}} @@ -86,10 +86,10 @@ -   {{$t('automaticDrivingDataRecordingSystem')}} + {{$t('automaticDrivingDataRecordingSystem')}} - -   {{$t('eventdatarecordingsystem')}} + + {{$t('eventdatarecordingsystem')}}
@@ -1067,6 +1067,7 @@ button{ width: 100%; height: 200px; line-height: 200px; + padding: 10px; } .radio-text-two{ display: inline-block; @@ -1076,6 +1077,9 @@ button{ width: 100%; height: 100px; line-height: 100px; + padding: 10px; + display: flex; + align-items: center; } .radio-text-three{ display: inline-block; @@ -1085,6 +1089,9 @@ button{ width: 100%; height: 50px; line-height: 50px; + padding: 10px; + align-items: center; + display: flex; } .radio-text-four{ display: inline-block; @@ -1094,6 +1101,7 @@ button{ width: 100%; height: 250px; line-height: 250px; + padding: 10px; } .radio-text-five{ display: inline-block; @@ -1103,6 +1111,7 @@ button{ width: 100%; height: 150px; line-height: 150px; + padding: 10px; } .text-box{ display: inline-block; @@ -1131,6 +1140,7 @@ button{ display: flex; justify-content: left; align-items: center; + padding: 10px; } .text-text-two{ /*display: inline-block;*/ @@ -1144,6 +1154,7 @@ button{ display: flex; justify-content: left; align-items: center; + padding: 10px; } .text-text-three{ /*display: inline-block;*/ @@ -1156,6 +1167,7 @@ button{ display: flex; justify-content: left; align-items: center; + padding: 10px; } .text-text-five{ /*display: inline-block;*/ @@ -1168,6 +1180,7 @@ button{ display: flex; justify-content: left; align-items: center; + padding: 10px; } .text-box-three{ display: inline-block; @@ -1177,6 +1190,7 @@ button{ width: 100%; height: 250px; line-height: 250px; + padding: 10px; } .text-box-four{ display: inline-block; @@ -1218,7 +1232,10 @@ button{ border-right: none; width: 100%; height: 100px; - line-height: 100px; + line-height: 20px; + display: flex; + align-items: center; + padding: 10px; } span{ /* overflow: hidden; /*超出部分隐藏*/ From 94202e0a19465da362e6d85aa88758cd48b1fbca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Wed, 29 Mar 2023 16:21:16 +0800 Subject: [PATCH 517/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E8=BD=A6=E8=BE=86=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/ota/entity/OtaBaCxAqcs.java | 3 +- .../modules/ota/entity/OtaBaCxZxsjyq.java | 3 +- .../jero/modules/ota/enums/OtaTitleEnum.java | 1 - .../service/impl/OtaBaCxAqcsServiceImpl.java | 30 ++++++++++++++++++ .../impl/OtaBaCxZxsjyqServiceImpl.java | 31 +++++++++++++++++++ .../modules/ota/utils/ComparisonUtil.java | 13 ++++++++ 6 files changed, 78 insertions(+), 3 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxAqcs.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxAqcs.java index 7b73501d0..fd3829332 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxAqcs.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxAqcs.java @@ -3,6 +3,7 @@ package com.jero.modules.ota.entity; import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.math.BigDecimal; +import java.util.ArrayList; import java.util.List; import com.baomidou.mybatisplus.annotation.IdType; @@ -99,6 +100,6 @@ public class OtaBaCxAqcs implements Serializable { private java.lang.String zmcl; @TableField(exist = false) - private List zmclList; + private List zmclList = new ArrayList<>(); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxZxsjyq.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxZxsjyq.java index 6cc9a8581..24984285d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxZxsjyq.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxZxsjyq.java @@ -3,6 +3,7 @@ package com.jero.modules.ota.entity; import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.math.BigDecimal; +import java.util.ArrayList; import java.util.List; import com.baomidou.mybatisplus.annotation.IdType; @@ -125,6 +126,6 @@ public class OtaBaCxZxsjyq implements Serializable { private java.lang.String zmcl; @TableField(exist = false) - private List zmclList; + private List zmclList = new ArrayList<>(); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java index 8dd21374f..33d7f382a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java @@ -32,7 +32,6 @@ public enum OtaTitleEnum { SJSBAQ("sjsbaq", "升级失败安全状态", "2"), SJGG("sjgg", "升级公告", "2"), SJZT("sjzt", "升级结果状态", "2"), - ZMCL("zmcl", "证明材料", "0"), BHJZ("bhjz", "保护机制", "protection_mechanism"), FSXJZ("fsxjz", "防失效机制", "fail_safe_mechanism"), diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java index 452839e8e..85b38658b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java @@ -76,6 +76,7 @@ public class OtaBaCxAqcsServiceImpl extends ServiceImpl 0) { JSONArray obj = new JSONArray(); for (AttachmentEO aeo : otaBaCxAqcs.getZmclList()) { @@ -83,12 +84,41 @@ public class OtaBaCxAqcsServiceImpl extends ServiceImpl aeoList = JSONArray.parseArray(otaBaCxAqcsOld.getZmcl(), AttachmentEO.class); + otaBaCxAqcsOld.setZmclList(aeoList); + } saveOrUpdate(otaBaCxAqcs); ComparisonUtil cu = new ComparisonUtil(); if (ObjectUtils.isEmpty(otaBaCxAqcsOld)) { otaBaCxAqcsOld = new OtaBaCxAqcs(); } List reList = cu.comparisonRecord(otaBaCxAqcs.getOtaId(), OtaModuleEnum.CX_AQCS, otaBaCxAqcsOld, otaBaCxAqcs, sysDictService); + + for (AttachmentEO aeoNew : otaBaCxAqcs.getZmclList()) { + boolean flag = true; + for (AttachmentEO aeoOld : otaBaCxAqcsOld.getZmclList()) { + if (aeoNew.getId().equals(aeoOld.getId())) { + flag = false; + break; + } + } + if (flag) { + reList.add(cu.addAttRecord(otaBaCxAqcs.getOtaId(), OtaModuleEnum.CX_AQCS, "证明材料", aeoNew.getFileName())); + } + } + for (AttachmentEO aeoOld : otaBaCxAqcsOld.getZmclList()) { + boolean flag = true; + for (AttachmentEO aeoNew : otaBaCxAqcs.getZmclList()) { + if (aeoOld.getId().equals(aeoNew.getId())) { + flag = false; + break; + } + } + if (flag) { + reList.add(cu.delAttRecord(otaBaCxAqcs.getOtaId(), OtaModuleEnum.CX_AQCS, "证明材料", aeoOld.getFileName())); + } + } otaBaCxTxjlService.saveBatch(reList); } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxZxsjyqServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxZxsjyqServiceImpl.java index 32d24f4a3..d4cc7dc9e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxZxsjyqServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxZxsjyqServiceImpl.java @@ -81,6 +81,7 @@ public class OtaBaCxZxsjyqServiceImpl extends ServiceImpl 0) { JSONArray obj = new JSONArray(); for (AttachmentEO aeo : otaBaCxZxsjyq.getZmclList()) { @@ -88,12 +89,42 @@ public class OtaBaCxZxsjyqServiceImpl extends ServiceImpl aeoList = JSONArray.parseArray(otaBaCxZxsjyqOld.getZmcl(), AttachmentEO.class); + otaBaCxZxsjyqOld.setZmclList(aeoList); + } saveOrUpdate(otaBaCxZxsjyq); + ComparisonUtil cu = new ComparisonUtil(); if (ObjectUtils.isEmpty(otaBaCxZxsjyqOld)) { otaBaCxZxsjyqOld = new OtaBaCxZxsjyq(); } + List reList = cu.comparisonRecord(otaBaCxZxsjyq.getOtaId(), OtaModuleEnum.CX_ZXSJYQ, otaBaCxZxsjyqOld, otaBaCxZxsjyq, sysDictService); + for (AttachmentEO aeoNew : otaBaCxZxsjyq.getZmclList()) { + boolean flag = true; + for (AttachmentEO aeoOld : otaBaCxZxsjyqOld.getZmclList()) { + if (aeoNew.getId().equals(aeoOld.getId())) { + flag = false; + break; + } + } + if (flag) { + reList.add(cu.addAttRecord(otaBaCxZxsjyq.getOtaId(), OtaModuleEnum.CX_ZXSJYQ, "证明材料", aeoNew.getFileName())); + } + } + for (AttachmentEO aeoOld : otaBaCxZxsjyqOld.getZmclList()) { + boolean flag = true; + for (AttachmentEO aeoNew : otaBaCxZxsjyq.getZmclList()) { + if (aeoOld.getId().equals(aeoNew.getId())) { + flag = false; + break; + } + } + if (flag) { + reList.add(cu.delAttRecord(otaBaCxZxsjyq.getOtaId(), OtaModuleEnum.CX_ZXSJYQ, "证明材料", aeoOld.getFileName())); + } + } otaBaCxTxjlService.saveBatch(reList); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java index 257d5b1a0..5a7c9dd7e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java @@ -22,6 +22,19 @@ public class ComparisonUtil { public ComparisonUtil() { } + + public OtaBaCxTxjl addAttRecord(String otaId, OtaModuleEnum otaModuleEnum, String title, String attName) { + String content = title + "中添加了附件:'" + attName; + OtaBaCxTxjl jl = new OtaBaCxTxjl(otaId, otaModuleEnum.getName(), content); + return jl; + } + + public OtaBaCxTxjl delAttRecord(String otaId, OtaModuleEnum otaModuleEnum, String title, String attName) { + String content = title + "中删除了附件:'" + attName; + OtaBaCxTxjl jl = new OtaBaCxTxjl(otaId, otaModuleEnum.getName(), content); + return jl; + } + /** * 对比字段并添加到记录 */ From 66c3f8eb03a8c0f3b450adee687dc772c919948c Mon Sep 17 00:00:00 2001 From: yuekuo Date: Wed, 29 Mar 2023 16:26:47 +0800 Subject: [PATCH 518/645] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/upgradetargetmodel.vue | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue index 591c724e9..08939f295 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue @@ -111,7 +111,7 @@
- {{$t('Vehicledynamictype')}} + {{$t('Vehicledynamictype')}}
-
-
-
- -
-
- - {{$t('templateDownload')}} -
-
- - - - {{$t('upgradePurpose')}} - - - - - - - - {{$t('impactassessmentofupgradeactivities')}} - - - {{$t('correspondingvehicletype')}} - {{$t('technicalperformancechanges')}} - {{$t('technicalstandardsandsafetytechnicalconditions')}} - {{$t('autoautonomousdrivingfunction')}} - - - - - {{ $t('yes') }} - {{ $t('not') }} - - - - - {{ $t('yes') }} - {{ $t('not') }} - - - - - {{ $t('yes') }} - {{ $t('not') }} - - - - - {{ $t('yes') }} - {{ $t('not') }} - - - - - - {{ (form.bgfj === 'null' || form.bgfj === '' || - form.bgfj == null) ? $t('uploadattachment') : $t('viewUploadedFiles') - }} - - {{$t('notetwo')}} - {{$t('format')}} - - -
-
- {{$t('vehiclepriortothereleaseoftheupgrade')}} - {{$t('conditionsareupgradesperformed')}} - {{$t('upgradefailureorinterruption')}} - {{$t('upgradeactivitiesaffectvehiclesafety')}} - {{$t('upgradeactivityprovidesuserconfirmationoptions')}} - {{$t('upgradepackagetest')}} - {{$t('reliabilityofonlineupgradeactivities')}} -
-
- - - {{ $t('yes') }} - {{ $t('not') }} - - - - - - - - - - - {{ $t('yes') }} - {{ $t('not') }} - - - - - {{ $t('yes') }} - {{ $t('not') }} - - - - - - - - {{ $t('yes') }} - {{ $t('not') }} - - -
-
- - {{ (form.clfj === 'null' || form.clfj === '' || - form.clfj == null) ? $t('uploadattachment') : $t('viewUploadedFiles') - }} - - {{$t('notethree')}} - {{$t('format')}} -
-
- -
- {{$t('preservation')}} - {{$t('last')}} - {{$t('next')}} -
- -
- - - - - \ No newline at end of file diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue index 08939f295..e4f9fb135 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue @@ -67,7 +67,7 @@ {{$t('Modelandfunctionrecord')}}
- + {{ item.ggpc }} @@ -314,8 +314,12 @@ import ImportFile from '@/components/ImportFileData/index' this.form.cpsb = item.cpsb this.form.cpmc = item.cpmc this.form.cpxh = item.cpxh - this.form.babh = item.cpdjbh - } + getAction('/ota/otaBaCxJbxx/queryByOtaId',{otaIdT:'',otaId:item.id}).then(res=>{ + this.form.dllx1=res.result.dllx1 + this.form.dllx2=res.result.dllx2 + this.$forceUpdate() + }) + } }) this.$forceUpdate() }, From 5ab0c3c91dbb480da0b98a7db7efa3a4c76a7cf7 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Wed, 29 Mar 2023 17:33:38 +0800 Subject: [PATCH 523/645] bug 67613 --- .../views/otamanagement/upgradeactivity/components/gnxtwh.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jero-web/src/views/otamanagement/upgradeactivity/components/gnxtwh.vue b/jero-web/src/views/otamanagement/upgradeactivity/components/gnxtwh.vue index 4bb063ae6..54bb647c5 100644 --- a/jero-web/src/views/otamanagement/upgradeactivity/components/gnxtwh.vue +++ b/jero-web/src/views/otamanagement/upgradeactivity/components/gnxtwh.vue @@ -71,7 +71,7 @@
- + * {{$t('gnxt')}}
@@ -88,6 +88,7 @@
+ * {{$t('dykzq') + (index+1)}}
Date: Wed, 29 Mar 2023 17:38:09 +0800 Subject: [PATCH 524/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E8=BD=A6=E8=BE=86=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/OtaBaCxAqcsServiceImpl.java | 30 ++++++----------- .../impl/OtaBaCxKsjxtmccsServiceImpl.java | 12 ++++++- .../impl/OtaBaCxZxsjyqServiceImpl.java | 33 +++++++------------ .../impl/OtaBaSjSjmbclServiceImpl.java | 1 + 4 files changed, 33 insertions(+), 43 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java index 85b38658b..c7420a449 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java @@ -28,6 +28,8 @@ import java.io.File; import java.io.InputStream; import java.util.List; import java.util.Date; +import java.util.Map; +import java.util.stream.Collectors; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.web.multipart.MultipartFile; @@ -95,28 +97,16 @@ public class OtaBaCxAqcsServiceImpl extends ServiceImpl reList = cu.comparisonRecord(otaBaCxAqcs.getOtaId(), OtaModuleEnum.CX_AQCS, otaBaCxAqcsOld, otaBaCxAqcs, sysDictService); - for (AttachmentEO aeoNew : otaBaCxAqcs.getZmclList()) { - boolean flag = true; - for (AttachmentEO aeoOld : otaBaCxAqcsOld.getZmclList()) { - if (aeoNew.getId().equals(aeoOld.getId())) { - flag = false; - break; - } - } - if (flag) { - reList.add(cu.addAttRecord(otaBaCxAqcs.getOtaId(), OtaModuleEnum.CX_AQCS, "证明材料", aeoNew.getFileName())); + Map newAttMap = otaBaCxAqcs.getZmclList().stream().collect(Collectors.toMap(AttachmentEO::getId, AttachmentEO::getFileName)); + Map oldAttMap = otaBaCxAqcsOld.getZmclList().stream().collect(Collectors.toMap(AttachmentEO::getId, AttachmentEO::getFileName)); + for (String nId : newAttMap.keySet()) { + if (!oldAttMap.containsKey(nId)) { + reList.add(cu.addAttRecord(otaBaCxAqcs.getOtaId(), OtaModuleEnum.CX_AQCS, "证明材料", newAttMap.get(nId))); } } - for (AttachmentEO aeoOld : otaBaCxAqcsOld.getZmclList()) { - boolean flag = true; - for (AttachmentEO aeoNew : otaBaCxAqcs.getZmclList()) { - if (aeoOld.getId().equals(aeoNew.getId())) { - flag = false; - break; - } - } - if (flag) { - reList.add(cu.delAttRecord(otaBaCxAqcs.getOtaId(), OtaModuleEnum.CX_AQCS, "证明材料", aeoOld.getFileName())); + for (String oId : oldAttMap.keySet()) { + if (!newAttMap.containsKey(oId)) { + reList.add(cu.delAttRecord(otaBaCxAqcs.getOtaId(), OtaModuleEnum.CX_AQCS, "证明材料", newAttMap.get(oId))); } } otaBaCxTxjlService.saveBatch(reList); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java index a31008aac..d5461ddf2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java @@ -18,7 +18,7 @@ import com.jero.modules.ota.service.IOtaBaCxTxjlService; import com.jero.modules.ota.utils.ComparisonUtil; import com.jero.modules.ota.utils.ImportFileUtil; import com.jero.modules.system.service.ISysDictService; -import com.jero.modules.system.util.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.Row; @@ -107,6 +107,16 @@ public class OtaBaCxKsjxtmccsServiceImpl extends ServiceImpl reList = cu.comparisonListRecord(otaId, OtaModuleEnum.CX_KSJDXTMCYCS, OtaTitleEnum.XTLB.getName(), oldList, newList, sysDictService); saveOrUpdateBatch(newList); + + + for (OtaBaCxKsjxtmccs newMccs:newList) { + String newTpt = newMccs.getTpt(); + if(StringUtils.isNotEmpty(newTpt)){ + + + } + + } otaBaCxTxjlService.saveBatch(reList); String fj = (String) json.get("fj"); if (StringUtils.isNotEmpty(fj)) { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxZxsjyqServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxZxsjyqServiceImpl.java index d4cc7dc9e..3a84bef71 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxZxsjyqServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxZxsjyqServiceImpl.java @@ -17,8 +17,6 @@ import com.jero.modules.ota.service.IOtaBaCxZxsjyqService; import com.jero.modules.ota.utils.ComparisonUtil; import com.jero.modules.ota.utils.ImportFileUtil; import com.jero.modules.system.service.ISysDictService; -import org.apache.commons.collections4.ListUtils; -import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.usermodel.Cell; @@ -36,6 +34,8 @@ import java.io.File; import java.io.InputStream; import java.util.Date; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** * @Description: 车型备案-在线升级要求 @@ -101,28 +101,17 @@ public class OtaBaCxZxsjyqServiceImpl extends ServiceImpl reList = cu.comparisonRecord(otaBaCxZxsjyq.getOtaId(), OtaModuleEnum.CX_ZXSJYQ, otaBaCxZxsjyqOld, otaBaCxZxsjyq, sysDictService); - for (AttachmentEO aeoNew : otaBaCxZxsjyq.getZmclList()) { - boolean flag = true; - for (AttachmentEO aeoOld : otaBaCxZxsjyqOld.getZmclList()) { - if (aeoNew.getId().equals(aeoOld.getId())) { - flag = false; - break; - } - } - if (flag) { - reList.add(cu.addAttRecord(otaBaCxZxsjyq.getOtaId(), OtaModuleEnum.CX_ZXSJYQ, "证明材料", aeoNew.getFileName())); + Map newAttMap = otaBaCxZxsjyq.getZmclList().stream().collect(Collectors.toMap(AttachmentEO::getId, AttachmentEO::getFileName)); + Map oldAttMap = otaBaCxZxsjyqOld.getZmclList().stream().collect(Collectors.toMap(AttachmentEO::getId, AttachmentEO::getFileName)); + + for (String nId : newAttMap.keySet()) { + if (!oldAttMap.containsKey(nId)) { + reList.add(cu.addAttRecord(otaBaCxZxsjyq.getOtaId(), OtaModuleEnum.CX_ZXSJYQ, "证明材料", newAttMap.get(nId))); } } - for (AttachmentEO aeoOld : otaBaCxZxsjyqOld.getZmclList()) { - boolean flag = true; - for (AttachmentEO aeoNew : otaBaCxZxsjyq.getZmclList()) { - if (aeoOld.getId().equals(aeoNew.getId())) { - flag = false; - break; - } - } - if (flag) { - reList.add(cu.delAttRecord(otaBaCxZxsjyq.getOtaId(), OtaModuleEnum.CX_ZXSJYQ, "证明材料", aeoOld.getFileName())); + for (String oId : oldAttMap.keySet()) { + if (!newAttMap.containsKey(oId)) { + reList.add(cu.delAttRecord(otaBaCxZxsjyq.getOtaId(), OtaModuleEnum.CX_ZXSJYQ, "证明材料", newAttMap.get(oId))); } } otaBaCxTxjlService.saveBatch(reList); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java index 5d54760a5..f03bccacc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java @@ -71,6 +71,7 @@ public class OtaBaSjSjmbclServiceImpl extends ServiceImpl Date: Wed, 29 Mar 2023 17:43:50 +0800 Subject: [PATCH 525/645] bug 67619 67610 --- .../upgradeactivity/components/gnxtwh.vue | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/jero-web/src/views/otamanagement/upgradeactivity/components/gnxtwh.vue b/jero-web/src/views/otamanagement/upgradeactivity/components/gnxtwh.vue index 54bb647c5..9bf23dc6d 100644 --- a/jero-web/src/views/otamanagement/upgradeactivity/components/gnxtwh.vue +++ b/jero-web/src/views/otamanagement/upgradeactivity/components/gnxtwh.vue @@ -94,7 +94,7 @@
-
@@ -166,7 +166,7 @@ export default { message: this.$t('gnxt') + this.$t('cannotEmpty'), trigger: 'blur' }, - {max: 50,message: this.$t('relevantSections') + this.$t('cannotExceed') + 50 + this.$t('Characters'),trigger: 'blur' + {max: 50,message: this.$t('gnxt') + this.$t('cannotExceed') + 50 + this.$t('Characters'),trigger: 'blur' } ], // dykzq: [ @@ -248,7 +248,10 @@ export default { this.formInline.dataList.splice(index + 1, 0, {}) this.formInline = { ...this.formInline } }, - deleteClick(index) { + deleteClick(index,value) { + this.$nextTick(() => { + this.$refs.ruleForm.validateField([value]) + }) this.formInline.dataList.splice(index, 1) this.formInline = { ...this.formInline } }, From 44ba3dbf128b6001a1b4eab8c6bd431e6845f984 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Wed, 29 Mar 2023 17:52:48 +0800 Subject: [PATCH 526/645] =?UTF-8?q?ota-=E5=8D=87=E7=BA=A7=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E5=A4=87=E6=A1=88-=E5=8D=87=E7=BA=A7=E7=9B=AE?= =?UTF-8?q?=E6=A0=87=E8=BD=A6=E5=9E=8B-=E8=A1=A8=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/upgradetargetmodel.vue | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue index 08939f295..00e99a101 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue @@ -10,7 +10,7 @@ {{$t('templateDownload')}}
- + @@ -20,7 +20,7 @@ {{$t('selectTheVehicleTemplate')}}
- + {{ item.cpdjbh }} @@ -59,7 +59,7 @@
- +
@@ -82,7 +82,7 @@
- +
@@ -93,7 +93,7 @@
- +
@@ -104,7 +104,7 @@
- +
@@ -143,7 +143,7 @@
- + @@ -192,7 +192,7 @@ import ImportFile from '@/components/ImportFileData/index' this.getSelect() this.getData() }, - + methods: { // 模板下载 handleModule() { @@ -220,7 +220,7 @@ import ImportFile from '@/components/ImportFileData/index' this.form=res.result if(res.result.dllx1==null){ this.form.dllx1=undefined - + } if(res.result.dllx2==null){ this.form.dllx2=undefined @@ -233,7 +233,7 @@ import ImportFile from '@/components/ImportFileData/index' } this.$forceUpdate() } - + } }) }, @@ -258,7 +258,7 @@ import ImportFile from '@/components/ImportFileData/index' }) } }) - + }, next(){ this.save() @@ -266,8 +266,8 @@ import ImportFile from '@/components/ImportFileData/index' if(valid){ this.$emit('basicInformationForm') }}) - - + + }, getSelect(){ getAction('/ota/otaBaCxList/list').then(res=>{ @@ -279,7 +279,7 @@ import ImportFile from '@/components/ImportFileData/index' obj=item this.selectListPc.push(obj) } - + }) } }) @@ -306,12 +306,12 @@ import ImportFile from '@/components/ImportFileData/index' }else{ this. projectNameList2=['其他'] } - + }, changeId(value,option){ this.selectListPc.map(item=>{ if(item.id==value){ - this.form.cpsb = item.cpsb + this.form.cpsb = item.cpsb this.form.cpmc = item.cpmc this.form.cpxh = item.cpxh this.form.babh = item.cpdjbh @@ -334,9 +334,9 @@ import ImportFile from '@/components/ImportFileData/index' } .box-title-text-add { - line-height: 1.4; + //line-height: 1.4; display: flex; - + align-items: center; } .title-text-add { @@ -350,7 +350,7 @@ import ImportFile from '@/components/ImportFileData/index' // text-overflow: ellipsis; // white-space: nowrap; height: 42px; - line-height: 42px; + //line-height: 20px; margin-top: 3px; } @@ -364,7 +364,7 @@ import ImportFile from '@/components/ImportFileData/index' text-overflow: ellipsis; white-space: nowrap; height: 42px; - line-height: 42px; + //line-height: 42px; margin-top: 3px; margin-bottom: 20px; } @@ -396,11 +396,11 @@ import ImportFile from '@/components/ImportFileData/index' } .plus{ margin-top: 5px; - line-height: 1.4 !important; + line-height: 1.2; } .plus2{ word-break: break-all; - line-height: 1.3; + line-height: 1.2; } .Required { color: red; From eb2eda030fec2ebfca29b86ff879d8aedb5d463b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Wed, 29 Mar 2023 18:04:15 +0800 Subject: [PATCH 527/645] =?UTF-8?q?ota-=E8=BD=A6=E5=9E=8B=E5=8F=8A?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=A4=87=E6=A1=88-=E8=BD=A6=E5=9E=8B?= =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF-=E8=A1=A8=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/basicInformation.vue | 53 ++++++++++--------- 1 file changed, 28 insertions(+), 25 deletions(-) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue index dd8bfcfee..e2dbcf92d 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue @@ -19,7 +19,7 @@ {{$t('selectTheVehicleTemplate')}}
- + {{ item.value }} @@ -34,7 +34,7 @@ {{$t('theNameOfFirm')}}
- {{$t('registrationnumber')}}
- - @@ -87,7 +87,7 @@ {{$t('noticebatch')}}
- {{$t('producttrademark')}}
- {{$t('productname')}}
- - +
@@ -139,7 +139,7 @@ {{$t('productModel')}}
-
- {{$t('Vehicledynamictype')}} + {{$t('Vehicledynamictype')}}
@@ -179,7 +179,7 @@
-
+
{{$t('communicationTerminal')}}
@@ -195,7 +195,7 @@
-
+
{{$t('otaUpgradeManagementSystem')}}
@@ -261,7 +261,7 @@ import { message } from 'ant-design-vue' otaId:'', rules:{ djbh:[ - { + { required: true, message:this.$t('registrationnumber')+this.$t('cannotEmpty'), trigger:'blur' @@ -280,7 +280,7 @@ import { message } from 'ant-design-vue' localStorage.removeItem('otaId') localStorage.removeItem('otaIdT') localStorage.setItem('otaIdT',value) - + this.getData() }, // 模板下载 @@ -344,8 +344,8 @@ import { message } from 'ant-design-vue' this.$forceUpdate() } }) - - + + }, next(){ this.$refs.ruleForm.validate(valid=>{ @@ -354,10 +354,10 @@ import { message } from 'ant-design-vue' setTimeout(()=>{ this.$emit('basicInformationForm') },1000) - + } }) - + }, save(){ this.$refs.ruleForm.validate(valid=>{ @@ -387,7 +387,7 @@ import { message } from 'ant-design-vue' }else{ this. projectNameList2=['其他'] } - + }, update(){ this.$forceUpdate() @@ -406,7 +406,7 @@ import { message } from 'ant-design-vue' .box-title-text-add { line-height: 1.4; display: flex; - + align-items: center; } .title-text-add { @@ -420,7 +420,7 @@ import { message } from 'ant-design-vue' // text-overflow: ellipsis; // white-space: nowrap; height: 42px; - line-height: 42px; + //line-height: 42px; margin-top: 3px; } @@ -434,7 +434,7 @@ import { message } from 'ant-design-vue' text-overflow: ellipsis; white-space: nowrap; height: 42px; - line-height: 42px; + //line-height: 42px; margin-top: 3px; margin-bottom: 20px; } @@ -477,11 +477,14 @@ import { message } from 'ant-design-vue' } .plus{ margin-top: 5px; - line-height: 1.4 !important; + line-height: 1.2; } .plus2{ width: 134px; margin-top: 5px; - line-height: 1.4 !important; + line-height: 1.2; + } + .plus3{ + word-break: break-word; } \ No newline at end of file From 908795cd980b6aa99d6582a2b053dff8c972b6ad Mon Sep 17 00:00:00 2001 From: cuijiaming <1410452759@qq.com> Date: Wed, 29 Mar 2023 18:04:59 +0800 Subject: [PATCH 528/645] =?UTF-8?q?=E6=97=A5=E6=9C=9F=E9=AA=8C=E8=AF=81?= =?UTF-8?q?=E5=92=8C=E8=B4=A3=E4=BB=BB=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/system/mapper/SysUserMapper.java | 2 + .../system/mapper/xml/SysUserMapper.xml | 4 + .../ProjectCertificationInventoryEO.java | 41 ++--- .../ProjectCertificationInventoryEOEn.java | 46 +++-- .../project/enums/ProjectRoleEnum.java | 1 - ...ctCertificationInventoryEOServiceImpl.java | 157 +++++++++++++++--- 6 files changed, 189 insertions(+), 62 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java index 2bd69698c..c9dcb01e8 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java @@ -153,4 +153,6 @@ public interface SysUserMapper extends BaseMapper { List getPPEmployeeList(@Param("thirdType") String thirdType); void updateByIdPP (SysUser sysUser); + + List getListUserName(); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml index 4f19d362b..414f333b2 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml @@ -222,4 +222,8 @@ id = #{id} + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java index 54c3fb880..09da7697e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java @@ -65,28 +65,28 @@ public class ProjectCertificationInventoryEO implements Serializable { private String sysOrgCode; /**类别*/ - @Excel(name = "类别", width = 15) + @Excel(name = "类别", width = 20) @ApiModelProperty(value = "类别") private String category; /**检验项目*/ - @Excel(name = "检验项目", width = 15) + @Excel(name = "检验项目", width = 20) @ApiModelProperty(value = "检验项目") private String inspectionItem; /**配置项*/ - @Excel(name = "配置项", width = 15) + @Excel(name = "配置项", width = 20) @ApiModelProperty(value = "配置项") @Dict(dicCode = "ren4_zheng4_qing1_dan1_-_pei4_zhi4_xiang4") private String configItem; /**WVTA ID*/ - @Excel(name = "WVTA ID", width = 15) + @Excel(name = "WVTA ID", width = 20) @ApiModelProperty(value = "WVTA ID") private String wvtaId; /**标准编号*/ - @Excel(name = "*标准编号", width = 15) + @Excel(name = "*标准编号", width = 20) @ApiModelProperty(value = "标准编号") private String serialNumber; @@ -94,7 +94,7 @@ public class ProjectCertificationInventoryEO implements Serializable { @ApiModelProperty(value = "责任领域") private String dutyTerritory; /**责任领域名称**/ - @Excel(name = "*责任领域", width = 15) + @Excel(name = "*责任领域", width = 20) @TableField(exist = false) private String dutyTerritoryName; /**责任领域名称-英文**/ @@ -105,7 +105,7 @@ public class ProjectCertificationInventoryEO implements Serializable { @ApiModelProperty(value = "工程接口人") private String sdt; /**工程接口人名称**/ - @Excel(name = "工程接口人", width = 15) + @Excel(name = "工程接口人", width = 20) @TableField(exist = false) private String sdtName; @@ -113,7 +113,7 @@ public class ProjectCertificationInventoryEO implements Serializable { @ApiModelProperty(value = "责任人") private String dutyPerson; /**责任人名称**/ - @Excel(name = "责任人", width = 15) + @Excel(name = "责任人", width = 20) @TableField(exist = false) private String dutyPersonName; @@ -121,7 +121,7 @@ public class ProjectCertificationInventoryEO implements Serializable { @ApiModelProperty(value = "交付物类型") private String deliverableType; // 交付物类型名称 - @Excel(name = "交付物类型", width = 15) + @Excel(name = "交付物类型", width = 20) @TableField(exist = false) private String deliverableTypeName; // 交付物类型名称-英文 @@ -144,16 +144,16 @@ public class ProjectCertificationInventoryEO implements Serializable { private String deliverableTemplate; /**交付物模板名称**/ @TableField(exist = false) - @Excel(name = "交付物模板", width = 15) + @Excel(name = "交付物模板", width = 20) private String deliverableTemplateName; /**交付结果*/ - @Excel(name = "交付结果", width = 15) + @Excel(name = "交付结果", width = 20) @ApiModelProperty(value = "交付结果") private String deliveryResult; /**截止日期*/ - @Excel(name = "截止日期", width = 15, format = "yyyy-MM-dd") + @Excel(name = "截止日期", width = 20, format = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "截止日期") @@ -162,31 +162,32 @@ public class ProjectCertificationInventoryEO implements Serializable { @ApiModelProperty(value = "流程状态") private String flowStatus; // 流程状态展示名称 - @Excel(name = "流程状态", width = 15) + @Excel(name = "流程状态", width = 20) @TableField(exist = false) private String flowStatusName; /**报告编号*/ - @Excel(name = "报告编号", width = 15) + @Excel(name = "报告编号", width = 20) @ApiModelProperty(value = "报告编号") private String reportNumber; /**产品型号*/ - @Excel(name = "产品型号", width = 15) + @Excel(name = "产品型号", width = 20) @ApiModelProperty(value = "产品型号") private String productModel; /**生产企业名称*/ - @Excel(name = "生产企业名称", width = 15) + @Excel(name = "生产企业名称", width = 20) @ApiModelProperty(value = "生产企业名称") private String productionEnterpriseName; /**认证进度*/ - @Excel(name = "认证进度", width = 15) + @ApiModelProperty(value = "认证进度") private String certificationProgress; /**认证进度展示名称**/ + @Excel(name = "认证进度", width = 20) @TableField(exist = false) private String certificationProgress_dictText; @@ -214,7 +215,7 @@ public class ProjectCertificationInventoryEO implements Serializable { @TableField(exist = false) private String excelName; -// @Excel(name = "截止日期", width = 15, format = "yyyy-MM-dd") -// @TableField(exist = false) -// private String endTimeStr; +// @Excel(name = "截止日期", width = 20, format = "yyyy-MM-dd") + @TableField(exist = false) + private String endTimeStr; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEOEn.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEOEn.java index 1f31acd54..3b3cdd292 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEOEn.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEOEn.java @@ -63,28 +63,28 @@ public class ProjectCertificationInventoryEOEn implements Serializable { private java.lang.String sysOrgCode; /**类别*/ - @Excel(name = "Category", width = 15) + @Excel(name = "Category", width = 20) @ApiModelProperty(value = "类别") private java.lang.String category; /**检验项目*/ - @Excel(name = "Inspection Items", width = 15) + @Excel(name = "Inspection Items", width = 20) @ApiModelProperty(value = "检验项目") private java.lang.String inspectionItem; /**配置项*/ - @Excel(name = "Configuration Item", width = 15) + @Excel(name = "Configuration Item", width = 20) @ApiModelProperty(value = "配置项") @Dict(dicCode = "ren4_zheng4_qing1_dan1_-_pei4_zhi4_xiang4") private java.lang.String configItem; /**WVTA ID*/ - @Excel(name = "WVTA ID", width = 15) + @Excel(name = "WVTA ID", width = 20) @ApiModelProperty(value = "WVTA ID") private java.lang.String wvtaId; /**标准编号*/ - @Excel(name = "*Standard No", width = 15) + @Excel(name = "*Standard No", width = 20) @ApiModelProperty(value = "标准编号") private java.lang.String serialNumber; @@ -92,7 +92,7 @@ public class ProjectCertificationInventoryEOEn implements Serializable { @ApiModelProperty(value = "责任领域") private java.lang.String dutyTerritory; /**责任领域名称**/ - @Excel(name = "*Responsible Field", width = 15) + @Excel(name = "*Responsible Field", width = 20) @TableField(exist = false) private String dutyTerritoryName; /**责任领域名称-英文**/ @@ -103,7 +103,7 @@ public class ProjectCertificationInventoryEOEn implements Serializable { @ApiModelProperty(value = "工程接口人") private java.lang.String sdt; /**工程接口人名称**/ - @Excel(name = "Eng. Interface", width = 15) + @Excel(name = "Eng. Interface", width = 20) @TableField(exist = false) private String sdtName; @@ -111,7 +111,7 @@ public class ProjectCertificationInventoryEOEn implements Serializable { @ApiModelProperty(value = "责任人") private java.lang.String dutyPerson; /**责任人名称**/ - @Excel(name = "Assignee", width = 15) + @Excel(name = "Assignee", width = 20) @TableField(exist = false) private String dutyPersonName; @@ -119,7 +119,7 @@ public class ProjectCertificationInventoryEOEn implements Serializable { @ApiModelProperty(value = "交付物类型") private java.lang.String deliverableType; // 交付物类型名称 - @Excel(name = "Deliverable Type", width = 15) + @Excel(name = "Deliverable Type", width = 20) @TableField(exist = false) private String deliverableTypeName; // 交付物类型名称-英文 @@ -142,16 +142,16 @@ public class ProjectCertificationInventoryEOEn implements Serializable { private java.lang.String deliverableTemplate; /**交付物模板名称**/ @TableField(exist = false) - @Excel(name = "交付物模板", width = 15) + @Excel(name = "交付物模板", width = 20) private String deliverableTemplateName; /**交付结果*/ - @Excel(name = "Deliverables Result", width = 15) + @Excel(name = "Deliverables Result", width = 20) @ApiModelProperty(value = "交付结果") private java.lang.String deliveryResult; /**截止日期*/ - @Excel(name = "Due Date", width = 15, format = "yyyy-MM-dd") + @Excel(name = "Due Date", width = 20, format = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "截止日期") @@ -161,32 +161,33 @@ public class ProjectCertificationInventoryEOEn implements Serializable { @ApiModelProperty(value = "流程状态") private java.lang.String flowStatus; // 流程状态展示名称 - @Excel(name = "Process Status", width = 15) + @Excel(name = "Process Status", width = 20) @TableField(exist = false) private String flowStatusName; /**报告编号*/ - @Excel(name = "Report No", width = 15) + @Excel(name = "Report No", width = 20) @ApiModelProperty(value = "报告编号") private java.lang.String reportNumber; /**产品型号*/ - @Excel(name = "Product Model", width = 15) + @Excel(name = "Product Model", width = 20) @ApiModelProperty(value = "产品型号") private java.lang.String productModel; /**生产企业名称*/ - @Excel(name = "Name Of Manufacturer", width = 15) + @Excel(name = "Name Of Manufacturer", width = 40) @ApiModelProperty(value = "生产企业名称") private java.lang.String productionEnterpriseName; /**认证进度*/ - @Excel(name = "Homologation Progress", width = 15) + @ApiModelProperty(value = "认证进度") private java.lang.String certificationProgress; /**认证进度展示名称**/ @TableField(exist = false) + @Excel(name = "Homologation Progress", width = 40) private String certificationProgress_dictText; // @Excel(name = "认证进度备注", width = 15) @@ -205,4 +206,15 @@ public class ProjectCertificationInventoryEOEn implements Serializable { @TableField(exist = false) private String roleCode; + + /**值类型，对应SysCategoryValueTypeEnum中value**/ + @TableField(exist = false) + private String valueType; + + @TableField(exist = false) + private String excelName; + + // @Excel(name = "截止日期", width = 20, format = "yyyy-MM-dd") + @TableField(exist = false) + private String endTimeStr; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectRoleEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectRoleEnum.java index cbffa1463..24bfda6e3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectRoleEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectRoleEnum.java @@ -21,7 +21,6 @@ public enum ProjectRoleEnum { MANAGER("manage","11",""), ADMIN("系统管理员","12",""), VIEWER("Viewer","13",""), - DUTYPERSON("责任人","14","") ; String name; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index f003acfa6..78289d860 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -45,6 +45,7 @@ import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.enums.SysCategoryValueTypeEnum; import com.jero.modules.system.mapper.SysCategoryMapper; import com.jero.modules.system.mapper.SysRoleMapper; +import com.jero.modules.system.mapper.SysUserMapper; import com.jero.modules.system.service.ISysCategoryService; import com.jero.modules.system.service.ISysDictItemService; import com.jero.modules.system.service.ISysUserService; @@ -155,6 +156,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl> mapPersonList = (List>) objectMap.get("engineeringInterfacePersonList"); //所有人 - List> allPersonList = (List>) objectMap.get("allPersonList"); +// List> allPersonList = (List>) objectMap.get("allPersonList"); + + List listUserName = new ArrayList<>(); + listUserName = sysUserMapper.getListUserName(); + listUserName = listUserName.stream().distinct().collect(Collectors.toList()); + String nameCn = ""; String nameEn = ""; @@ -3113,7 +3137,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl msgList, String nameCn, String nameEn) { + String errorMsg, String field, List msgList, String nameCn, String nameEn) { //判断格式是否正确 boolean flag = true; if(ObjectUtils.isNotEmpty(field)){ - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - String format = sdf.format(field); - if (!DateUtils.isValidDate(format)) { +// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); +// String format = sdf.format(field); + if (!DateUtils.isValidDate(field)) { flag = false; if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){ errorMsg += nameCn + "格式不正确, 正确格式如:yyyy/m/d、yyyy-MM-dd、yyyy年MM月dd日"; @@ -3203,6 +3234,24 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpllongdate){ + flag = false; + if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){ + errorMsg += nameCn + "不能导入今天之前的日期"; + }else{ + errorMsg += nameEn + " Cannot import dates before today "; + } + msgList.add(errorMsg); + } + } catch (ParseException e) { + e.printStackTrace(); + } } return flag; } @@ -3315,7 +3364,39 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl msgList, String regulationOwnerId, + List listUserName ,String nameCn, String nameEn){ + //单选 + if(regulationOwnerId.contains(",")){ + if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){ + errorMsg += nameCn + "导入只能填写一个用户名, "; + }else{ + errorMsg += "Only one user name can be entered for"+ nameEn +"import, "; + } + msgList.add(errorMsg); + } + int count =0; + for(SysUser name : listUserName){ + if(StringUtils.isNotEmpty(name.getUsername())){ + if(name.getUsername().equals(regulationOwnerId)){ + count++; + String id = name.getId(); + projectCertificationInventoryEO.setDutyPerson(id); + break; + } + } + } + if(count==0){ + if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){ + errorMsg += nameCn+regulationOwnerId+"与所有人员名单不匹配"; + }else{ + errorMsg += nameEn+regulationOwnerId+"does not match a person with all person list"; + } + msgList.add(errorMsg); + } + } private void personnelVerify(ProjectCertificationInventoryEO projectCertificationInventoryEO, String errorMsg, List msgList, String regulationOwnerId, List> mapList, String nameCn, String nameEn, String fieldNumber) { @@ -3337,8 +3418,6 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl fileInfos = getOssFiles(dataList); //处理文件名称 + String fileName = ""; for (int i = 0; i < dataList.size(); i++) { - if(StringUtils.isNotEmpty(dataList.get(i).getDeliveryResult())){ - String fileName = ossFileService.getFileInfos(dataList.get(i).getDeliveryResult()).stream().map(OSSFile::getFileName).distinct().collect(Collectors.joining(",")); - dataList.get(i).setDeliveryResult(fileName); - - } if(StringUtils.isNotEmpty(dataList.get(i).getDeliverableTemplate())){ String deliverableTemplateName = template(fileInfos, dataList.get(i).getDeliverableTemplate()); dataList.get(i).setDeliverableTemplateName(deliverableTemplateName); @@ -3482,6 +3557,30 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl deliverableTemplateFileList = new ArrayList<>(); + List deliveryResultList = new ArrayList<>(); List oSSFileList = new ArrayList<>(); if(StringUtils.isNotBlank(deliverableTemplate)){ deliverableTemplateFileList = fileInfos.stream().filter(e -> deliverableTemplate.contains(e.getId())).collect(Collectors.toList()); oSSFileList.addAll(deliverableTemplateFileList); } + if(StringUtils.isNotBlank(deliveryResult) && projectCertificationInventoryEO.getValueType().equals(SysCategoryValueTypeEnum.FILE.getValue())){ + deliveryResultList = fileInfos.stream().filter(e -> deliveryResult.contains(e.getId())).collect(Collectors.toList()); + oSSFileList.addAll(deliveryResultList); + + } if(oSSFileList.size() != 0){ String fileNowPath = uploadpath + "/tempZip/" + serialNumber; File file = new File(fileNowPath); @@ -3594,6 +3700,9 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl fileInfos = new ArrayList<>(); @@ -3679,8 +3788,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl Date: Wed, 29 Mar 2023 18:21:41 +0800 Subject: [PATCH 529/645] =?UTF-8?q?ota-=E5=8D=87=E7=BA=A7=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E5=A4=87=E6=A1=88-=E5=8D=87=E7=BA=A7=E7=9B=AE?= =?UTF-8?q?=E6=A0=87=E8=BD=A6=E5=9E=8B-=E8=A1=A8=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/usernotification.vue | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue index 79f27f620..4ef696eee 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue @@ -145,7 +145,7 @@
-
+
{{$t('usernotificationmode')}}
@@ -160,7 +160,7 @@
-
+
{{$t('allupdatestotheusermanualareinformed')}}
@@ -246,7 +246,7 @@ export default { }) }, getData(){ - + let otaIdT=localStorage.getItem('otaIdT') if(otaIdT==null){ otaIdT='' @@ -257,11 +257,11 @@ export default { } getAction('/ota/otaBaSjGgnrfs/queryByOtaId',{otaIdT:otaIdT,otaId:otaId}).then(res=>{ if(res.code == 200){ - + this.formInline= res.result ==null ? { sjky:'车辆解闭锁功能可用，但不可驾驶', sjbkygn:'除解闭锁均不可用' - } :res.result + } :res.result this.formInline.id=res.result.id this.$forceUpdate() } @@ -305,9 +305,9 @@ export default { } .box-title-text-add { - line-height: 1.4; + //line-height: 1.4; display: flex; - + align-items: center; } h1{ font-weight: 700; @@ -322,9 +322,9 @@ h1{ margin-right: 16px; //overflow: hidden; //text-overflow: ellipsis; - white-space: nowrap; + //white-space: nowrap; height: 42px; - line-height: 42px; + //line-height: 42px; margin-top: 3px; } @@ -338,7 +338,7 @@ h1{ text-overflow: ellipsis; white-space: nowrap; height: 42px; - line-height: 42px; + //line-height: 42px; margin-top: 3px; margin-bottom: 20px; } @@ -371,4 +371,8 @@ h1{ left: 40%; text-align: center!important; } + +.plus{ + display: flex; +} \ No newline at end of file From b78e416ad8ef14026f2939f306b71bba95afa7fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Wed, 29 Mar 2023 19:25:33 +0800 Subject: [PATCH 530/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E8=BD=A6=E8=BE=86=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/ota/enums/OtaTitleEnum.java | 4 +- .../impl/OtaBaCxKsjxtmccsServiceImpl.java | 94 +++++++++++++++---- 2 files changed, 78 insertions(+), 20 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java index 33d7f382a..6f2e3736e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java @@ -40,8 +40,8 @@ public enum OtaTitleEnum { XTLB("xtlb", "系统类别", "0"), SFKSJ("sfksj", "是否可升级", "2"), - SJBGCS("sjbgcs", "升级变更技术参数", "0"), - TPT("tpt", "系统电子控制器架构拓扑图", "0"), + SJBGCS("sjbgcs", "升级可能变更的《公告》技术参数(如有)", "0"), + //TPT("tpt", "系统-电子控制器架构拓扑图(附件需含拓扑图介绍)", "0"), KZQMC("kzqmc", "电子控制器名称", "0"), AQWZXDJ("aqwzxdj", "安全完整性等级", "0"), KZQSCQY("kzqscqy", "电子控制器生产企业", "0"), diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java index d5461ddf2..0d82b2afd 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java @@ -32,6 +32,8 @@ import java.io.File; import java.io.InputStream; import java.lang.reflect.Field; import java.util.*; +import java.util.function.Function; +import java.util.stream.Collectors; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.web.multipart.MultipartFile; @@ -108,27 +110,83 @@ public class OtaBaCxKsjxtmccsServiceImpl extends ServiceImpl reList = cu.comparisonListRecord(otaId, OtaModuleEnum.CX_KSJDXTMCYCS, OtaTitleEnum.XTLB.getName(), oldList, newList, sysDictService); saveOrUpdateBatch(newList); - - for (OtaBaCxKsjxtmccs newMccs:newList) { - String newTpt = newMccs.getTpt(); - if(StringUtils.isNotEmpty(newTpt)){ - - + Map newMap = newList.stream().collect(Collectors.toMap(OtaBaCxKsjxtmccs::getId, Function.identity())); + Map oldMap = oldList.stream().collect(Collectors.toMap(OtaBaCxKsjxtmccs::getId, Function.identity())); + for (String nId : newMap.keySet()) { + if (oldMap.containsKey(nId)) { + String newTptStr = newMap.get(nId).getTpt(); + if (StringUtils.isNotEmpty(newTptStr)) { + String[] newTpts = newTptStr.split(","); + String oldTptStr = oldMap.get(nId).getTpt(); + for (String nt : newTpts) { + if (StringUtils.isEmpty(oldTptStr) || !oldTptStr.contains(nt)) { + List fileList = ossFileService.getFileInfos(nt); + if (ObjectUtils.isNotEmpty(fileList)) { + for (OSSFile f : fileList) { + reList.add(cu.addAttRecord(otaId, OtaModuleEnum.CX_KSJDXTMCYCS, newMap.get(nId).getXtlb() + "-系统-电子控制器架构拓扑图(附件需含拓扑图介绍)", f.getFileName())); + } + } + } + } + } } + } + for (String oId : oldMap.keySet()) { + if (newMap.containsKey(oId)) { + String oldTptStr = oldMap.get(oId).getTpt(); + if (StringUtils.isNotEmpty(oldTptStr)) { + String[] oldTpts = oldTptStr.split(","); + String newTptStr = newMap.get(oId).getTpt(); + for (String ot : oldTpts) { + if (StringUtils.isEmpty(newTptStr) || !newTptStr.contains(ot)) { + List fileList = ossFileService.getFileInfos(ot); + if (ObjectUtils.isNotEmpty(fileList)) { + for (OSSFile f : fileList) { + reList.add(cu.delAttRecord(otaId, OtaModuleEnum.CX_KSJDXTMCYCS, oldMap.get(oId).getXtlb() + "-系统-电子控制器架构拓扑图(附件需含拓扑图介绍)", f.getFileName())); + } + } + } + } + } + } + } + + String fj = (String) json.get("fj"); + OtaBaCxList otaBaCxList = otaBaCxListService.queryById(otaId); + String oldFjStr = otaBaCxList.getZxsjxtfj(); + otaBaCxList.setZxsjxtfj(fj); + otaBaCxListService.editById(otaBaCxList); + String[] newFjList = {}; + if (StringUtils.isNotEmpty(fj)) { + newFjList = fj.split(","); + } + for (String nf : newFjList) { + if (StringUtils.isEmpty(oldFjStr) || !oldFjStr.contains(nf)) { + List fileList = ossFileService.getFileInfos(nf); + if (ObjectUtils.isNotEmpty(fileList)) { + for (OSSFile f : fileList) { + reList.add(cu.addAttRecord(otaId, OtaModuleEnum.CX_KSJDXTMCYCS, "附件", f.getFileName())); + } + } + } + } + String[] oldFjList = {}; + if (StringUtils.isNotEmpty(oldFjStr)) { + oldFjList = oldFjStr.split(","); + } + for (String of : oldFjList) { + if (StringUtils.isEmpty(fj) || !fj.contains(of)) { + List fileList = ossFileService.getFileInfos(of); + if (ObjectUtils.isNotEmpty(fileList)) { + for (OSSFile f : fileList) { + reList.add(cu.delAttRecord(otaId, OtaModuleEnum.CX_KSJDXTMCYCS, "附件", f.getFileName())); + } + } + } } otaBaCxTxjlService.saveBatch(reList); - String fj = (String) json.get("fj"); - if (StringUtils.isNotEmpty(fj)) { - OtaBaCxList otaBaCxList = otaBaCxListService.queryById(otaId); - if (ObjectUtils.isNotEmpty(otaBaCxList)) { - otaBaCxList.setZxsjxtfj(fj); - otaBaCxListService.editById(otaBaCxList); - } - } } - - } /** @@ -203,7 +261,7 @@ public class OtaBaCxKsjxtmccsServiceImpl extends ServiceImpl getByOtaId(String otaId) { - if(org.apache.commons.lang3.StringUtils.isEmpty(otaId)){ + if (org.apache.commons.lang3.StringUtils.isEmpty(otaId)) { return null; } LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); @@ -381,7 +439,7 @@ public class OtaBaCxKsjxtmccsServiceImpl extends ServiceImpl Date: Wed, 29 Mar 2023 19:51:55 +0800 Subject: [PATCH 531/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E8=BD=A6=E8=BE=86=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/OtaBaCxAqcsServiceImpl.java | 2 +- .../impl/OtaBaCxKsjjsmccsServiceImpl.java | 41 +++++++++++++++---- .../impl/OtaBaCxZxsjyqServiceImpl.java | 2 +- 3 files changed, 36 insertions(+), 9 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java index c7420a449..aa786c249 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java @@ -106,7 +106,7 @@ public class OtaBaCxAqcsServiceImpl extends ServiceImpl reList = cu.comparisonListRecord(otaId, OtaModuleEnum.CX_KZXSJDJSFZGNMCYCS, OtaTitleEnum.GNMC.getName(), oldList, newList, sysDictService); saveOrUpdateBatch(newList); - otaBaCxTxjlService.saveBatch(reList); String fj = (String) json.get("fj"); + OtaBaCxList otaBaCxList = otaBaCxListService.queryById(otaId); + String oldFjStr = otaBaCxList.getZxsjjsfj(); + otaBaCxList.setZxsjjsfj(fj); + otaBaCxListService.editById(otaBaCxList); + String[] newFjList = {}; if (StringUtils.isNotEmpty(fj)) { - OtaBaCxList otaBaCxList = otaBaCxListService.queryById(otaId); - if (ObjectUtils.isNotEmpty(otaBaCxList)) { - otaBaCxList.setZxsjjsfj(fj); - otaBaCxListService.editById(otaBaCxList); + newFjList = fj.split(","); + } + for (String nf : newFjList) { + if (StringUtils.isEmpty(oldFjStr) || !oldFjStr.contains(nf)) { + List fileList = ossFileService.getFileInfos(nf); + if (ObjectUtils.isNotEmpty(fileList)) { + for (OSSFile f : fileList) { + reList.add(cu.addAttRecord(otaId, OtaModuleEnum.CX_KZXSJDJSFZGNMCYCS, "附件", f.getFileName())); + } + } } } + String[] oldFjList = {}; + if (StringUtils.isNotEmpty(oldFjStr)) { + oldFjList = oldFjStr.split(","); + } + for (String of : oldFjList) { + if (StringUtils.isEmpty(fj) || !fj.contains(of)) { + List fileList = ossFileService.getFileInfos(of); + if (ObjectUtils.isNotEmpty(fileList)) { + for (OSSFile f : fileList) { + reList.add(cu.delAttRecord(otaId, OtaModuleEnum.CX_KZXSJDJSFZGNMCYCS, "附件", f.getFileName())); + } + } + } + } + + + otaBaCxTxjlService.saveBatch(reList); } } @@ -195,7 +222,7 @@ public class OtaBaCxKsjjsmccsServiceImpl extends ServiceImpl getByOtaId(String otaId) { - if(org.apache.commons.lang3.StringUtils.isEmpty(otaId)){ + if (StringUtils.isEmpty(otaId)) { return null; } LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxZxsjyqServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxZxsjyqServiceImpl.java index 3a84bef71..3abfdc679 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxZxsjyqServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxZxsjyqServiceImpl.java @@ -111,7 +111,7 @@ public class OtaBaCxZxsjyqServiceImpl extends ServiceImpl Date: Wed, 29 Mar 2023 20:26:32 +0800 Subject: [PATCH 532/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E8=BD=A6=E8=BE=86=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/ota/enums/OtaTitleEnum.java | 4 +-- .../impl/OtaBaSjSjmbclServiceImpl.java | 10 ++++++ .../impl/OtaBaSjSjyxpgServiceImpl.java | 15 ++++++++ .../modules/ota/utils/ComparisonUtil.java | 34 +++++++++++++++++++ 4 files changed, 61 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java index 6f2e3736e..6eaed06d2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java @@ -169,8 +169,8 @@ public enum OtaTitleEnum { YHQR("yhqr", "升级活动是否提供用户确认选项", "0"), SJBCS("sjbcs", "升级包测试", "package_test"), AQKKX("aqkkx", "是杏已验证确认在线升级活动的安全性和可靠性", "0"), - BGFJ("bgfj", "提供变更或扩展后的《公告》批次及证明材料", "0"), - CLFJ("clfj", "提供证明材料", "0"), +// BGFJ("bgfj", "提供变更或扩展后的《公告》批次及证明材料", "0"), +// CLFJ("clfj", "提供证明材料", "0"), XTMC("xtmc", "系统名称", "0"), SJQBGCS("sjqbgcs", "升级前已变更《公告》参数的对应调整", "0"), SJHBGCS("sjhbgcs", "升级后已变更《公告》参数的对应调整", "0"), diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java index f03bccacc..266fce976 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java @@ -2,6 +2,8 @@ package com.jero.modules.ota.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.common.exception.JeroBootException; +import com.jero.modules.oss.entity.OSSFile; +import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.ota.entity.*; import com.jero.modules.ota.enums.OtaModuleEnum; import com.jero.modules.ota.mapper.OtaBaSjSjmbclMapper; @@ -54,6 +56,9 @@ public class OtaBaSjSjmbclServiceImpl extends ServiceImpl reList = cu.comparisonRecord(otaBaSjSjmbcl.getOtaId(), OtaModuleEnum.SJ_SJMBCL, otaBaSjSjmbclOld, otaBaSjSjmbcl, sysDictService); + reList.addAll(cu.comparisonRecord(otaBaSjSjmbcl.getOtaId(), newFj, oldFjStr, OtaModuleEnum.SJ_SJMBCL, "附件", ossFileService)); otaBaCxTxjlService.saveBatch(reList); } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjyxpgServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjyxpgServiceImpl.java index 111049ed2..d60a46d82 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjyxpgServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjyxpgServiceImpl.java @@ -3,6 +3,7 @@ package com.jero.modules.ota.service.impl; import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.common.exception.JeroBootException; +import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.ota.entity.*; import com.jero.modules.ota.enums.OtaModuleEnum; import com.jero.modules.ota.mapper.OtaBaSjSjyxpgMapper; @@ -49,6 +50,9 @@ public class OtaBaSjSjyxpgServiceImpl extends ServiceImpl reList = cu.comparisonRecord(otaBaSjSjyxpg.getOtaId(), OtaModuleEnum.SJ_SJYXPG, otaBaSjSjyxpgOld, otaBaSjSjyxpg, sysDictService); + reList.addAll(cu.comparisonRecord(otaBaSjSjyxpg.getOtaId(), newYzcl, oldYzcl, OtaModuleEnum.SJ_SJMBCL, "验证材料", ossFileService)); + reList.addAll(cu.comparisonRecord(otaBaSjSjyxpg.getOtaId(), newZmcl, oldZmcl, OtaModuleEnum.SJ_SJMBCL, "证明材料", ossFileService)); otaBaCxTxjlService.saveBatch(reList); } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java index 5a7c9dd7e..6c42e3acc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java @@ -1,5 +1,7 @@ package com.jero.modules.ota.utils; +import com.jero.modules.oss.entity.OSSFile; +import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.ota.entity.OtaBaCxTxjl; import com.jero.modules.ota.enums.OtaModuleEnum; import com.jero.modules.ota.enums.OtaTitleEnum; @@ -23,6 +25,38 @@ public class ComparisonUtil { } + public List comparisonRecord(String otaId, String newFj,String oldFjStr,OtaModuleEnum otaModuleEnum, String title, IOSSFileService ossFileService) { + List reList = new ArrayList<>(); + String[] newFjList = {}; + if (StringUtils.isNotEmpty(newFj)) { + newFjList = newFj.split(","); + } + for (String nf : newFjList) { + if (StringUtils.isEmpty(oldFjStr) || !oldFjStr.contains(nf)) { + List fileList = ossFileService.getFileInfos(nf); + if (ObjectUtils.isNotEmpty(fileList)) { + for (OSSFile f : fileList) { + reList.add(addAttRecord(otaId, otaModuleEnum, title, f.getFileName())); + } + } + } + } + String[] oldFjList = {}; + if (StringUtils.isNotEmpty(oldFjStr)) { + oldFjList = oldFjStr.split(","); + } + for (String of : oldFjList) { + if (StringUtils.isEmpty(newFj) || !newFj.contains(of)) { + List fileList = ossFileService.getFileInfos(of); + if (ObjectUtils.isNotEmpty(fileList)) { + for (OSSFile f : fileList) { + reList.add(delAttRecord(otaId, otaModuleEnum, title, f.getFileName())); + } + } + } + } + return reList; + } public OtaBaCxTxjl addAttRecord(String otaId, OtaModuleEnum otaModuleEnum, String title, String attName) { String content = title + "中添加了附件:'" + attName; OtaBaCxTxjl jl = new OtaBaCxTxjl(otaId, otaModuleEnum.getName(), content); From 9457c81e1391679153566a1680ca4c57bfec60ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Wed, 29 Mar 2023 20:45:00 +0800 Subject: [PATCH 533/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E8=BD=A6=E8=BE=86=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/ota/enums/OtaTitleEnum.java | 2 +- .../impl/OtaBaCxKsjjsmccsServiceImpl.java | 31 +------------------ .../impl/OtaBaSjGgnrfsServiceImpl.java | 21 +++++++------ .../impl/OtaBaSjSjfzbhServiceImpl.java | 15 +++++---- 4 files changed, 21 insertions(+), 48 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java index 6eaed06d2..b73fb784a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java @@ -197,7 +197,7 @@ public enum OtaTitleEnum { GZBG("gzbg", "告知实施的变更", "0"), GZSCNR("gzscnr", "告知了对用户手册的全部更新内容", "0"), GZYHFS("gzyhfs", "告知用户方式（可多选）", "0"), - XGWJ("xgwj", "用户告知相关文件", "0"), +// XGWJ("xgwj", "用户告知相关文件", "0"), RWMC("rwmc", "任务名称", "0"), SJFBSJ("sjfbsj", "升级发布时间", "0"), SJJZSJ("sjjzsj", "升级计划截止时间", "0"); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java index a1fc4e36c..a46356589 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java @@ -116,36 +116,7 @@ public class OtaBaCxKsjjsmccsServiceImpl extends ServiceImpl fileList = ossFileService.getFileInfos(nf); - if (ObjectUtils.isNotEmpty(fileList)) { - for (OSSFile f : fileList) { - reList.add(cu.addAttRecord(otaId, OtaModuleEnum.CX_KZXSJDJSFZGNMCYCS, "附件", f.getFileName())); - } - } - } - } - String[] oldFjList = {}; - if (StringUtils.isNotEmpty(oldFjStr)) { - oldFjList = oldFjStr.split(","); - } - for (String of : oldFjList) { - if (StringUtils.isEmpty(fj) || !fj.contains(of)) { - List fileList = ossFileService.getFileInfos(of); - if (ObjectUtils.isNotEmpty(fileList)) { - for (OSSFile f : fileList) { - reList.add(cu.delAttRecord(otaId, OtaModuleEnum.CX_KZXSJDJSFZGNMCYCS, "附件", f.getFileName())); - } - } - } - } - - + reList.addAll(cu.comparisonRecord(otaId, fj, oldFjStr, OtaModuleEnum.CX_KZXSJDJSFZGNMCYCS, "附件", ossFileService)); otaBaCxTxjlService.saveBatch(reList); } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjGgnrfsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjGgnrfsServiceImpl.java index a3aeb236c..fd23adce6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjGgnrfsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjGgnrfsServiceImpl.java @@ -1,10 +1,9 @@ package com.jero.modules.ota.service.impl; -import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.exception.JeroBootException; -import com.jero.modules.ota.entity.AttachmentEO; -import com.jero.modules.ota.entity.OtaBaCxAqcs; +import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.ota.entity.OtaBaCxTxjl; import com.jero.modules.ota.entity.OtaBaSjGgnrfs; import com.jero.modules.ota.enums.OtaModuleEnum; @@ -18,16 +17,13 @@ import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; - -import java.io.File; -import java.util.List; -import java.util.Date; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.util.Date; +import java.util.List; /** * @Description: 升级备案-用户告知内容及方式 @@ -50,6 +46,9 @@ public class OtaBaSjGgnrfsServiceImpl extends ServiceImpl reList = cu.comparisonRecord(otaBaSjGgnrfs.getOtaId(), OtaModuleEnum.SJ_YHGZNRFS, otaBaSjGgnrfsOld, otaBaSjGgnrfs, sysDictService); + + reList.addAll(cu.comparisonRecord(otaBaSjGgnrfs.getOtaId(), otaBaSjGgnrfs.getXgwj(), oldFjStr, OtaModuleEnum.SJ_YHGZNRFS, "附件", ossFileService)); otaBaCxTxjlService.saveBatch(reList); } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjfzbhServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjfzbhServiceImpl.java index 5b9ef816e..506a01738 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjfzbhServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjfzbhServiceImpl.java @@ -107,15 +107,14 @@ public class OtaBaSjSjfzbhServiceImpl extends ServiceImpl reList = cu.comparisonListRecord(otaId, OtaModuleEnum.SJ_SJJSMCBH, OtaTitleEnum.GNMC.getName(), oldList, newList, sysDictService); saveOrUpdateBatch(newList); - otaBaCxTxjlService.saveBatch(reList); String fj = (String) json.get("fj"); - if (StringUtils.isNotEmpty(fj)) { - OtaBaSjList otaBaSjList = otaBaSjListService.queryById(otaId); - if (ObjectUtils.isNotEmpty(otaBaSjList)) { - otaBaSjList.setSjjsfj(fj); - otaBaSjListService.editById(otaBaSjList); - } - } + OtaBaSjList otaBaSjList = otaBaSjListService.queryById(otaId); + String oldFjStr = otaBaSjList.getSjjsfj(); + otaBaSjList.setSjjsfj(fj); + otaBaSjListService.editById(otaBaSjList); + reList.addAll(cu.comparisonRecord(otaId, fj, oldFjStr, OtaModuleEnum.SJ_SJJSMCBH, "附件", ossFileService)); + otaBaCxTxjlService.saveBatch(reList); + } } From 2bc71b83a7c4f4845f9a8e438ebe07893dc3d3e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Wed, 29 Mar 2023 20:47:12 +0800 Subject: [PATCH 534/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E8=BD=A6=E8=BE=86=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/ota/controller/OtaBaCxListController.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java index c1ff0530c..3cf8577c8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java @@ -86,6 +86,12 @@ public class OtaBaCxListController extends JeroController pageList = otaBaCxListService.page(page, queryWrapper); return Result.OK(pageList); From 20042acca5b8abe2eb3c2b5ae1696c185f84e882 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Wed, 29 Mar 2023 20:48:59 +0800 Subject: [PATCH 535/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E8=BD=A6=E8=BE=86=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ota/controller/OtaBaSjListController.java | 35 +++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java index 344eafb8c..a7ebadbc4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java @@ -1,6 +1,7 @@ package com.jero.modules.ota.controller; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -8,11 +9,13 @@ import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.ota.entity.OtaBaCxList; import com.jero.modules.ota.entity.OtaBaSjList; import com.jero.modules.ota.service.IOtaBaSjListService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -55,9 +58,37 @@ public class OtaBaSjListController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(otaBaSjList, req.getParameterMap()); - queryWrapper.orderByDesc("create_time"); Page page = new Page(pageNo, pageSize); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + String cpdjbh = req.getParameter("cpdjbh"); + if (StringUtils.isNotBlank(cpdjbh)) { + cpdjbh = cpdjbh.replace("%", "\\%"); + queryWrapper.like(OtaBaSjList::getCpdjbh, cpdjbh); + } + String ggpc = req.getParameter("ggpc"); + if (StringUtils.isNotBlank(ggpc)) { + ggpc = ggpc.replace("%", "\\%"); + queryWrapper.like(OtaBaSjList::getGgpc, ggpc); + } + + String cpsb = req.getParameter("cpsb"); + if (StringUtils.isNotBlank(cpsb)) { + cpsb = cpsb.replace("%", "\\%"); + queryWrapper.like(OtaBaSjList::getCpsb, cpsb); + } + + String cpmc = req.getParameter("cpmc"); + if (StringUtils.isNotBlank(cpmc)) { + cpmc = cpmc.replace("%", "\\%"); + queryWrapper.like(OtaBaSjList::getCpmc, cpmc); + } + + String cpxh = req.getParameter("cpmc"); + if (StringUtils.isNotBlank(cpxh)) { + cpxh = cpxh.replace("%", "\\%"); + queryWrapper.like(OtaBaSjList::getCpxh, cpxh); + } + IPage pageList = otaBaSjListService.page(page, queryWrapper); return Result.OK(pageList); } From d3f44965623b4bf0f3f612a62021479978fdc207 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Wed, 29 Mar 2023 20:53:49 +0800 Subject: [PATCH 536/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E8=BD=A6=E8=BE=86=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/modules/ota/enums/OtaTitleEnum.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java index b73fb784a..3cf5e2fce 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java @@ -120,19 +120,19 @@ public enum OtaTitleEnum { CZTX_BBH("cztxBbh", "车载通信系统-版本号", "0"), CZTX_KFQY("cztxKfqy", "车载通信系统-软件开发企业", "0"), JSFZCZJ_PZ("jsfzczjPz", "驾驶辅助系统操纵件、指示器及信号装置-驾驶辅助功能操纵件-配置", "2"), - JSFZCZJ_MC("jsfzczjMc", "驾驶辅助系统操纵件、指示器及信号装置-驾驶辅助功能操纵件-名称", "0"), + JSFZCZJ_MC("jsfzczjMc", "驾驶辅助系统操纵件、指示器及信号装置-驾驶辅助功能操纵件-操纵件名称", "0"), JSFZCZJ_YJXH("jsfzczjYjxh", "驾驶辅助系统操纵件、指示器及信号装置-驾驶辅助功能操纵件-硬件规格型号", "0"), JSFZCZJ_SCQY("jsfzczjScqy", "驾驶辅助系统操纵件、指示器及信号装置-驾驶辅助功能操纵件-生产企业", "0"), - JSFZZSQ_PZ("jsfzzsqPz", "驾驶辅助系统操纵件、指示器及信号装置- 驾驶辅助功能指示器/信号装置-配置", "2"), - JSFZZSQ_MC("jsfzzsqMc", "驾驶辅助系统操纵件、指示器及信号装置- 驾驶辅助功能指示器/信号装置-名称", "0"), - JSFZZSQ_YJXH("jsfzzsqYjxh", "驾驶辅助系统操纵件、指示器及信号装置- 驾驶辅助功能指示器/信号装置-硬件规格型号", "0"), - JSFZZSQ_SCQY("jsfzzsqScqy", "驾驶辅助系统操纵件、指示器及信号装置- 驾驶辅助功能指示器/信号装置-生产企业", "0"), + JSFZZSQ_PZ("jsfzzsqPz", "驾驶辅助系统操纵件、指示器及信号装置-驾驶辅助功能指示器/信号装置-配置", "2"), + JSFZZSQ_MC("jsfzzsqMc", "驾驶辅助系统操纵件、指示器及信号装置-驾驶辅助功能指示器/信号装置-指示器/信号装置名称", "0"), + JSFZZSQ_YJXH("jsfzzsqYjxh", "驾驶辅助系统操纵件、指示器及信号装置-驾驶辅助功能指示器/信号装置-硬件规格型号", "0"), + JSFZZSQ_SCQY("jsfzzsqScqy", "驾驶辅助系统操纵件、指示器及信号装置-驾驶辅助功能指示器/信号装置-生产企业", "0"), FXPTSTS_PZ("fxptstsPz", "驾驶辅助系统操纵件、指示器及信号装置-方向盘脱手提示器/信号装置-配置", "2"), - FXPTSTS_MC("fxptstsMc", "驾驶辅助系统操纵件、指示器及信号装置-方向盘脱手提示器/信号装置-名称", "0"), + FXPTSTS_MC("fxptstsMc", "驾驶辅助系统操纵件、指示器及信号装置-方向盘脱手提示器/信号装置-指示器/信号装置名称", "0"), FXPTSTS_YJXH("fxptstsYjxh", "驾驶辅助系统操纵件、指示器及信号装置-方向盘脱手提示器/信号装置-硬件规格型号", "0"), FXPTSTS_SCQY("fxptstsScqy", "驾驶辅助系统操纵件、指示器及信号装置-方向盘脱手提示器/信号装置-生产企业", "0"), JSYZYLTS_PZ("jsyzyltsPz", "驾驶辅助系统操纵件、指示器及信号装置-驾驶员注意力提醒指示器/信号装置-配置", "2"), - JSYZYLTS_MC("jsyzyltsMc", "驾驶辅助系统操纵件、指示器及信号装置-驾驶员注意力提醒指示器/信号装置-名称", "0"), + JSYZYLTS_MC("jsyzyltsMc", "驾驶辅助系统操纵件、指示器及信号装置-驾驶员注意力提醒指示器/信号装置-指示器/信号装置名称", "0"), JSYZYLTS_YJXH("jsyzyltsYjxh", "驾驶辅助系统操纵件、指示器及信号装置-驾驶员注意力提醒指示器/信号装置-硬件规格型号", "0"), JSYZYLTS_SCQY("jsyzyltsScqy", "驾驶辅助系统操纵件、指示器及信号装置-驾驶员注意力提醒指示器/信号装置-生产企业", "0"), DSSAD_PZ("dssadPz", "自动驾驶数据记录系统(DSSAD)-系统配置", "2"), From 903369483bb6d10a589a4f929c045e5d9ce50579 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Wed, 29 Mar 2023 21:01:56 +0800 Subject: [PATCH 537/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E8=BD=A6=E8=BE=86=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/ota/enums/OtaTitleEnum.java | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java index 3cf5e2fce..a0dca3213 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java @@ -22,44 +22,44 @@ public enum OtaTitleEnum { TXZD("txzd", "通信终端", "communication_terminal"), CDOTASJ("cdotasj", "车端OTA升级管理系统", "0"), - BHSJB("bhsjb", "保护升级包", "2"), - BHCLBB("bhclbb", "保护车辆版本", "2"), - CLGXNL("clgxnl", "车辆更新能力", "2"), - CLSJTJ("clsjtj", "车辆升级条件", "2"), - CLSJDL("clsjdl", "车辆升级所需电量", "2"), - SJBHAQ("sjbhaq", "升级保护车辆安全", "2"), - SJANTJ("sjantj", "升级所满足的安全条件", "2"), - SJSBAQ("sjsbaq", "升级失败安全状态", "2"), - SJGG("sjgg", "升级公告", "2"), - SJZT("sjzt", "升级结果状态", "2"), + BHSJB("bhsjb", "激光雷达-应保护升级包的真实性和完整性，以合理地防止其受到损害，并合理地防止无效升级\t", "2"), + BHCLBB("bhclbb", "激光雷达-应保护车辆上的软件版本（集），防止未经授权的修改", "2"), + CLGXNL("clgxnl", "升级功能要求-车辆应具备更新软件版本（集）的能力，应通过使用电子通信接口，至少用过标准接口（如OBD端口），以标准化的方式易于读取", "2"), + CLSJTJ("clsjtj", "升级功能要求-应确保车辆在执行软件升级之前满足先决条件", "2"), + CLSJDL("clsjdl", "升级功能要求-应确保只有当车辆有充足电量完成升级过程时，才能执行软件升级(包括可能恢复到以前版本或使车辆进入安全状态所需的电量)", "2"), + SJBHAQ("sjbhaq", "升级功能要求-当执行升级可能影响车辆安全时，应在升级执行过程中通过技术手段确保车辆安全", "2"), + SJANTJ("sjantj", "升级功能要求-若升级的执行影响驾驶安全，至少应满足： (a)确保升级执行期间无法驾驶车辆； (b)确保驾驶员不能使用任何可能影响车辆安全或成功执行升级的车辆功能", "2"), + SJSBAQ("sjsbaq", "升级功能要求-车辆能够恢复到以前的可用版本，或确保车辆处于安全状态。", "2"), + SJGG("sjgg", "用户告知要求-在升级执行前，应告知车辆用户升级信息，告知的信息应包括： (a)升级目的； (b)车辆功能升级所实施的任何变更； (c)完成升级执行的预计时间； (d)升级执行期间可能不可用的任何车辆功能； (e)可能帮助车辆用户安全执行升级的任何指导信息。", "2"), + SJZT("sjzt", "用户告知要求-在执行升级后，车辆应： (a)告知车辆用户车辆升级的结果(成功或失败)； (b)若升级成功，告知车辆用户已实施的变更，用户手册(如果适用)的任何相关更新。", "2"), - BHJZ("bhjz", "保护机制", "protection_mechanism"), - FSXJZ("fsxjz", "防失效机制", "fail_safe_mechanism"), - SJSBCS("sjsbcs", "升级失败措施", "upgrade_failure"), + BHJZ("bhjz", "真实性、完整性保护机制", "protection_mechanism"), + FSXJZ("fsxjz", "防失效保护机制", "fail_safe_mechanism"), + SJSBCS("sjsbcs", "升级失败后车辆安全措施", "upgrade_failure"), XXAQJZ("xxaqjz", "信息安全机制", "Information_security_mechanism"), XTLB("xtlb", "系统类别", "0"), SFKSJ("sfksj", "是否可升级", "2"), - SJBGCS("sjbgcs", "升级可能变更的《公告》技术参数(如有)", "0"), + SJBGCS("sjbgcs", "升级可能变更的《公告》技术参数", "0"), //TPT("tpt", "系统-电子控制器架构拓扑图(附件需含拓扑图介绍)", "0"), KZQMC("kzqmc", "电子控制器名称", "0"), - AQWZXDJ("aqwzxdj", "安全完整性等级", "0"), + AQWZXDJ("aqwzxdj", "电子控制器汽车安全完整性等级(ASIL)", "0"), KZQSCQY("kzqscqy", "电子控制器生产企业", "0"), KZQXH("kzqxh", "电子控制器型号", "0"), YJBBXX("yjbbxx", "硬件版本信息", "0"), CSRJBBH("csrjbbh", "初始软件版本号", "0"), - CSRJBWZSJ("csrjbwzsj", "初始软件包完整数据", "0"), - SJSFYX("sjsfyx", "升级是否影响整车安全、节能、环保、防盗等", "0"), + CSRJBWZSJ("csrjbwzsj", "初始软件包的完整性验证数据", "0"), + SJSFYX("sjsfyx", "升级是否影响整车安全、节能、环保、防盗等性能", "0"), CZXTLX("czxtlx", "操作系统类型", "0"), CZXTSCQY("czxtscqy", "操作系统生产企业", "0"), - CZXTBBH("czxtbbh", "操作系统版本号", "0"), + CZXTBBH("czxtbbh", "软件版本号", "0"), GNMC("gnmc", "功能名称", "0"), PZQK("pzqk", "配置情况", "2"), JSZDHJB("jszdhjb", "驾驶自动化级别", "driving_automation_level"), SJGGCS("sjggcs", "升级可能变更的《公告》技术参数", "0"), GNMS("gnms", "功能描述", "0"), - SYTJ("sytj", "适用条件", "0"), + SYTJ("sytj", "适用条件（边界条件）", "0"), RJKFQY("rjkfqy", "软件开发企业", "0"), CSYZSJ("csyzsj", "初始软件包的完整性验证数据", "0"), FJ("fj", "附件", "0"), @@ -169,7 +169,7 @@ public enum OtaTitleEnum { YHQR("yhqr", "升级活动是否提供用户确认选项", "0"), SJBCS("sjbcs", "升级包测试", "package_test"), AQKKX("aqkkx", "是杏已验证确认在线升级活动的安全性和可靠性", "0"), -// BGFJ("bgfj", "提供变更或扩展后的《公告》批次及证明材料", "0"), + // BGFJ("bgfj", "提供变更或扩展后的《公告》批次及证明材料", "0"), // CLFJ("clfj", "提供证明材料", "0"), XTMC("xtmc", "系统名称", "0"), SJQBGCS("sjqbgcs", "升级前已变更《公告》参数的对应调整", "0"), @@ -197,7 +197,7 @@ public enum OtaTitleEnum { GZBG("gzbg", "告知实施的变更", "0"), GZSCNR("gzscnr", "告知了对用户手册的全部更新内容", "0"), GZYHFS("gzyhfs", "告知用户方式（可多选）", "0"), -// XGWJ("xgwj", "用户告知相关文件", "0"), + // XGWJ("xgwj", "用户告知相关文件", "0"), RWMC("rwmc", "任务名称", "0"), SJFBSJ("sjfbsj", "升级发布时间", "0"), SJJZSJ("sjjzsj", "升级计划截止时间", "0"); From bf6d88219040a682c56aaafa5e2a27f9818d8db1 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Wed, 29 Mar 2023 21:02:17 +0800 Subject: [PATCH 538/645] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B5=81=E7=A8=8B-?= =?UTF-8?q?=E9=A3=9E=E4=B9=A6=E6=B6=88=E6=81=AF=E8=B7=B3=E8=BD=AC=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/project/enums/JumpLinkEnum.java | 1 + .../project/job/InventoryAffirmJob.java | 30 +++ .../modules/project/job/TaskAffirmJob.java | 70 ++++++ .../project/job/VerifyComplianceJob.java | 48 ++++ .../project/job/designComplianceJob.java | 48 ++++ .../mapper/ProjectLibraryBaseMapper.java | 1 + .../mapper/xml/ProjectLibraryBaseMapper.xml | 11 + .../IProjectLawsInventoryEOService.java | 8 + .../ProjectLawsInventoryEOServiceImpl.java | 218 ++++++++++++++++-- .../mapper/xml/ProcessInfoEOMapper.xml | 9 +- .../impl/ProcessInfoEOServiceImpl.java | 3 +- 11 files changed, 421 insertions(+), 26 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/JumpLinkEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/JumpLinkEnum.java index 895537666..651d15973 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/JumpLinkEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/JumpLinkEnum.java @@ -20,6 +20,7 @@ public enum JumpLinkEnum { DESIGN_AFFIRM_LINK("设计符合性确认链接","4","/ProjectDetails?id=","&type=103"), CERTIFICATION_INVENTORY_LINK("认证清单链接","5","/ProjectDetails?id=","&type=106"), TASK_AFFIRM_LINK("任务确认链接","2","/ProcessCenter",""), + FGRW_TO_DO_CENTER_LINK("项目法规任务待办中心链接","2","/projectRegulationTasks",""), FGPG_TODO_CENTER_LINK("法规评估任务待办中心链接","88","/regulatoryAssessmentTasks",""), XMCS_TODO_CENTER_LINK("项目参数任务待办中心链接","99","/projectParameterTasks",""), COMPLIANCE_PROCESS_DETAIL_LINK("符合性流程明细页路由","2","/taskListProcess",""), diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java index 79ef222d6..3d76b3089 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java @@ -21,6 +21,7 @@ import com.jero.modules.project.mapper.ProjectLibraryBaseMapper; import com.jero.modules.project.mapper.ProjectNameInfoEOMapper; import com.jero.modules.project.mapper.ProjectYearNameInfoEOMapper; import com.jero.modules.project.service.IProjectLawsInventoryEOService; +import com.jero.modules.project.service.IProjectLibraryBaseService; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysUserService; import lombok.extern.slf4j.Slf4j; @@ -69,6 +70,8 @@ public class InventoryAffirmJob implements Job { private ISysUserService sysUserService; @Autowired private IBussDocumentLibraryEOService bussDocumentLibraryEOService; + @Autowired + private IProjectLibraryBaseService projectLibraryBaseService; private static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); @@ -124,6 +127,15 @@ public class InventoryAffirmJob implements Job { params.put("endTime",endTime); params.put("userIdList",userIdList); params.put("serialNumbers",serialNumbers); + + ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); + String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 + String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 + // 获取法规清单 - 飞书跳转链接 + Map hrefFeishuMap = this.projectLawsInventoryEOService.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN); + params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE4.getValue(),params); } // 当天结束的 @@ -143,6 +155,15 @@ public class InventoryAffirmJob implements Job { params.put("endTime",endTime); params.put("userIdList",userIdList); params.put("serialNumbers",serialNumbers); + + ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); + String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 + String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 + // 获取法规清单 - 飞书跳转链接 + Map hrefFeishuMap = this.projectLawsInventoryEOService.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN); + params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE4.getValue(),params); } // 逾期的 @@ -162,6 +183,15 @@ public class InventoryAffirmJob implements Job { params.put("endTime",endTime); params.put("userIdList",userIdList); params.put("serialNumbers",serialNumbers); + + ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); + String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 + String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 + // 获取法规清单 - 飞书跳转链接 + Map hrefFeishuMap = this.projectLawsInventoryEOService.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN); + params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE4.getValue(),params); } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/TaskAffirmJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/TaskAffirmJob.java index 3f5ab9dc5..3a60bf6db 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/TaskAffirmJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/TaskAffirmJob.java @@ -22,6 +22,7 @@ import com.jero.modules.project.mapper.ProjectLibraryBaseMapper; import com.jero.modules.project.mapper.ProjectNameInfoEOMapper; import com.jero.modules.project.mapper.ProjectYearNameInfoEOMapper; import com.jero.modules.project.service.IProjectLawsInventoryEOService; +import com.jero.modules.project.service.IProjectLibraryBaseService; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysUserService; import com.jero.modules.wkflow.enums.FlowTypeEnum; @@ -69,6 +70,9 @@ public class TaskAffirmJob implements Job { @Autowired private IProjectLawsInventoryEOService projectLawsInventoryEOService; + @Autowired + private IProjectLibraryBaseService projectLibraryBaseService; + private static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); @@ -131,6 +135,17 @@ public class TaskAffirmJob implements Job { params.put("serialNumbers",serialNumbers); params.put("flowTypeCn","设计符合性流程"); params.put("flowTypeEn","Design Compliance Process"); + + ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); + // String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 + String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 + // 获取待办中心 - 飞书跳转链接 + Map todoCenterParams = new HashMap<>(); + todoCenterParams.put("projectNameCn",PRN_CN); + Map hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); + params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION4.getValue(),params); } // 当天结束的 @@ -152,6 +167,17 @@ public class TaskAffirmJob implements Job { params.put("serialNumbers",serialNumbers); params.put("flowTypeCn","设计符合性流程"); params.put("flowTypeEn","Design Compliance Process"); + + ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); + // String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 + String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 + // 获取待办中心 - 飞书跳转链接 + Map todoCenterParams = new HashMap<>(); + todoCenterParams.put("projectNameCn",PRN_CN); + Map hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); + params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION4.getValue(),params); } // 逾期的 @@ -173,6 +199,17 @@ public class TaskAffirmJob implements Job { params.put("serialNumbers",serialNumbers); params.put("flowTypeCn","设计符合性流程"); params.put("flowTypeEn","Design Compliance Process"); + + ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); + // String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 + String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 + // 获取待办中心 - 飞书跳转链接 + Map todoCenterParams = new HashMap<>(); + todoCenterParams.put("projectNameCn",PRN_CN); + Map hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); + params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION5.getValue(),params); } } @@ -209,6 +246,17 @@ public class TaskAffirmJob implements Job { params.put("serialNumbers",serialNumbers); params.put("flowTypeCn","验证符合性流程"); params.put("flowTypeEn","Validation Compliance Process"); + + ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); + // String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 + String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 + // 获取待办中心 - 飞书跳转链接 + Map todoCenterParams = new HashMap<>(); + todoCenterParams.put("projectNameCn",PRN_CN); + Map hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); + params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION4.getValue(),params); } // 当天结束的 @@ -230,6 +278,17 @@ public class TaskAffirmJob implements Job { params.put("serialNumbers",serialNumbers); params.put("flowTypeCn","验证符合性流程"); params.put("flowTypeEn","Validation Compliance Process"); + + ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); + // String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 + String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 + // 获取待办中心 - 飞书跳转链接 + Map todoCenterParams = new HashMap<>(); + todoCenterParams.put("projectNameCn",PRN_CN); + Map hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); + params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION4.getValue(),params); } // 逾期的 @@ -251,6 +310,17 @@ public class TaskAffirmJob implements Job { params.put("serialNumbers",serialNumbers); params.put("flowTypeCn","验证符合性流程"); params.put("flowTypeEn","Validation Compliance Process"); + + ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); + // String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 + String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 + // 获取待办中心 - 飞书跳转链接 + Map todoCenterParams = new HashMap<>(); + todoCenterParams.put("projectNameCn",PRN_CN); + Map hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); + params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION5.getValue(),params); } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/VerifyComplianceJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/VerifyComplianceJob.java index f22a64f06..b49eb845b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/VerifyComplianceJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/VerifyComplianceJob.java @@ -21,6 +21,7 @@ import com.jero.modules.project.mapper.ProjectLibraryBaseMapper; import com.jero.modules.project.mapper.ProjectNameInfoEOMapper; import com.jero.modules.project.mapper.ProjectYearNameInfoEOMapper; import com.jero.modules.project.service.IProjectLawsInventoryEOService; +import com.jero.modules.project.service.IProjectLibraryBaseService; import com.jero.modules.project.service.IProjectTaskInventoryEOService; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysUserService; @@ -62,6 +63,9 @@ public class VerifyComplianceJob implements Job { @Autowired private IProjectTaskInventoryEOService projectTaskInventoryEOService; + @Autowired + private IProjectLibraryBaseService projectLibraryBaseService; + @Value(value = "${jero.backUrl}") private String backUrl; @@ -120,6 +124,17 @@ public class VerifyComplianceJob implements Job { params.put("endTime",endTime); params.put("userIdList",userIdList); params.put("serialNumbers",serialNumbers); + + ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); + // String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 + String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 + // 获取待办中心 - 飞书跳转链接 + Map todoCenterParams = new HashMap<>(); + todoCenterParams.put("projectNameCn",PRN_CN); + Map hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); + params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION1.getValue(),params); } @@ -140,6 +155,17 @@ public class VerifyComplianceJob implements Job { params.put("endTime",endTime); params.put("userIdList",userIdList); params.put("serialNumbers",serialNumbers); + + ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); + // String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 + String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 + // 获取待办中心 - 飞书跳转链接 + Map todoCenterParams = new HashMap<>(); + todoCenterParams.put("projectNameCn",PRN_CN); + Map hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); + params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION1.getValue(),params); } @@ -160,6 +186,17 @@ public class VerifyComplianceJob implements Job { params.put("endTime",endTime); params.put("userIdList",userIdList); params.put("serialNumbers",serialNumbers); + + ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); + // String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 + String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 + // 获取待办中心 - 飞书跳转链接 + Map todoCenterParams = new HashMap<>(); + todoCenterParams.put("projectNameCn",PRN_CN); + Map hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); + params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION1.getValue(),params); } // 逾期的 @@ -179,6 +216,17 @@ public class VerifyComplianceJob implements Job { params.put("endTime",endTime); params.put("userIdList",userIdList); params.put("serialNumbers",serialNumbers); + + ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); + // String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 + String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 + // 获取待办中心 - 飞书跳转链接 + Map todoCenterParams = new HashMap<>(); + todoCenterParams.put("projectNameCn",PRN_CN); + Map hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); + params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION3.getValue(),params); } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/designComplianceJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/designComplianceJob.java index 361be9a51..dca721736 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/designComplianceJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/designComplianceJob.java @@ -21,6 +21,7 @@ import com.jero.modules.project.mapper.ProjectLibraryBaseMapper; import com.jero.modules.project.mapper.ProjectNameInfoEOMapper; import com.jero.modules.project.mapper.ProjectYearNameInfoEOMapper; import com.jero.modules.project.service.IProjectLawsInventoryEOService; +import com.jero.modules.project.service.IProjectLibraryBaseService; import com.jero.modules.project.service.IProjectTaskInventoryEOService; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysUserService; @@ -71,6 +72,9 @@ public class designComplianceJob implements Job { private ISysUserService sysUserService; @Autowired private IFeishuService feishuService; + + @Autowired + private IProjectLibraryBaseService projectLibraryBaseService; private static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); @Override @@ -120,6 +124,17 @@ public class designComplianceJob implements Job { params.put("endTime",endTime); params.put("userIdList",userIdList); params.put("serialNumbers",serialNumbers); + + ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); + // String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 + String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 + // 获取待办中心 - 飞书跳转链接 + Map todoCenterParams = new HashMap<>(); + todoCenterParams.put("projectNameCn",PRN_CN); + Map hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); + params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION1.getValue(),params); } @@ -140,6 +155,17 @@ public class designComplianceJob implements Job { params.put("endTime",endTime); params.put("userIdList",userIdList); params.put("serialNumbers",serialNumbers); + + ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); + // String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 + String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 + // 获取待办中心 - 飞书跳转链接 + Map todoCenterParams = new HashMap<>(); + todoCenterParams.put("projectNameCn",PRN_CN); + Map hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); + params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION1.getValue(),params); } @@ -160,6 +186,17 @@ public class designComplianceJob implements Job { params.put("endTime",endTime); params.put("userIdList",userIdList); params.put("serialNumbers",serialNumbers); + + ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); + // String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 + String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 + // 获取待办中心 - 飞书跳转链接 + Map todoCenterParams = new HashMap<>(); + todoCenterParams.put("projectNameCn",PRN_CN); + Map hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); + params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION1.getValue(),params); } // 逾期的 @@ -179,6 +216,17 @@ public class designComplianceJob implements Job { params.put("endTime",endTime); params.put("userIdList",userIdList); params.put("serialNumbers",serialNumbers); + + ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); + // String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 + String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 + // 获取待办中心 - 飞书跳转链接 + Map todoCenterParams = new HashMap<>(); + todoCenterParams.put("projectNameCn",PRN_CN); + Map hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); + params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION3.getValue(),params); } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectLibraryBaseMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectLibraryBaseMapper.java index 164a6fb5a..bf11fb26c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectLibraryBaseMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectLibraryBaseMapper.java @@ -25,4 +25,5 @@ public interface ProjectLibraryBaseMapper extends BaseMapper /**根据id查询*/ List queryById(String id); + ProjectLibraryBase selectProjectName(@Param("projectLibraryId") String projectLibraryId); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml index 909b618e8..72c19665d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml @@ -279,4 +279,15 @@ order by plb.create_time desc + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java index fd885984d..64c8d3eea 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java @@ -209,6 +209,14 @@ public interface IProjectLawsInventoryEOService extends IService getProjectLawsInventoryLinkHrefFeishu(String projectLibraryId, String PRN_CN, String PRN_EN); + /** + * 获取待办中心跳转链接 + * @param projectLibraryId + * @param todoCenterParams + * @return + */ + Map getToDoCenterLinkHrefFeishu(String projectLibraryId, Map todoCenterParams); + /** * 法规清单根据清单确认截至日期顺序排序 * @param projectLawsInventoryEOS diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 14b4bc427..795989c29 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -668,6 +668,17 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl todoCenterParams = new HashMap<>(); + todoCenterParams.put("projectNameCn",PRN_CN); + Map hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); + params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(),params); } } @@ -687,6 +698,17 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl todoCenterParams = new HashMap<>(); + todoCenterParams.put("projectNameCn",PRN_CN); + Map hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); + params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(),params); } } @@ -706,6 +728,17 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl todoCenterParams = new HashMap<>(); + todoCenterParams.put("projectNameCn",PRN_CN); + Map hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); + params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(),params); } } @@ -732,6 +765,17 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl todoCenterParams = new HashMap<>(); + todoCenterParams.put("projectNameCn",PRN_CN); + Map hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); + params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(),params); } } @@ -757,6 +801,17 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl todoCenterParams = new HashMap<>(); + todoCenterParams.put("projectNameCn",PRN_CN); + Map hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); + params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(),params); } } @@ -786,6 +841,17 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl todoCenterParams = new HashMap<>(); + todoCenterParams.put("projectNameCn",PRN_CN); + Map hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); + params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + this.sendMessageByTemplateId(TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION1.getValue(),params); } @@ -807,6 +873,17 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl todoCenterParams = new HashMap<>(); + todoCenterParams.put("projectNameCn",PRN_CN); + Map hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); + params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); this.sendMessageByTemplateId(TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION1.getValue(),params); } } @@ -3066,6 +3143,17 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl prarams = (Map) jsonObject.get("params"); String templateId = jsonObject.getString("templateId"); + + String projectLibraryId = (String) prarams.get("projectLibraryId"); + ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); + // String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 + String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 + // 获取待办中心 - 飞书跳转链接 + Map todoCenterParams = new HashMap<>(); + todoCenterParams.put("projectNameCn",PRN_CN); + Map hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); + prarams.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + prarams.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); this.sendMessageByTemplateId(templateId,prarams); } @@ -6157,6 +6245,16 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN); + paramsMsg.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + paramsMsg.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + + this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE2.getValue(),paramsMsg); } return Result.OK("变更成功！"); @@ -9524,6 +9622,15 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN); + params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE1.getValue(),params); } } @@ -9566,6 +9673,16 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN); + params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + + this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE2.getValue(),params); } } @@ -9604,6 +9721,17 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl todoCenterParams = new HashMap<>(); + todoCenterParams.put("projectNameCn",PRN_CN); + Map hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); + params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + this.sendMessageByTemplateId(TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION1.getValue(),params); } } @@ -9643,6 +9771,15 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN); + params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE2.getValue(),params); } } @@ -9681,6 +9818,17 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl todoCenterParams = new HashMap<>(); + todoCenterParams.put("projectNameCn",PRN_CN); + Map hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); + params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + this.sendMessageByTemplateId(TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION1.getValue(),params); } } @@ -10454,15 +10602,6 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl().lambda().eq(SysUser::getId, projectLibraryBase.getStudioEngineer()) - ); - String ids = json.getString("ids"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); @@ -10531,6 +10670,15 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN); + params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE1.getValue(),params); return Result.OK("发起清单确认成功！"); @@ -10542,15 +10690,6 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl().lambda().eq(SysUser::getId, projectLibraryBase.getStudioEngineer()) - ); - String ids = json.getString("ids"); QueryWrapper queryWrapper = new QueryWrapper<>(); if(StringUtils.isEmpty(ids)){ @@ -10609,6 +10748,15 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN); + params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE2.getValue(),params); return Result.OK("撤回成功！"); @@ -10668,6 +10816,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN); + params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE3.getValue(),params); return Result.OK("退回成功！"); } @@ -10725,16 +10879,15 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN, PRN_EN); - String hrefFeishu_CN = (String) hrefFeishuMap.get("hrefFeishu_CN"); - String hrefFeishu_EN = (String) hrefFeishuMap.get("hrefFeishu_EN"); + try { for (String userId : userIdList) { String thirdId = this.sysUserService.getUserThirdIdByUserId(userInfoList,userId); @@ -10792,6 +10945,27 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl getToDoCenterLinkHrefFeishu(String projectLibraryId, Map todoCenterParams) { + // String projectNameCn = (String) todoCenterParams.get("projectNameCn"); + + ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.getBaseMapper().selectProjectName(projectLibraryId); + String projectNameCn = projectLibraryBase.getProjectName(); + + Map result = new HashMap<>(); + + String hrefFeishu_CN = backUrl + + JumpLinkEnum.FGRW_TO_DO_CENTER_LINK.getLink() + "?projectName=" + projectNameCn; + + //飞书跳转链接 + String hrefFeishu_EN = backUrl + + JumpLinkEnum.FGRW_TO_DO_CENTER_LINK.getLink() + "?projectName=" + projectNameCn; + + result.put("hrefFeishu_CN",hrefFeishu_CN); + result.put("hrefFeishu_EN",hrefFeishu_EN); + return result; + } + @Override public void lawsInventoryEOListSortByInventoryAffirmDueDate(List projectLawsInventoryEOS) { Collections.sort(projectLawsInventoryEOS, new Comparator() { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml index 3119767fe..12b8435a6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml @@ -46,7 +46,8 @@ pi.project_laws_inventory_id, pi.buss_document_library_id, pi.acti_proc_inst_id, - pni.project_name, + + concat( pni.project_name, '-', pyni.year_name ) AS project_name, pyni.year_name, pli.serial_number, pli.title, @@ -115,7 +116,8 @@ pi.project_laws_inventory_id, pi.buss_document_library_id, pi.acti_proc_inst_id, - pni.project_name, + + concat( pni.project_name, '-', pyni.year_name ) AS project_name, pyni.year_name, pli.serial_number, pli.title, @@ -165,7 +167,8 @@ pi.project_laws_inventory_id, pi.buss_document_library_id, pi.acti_proc_inst_id, - pni.project_name, + + concat( pni.project_name, '-', pyni.year_name ) AS project_name, pyni.year_name, '--' as serial_number, '--' as standard_info, diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java index d2163643e..a4b5ddfe3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java @@ -566,7 +566,8 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl Date: Wed, 29 Mar 2023 21:05:43 +0800 Subject: [PATCH 539/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E8=BD=A6=E8=BE=86=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java index a0dca3213..5822dcd65 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java @@ -22,7 +22,7 @@ public enum OtaTitleEnum { TXZD("txzd", "通信终端", "communication_terminal"), CDOTASJ("cdotasj", "车端OTA升级管理系统", "0"), - BHSJB("bhsjb", "激光雷达-应保护升级包的真实性和完整性，以合理地防止其受到损害，并合理地防止无效升级\t", "2"), + BHSJB("bhsjb", "激光雷达-应保护升级包的真实性和完整性，以合理地防止其受到损害，并合理地防止无效升级", "2"), BHCLBB("bhclbb", "激光雷达-应保护车辆上的软件版本（集），防止未经授权的修改", "2"), CLGXNL("clgxnl", "升级功能要求-车辆应具备更新软件版本（集）的能力，应通过使用电子通信接口，至少用过标准接口（如OBD端口），以标准化的方式易于读取", "2"), CLSJTJ("clsjtj", "升级功能要求-应确保车辆在执行软件升级之前满足先决条件", "2"), From 07bf2bcb9fecc434ea22c06511b47dabb805bd8e Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Wed, 29 Mar 2023 21:15:34 +0800 Subject: [PATCH 540/645] =?UTF-8?q?67538=20=E6=B3=95=E8=A7=84=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E8=B0=83=E5=8F=96=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9=EF=BC=8C?= =?UTF-8?q?=E9=87=8D=E7=BD=AE=E5=8F=8C=E6=97=B6=E9=97=B4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProjectLawsInventoryEOServiceImpl.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 795989c29..0fd56b6ae 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -303,6 +303,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl Date: Wed, 29 Mar 2023 21:56:12 +0800 Subject: [PATCH 541/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E8=BD=A6=E8=BE=86=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/modules/ota/entity/VinObj.java | 58 +++++++++++++++ .../impl/OtaBaSjSjmbclServiceImpl.java | 72 ++++++++++++++++--- 2 files changed, 121 insertions(+), 9 deletions(-) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/VinObj.java diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/VinObj.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/VinObj.java new file mode 100644 index 000000000..a0511aaaf --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/VinObj.java @@ -0,0 +1,58 @@ +package com.jero.modules.ota.entity; + +import com.jero.modules.extRepo.entity.ERFTreeData; +import com.jero.modules.ota.service.impl.OtaBaSjSjmbclServiceImpl; +import org.jetbrains.annotations.NotNull; + +import java.util.Date; + +public class VinObj { + + + String vin; + String cx; + String gglx; + Date scrq; + String scrqStr; + + public String getVin() { + return vin; + } + + public void setVin(String vin) { + this.vin = vin; + } + + public String getCx() { + return cx; + } + + public void setCx(String cx) { + this.cx = cx; + } + + public String getGglx() { + return gglx; + } + + public void setGglx(String gglx) { + this.gglx = gglx; + } + + public Date getScrq() { + return scrq; + } + + public void setScrq(Date scrq) { + this.scrq = scrq; + } + + public String getScrqStr() { + return scrqStr; + } + + public void setScrqStr(String scrqStr) { + this.scrqStr = scrqStr; + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java index 266fce976..0edcd6d15 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java @@ -2,15 +2,13 @@ package com.jero.modules.ota.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.common.exception.JeroBootException; +import com.jero.modules.extRepo.entity.ERFTreeData; import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.ota.entity.*; import com.jero.modules.ota.enums.OtaModuleEnum; import com.jero.modules.ota.mapper.OtaBaSjSjmbclMapper; -import com.jero.modules.ota.service.IOtaBaCxTxjlService; -import com.jero.modules.ota.service.IOtaBaSjListService; -import com.jero.modules.ota.service.IOtaBaSjLsjlService; -import com.jero.modules.ota.service.IOtaBaSjSjmbclService; +import com.jero.modules.ota.service.*; import com.jero.modules.ota.utils.ComparisonUtil; import com.jero.modules.ota.utils.ImportFileUtil; import com.jero.modules.system.service.ISysDictService; @@ -20,14 +18,14 @@ import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.Row; import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.Workbook; +import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import java.io.File; -import java.util.List; -import java.util.Date; -import java.util.UUID; +import java.text.SimpleDateFormat; +import java.util.*; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.web.multipart.MultipartFile; @@ -44,6 +42,8 @@ import javax.servlet.http.HttpServletResponse; @Service public class OtaBaSjSjmbclServiceImpl extends ServiceImpl implements IOtaBaSjSjmbclService { + private static final SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd"); + @Value(value = "${ota.templatePath}") private String templatePath; @@ -59,6 +59,10 @@ public class OtaBaSjSjmbclServiceImpl extends ServiceImpl vinList = new ArrayList<>(); + for (int i = 1; i < rows; i++) { + VinObj vinObj = new VinObj(); + Row row = s.getRow(i); + Cell cell = row.getCell(0); + vinObj.setVin(ImportFileUtil.getCellValue(cell, wb)); + cell = row.getCell(1); + vinObj.setCx(ImportFileUtil.getCellValue(cell, wb)); + if (!cx.equals(vinObj.getCx())) { + continue; + } + cell = row.getCell(2); + vinObj.setGglx(ImportFileUtil.getCellValue(cell, wb)); + cell = row.getCell(3); + vinObj.setScrq(cell.getDateCellValue()); + vinObj.setScrqStr(sdf.format(vinObj.getScrq())); + vinList.add(vinObj); + } + + + mbcl.setOtaId(otaId); + if (ObjectUtils.isNotEmpty(vinList)) { + // 匿名比较器排序 + Collections.sort(vinList, new Comparator() { + @Override + public int compare(VinObj p1, VinObj p2) { + return p1.getScrq().compareTo(p2.getScrq()); + } + }); + mbcl.setZsl(String.valueOf(vinList.size())); + mbcl.setScrqks(vinList.get(0).getScrq()); + mbcl.setScrqjs(vinList.get(vinList.size() - 1).getScrq()); + // 匿名比较器排序 + Collections.sort(vinList, new Comparator() { + @Override + public int compare(VinObj p1, VinObj p2) { + return p1.getVin().compareTo(p2.getVin()); + } + }); + mbcl.setVinList(vinList.get(0).getVin() + "-" + vinList.get(vinList.size() - 1).getVin()); + } + } return mbcl; } @@ -205,4 +258,5 @@ public class OtaBaSjSjmbclServiceImpl extends ServiceImpl Date: Wed, 29 Mar 2023 22:43:38 +0800 Subject: [PATCH 542/645] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E5=B8=82=E5=9C=BA?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E5=AF=BC=E5=85=A5=E6=97=B6=E7=9A=84=E9=AA=8C?= =?UTF-8?q?=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AuthDummyInventoryInfoEOServiceImpl.java | 386 +++++++++++++++++- .../ProjectCertificationInventoryEOEn.java | 2 +- ...ctCertificationInventoryEOServiceImpl.java | 2 +- 3 files changed, 371 insertions(+), 19 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java index 722c114cb..ccc0b9946 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java @@ -28,6 +28,7 @@ import com.jero.modules.dummy.enums.DummyInventoryBaseFieldEnum; import com.jero.modules.dummy.service.impl.DummyLogEOServiceImpl; import com.jero.modules.dummy.util.DeepCopyListUtil; import com.jero.modules.oss.service.IOSSFileService; +import com.jero.modules.project.entity.ProjectCertificationInventoryEO; import com.jero.modules.project.enums.ProjectInventoryFieldEnum; import com.jero.modules.split.common.FileUnZip; import com.jero.modules.system.entity.SysCategory; @@ -513,9 +514,9 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl categoryList = sysCategoryService.list(); -// //普通数据字典 -// List dictItemList = sysDictItemServiceImpl.selectItemsAll(); -// importDatas(datas, categoryList, dictItemList, zipEntryName,saveDirectory,authDummyInventoryInfoEO); - String cut = authDummyInventoryInfoEO.getCut(); - importDisposeData(datas,cut); + List categoryList = sysCategoryService.list(); + //普通数据字典 + List dictItemList = sysDictItemServiceImpl.selectItemsAll(); + importDatas(datas, categoryList, dictItemList, zipEntryName,saveDirectory,authDummyInventoryInfoEO); +// String cut = authDummyInventoryInfoEO.getCut(); +// importDisposeData(datas,cut); //删除原上传文件 FileUnZip.deleteDir(saveDirectory); }else{ @@ -720,6 +721,357 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl datas, + List categoryList, List dictItemList, + String zipEntryName, File saveDirectory, + AuthDummyInventoryInfoEO authDummyInventoryInfoEOTemp) { + List msgList = new ArrayList<>(); + + //模板数据验证 + msgList = dataTemplateVerify(datas, dictItemList, zipEntryName, authDummyInventoryInfoEOTemp, categoryList); + if (msgList.size() > 0) { + //返回报错信息 + String html = ""; + for (String s : msgList) { + html += s + "
"; + } + FileUnZip.deleteDir(saveDirectory); + throw new JeroBootException(html); + }else { + if (datas.size() != 0) { + this.saveBatch(datas); + } + } + } + + private List dataTemplateVerify(List datas, + List dictItemList, String zipEntryName, + AuthDummyInventoryInfoEO authDummyInventoryInfoEOTemp, + List categoryList) { + String dictId = sysCategoryMapper.getDictId("ren4_zheng4_-_jiao1_fu4_wu4_lei4_xing2"); + List collect = categoryList.stream().filter(e -> e.getSysDictId().equals(dictId)).collect(Collectors.toList()); + List treeNameList = new ArrayList<>(); + if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEOTemp.getCut())){ + treeNameList = collect.stream().map(SysCategory::getName).collect(Collectors.toList()); + }else{ + treeNameList = collect.stream().map(SysCategory::getEnName).collect(Collectors.toList()); + } + int i = 2; + List msgList = new ArrayList<>(); + String value = ""; + boolean flag = true; + + //编号验证 + verifySerialNumber(datas,authDummyInventoryInfoEOTemp); + for(AuthDummyInventoryInfoEO authDummyInventoryInfoEO :datas){ + i++; + String errorMsg = ""; + if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEOTemp.getCut())){ + errorMsg = "第" + i + "行："; + }else{ + errorMsg = i + " line："; + } + //类别 + String category = authDummyInventoryInfoEO.getCategory(); + //检验项目 + String inspectionItem = authDummyInventoryInfoEO.getInspectionItem(); + //配置项 + String configItem = authDummyInventoryInfoEO.getConfigItem(); + //WVTA ID + String wvtaId = authDummyInventoryInfoEO.getWvtaId(); + //标准编号 + String serialNumber = authDummyInventoryInfoEO.getSerialNumber(); + //责任领域 + String dutyTerritory = authDummyInventoryInfoEO.getDutyTerritoryName(); + //交付物类型 + String deliverableType = ""; + if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEO.getCut())){ + deliverableType = authDummyInventoryInfoEO.getDeliverableTypeName(); + }else { + deliverableType = authDummyInventoryInfoEO.getDeliverableTypeNameEn(); + } + + //编号必填 + flag = must(authDummyInventoryInfoEO, errorMsg, msgList, serialNumber, "编号", "Number"); + + //WVTA ID + + if(StringUtils.isNotBlank(wvtaId)){ + if(wvtaId.length() > 100){ + String message = ""; + if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEOTemp.getCut())){ + message = errorMsg + "WVTA ID不能超过100个字符, "; + }else{ + message = errorMsg + " The WVTA ID cannot contain more than 100 characters, "; + } + msgList.add(message); + } + } else { + String message = ""; + if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEOTemp.getCut())){ + message = errorMsg + "WVTA ID不能为空, "; + }else{ + message = errorMsg + " The WVTA ID cannot null, "; + } + msgList.add(message); + } + //类别 + + if(StringUtils.isNotBlank(category)){ + if(category.length() > 100){ + String message = ""; + if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEOTemp.getCut())){ + message = errorMsg + "类别不能超过100个字符, "; + }else{ + message = errorMsg + " The Category cannot contain more than 100 characters, "; + } + msgList.add(message); + } + }else { + String message = ""; + if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEOTemp.getCut())){ + message = errorMsg + "类别不能为空, "; + }else{ + message = errorMsg + " The Category cannot null, "; + } + msgList.add(message); + } + //检验项目 + + if(StringUtils.isNotBlank(inspectionItem)){ + if(inspectionItem.length() > 100){ + String message = ""; + if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEOTemp.getCut())){ + message = errorMsg + "检验项目不能超过100个字符, "; + }else{ + message = errorMsg + " The InspectionItem cannot contain more than 100 characters, "; + } + msgList.add(message); + } + }else { + String message = ""; + if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEOTemp.getCut())){ + message = errorMsg + "检验项目不能为空, "; + }else{ + message = errorMsg + " The InspectionItem cannot null, "; + } + msgList.add(message); + } + //配置项 + + if(StringUtils.isNotBlank(configItem)){ + if(configItem.length() > 100){ + String message = ""; + if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEOTemp.getCut())){ + message = errorMsg + "配置项不能超过100个字符, "; + }else{ + message = errorMsg + " The ConfigItem cannot contain more than 100 characters, "; + } + msgList.add(message); + } + }else { + String message = ""; + if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEOTemp.getCut())){ + message = errorMsg + "配置项不能为空, "; + }else{ + message = errorMsg + " The ConfigItem cannot null, "; + } + msgList.add(message); + } + //责任领域 + if(StringUtils.isNotBlank(dutyTerritory)){ + value = pullMore(dictItemList, authDummyInventoryInfoEO, errorMsg, dutyTerritory,msgList,"责任领域","Responsible Field","duty_territory"); + if(StringUtils.isNotBlank(value)){ + authDummyInventoryInfoEO.setDutyTerritory(value); + } + }else { + String message = ""; + if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEOTemp.getCut())){ + message = errorMsg + "责任领域不能为空, "; + }else{ + message = errorMsg + " The Responsible Field cannot null, "; + } + msgList.add(message); + } + //交付物类型 + if(StringUtils.isNotEmpty(deliverableType)){ + value = tree(categoryList,treeNameList, authDummyInventoryInfoEO, errorMsg, deliverableType,msgList,"交付物类型","Deliverable Type","deliverable_template"); + if(StringUtils.isNotBlank(value)){ + String treeId = getTreeId(categoryList, authDummyInventoryInfoEOTemp, treeNameList, value); + authDummyInventoryInfoEO.setDeliverableType(treeId); + } + }else{ + String message = ""; + if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEOTemp.getCut())){ + message = errorMsg + "交付物类型不能为空, "; + }else{ + message = errorMsg + " The Deliverable Type cannot null, "; + } + msgList.add(message); + } + } + return msgList; + } + + private String getTreeId(List categoryList, AuthDummyInventoryInfoEO authDummyInventoryInfoEOTemp, + List treeNameList, String value) { + StringBuilder sb = new StringBuilder(); + for (String valueTemp : value.split(",")) { + if (treeNameList.contains(valueTemp)) { + List sysCategoryList = new ArrayList<>(); + if (CutEnum.CN.getValue().equals(authDummyInventoryInfoEOTemp.getCut())) { + sysCategoryList = categoryList.stream().filter(e -> e.getName().equals(valueTemp)).collect(Collectors.toList()); + } else { + sysCategoryList = categoryList.stream().filter(e -> e.getEnName().equals(valueTemp)).collect(Collectors.toList()); + } + if (sysCategoryList.size() != 0) { + sb.append(sysCategoryList.get(0).getId() + ","); + } + } + } + if (StringUtils.isNotBlank(sb)) { + String substring = sb.substring(0, sb.length() - 1); + return substring; + } + return null; + } + + private String tree(List categoryList, List nameList, + AuthDummyInventoryInfoEO authDummyInventoryInfoEO, + String errorMsg, String value, List msgList, + String nameCn, String nameEn, String dictCode) { + if (StringUtils.isNotBlank(value)) { + StringBuilder sb = new StringBuilder(); + for (String s : value.split(",")) { + if(!nameList.contains(s)){ + sb.append(s+","); + } + } + if(StringUtils.isNotBlank(sb)){ + String substring = sb.substring(0, sb.length() - 1); + if (CutEnum.CN.getValue().equals(authDummyInventoryInfoEO.getCut())) { + errorMsg += nameCn + "中的" + substring + "与数据字典不匹配, "; + } else { + errorMsg += nameEn + " " + substring + " does not match the data dictionary, "; + } + msgList.add(errorMsg); + }else{ + StringBuilder sbTemp = new StringBuilder(); + for (String s : value.split(",")) { + List collect = new ArrayList<>(); + if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEO.getCut())){ + collect = categoryList.stream().filter(e -> s.equals(e.getName())).collect(Collectors.toList()); + if(collect.size() != 0){ + sbTemp.append(collect.get(0).getName()+","); + } + }else{ + collect = categoryList.stream().filter(e -> s.equals(e.getEnName())).collect(Collectors.toList()); + if(collect.size() != 0){ + sbTemp.append(collect.get(0).getEnName()+","); + } + } + } + if(StringUtils.isNotBlank(sbTemp)){ + String substring = sbTemp.substring(0, sbTemp.length() - 1); + return substring; + } + } + } + return null; + } + + private String pullMore(List dictItemList, AuthDummyInventoryInfoEO authDummyInventoryInfoEO, + String errorMsg, String value, List msgList, String nameCn, + String nameEn, String dictCode) { + List valueList = new ArrayList<>(); + if (StringUtils.isNotBlank(value)) { + List list = Arrays.asList(value.split(",")); + List sysDictItemList = new ArrayList<>(); + if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEO.getCut())){ + sysDictItemList = dictItemList.stream().filter(e ->dictCode.equals(e.getDictCode()) && list.contains(e.getItemText())).collect(Collectors.toList()); + }else{ + sysDictItemList = dictItemList.stream().filter(e ->dictCode.equals(e.getDictCode()) && list.contains(e.getEnName())).collect(Collectors.toList()); + } + + if(list.size() == sysDictItemList.size()){ + valueList = sysDictItemList.stream().map(SysDictItem::getItemValue).collect(Collectors.toList()); + + }else{ + //数据中有与数据字典不匹配的值 + List finalValueList = valueList; + List diffList = list.stream().filter(e -> !finalValueList.contains(e)).collect(Collectors.toList()); + if (CutEnum.CN.getValue().equals(authDummyInventoryInfoEO.getCut())) { + errorMsg += nameCn + "中的" + StringUtils.join(diffList,",") + "与数据字典不匹配, "; + } else { + errorMsg += nameEn + " " + StringUtils.join(diffList,",") + " does not match the data dictionary, "; + } + msgList.add(errorMsg); + } + } + return StringUtils.join(valueList,","); + } + + private boolean must(AuthDummyInventoryInfoEO authDummyInventoryInfoEO, + String errorMsg, List msgList, String serialNumber, + String nameCn, String nameEn) { + int errorCount = 0; + if(StringUtils.isBlank(serialNumber)){ + errorCount ++; + if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEO.getCut())){ + errorMsg += nameCn + "为必填项,不能为空, "; + }else{ + errorMsg += nameEn + "This parameter is mandatory and cannot be empty, "; + } + msgList.add(errorMsg); + } + if(errorCount == 0){ + return true; + }else{ + return false; + } + } + + private void verifySerialNumber(List datas, + AuthDummyInventoryInfoEO authDummyInventoryInfoEOTemp) { + //1. 验证标准号在文档库中是否存在 + List serialNumberList = datas.stream().map(AuthDummyInventoryInfoEO::getSerialNumber).collect(Collectors.toList()); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(BussDocumentLibraryEO::getSerialNumber,serialNumberList); + List bussDocumentLibraryEOList = iBussDocumentLibraryEOService.list(wrapper); + //文档库中可能存在重复的标准号 + List serialNumberListTemp = bussDocumentLibraryEOList.stream().map(BussDocumentLibraryEO::getSerialNumber).distinct().collect(Collectors.toList()); + if(serialNumberList.size() != serialNumberListTemp.size()){ + //存在文档库没有的数据 + List collect = bussDocumentLibraryEOList.stream().map(BussDocumentLibraryEO::getSerialNumber).collect(Collectors.toList()); + List serialNumbers = serialNumberList.stream().filter(e -> !collect.contains(e)).collect(Collectors.toList()); + if(serialNumbers.size() > 0){ + if(CutEnum.CN.getValue().equals(datas.get(0).getCut())){ + throw new JeroBootException(StringUtils.join(serialNumbers,",")+"文档库中不存在,不能添加"); + }else{ + throw new JeroBootException(StringUtils.join(serialNumbers,",")+" does not exist in the document library and cannot be added"); + } + } + }else{ + for (AuthDummyInventoryInfoEO authDummyInventoryInfoEO : datas) { + List collect = bussDocumentLibraryEOList.stream() + .filter(e -> e.getSerialNumber().equals(authDummyInventoryInfoEO.getSerialNumber())).collect(Collectors.toList()); + authDummyInventoryInfoEO.setBussDocumentLibraryId(collect.get(0).getId()); + } + } +// //2. 验证标准号在法规清单中是否添加过 +// LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); +// lambdaQueryWrapper.in(ProjectCertificationInventoryEO::getSerialNumber,serialNumberList).in(ProjectCertificationInventoryEO::getProjectLibraryId,projectCertificationInventoryEOTemp.getProjectLibraryId()); +// List projectCertificationInventoryEOList = this.list(lambdaQueryWrapper); +// List serialNumberTempList = projectCertificationInventoryEOList.stream().map(ProjectCertificationInventoryEO::getSerialNumber).collect(Collectors.toList()); +// if(projectCertificationInventoryEOList.size() > 0){ +// if(CutEnum.CN.getValue().equals(datas.get(0).getCut())){ +// throw new JeroBootException(StringUtils.join(serialNumberTempList,",")+"已存在,不能重复添加"); +// }else{ +// throw new JeroBootException(StringUtils.join(serialNumberTempList,",")+" already exists and cannot be added again"); +// } +// } + } + @Override public Result batchAdd(JSONObject json) { try { @@ -763,21 +1115,21 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl Date: Wed, 29 Mar 2023 22:55:58 +0800 Subject: [PATCH 543/645] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E4=B8=8B=E8=BD=BD=E5=A2=9E=E5=8A=A0=E4=B8=89?= =?UTF-8?q?=E4=B8=AA=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectCertificationInventoryEOServiceImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index e19d7b423..42836a268 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -3837,19 +3837,19 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl list = Arrays.asList(title.split(",")); int index = 0; if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){ - index = list.indexOf("*截止日期") + 1; + index = list.indexOf("生产企业名称") + 1; }else{ - index = list.indexOf("*Due Date") + 1; + index = list.indexOf("Name Of Manufacturer") + 1; } //创建临时文件夹 @@ -3869,7 +3869,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl Date: Wed, 29 Mar 2023 23:52:39 +0800 Subject: [PATCH 544/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E8=BD=A6=E8=BE=86=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/OtaBaSjSjmbclServiceImpl.java | 40 +++- .../com/jero/modules/ota/utils/CSVUtil.java | 198 ++++++++++++++++++ 2 files changed, 228 insertions(+), 10 deletions(-) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/CSVUtil.java diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java index 0edcd6d15..52a54ee7c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java @@ -1,14 +1,21 @@ package com.jero.modules.ota.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.constant.enums.CutEnum; import com.jero.common.exception.JeroBootException; -import com.jero.modules.extRepo.entity.ERFTreeData; import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; -import com.jero.modules.ota.entity.*; +import com.jero.modules.ota.entity.OtaBaCxTxjl; +import com.jero.modules.ota.entity.OtaBaSjSjmbcl; +import com.jero.modules.ota.entity.OtaBaSjSjmbcx; +import com.jero.modules.ota.entity.VinObj; import com.jero.modules.ota.enums.OtaModuleEnum; import com.jero.modules.ota.mapper.OtaBaSjSjmbclMapper; -import com.jero.modules.ota.service.*; +import com.jero.modules.ota.service.IOtaBaCxTxjlService; +import com.jero.modules.ota.service.IOtaBaSjSjmbclService; +import com.jero.modules.ota.service.IOtaBaSjSjmbcxService; +import com.jero.modules.ota.utils.CSVUtil; import com.jero.modules.ota.utils.ComparisonUtil; import com.jero.modules.ota.utils.ImportFileUtil; import com.jero.modules.system.service.ISysDictService; @@ -18,20 +25,16 @@ import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.Row; import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.Workbook; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; - -import java.io.File; -import java.text.SimpleDateFormat; -import java.util.*; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.text.SimpleDateFormat; +import java.util.*; /** * @Description: 升级备案-升级目标车辆 @@ -219,6 +222,7 @@ public class OtaBaSjSjmbclServiceImpl extends ServiceImpl(); + Map vrow = null; + for (int i = 0; i < vinList.size(); i++) { + vrow = new LinkedHashMap(); + vrow.put("1", vinList.get(i).getVin()); + exportData.add(vrow); + } + String fileName = "VIN码.csv"; + File file = CSVUtil.createCSVFile(exportData, map, uploadPath + System.currentTimeMillis(), fileName); + String filePath = uploadPath + "/" + file.getName(); + OSSFile ossFile = ossFileService.uploadLocalOfCos(ImportFileUtil.createMfileByFile(file), "/ota", "", CutEnum.CN.getValue()); + mbcl.setCsv(ossFile.getId()); } } return mbcl; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/CSVUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/CSVUtil.java new file mode 100644 index 000000000..423f532ad --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/CSVUtil.java @@ -0,0 +1,198 @@ +package com.jero.modules.ota.utils; + +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.OutputStreamWriter; +import java.net.URLEncoder; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.beanutils.BeanUtils; + +/** + * 文件操作 + */ +public class CSVUtil { + + /** + * 生成为CVS文件 + * + * @param exportData 源数据List + * @param map csv文件的列表头map + * @param outPutPath 文件路径 + * @param fileName 文件名称 + * @return + */ + @SuppressWarnings("rawtypes") + public static File createCSVFile(List exportData, LinkedHashMap map, + String outPutPath, String fileName) { + File csvFile = null; + BufferedWriter csvFileOutputStream = null; + try { + // 定义文件名格式并创建 + File file = new File(outPutPath); + if (!file.exists()) { + file.mkdir(); + } + csvFile = new File(outPutPath + "/" + fileName); + System.out.println("csvFile：" + csvFile); + // UTF-8使正确读取分隔符"," + csvFileOutputStream = new BufferedWriter( + new OutputStreamWriter( + new FileOutputStream(csvFile), "UTF-8"), 1024); + System.out.println("csvFileOutputStream：" + csvFileOutputStream); + // 写入文件头部 + for (Iterator propertyIterator = map.entrySet().iterator(); + propertyIterator.hasNext(); ) { + java.util.Map.Entry propertyEntry = + (java.util.Map.Entry) propertyIterator.next(); + csvFileOutputStream.write( + "" + (String) propertyEntry.getValue() != null ? + (String) propertyEntry.getValue() : "" + ""); + if (propertyIterator.hasNext()) { + csvFileOutputStream.write(","); + } + } + csvFileOutputStream.newLine(); + // 写入文件内容 + for (Iterator iterator = exportData.iterator(); iterator.hasNext(); ) { + Object row = (Object) iterator.next(); + for (Iterator propertyIterator = map.entrySet().iterator(); + propertyIterator.hasNext(); ) { + java.util.Map.Entry propertyEntry = + (java.util.Map.Entry) propertyIterator.next(); + csvFileOutputStream.write((String) BeanUtils.getProperty( + row, (String) propertyEntry.getKey())); + if (propertyIterator.hasNext()) { + csvFileOutputStream.write(","); + } + } + if (iterator.hasNext()) { + csvFileOutputStream.newLine(); + } + } + csvFileOutputStream.flush(); + } catch (Exception e) { + e.printStackTrace(); + } finally { + try { + csvFileOutputStream.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + return csvFile; + } + + /** + * 下载文件 + * + * @param response + * @param csvFilePath 文件路径 + * @param fileName 文件名称 + * @throws IOException + */ + public static void exportFile(HttpServletResponse response, + String csvFilePath, String fileName) + throws IOException { + response.setContentType("application/csv;charset=UTF-8"); + response.setHeader("Content-Disposition", "attachment; filename=" + + URLEncoder.encode(fileName, "UTF-8")); + + InputStream in = null; + try { + in = new FileInputStream(csvFilePath); + int len = 0; + byte[] buffer = new byte[1024]; + response.setCharacterEncoding("UTF-8"); + OutputStream out = response.getOutputStream(); + while ((len = in.read(buffer)) > 0) { + out.write(new byte[]{(byte) 0xEF, (byte) 0xBB, (byte) 0xBF}); + out.write(buffer, 0, len); + } + } catch (FileNotFoundException e) { + System.out.println(e); + } finally { + if (in != null) { + try { + in.close(); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + } + } + + /** + * 删除该目录filePath下的所有文件 + * + * @param filePath 文件目录路径 + */ + public static void deleteFiles(String filePath) { + File file = new File(filePath); + if (file.exists()) { + File[] files = file.listFiles(); + for (int i = 0; i < files.length; i++) { + if (files[i].isFile()) { + files[i].delete(); + } + } + } + } + + /** + * 删除单个文件 + * + * @param filePath 文件目录路径 + * @param fileName 文件名称 + */ + public static void deleteFile(String filePath, String fileName) { + File file = new File(filePath); + if (file.exists()) { + File[] files = file.listFiles(); + for (int i = 0; i < files.length; i++) { + if (files[i].isFile()) { + if (files[i].getName().equals(fileName)) { + files[i].delete(); + return; + } + } + } + } + } + + /** + * 测试数据 + * + * @param args + */ + @SuppressWarnings({"rawtypes", "unchecked"}) + public static void main(String[] args) { + List exportData = new ArrayList(); + Map row1 = new LinkedHashMap(); + row1.put("1", "11"); + exportData.add(row1); + row1 = new LinkedHashMap(); + row1.put("1", "21"); + exportData.add(row1); + LinkedHashMap map = new LinkedHashMap(); + map.put("1", "第一列"); + + String path = "c:/export/"; + String fileName = "文件导出"; + File file = CSVUtil.createCSVFile(exportData, map, path, fileName); + String fileName2 = file.getName(); + System.out.println("文件名称：" + fileName2); + } +} From 61b1672d8483db06f618469b2a71dffa1c03f210 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Thu, 30 Mar 2023 00:23:00 +0800 Subject: [PATCH 545/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E8=BD=A6=E8=BE=86=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/OtaBaSjSjyxpgServiceImpl.java | 26 +++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjyxpgServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjyxpgServiceImpl.java index d60a46d82..be7d94fc9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjyxpgServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjyxpgServiceImpl.java @@ -14,11 +14,17 @@ import com.jero.modules.ota.utils.ImportFileUtil; import com.jero.modules.system.service.ISysDictService; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.poi.xwpf.usermodel.XWPFDocument; +import org.apache.poi.xwpf.usermodel.XWPFTable; +import org.apache.poi.xwpf.usermodel.XWPFTableCell; +import org.apache.poi.xwpf.usermodel.XWPFTableRow; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import java.io.File; +import java.io.FileInputStream; +import java.io.InputStream; import java.util.List; import java.util.Date; @@ -177,8 +183,24 @@ public class OtaBaSjSjyxpgServiceImpl extends ServiceImpl tables = doc.getTables(); + String sjmdStr = tables.get(1).getRow(0).getCell(2).getText(); + if (StringUtils.isNotEmpty(sjmdStr)) { + StringBuilder sb = new StringBuilder(); + String[] strs = sjmdStr.split("、"); + for (int i = 0; i < strs.length; i++) { + if (i >= strs.length - 1) { + sb.append(sysDictService.queryDictItemByValue("uipgrade_purpose", strs[i], cut)); + } else { + sb.append(sysDictService.queryDictItemByValue("uipgrade_purpose", strs[i], cut)).append(","); + } + } + sjyxpg.setSjmd(sb.toString()); + } return sjyxpg; } @@ -186,7 +208,7 @@ public class OtaBaSjSjyxpgServiceImpl extends ServiceImpl upLoadFiles, String otaId, String cut) throws Exception { File upFile = null; for (File f : upLoadFiles) { - if (f.getName().equals("车型基本信息.xlsx")) { + if (f.getName().equals("升级影响评估.docx")) { upFile = f; } } From 9fdde4fe568cbbb940fba3e4e38bb32b98a98c9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Thu, 30 Mar 2023 00:56:14 +0800 Subject: [PATCH 546/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E8=BD=A6=E8=BE=86=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ota/service/IOtaBaSjGnxtwhService.java | 73 ++++++------ .../impl/OtaBaSjGnxtwhServiceImpl.java | 104 ++++++++++-------- .../impl/OtaBaSjSjxtbhServiceImpl.java | 43 +++++--- 3 files changed, 127 insertions(+), 93 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjGnxtwhService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjGnxtwhService.java index f96073061..557d2f6ff 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjGnxtwhService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjGnxtwhService.java @@ -2,60 +2,63 @@ package com.jero.modules.ota.service; import com.jero.modules.ota.entity.OtaBaSjGnxtwh; import com.baomidou.mybatisplus.extension.service.IService; + import java.util.List; /** * @Description: 车型备案-功能系统维护 * @Author: jero-boot - * @Date: 2023-03-28 + * @Date: 2023-03-28 * @Version: V1.0 */ public interface IOtaBaSjGnxtwhService extends IService { - /** - * 保存 - * - * @param otaBaSjGnxtwh - * @return - */ + /** + * 保存 + * + * @param otaBaSjGnxtwh + * @return + */ void add(OtaBaSjGnxtwh otaBaSjGnxtwh); - /** - * 更新 - * - * @param otaBaSjGnxtwh - * @return - */ + /** + * 更新 + * + * @param otaBaSjGnxtwh + * @return + */ void editById(OtaBaSjGnxtwh otaBaSjGnxtwh); - /** - * 通过id删除 - * - * @param id - * @return - */ + /** + * 通过id删除 + * + * @param id + * @return + */ void deleteById(String id); - /** - * 批量删除 - * - * @param ids - * @return - */ + /** + * 批量删除 + * + * @param ids + * @return + */ void deleteByIds(List ids); - /** - * 通过id查询 - * - * @param id - * @return - */ + /** + * 通过id查询 + * + * @param id + * @return + */ OtaBaSjGnxtwh queryById(String id); + String queryGnxtByKzq(String kzq); + /** - * 列表查询 - * - * @return - */ + * 列表查询 + * + * @return + */ List queryList(); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjGnxtwhServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjGnxtwhServiceImpl.java index 416da171e..50f834b56 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjGnxtwhServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjGnxtwhServiceImpl.java @@ -4,26 +4,28 @@ import com.jero.modules.ota.entity.OtaBaSjGnxtwh; import com.jero.modules.ota.mapper.OtaBaSjGnxtwhMapper; import com.jero.modules.ota.service.IOtaBaSjGnxtwhService; import org.springframework.stereotype.Service; + import java.util.List; import java.util.Date; + import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 车型备案-功能系统维护 * @Author: jero-boot - * @Date: 2023-03-28 + * @Date: 2023-03-28 * @Version: V1.0 */ @Service public class OtaBaSjGnxtwhServiceImpl extends ServiceImpl implements IOtaBaSjGnxtwhService { - /** - * 保存 - * - * @param otaBaSjGnxtwh - * @return - */ - @Override + /** + * 保存 + * + * @param otaBaSjGnxtwh + * @return + */ + @Override public void add(OtaBaSjGnxtwh otaBaSjGnxtwh) { Date now = new Date(); otaBaSjGnxtwh.setCreateTime(now); @@ -31,58 +33,74 @@ public class OtaBaSjGnxtwhServiceImpl extends ServiceImpl ids) { removeByIds(ids); } - /** - * 通过id查询 - * - * @param id - * @return - */ - @Override + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override public OtaBaSjGnxtwh queryById(String id) { return getById(id); } + + @Override + public String queryGnxtByKzq(String kzq) { + List list = list(); + for (OtaBaSjGnxtwh wh : list) { + String[] strs = wh.getDykzq().split(","); + for (String str : strs) { + if (str.equals(kzq)) { + return wh.getGnxt(); + } + } + } + return null; + } + + /** - * 列表查询 - * - * @return - */ - @Override + * 列表查询 + * + * @return + */ + @Override public List queryList() { return list(); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java index 11f9bf2b5..4a5ed30b7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java @@ -11,11 +11,12 @@ import com.jero.modules.ota.enums.OtaModuleEnum; import com.jero.modules.ota.enums.OtaTitleEnum; import com.jero.modules.ota.mapper.OtaBaSjSjxtbhMapper; import com.jero.modules.ota.service.IOtaBaCxTxjlService; +import com.jero.modules.ota.service.IOtaBaSjGnxtwhService; import com.jero.modules.ota.service.IOtaBaSjSjxtbhService; import com.jero.modules.ota.utils.ComparisonUtil; import com.jero.modules.ota.utils.ImportFileUtil; import com.jero.modules.system.service.ISysDictService; -import com.jero.modules.system.util.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.Row; @@ -52,6 +53,9 @@ public class OtaBaSjSjxtbhServiceImpl extends ServiceImpl(); } ComparisonUtil cu = new ComparisonUtil(); - List reList = cu.comparisonListRecord(otaId, OtaModuleEnum.SJ_SJXTMCBH, OtaTitleEnum.SJKZQMC.getName(), oldList, newList, sysDictService); + List reList = cu.comparisonListRecord(otaId, OtaModuleEnum.SJ_SJXTMCBH, OtaTitleEnum.XTMC.getName(), oldList, newList, sysDictService); + deleteByOtaId(otaId); saveOrUpdateBatch(newList); otaBaCxTxjlService.saveBatch(reList); } @@ -233,30 +238,38 @@ public class OtaBaSjSjxtbhServiceImpl extends ServiceImpl Date: Thu, 30 Mar 2023 01:31:35 +0800 Subject: [PATCH 547/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E8=BD=A6=E8=BE=86=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/OtaBaSjListServiceImpl.java | 32 ++++++++++++++++--- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java index 26ed5e1db..6bb47d691 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java @@ -18,6 +18,7 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.File; +import java.io.FileOutputStream; import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; @@ -48,9 +49,6 @@ public class OtaBaSjListServiceImpl extends ServiceImpl Date: Thu, 30 Mar 2023 02:07:42 +0800 Subject: [PATCH 548/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E8=BD=A6=E8=BE=86=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ota/controller/OtaBaCxTxjlController.java | 283 +++++++++--------- .../modules/ota/entity/OtaBaSjGgnrfs.java | 1 + .../jero/modules/ota/enums/OtaTitleEnum.java | 32 +- .../modules/ota/utils/ComparisonUtil.java | 10 +- 4 files changed, 171 insertions(+), 155 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxTxjlController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxTxjlController.java index 0f395f100..b946675a7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxTxjlController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxTxjlController.java @@ -4,6 +4,7 @@ import java.util.Arrays; import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + import com.jero.common.api.vo.Result; import com.jero.common.system.query.QueryGenerator; import com.jero.modules.ota.entity.OtaBaCxTxjl; @@ -13,6 +14,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; import com.jero.common.system.base.controller.JeroController; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -22,164 +24,169 @@ import io.swagger.annotations.ApiOperation; import com.jero.common.aspect.annotation.AutoLog; - /** +/** * @Description: 车型备案-填写记录表 * @Author: jero-boot - * @Date: 2023-03-25 + * @Date: 2023-03-25 * @Version: V1.0 */ -@Api(tags="车型备案-填写记录表") +@Api(tags = "车型备案-填写记录表") @RestController @RequestMapping("/ota/otaBaCxTxjl") @Slf4j public class OtaBaCxTxjlController extends JeroController { - @Autowired - private IOtaBaCxTxjlService otaBaCxTxjlService; - - /** - * 分页列表查询 - * - * @param otaBaCxTxjl - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @AutoLog(value = "车型备案-填写记录表-分页列表查询") - @ApiOperation(value="车型备案-填写记录表-分页列表查询", notes="车型备案-填写记录表-分页列表查询") - @GetMapping(value = "/page") - public Result queryPageList(OtaBaCxTxjl otaBaCxTxjl, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(otaBaCxTxjl, req.getParameterMap()); - queryWrapper.orderByDesc("create_time"); - Page page = new Page(pageNo, pageSize); - IPage pageList = otaBaCxTxjlService.page(page, queryWrapper); - return Result.OK(pageList); - } + @Autowired + private IOtaBaCxTxjlService otaBaCxTxjlService; /** - * 列表查询 - * - * @return - */ - @AutoLog(value = "车型备案-填写记录表-列表查询") - @ApiOperation(value="车型备案-填写记录表-列表查询", notes="车型备案-填写记录表-列表查询") - @GetMapping(value = "/list") - public Result> queryList() { + * 分页列表查询 + * + * @param otaBaCxTxjl + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "车型备案-填写记录表-分页列表查询") + @ApiOperation(value = "车型备案-填写记录表-分页列表查询", notes = "车型备案-填写记录表-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(OtaBaCxTxjl otaBaCxTxjl, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + + Page page = new Page(pageNo, pageSize); + String otaId = req.getParameter("otaId"); + if (StringUtils.isEmpty(otaId)) { + return Result.OK(page); + } + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(otaBaCxTxjl, req.getParameterMap()); + queryWrapper.orderByDesc("create_time"); + IPage pageList = otaBaCxTxjlService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "车型备案-填写记录表-列表查询") + @ApiOperation(value = "车型备案-填写记录表-列表查询", notes = "车型备案-填写记录表-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { List list = otaBaCxTxjlService.queryList(); return Result.OK(list); - } - - /** - * 添加 - * - * @param otaBaCxTxjl - * @return - */ - @AutoLog(value = "车型备案-填写记录表-添加") - @ApiOperation(value="车型备案-填写记录表-添加", notes="车型备案-填写记录表-添加") - @PostMapping(value = "/add") - public Result add(@Validated @RequestBody OtaBaCxTxjl otaBaCxTxjl) { - otaBaCxTxjlService.add(otaBaCxTxjl); - return Result.OK("添加成功！"); - } - - /** - * 编辑 - * - * @param otaBaCxTxjl - * @return - */ - @AutoLog(value = "车型备案-填写记录表-编辑") - @ApiOperation(value="车型备案-填写记录表-编辑", notes="车型备案-填写记录表-编辑") - @PutMapping(value = "/edit") - public Result edit(@Validated @RequestBody OtaBaCxTxjl otaBaCxTxjl) { - otaBaCxTxjlService.editById(otaBaCxTxjl); - return Result.OK("编辑成功!"); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @AutoLog(value = "车型备案-填写记录表-通过id删除") - @ApiOperation(value="车型备案-填写记录表-通过id删除", notes="车型备案-填写记录表-通过id删除") - @DeleteMapping(value = "/delete") - public Result delete(@RequestParam(name="id",required=true) String id) { - otaBaCxTxjlService.deleteById(id); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @AutoLog(value = "车型备案-填写记录表-批量删除") - @ApiOperation(value="车型备案-填写记录表-批量删除", notes="车型备案-填写记录表-批量删除") - @DeleteMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.otaBaCxTxjlService.deleteByIds(Arrays.asList(ids.split(","))); - return Result.OK("批量删除成功!"); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @AutoLog(value = "车型备案-填写记录表-通过id查询") - @ApiOperation(value="车型备案-填写记录表-通过id查询", notes="车型备案-填写记录表-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name="id",required=true) String id) { - OtaBaCxTxjl otaBaCxTxjl = otaBaCxTxjlService.queryById(id); - if(otaBaCxTxjl==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(otaBaCxTxjl); - } - - /** - * 通过otaId查询 - * - * @param otaId - * @return - */ - @AutoLog(value = "车型备案-填写记录表-通过otaId查询") - @ApiOperation(value="车型备案-填写记录表-通过otaId查询", notes="车型备案-填写记录表-通过otaId查询") - @GetMapping(value = "/queryByOtaId") - public Result queryByOtaId(@RequestParam(name="otaId",required=true) String otaId) { - List otaBaCxTxjlList = otaBaCxTxjlService.queryByOtaId(otaId); - if(otaBaCxTxjlList==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(otaBaCxTxjlList); - } + } /** - * 导出excel - * - * @param request - * @param otaBaCxTxjl - */ + * 添加 + * + * @param otaBaCxTxjl + * @return + */ + @AutoLog(value = "车型备案-填写记录表-添加") + @ApiOperation(value = "车型备案-填写记录表-添加", notes = "车型备案-填写记录表-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody OtaBaCxTxjl otaBaCxTxjl) { + otaBaCxTxjlService.add(otaBaCxTxjl); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param otaBaCxTxjl + * @return + */ + @AutoLog(value = "车型备案-填写记录表-编辑") + @ApiOperation(value = "车型备案-填写记录表-编辑", notes = "车型备案-填写记录表-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody OtaBaCxTxjl otaBaCxTxjl) { + otaBaCxTxjlService.editById(otaBaCxTxjl); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "车型备案-填写记录表-通过id删除") + @ApiOperation(value = "车型备案-填写记录表-通过id删除", notes = "车型备案-填写记录表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name = "id", required = true) String id) { + otaBaCxTxjlService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "车型备案-填写记录表-批量删除") + @ApiOperation(value = "车型备案-填写记录表-批量删除", notes = "车型备案-填写记录表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) { + this.otaBaCxTxjlService.deleteByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "车型备案-填写记录表-通过id查询") + @ApiOperation(value = "车型备案-填写记录表-通过id查询", notes = "车型备案-填写记录表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name = "id", required = true) String id) { + OtaBaCxTxjl otaBaCxTxjl = otaBaCxTxjlService.queryById(id); + if (otaBaCxTxjl == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(otaBaCxTxjl); + } + + /** + * 通过otaId查询 + * + * @param otaId + * @return + */ + @AutoLog(value = "车型备案-填写记录表-通过otaId查询") + @ApiOperation(value = "车型备案-填写记录表-通过otaId查询", notes = "车型备案-填写记录表-通过otaId查询") + @GetMapping(value = "/queryByOtaId") + public Result queryByOtaId(@RequestParam(name = "otaId", required = true) String otaId) { + List otaBaCxTxjlList = otaBaCxTxjlService.queryByOtaId(otaId); + if (otaBaCxTxjlList == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(otaBaCxTxjlList); + } + + /** + * 导出excel + * + * @param request + * @param otaBaCxTxjl + */ @RequestMapping(value = "/exportXls") public ModelAndView exportXls(HttpServletRequest request, OtaBaCxTxjl otaBaCxTxjl) { return super.exportXls(request, otaBaCxTxjl, OtaBaCxTxjl.class, "车型备案-填写记录表"); } /** - * 通过excel导入数据 - * - * @param request - * @param response - * @return - */ + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ @RequestMapping(value = "/importExcel", method = RequestMethod.POST) public Result importExcel(HttpServletRequest request, HttpServletResponse response) { return super.importExcel(request, response, OtaBaCxTxjl.class); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjGgnrfs.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjGgnrfs.java index bf9b04d3a..33d1299d9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjGgnrfs.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjGgnrfs.java @@ -114,6 +114,7 @@ public class OtaBaSjGgnrfs implements Serializable { /**告知用户方式（可多选）*/ @Excel(name = "告知用户方式（可多选）", width = 15) @ApiModelProperty(value = "告知用户方式（可多选）") + @Dict(dicCode = "user_notification_mode") private java.lang.String gzyhfs; /**用户告知相关文件*/ diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java index 5822dcd65..194b039e6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java @@ -154,21 +154,21 @@ public enum OtaTitleEnum { BABH("babh", "备案编号", "0"), BAPC("bapc", "备案批次", "0"), ZSL("zsl", "总数量", "0"), - SCRQKS("scrqks", "生产日期开始", "0"), - SCRQJS("scrqjs", "生产日期结束", "0"), + SCRQKS("scrqks", "生产日期开始", "3"), + SCRQJS("scrqjs", "生产日期结束", "3"), VIN_LIST("vinList", "VIN码清单", "0"), SJMD("sjmd", "升级目的", "uipgrade_purpose"), - SFBGCS("sfbgcs", "是否变更对应车型的《公告》技术参数", "0"), - JSXNBH("jsxnbh", "是否涉及性能变化", "0"), - FHGD("fhgd", "是否符合国家法律、行政法规、规章规定，以及道路机动车辆公告管理相关国家技术标准及安全技术条件等", "0"), - ZDJSXG("zdjsxg", "是否涉及汽车自动驾驶功能相关升级", "0"), - JRXXG("jrxxg", "兼容性评估相关", "0"), + SFBGCS("sfbgcs", "是否变更对应车型的《公告》技术参数", "2"), + JSXNBH("jsxnbh", "是否涉及性能变化", "2"), + FHGD("fhgd", "是否符合国家法律、行政法规、规章规定，以及道路机动车辆公告管理相关国家技术标准及安全技术条件等", "2"), + ZDJSXG("zdjsxg", "是否涉及汽车自动驾驶功能相关升级", "2"), + JRXXG("jrxxg", "兼容性评估相关", "2"), ZXSJ("zxsj", "如何执行升级", "conditions_upgrades"), AQJZ("aqjz", "升级失败或中断后，车辆采取的安全机制", "upgrade_failed"), - SFYXAQ("sfyxaq", "升级活动是否影响车辆安全", "0"), - YHQR("yhqr", "升级活动是否提供用户确认选项", "0"), + SFYXAQ("sfyxaq", "升级活动是否影响车辆安全", "2"), + YHQR("yhqr", "升级活动是否提供用户确认选项", "2"), SJBCS("sjbcs", "升级包测试", "package_test"), - AQKKX("aqkkx", "是杏已验证确认在线升级活动的安全性和可靠性", "0"), + AQKKX("aqkkx", "是否已验证确认在线升级活动的安全性和可靠性", "2"), // BGFJ("bgfj", "提供变更或扩展后的《公告》批次及证明材料", "0"), // CLFJ("clfj", "提供证明材料", "0"), XTMC("xtmc", "系统名称", "0"), @@ -193,14 +193,14 @@ public enum OtaTitleEnum { SJKY("sjky", "升级执行期问，车辆是否可用", "0"), SJBKYGN("sjbkygn", "升级执行期间不可用的车辆功能", "0"), ZDXX("zdxx", "帮助车辆用户安全执行升级的任何指导信息", "0"), - SJSFCG("sjsfcg", "告知用户升级成功或失败", "0"), - GZBG("gzbg", "告知实施的变更", "0"), - GZSCNR("gzscnr", "告知了对用户手册的全部更新内容", "0"), - GZYHFS("gzyhfs", "告知用户方式（可多选）", "0"), + SJSFCG("sjsfcg", "告知用户升级成功或失败", "2"), + GZBG("gzbg", "告知实施的变更", "2"), + GZSCNR("gzscnr", "告知了对用户手册的全部更新内容", "2"), + GZYHFS("gzyhfs", "告知用户方式（可多选）", "user_notification_mode"), // XGWJ("xgwj", "用户告知相关文件", "0"), RWMC("rwmc", "任务名称", "0"), - SJFBSJ("sjfbsj", "升级发布时间", "0"), - SJJZSJ("sjjzsj", "升级计划截止时间", "0"); + SJFBSJ("sjfbsj", "升级发布时间", "3"), + SJJZSJ("sjjzsj", "升级计划截止时间", "3"); String name; String value; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java index 6c42e3acc..568052a49 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java @@ -10,6 +10,7 @@ import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import java.lang.reflect.Field; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.List; @@ -20,12 +21,14 @@ import java.util.List; * @param */ public class ComparisonUtil { + private static final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + public ComparisonUtil() { } - public List comparisonRecord(String otaId, String newFj,String oldFjStr,OtaModuleEnum otaModuleEnum, String title, IOSSFileService ossFileService) { + public List comparisonRecord(String otaId, String newFj, String oldFjStr, OtaModuleEnum otaModuleEnum, String title, IOSSFileService ossFileService) { List reList = new ArrayList<>(); String[] newFjList = {}; if (StringUtils.isNotEmpty(newFj)) { @@ -57,6 +60,7 @@ public class ComparisonUtil { } return reList; } + public OtaBaCxTxjl addAttRecord(String otaId, OtaModuleEnum otaModuleEnum, String title, String attName) { String content = title + "中添加了附件:'" + attName; OtaBaCxTxjl jl = new OtaBaCxTxjl(otaId, otaModuleEnum.getName(), content); @@ -226,6 +230,10 @@ public class ComparisonUtil { res = "否"; } } + } else if ("3".equals(ote.getType())) { + if (ObjectUtils.isNotEmpty(newVal)) { + res = sdf.format(newVal); + } } else { newVal = field.get(clazz); if (ObjectUtils.isNotEmpty(newVal)) { From c1d0d8568150d4e37ffba5dd04506c27920cf264 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Thu, 30 Mar 2023 09:14:35 +0800 Subject: [PATCH 549/645] bug 67621 --- .../otamanagement/upgradeactivity/index.vue | 21 ++++++------------- .../components/usernotification.vue | 2 +- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/jero-web/src/views/otamanagement/upgradeactivity/index.vue b/jero-web/src/views/otamanagement/upgradeactivity/index.vue index dfaff90fc..cd82f1401 100644 --- a/jero-web/src/views/otamanagement/upgradeactivity/index.vue +++ b/jero-web/src/views/otamanagement/upgradeactivity/index.vue @@ -201,7 +201,8 @@ export default { //url传参严格按照当前命名 url: { list: '/lawsTechnologyEvaluation/lawsTechnologyEvaluationEO/page', - deleteBatch: '/ota/otaBaSjList/delete' + deleteBatch: '/ota/otaBaSjList/delete', + importZipUrl: '/ota/otaBaSjList/importData',//导入 }, visible: false, @@ -435,22 +436,12 @@ export default { }, // 导出 handleExport(row) { - let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys)) - let text = '' + let text = '升级活动备案' + row.ggpc let flag - if (this.activeTab == this.$t('ImplementationDate')) { - flag = 0 - text = this.$t('ImplementationDate') - } else { - text = this.$t('vehicleInProductionDate') - flag = 1 - } let query = { - id: selectedRowKeys.join(','), - ...this.searchParmes, - flag: flag + otaId: row.id } - downloadFile(this.url.exportData, text + '.xls', query, this.Deselect) + downloadFile('/ota/otaBaSjList/exportData', text + '.zip', query, this.Deselect) }, // 结束升级 endUpgrade(record,flag){ @@ -486,7 +477,7 @@ export default { }, // 模板下载 handleModule(){ - downloadFile('params/paramsInfo/exportTemplate', this.$t('parameterTemplateExportName') + '.xlsx', {}) + downloadFile('ota/otaBaSjList/exportTemplate', '升级活动备案' + '.zip', {}) }, addModelList(record){ record.sjzt=1 diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue index 79f27f620..be32f2114 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue @@ -162,7 +162,7 @@
- {{$t('allupdatestotheusermanualareinformed')}} + {{$t('userinformstherelevantfile')}}
From a3fe427a1cb1a5c13576ea6abfd5cfb04cf76a2c Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Thu, 30 Mar 2023 09:18:52 +0800 Subject: [PATCH 550/645] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E5=A4=87=E6=A1=88-=E6=A8=A1=E6=9D=BF=E4=B8=8B=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/otamanagement/upgradeactivity/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/otamanagement/upgradeactivity/index.vue b/jero-web/src/views/otamanagement/upgradeactivity/index.vue index cd82f1401..07caabdb7 100644 --- a/jero-web/src/views/otamanagement/upgradeactivity/index.vue +++ b/jero-web/src/views/otamanagement/upgradeactivity/index.vue @@ -179,7 +179,7 @@ From 98fca905d0234389ee224d98dc8101c7435f4b5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Thu, 30 Mar 2023 11:01:17 +0800 Subject: [PATCH 557/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E8=BD=A6=E8=BE=86=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ota/controller/OtaBaSjListController.java | 2 +- .../modules/ota/entity/OtaBaSjGgnrfs.java | 1 + .../impl/OtaBaCxKsjjsmccsServiceImpl.java | 6 ++- .../impl/OtaBaCxKsjxtmccsServiceImpl.java | 6 ++- .../impl/OtaBaSjGgnrfsServiceImpl.java | 38 ++++++++++++-- .../impl/OtaBaSjSjmbcxServiceImpl.java | 2 +- .../impl/OtaBaSjSjyxpgServiceImpl.java | 51 +++++++++++++++++-- .../modules/ota/utils/ImportFileUtil.java | 9 ++++ 8 files changed, 103 insertions(+), 12 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java index a7ebadbc4..edc26fec1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java @@ -88,7 +88,7 @@ public class OtaBaSjListController extends JeroController pageList = otaBaSjListService.page(page, queryWrapper); return Result.OK(pageList); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjGgnrfs.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjGgnrfs.java index 33d1299d9..8963565a4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjGgnrfs.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjGgnrfs.java @@ -69,6 +69,7 @@ public class OtaBaSjGgnrfs implements Serializable { /**升级目的*/ @Excel(name = "升级目的", width = 15) @ApiModelProperty(value = "升级目的") + @Dict(dicCode = "uipgrade_purpose") private java.lang.String sjmd; /**由于软件升级活动而导致的车辆功能的任何变化*/ diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java index a46356589..5b95535dc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java @@ -273,7 +273,11 @@ public class OtaBaCxKsjjsmccsServiceImpl extends ServiceImpl upLoadFiles, String otaId, String cut) throws Exception { File attFile = null; - File upFile = null; for (File f : upLoadFiles) { if (f.isDirectory() && f.getName().equals("用户告知内容及方式")) { attFile = f; } -// else if (f.getName().equals("用户告知内容及方式.xlsx")) { -// upFile = f; -// } } - if (null == upFile || null == attFile) { + if (null == attFile) { throw new JeroBootException("请上传正确的文件"); } + OtaBaSjGgnrfs fs = parseFile(attFile, otaId, cut); + add(fs); + } + + private OtaBaSjGgnrfs parseFile(File attFile, String otaId, String cut) throws Exception { + OtaBaSjGgnrfs fs = new OtaBaSjGgnrfs(); + fs.setOtaId(otaId); + OtaBaSjSjyxpg pg = otaBaSjSjyxpgService.queryByOtaId(otaId, ""); + if (StringUtils.isNotEmpty(pg.getSjmd())) { + fs.setSjmd(pg.getSjmd()); + } + StringBuilder attStr1 = new StringBuilder(); + File[] attFiles1 = attFile.listFiles(); + for (int i = 0; i < attFiles1.length; i++) { + if (!attFiles1[i].isDirectory() && (attFiles1[i].getName().contains(".doc") || attFiles1[i].getName().contains(".docx") || attFiles1[i].getName().contains(".pdf"))) { + if (i >= attFiles1.length - 1) { + attStr1.append(ImportFileUtil.uploadFiles(attFiles1[i], ossFileService)); + } else { + attStr1.append(ImportFileUtil.uploadFiles(attFiles1[i], ossFileService)).append(","); + } + } + } + fs.setXgwj(attStr1.toString()); + return fs; } @Override diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java index 5686e1c91..44dea6f27 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java @@ -188,7 +188,7 @@ public class OtaBaSjSjmbcxServiceImpl extends ServiceImpl upLoadFiles, String otaId, String cut) throws Exception { File upFile = null; for (File f : upLoadFiles) { - if (f.getName().equals("车型基本信息.xlsx")) { + if (f.getName().equals("升级目标车型.xlsx")) { upFile = f; } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjyxpgServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjyxpgServiceImpl.java index be7d94fc9..37ce93468 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjyxpgServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjyxpgServiceImpl.java @@ -183,7 +183,7 @@ public class OtaBaSjSjyxpgServiceImpl extends ServiceImpl= attFiles1.length - 1) { + attStr1.append(ImportFileUtil.uploadFiles(attFiles1[i], ossFileService)); + } else { + attStr1.append(ImportFileUtil.uploadFiles(attFiles1[i], ossFileService)).append(","); + } + } + } + sjyxpg.setBgfj(attStr1.toString()); + StringBuilder attStr2 = new StringBuilder(); + File[] attFiles2 = attFile2.listFiles(); + for (int i = 0; i < attFiles2.length; i++) { + if (!attFiles2[i].isDirectory() && (attFiles2[i].getName().contains(".doc") || attFiles2[i].getName().contains(".docx") || attFiles2[i].getName().contains(".pdf"))) { + if (i >= attFiles2.length - 1) { + attStr2.append(ImportFileUtil.uploadFiles(attFiles2[i], ossFileService)); + } else { + attStr2.append(ImportFileUtil.uploadFiles(attFiles2[i], ossFileService)).append(","); + } + } + } + sjyxpg.setClfj(attStr2.toString()); return sjyxpg; } @Override public OtaBaSjSjyxpg parseFileList(List upLoadFiles, String otaId, String cut) throws Exception { File upFile = null; + File attFile = null; + File attFile1 = null; + File attFile2 = null; for (File f : upLoadFiles) { if (f.getName().equals("升级影响评估.docx")) { upFile = f; } + if (f.isDirectory() && f.getName().equals("升级影响评估")) { + attFile = f; + } } - if (null == upFile) { + + if (null == upFile || null == attFile) { throw new JeroBootException("请上传正确的文件"); } - OtaBaSjSjyxpg sjyxpg = parseFile(upFile, cut); + + for (File f : attFile.listFiles()) { + if (f.isDirectory() && f.getName().equals("测试报告")) { + attFile1 = f; + } + if (f.isDirectory() && f.getName().equals("硬件版本号附件")) { + attFile2 = f; + } + } + if (null == attFile1 || null == attFile2) { + throw new JeroBootException("请上传正确的文件"); + } + + + OtaBaSjSjyxpg sjyxpg = parseFile(upFile, attFile1, attFile2, cut); sjyxpg.setOtaId(otaId); add(sjyxpg); return sjyxpg; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ImportFileUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ImportFileUtil.java index 13c24ace0..510ea3469 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ImportFileUtil.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ImportFileUtil.java @@ -294,6 +294,15 @@ public class ImportFileUtil { return res; } + public static String uploadFiles(File attFile, IOSSFileService ossFileService) throws Exception { + String res = ""; + OSSFile ossFile = ossFileService.uploadLocalOfCos(ImportFileUtil.createMfileByFile(attFile), "", null, null); + if (ObjectUtils.isNotEmpty(ossFile)) { + res = ossFile.getId(); + } + return res; + } + public static String uploadFiles(File attFile, String[] strs, IOSSFileService ossFileService) throws Exception { String res = ""; for (int i = 0; i < strs.length; i++) { From 415c53202c0dd9b3213e0ba4999e1c4df6183b7d Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Thu, 30 Mar 2023 11:17:49 +0800 Subject: [PATCH 558/645] =?UTF-8?q?=E8=B0=83=E5=8F=96=E3=80=81=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E8=AE=A4=E8=AF=81=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=AA=8C=E9=87=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AuthDummyInventoryInfoEOController.java | 3 +- .../IAuthDummyInventoryInfoEOService.java | 5 +- .../AuthDummyInventoryInfoEOServiceImpl.java | 124 ++++++++++++++---- 3 files changed, 104 insertions(+), 28 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/controller/AuthDummyInventoryInfoEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/controller/AuthDummyInventoryInfoEOController.java index cc70ef79a..a08f4af17 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/controller/AuthDummyInventoryInfoEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/controller/AuthDummyInventoryInfoEOController.java @@ -236,7 +236,6 @@ public class AuthDummyInventoryInfoEOController extends JeroController acquireAdd(@RequestBody JSONObject json) { - this.authDummyInventoryInfoEOService.acquireAdd(json); - return Result.OK("调取成功！"); + return this.authDummyInventoryInfoEOService.acquireAdd(json); } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/IAuthDummyInventoryInfoEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/IAuthDummyInventoryInfoEOService.java index 5b1281004..4bbb55bc5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/IAuthDummyInventoryInfoEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/IAuthDummyInventoryInfoEOService.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject; import com.jero.common.api.vo.Result; import com.jero.modules.authDummy.entity.AuthDummyInventoryInfoEO; import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.modules.project.entity.ProjectCertificationInventoryEO; import com.jero.modules.system.entity.SysCategory; import org.springframework.web.multipart.MultipartFile; @@ -141,5 +142,7 @@ public interface IAuthDummyInventoryInfoEOService extends IService infoListCopy); - void acquireAdd(JSONObject json); + Result acquireAdd(JSONObject json); + + List dataUniqueCheck(List addList, String cut, List result, String authDummyInventoryBaseId); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java index ccc0b9946..b0475e591 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java @@ -1074,33 +1074,43 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl batchAdd(JSONObject json) { + String serialNumber = json.getString("serialNumber"); + String cut = json.getString("cut"); + String wvtaId = json.getString("wvtaId"); + String dutyTerritory = json.getString("dutyTerritory"); + String bussDocumentLibraryId = json.getString("bussDocumentLibraryId"); + String authDummyInventoryBaseId = json.getString("authDummyInventoryBaseId"); + + List result = new ArrayList<>(); + if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + result.add("添加成功!"); + }else { + result.add("Successfully added!"); + } + + List authDummyInventoryInfoEOList = new ArrayList<>(); + JSONArray dataList = json.getJSONArray("dataList"); + AuthDummyInventoryInfoEO authDummyInventoryInfoEO = null; + for (Object data : dataList) { + authDummyInventoryInfoEO = JSONObject.parseObject(JSONObject.toJSONString(data), AuthDummyInventoryInfoEO.class); + authDummyInventoryInfoEO.setSerialNumber(serialNumber); + authDummyInventoryInfoEO.setWvtaId(wvtaId); + authDummyInventoryInfoEO.setBussDocumentLibraryId(bussDocumentLibraryId); + authDummyInventoryInfoEO.setDutyTerritory(dutyTerritory); + authDummyInventoryInfoEO.setAuthDummyInventoryBaseId(authDummyInventoryBaseId); + authDummyInventoryInfoEOList.add(authDummyInventoryInfoEO); + } + + List saveDataList = this.dataUniqueCheck(authDummyInventoryInfoEOList, cut, result, authDummyInventoryBaseId); + try { - String serialNumber = json.getString("serialNumber"); - String wvtaId = json.getString("wvtaId"); - String dutyTerritory = json.getString("dutyTerritory"); - String bussDocumentLibraryId = json.getString("bussDocumentLibraryId"); - String authDummyInventoryBaseId = json.getString("authDummyInventoryBaseId"); - - List authDummyInventoryInfoEOList = new ArrayList<>(); - JSONArray dataList = json.getJSONArray("dataList"); - AuthDummyInventoryInfoEO authDummyInventoryInfoEO = null; - for (Object data : dataList) { - authDummyInventoryInfoEO = JSONObject.parseObject(JSONObject.toJSONString(data), AuthDummyInventoryInfoEO.class); - authDummyInventoryInfoEO.setSerialNumber(serialNumber); - authDummyInventoryInfoEO.setWvtaId(wvtaId); - authDummyInventoryInfoEO.setBussDocumentLibraryId(bussDocumentLibraryId); - authDummyInventoryInfoEO.setDutyTerritory(dutyTerritory); - authDummyInventoryInfoEO.setAuthDummyInventoryBaseId(authDummyInventoryBaseId); - authDummyInventoryInfoEOList.add(authDummyInventoryInfoEO); - } - - if(CollectionUtils.isNotEmpty(authDummyInventoryInfoEOList)){ - this.saveBatch(authDummyInventoryInfoEOList); + if(CollectionUtils.isNotEmpty(saveDataList)){ + this.saveBatch(saveDataList); //更新log LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); String username = sysUser.getUsername(); - String serialNumber1 = authDummyInventoryInfoEOList.stream().map(e->e.getSerialNumber()).collect(Collectors.joining(",")); + String serialNumber1 = saveDataList.stream().map(e->e.getSerialNumber()).collect(Collectors.joining(",")); String contentLog = username+"向清单中添加了“"+serialNumber1+"”"; String enContentLog = username+" added “"+serialNumber1+"” to the list."; authDummyLogService.updateLog(contentLog, authDummyInventoryInfoEO.getAuthDummyInventoryBaseId(),CutEnum.CN.getValue()); @@ -1109,7 +1119,7 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl acquireAdd(JSONObject json) { String authDummyInventoryBaseId = json.getString("authDummyInventoryBaseId"); String ids = json.getString("ids"); String cut = json.getString("cut"); + List result = new ArrayList<>(); + if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + result.add("调取成功!"); + }else { + result.add("Successfully retrieved!"); + } //检查虚拟清单是否存在 QueryWrapper baseQueryWrap = new QueryWrapper<>(); @@ -1558,7 +1574,10 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl saveDataList = this.dataUniqueCheck(addList, cut, result, authDummyInventoryBaseId); + + this.saveBatch(saveDataList); //更新log LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); @@ -1576,5 +1595,60 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl dataUniqueCheck(List addList, String cut, List result, String authDummyInventoryBaseId) { + List adiiSaveList = new ArrayList<>(); + + QueryWrapper pciQueryWrap = new QueryWrapper<>(); + pciQueryWrap.lambda().eq(AuthDummyInventoryInfoEO::getAuthDummyInventoryBaseId,authDummyInventoryBaseId); + List allDataList = this.list(pciQueryWrap); + + // 重复数据数组 + List duplicateDataList = allDataList.stream().filter(data -> { + boolean flag = false; + for (AuthDummyInventoryInfoEO aiiEo : addList) { + boolean categoryFlag = StringUtils.equals(aiiEo.getCategory(), data.getCategory()); + boolean inspectionItemFlag = StringUtils.equals(aiiEo.getInspectionItem(), data.getInspectionItem()); + boolean configItemFlag = StringUtils.equals(aiiEo.getConfigItem(), data.getConfigItem()); + boolean serialNumberFlag = StringUtils.equals(aiiEo.getSerialNumber(), data.getSerialNumber()); + boolean dutyTerritoryFlag = StringUtils.equals(aiiEo.getDutyTerritory(), data.getDutyTerritory()); + // 类别+检验项目+配置项+编号+责任领域 作为唯一检验 + if(categoryFlag && inspectionItemFlag && configItemFlag && serialNumberFlag && dutyTerritoryFlag){ + flag = true; + } + } + return flag; + }).collect(Collectors.toList()); + if(CollectionUtils.isNotEmpty(duplicateDataList)){ + if (StringUtils.equals(cut, CutEnum.CN.getValue())) { + result.add("您所选的数据中包含当前项目中已包含的条目信息，已为您过滤添加。"); + }else { + result.add("The data you have selected contains item information already included in the current project, which has been filtered and added for you."); + } + } + + // 过滤重复的数据 + adiiSaveList = addList.stream().filter(aiiEo -> { + boolean flag = true; + for (AuthDummyInventoryInfoEO allData : allDataList) { + boolean categoryFlag = StringUtils.equals(aiiEo.getCategory(), allData.getCategory()); + boolean inspectionItemFlag = StringUtils.equals(aiiEo.getInspectionItem(), allData.getInspectionItem()); + boolean configItemFlag = StringUtils.equals(aiiEo.getConfigItem(), allData.getConfigItem()); + boolean serialNumberFlag = StringUtils.equals(aiiEo.getSerialNumber(), allData.getSerialNumber()); + boolean dutyTerritoryFlag = StringUtils.equals(aiiEo.getDutyTerritory(), allData.getDutyTerritory()); + // 类别+检验项目+配置项+编号+责任领域 作为唯一检验 + if(categoryFlag && inspectionItemFlag && configItemFlag && serialNumberFlag && dutyTerritoryFlag){ + flag = false; + break; + } + } + return flag; + }).collect(Collectors.toList()); + + return adiiSaveList; } } From 38c2a0e15fe043058e69eec8929c19d34c736bb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Thu, 30 Mar 2023 11:19:45 +0800 Subject: [PATCH 559/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E8=BD=A6=E8=BE=86=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/ota/entity/OtaBaSjSjxtbh.java | 159 +++++++++++++----- .../impl/OtaBaSjSjxtbhServiceImpl.java | 5 +- 2 files changed, 123 insertions(+), 41 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjSjxtbh.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjSjxtbh.java index 25f9af23d..8b0c67320 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjSjxtbh.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjSjxtbh.java @@ -3,11 +3,13 @@ package com.jero.modules.ota.entity; import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.math.BigDecimal; + import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.StringUtils; import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; import com.jero.common.aspect.annotation.Dict; @@ -21,109 +23,188 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; /** * @Description: 升级备案-本次升级的系统名称与参数变化 * @Author: jero-boot - * @Date: 2023-03-17 + * @Date: 2023-03-17 * @Version: V1.0 */ @Data @TableName("ota_ba_sj_sjxtbh") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -@ApiModel(value="ota_ba_sj_sjxtbh对象", description="升级备案-本次升级的系统名称与参数变化") +@ApiModel(value = "ota_ba_sj_sjxtbh对象", description = "升级备案-本次升级的系统名称与参数变化") public class OtaBaSjSjxtbh implements Serializable { private static final long serialVersionUID = 1L; - /**主键*/ - @TableId(type = IdType.ASSIGN_ID) + /** + * 主键 + */ + @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value = "主键") private java.lang.String id; - /**创建人*/ + /** + * 创建人 + */ @ApiModelProperty(value = "创建人") private java.lang.String createBy; - /**创建日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + /** + * 创建日期 + */ + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "创建日期") private java.util.Date createTime; - /**更新人*/ + /** + * 更新人 + */ @ApiModelProperty(value = "更新人") private java.lang.String updateBy; - /**更新日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + /** + * 更新日期 + */ + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "更新日期") private java.util.Date updateTime; - /**所属部门*/ + /** + * 所属部门 + */ @ApiModelProperty(value = "所属部门") private java.lang.String sysOrgCode; - /**otaId*/ - @Excel(name = "otaId", width = 15) + /** + * otaId + */ + @Excel(name = "otaId", width = 15) @ApiModelProperty(value = "otaId") private java.lang.String otaId; - /**系统名称*/ - @Excel(name = "系统名称", width = 15) + /** + * 系统名称 + */ + @Excel(name = "系统名称", width = 15) @ApiModelProperty(value = "系统名称") private java.lang.String xtmc; - /**升级前已变更《公告》参数的对应调整*/ - @Excel(name = "升级前已变更《公告》参数的对应调整", width = 15) + /** + * 升级前已变更《公告》参数的对应调整 + */ + @Excel(name = "升级前已变更《公告》参数的对应调整", width = 15) @ApiModelProperty(value = "升级前已变更《公告》参数的对应调整") private java.lang.String sjqbgcs; - /**升级后已变更《公告》参数的对应调整*/ - @Excel(name = "升级后已变更《公告》参数的对应调整", width = 15) + /** + * 升级后已变更《公告》参数的对应调整 + */ + @Excel(name = "升级后已变更《公告》参数的对应调整", width = 15) @ApiModelProperty(value = "升级后已变更《公告》参数的对应调整") private java.lang.String sjhbgcs; - /**升级的电子控制器名称*/ - @Excel(name = "升级的电子控制器名称", width = 15) + /** + * 升级的电子控制器名称 + */ + @Excel(name = "升级的电子控制器名称", width = 15) @ApiModelProperty(value = "升级的电子控制器名称") private java.lang.String sjkzqmc; - /**适配的硬件版本*/ - @Excel(name = "适配的硬件版本", width = 15) + /** + * 适配的硬件版本 + */ + @Excel(name = "适配的硬件版本", width = 15) @ApiModelProperty(value = "适配的硬件版本") private java.lang.String yjbb; - /**软件版本号升级前*/ - @Excel(name = "软件版本号升级前", width = 15) + /** + * 软件版本号升级前 + */ + @Excel(name = "软件版本号升级前", width = 15) @ApiModelProperty(value = "软件版本号升级前") private java.lang.String sjqrjbb; - /**软件版本号升级后*/ - @Excel(name = "软件版本号升级后", width = 15) + /** + * 软件版本号升级后 + */ + @Excel(name = "软件版本号升级后", width = 15) @ApiModelProperty(value = "软件版本号升级后") private java.lang.String sjhrjbb; - /**操作系统版本号升级前*/ - @Excel(name = "操作系统版本号升级前", width = 15) + /** + * 操作系统版本号升级前 + */ + @Excel(name = "操作系统版本号升级前", width = 15) @ApiModelProperty(value = "操作系统版本号升级前") private java.lang.String sjqczxt; - /**操作系统版本号升级后*/ - @Excel(name = "操作系统版本号升级后", width = 15) + /** + * 操作系统版本号升级后 + */ + @Excel(name = "操作系统版本号升级后", width = 15) @ApiModelProperty(value = "操作系统版本号升级后") private java.lang.String sjhczxt; - /**升级包完整性验证数据*/ - @Excel(name = "升级包完整性验证数据", width = 15) + /** + * 升级包完整性验证数据 + */ + @Excel(name = "升级包完整性验证数据", width = 15) @ApiModelProperty(value = "升级包完整性验证数据") private java.lang.String sjbyzsj; - /**升级包大小*/ - @Excel(name = "升级包大小", width = 15) + /** + * 升级包大小 + */ + @Excel(name = "升级包大小", width = 15) @ApiModelProperty(value = "升级包大小") private java.lang.String sjbdx; - /**是否差分升级*/ - @Excel(name = "是否差分升级", width = 15) + /** + * 是否差分升级 + */ + @Excel(name = "是否差分升级", width = 15) @ApiModelProperty(value = "是否差分升级") private java.lang.String sfcfsj; + public boolean isNull() { + if (StringUtils.isNotEmpty(xtmc)) { + return false; + } + if (StringUtils.isNotEmpty(sjqbgcs)) { + return false; + } + if (StringUtils.isNotEmpty(sjhbgcs)) { + return false; + } + if (StringUtils.isNotEmpty(sjkzqmc)) { + return false; + } + if (StringUtils.isNotEmpty(yjbb)) { + return false; + } + if (StringUtils.isNotEmpty(sjqrjbb)) { + return false; + } + if (StringUtils.isNotEmpty(sjhrjbb)) { + return false; + } + if (StringUtils.isNotEmpty(sjqczxt)) { + return false; + } + if (StringUtils.isNotEmpty(sjhczxt)) { + return false; + } + if (StringUtils.isNotEmpty(sjbyzsj)) { + return false; + } + if (StringUtils.isNotEmpty(sjbdx)) { + return false; + } + if (StringUtils.isNotEmpty(sfcfsj)) { + return false; + } + return true; + } + + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java index 4a5ed30b7..2ba86905d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java @@ -239,7 +239,6 @@ public class OtaBaSjSjxtbhServiceImpl extends ServiceImpl Date: Thu, 30 Mar 2023 11:45:41 +0800 Subject: [PATCH 560/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E8=BD=A6=E8=BE=86=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/OtaBaSjSjmbcxServiceImpl.java | 5 +++- .../impl/OtaBaSjSjyxpgServiceImpl.java | 30 +++++++++++++++++-- 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java index 44dea6f27..35aad036a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java @@ -90,9 +90,12 @@ public class OtaBaSjSjmbcxServiceImpl extends ServiceImpl reList = cu.comparisonRecord(otaBaSjSjmbcx.getOtaId(), OtaModuleEnum.SJ_SJMBCX, otaBaSjSjmbcxOld, otaBaSjSjmbcx, sysDictService); + if (StringUtils.isEmpty(otaBaSjSjmbcx.getQymc())) { + otaBaSjSjmbcx.setQymc("安徽江淮汽车集团股份有限公司"); + } + saveOrUpdate(otaBaSjSjmbcx); otaBaCxTxjlService.saveBatch(reList); return otaBaSjSjmbcx; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjyxpgServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjyxpgServiceImpl.java index 37ce93468..a3607d886 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjyxpgServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjyxpgServiceImpl.java @@ -16,8 +16,6 @@ import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.apache.poi.xwpf.usermodel.XWPFDocument; import org.apache.poi.xwpf.usermodel.XWPFTable; -import org.apache.poi.xwpf.usermodel.XWPFTableCell; -import org.apache.poi.xwpf.usermodel.XWPFTableRow; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -85,7 +83,6 @@ public class OtaBaSjSjyxpgServiceImpl extends ServiceImpl reList = cu.comparisonRecord(otaBaSjSjyxpg.getOtaId(), OtaModuleEnum.SJ_SJYXPG, otaBaSjSjyxpgOld, otaBaSjSjyxpg, sysDictService); reList.addAll(cu.comparisonRecord(otaBaSjSjyxpg.getOtaId(), newYzcl, oldYzcl, OtaModuleEnum.SJ_SJMBCL, "验证材料", ossFileService)); reList.addAll(cu.comparisonRecord(otaBaSjSjyxpg.getOtaId(), newZmcl, oldZmcl, OtaModuleEnum.SJ_SJMBCL, "证明材料", ossFileService)); + + if (null == otaBaSjSjyxpg.getFhgd()) { + otaBaSjSjyxpg.setFhgd(2); + } + if (null == otaBaSjSjyxpg.getZdjsxg()) { + otaBaSjSjyxpg.setZdjsxg(1); + } + if (null == otaBaSjSjyxpg.getZxsj()) { + otaBaSjSjyxpg.setZxsj(2); + } + if (StringUtils.isEmpty(otaBaSjSjyxpg.getAqjz())) { + otaBaSjSjyxpg.setAqjz("2"); + } + if (null == otaBaSjSjyxpg.getSfyxaq()) { + otaBaSjSjyxpg.setSfyxaq(2); + } + + if (null == otaBaSjSjyxpg.getYhqr()) { + otaBaSjSjyxpg.setYhqr(1); + } + if (StringUtils.isEmpty(otaBaSjSjyxpg.getSjbcs())) { + otaBaSjSjyxpg.setSjbcs("3,4"); + } + if (null == otaBaSjSjyxpg.getAqkkx()) { + otaBaSjSjyxpg.setAqkkx(1); + } + saveOrUpdate(otaBaSjSjyxpg); otaBaCxTxjlService.saveBatch(reList); } } From 544b081826be98526411c05291e27e8bbe66307f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Thu, 30 Mar 2023 13:38:31 +0800 Subject: [PATCH 561/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E8=BD=A6=E8=BE=86=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/OtaBaCxKsjjsmccsServiceImpl.java | 23 ++++++++ .../impl/OtaBaCxKsjxtmccsServiceImpl.java | 23 ++++++++ .../impl/OtaBaSjGgnrfsServiceImpl.java | 27 ++++++++- .../impl/OtaBaSjSjyxpgServiceImpl.java | 56 ++++++++++--------- 4 files changed, 100 insertions(+), 29 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java index 5b95535dc..275353fe4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java @@ -80,6 +80,9 @@ public class OtaBaCxKsjjsmccsServiceImpl extends ServiceImpl setDefault(String otaId) { + Date now = new Date(); + List res = new ArrayList<>(); + String[] titles = {"前向碰撞预警(FCW)", "车道偏离预警(LDW)", "百区监测(BSD)", "驾驶员疲劳监测(DFM)", + "自动紧急制动(AEB)", "自适应巡航控制(ACC)", "车道保持辅助(LKA)", "智能泊车辅助(IPA)", "交通拥堵辅助(TJA)"}; + for (String t : titles) { + OtaBaCxKsjjsmccs cs = new OtaBaCxKsjjsmccs(); + cs.setOtaId(otaId); + cs.setGnmc(t); + cs.setCreateTime(now); + cs.setId(UUID.randomUUID().toString().replace("-", "")); + res.add(cs); + } + saveBatch(res); + return res; + } + @Override public JSONObject queryByOtaId(String otaId, String otaIdT) { List res = this.getByOtaId(otaId); if (ObjectUtil.isEmpty(res)) { res = getByOtaId(otaIdT); } + if (ObjectUtil.isEmpty(res)) { + res = setDefault(otaId); + } JSONObject json = new JSONObject(); json.put("list", res); OtaBaCxList otaBaCxList = otaBaCxListService.queryById(otaId); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java index b48223a74..08e7f3c69 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java @@ -81,6 +81,9 @@ public class OtaBaCxKsjxtmccsServiceImpl extends ServiceImpl setDefault(String otaId) { + Date now = new Date(); + List res = new ArrayList<>(); + String[] titles = {"动力系统", "传动系统", "转向系统", "制动系统", "车身系统", "车载能源系统"}; + for (String t : titles) { + OtaBaCxKsjxtmccs cs = new OtaBaCxKsjxtmccs(); + cs.setOtaId(otaId); + cs.setXtlb(t); + cs.setCreateTime(now); + cs.setId(UUID.randomUUID().toString().replace("-", "")); + res.add(cs); + } + saveBatch(res); + return res; + } + @Override public JSONObject queryByOtaId(String otaId, String otaIdT) { List res = getByOtaId(otaId); if (ObjectUtil.isEmpty(res)) { res = getByOtaId(otaIdT); } + if (ObjectUtil.isEmpty(res)) { + res = setDefault(otaId); + } JSONObject json = new JSONObject(); json.put("list", res); OtaBaCxList otaBaCxList = otaBaCxListService.queryById(otaId); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjGgnrfsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjGgnrfsServiceImpl.java index df7aa690f..1a92b0884 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjGgnrfsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjGgnrfsServiceImpl.java @@ -67,7 +67,7 @@ public class OtaBaSjGgnrfsServiceImpl extends ServiceImpl reList = cu.comparisonRecord(otaBaSjGgnrfs.getOtaId(), OtaModuleEnum.SJ_YHGZNRFS, otaBaSjGgnrfsOld, otaBaSjGgnrfs, sysDictService); - reList.addAll(cu.comparisonRecord(otaBaSjGgnrfs.getOtaId(), otaBaSjGgnrfs.getXgwj(), oldFjStr, OtaModuleEnum.SJ_YHGZNRFS, "附件", ossFileService)); otaBaCxTxjlService.saveBatch(reList); } @@ -150,6 +149,28 @@ public class OtaBaSjGgnrfsServiceImpl extends ServiceImpl Date: Thu, 30 Mar 2023 13:40:59 +0800 Subject: [PATCH 562/645] bug 67631 --- jero-web/src/common/lang/en-us.js | 2 +- jero-web/src/common/lang/zh-cn.js | 2 +- jero-web/src/components/uploadFile/file.vue | 2 +- jero-web/src/components/uploadFileOta/file.vue | 11 ++++++++++- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 4f0c90365..b07dc98e7 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1739,5 +1739,5 @@ module.exports = { verifyConformanceConfirmation:'Verify conformance confirmation', designConformanceVerification:'Design conformance verification', nomorethan:'No more than 10', - uploadedfilelarger:'The uploaded file is larger than 50 MB', + uploadedfilelarger:'The uploaded file is larger than', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index aaa978cf2..37ca1e33e 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1841,5 +1841,5 @@ module.exports = { verifyConformanceConfirmation:'验证符合性确认', designConformanceVerification:'设计符合性确认', nomorethan:'不能超过10个', - uploadedfilelarger:'文件大于50M', + uploadedfilelarger:'文件大于', } \ No newline at end of file diff --git a/jero-web/src/components/uploadFile/file.vue b/jero-web/src/components/uploadFile/file.vue index 747211830..b5af5bf18 100644 --- a/jero-web/src/components/uploadFile/file.vue +++ b/jero-web/src/components/uploadFile/file.vue @@ -103,7 +103,7 @@ const isLt2KB = file.size / 1024 /1024 < this.size let name = file.name if (!isLt2KB) { - this.$message.error(name + this.$t('uploadedfilelarger')) + this.$message.error(name + this.$t('uploadedfilelarger') + this.size + 'M') return false } } diff --git a/jero-web/src/components/uploadFileOta/file.vue b/jero-web/src/components/uploadFileOta/file.vue index eee02201e..06be66e1c 100644 --- a/jero-web/src/components/uploadFileOta/file.vue +++ b/jero-web/src/components/uploadFileOta/file.vue @@ -34,7 +34,7 @@ export default { name: 'file', - props: ['disableds', 'disabled','acceptcode', 'thisFileUploadUrl', 'readonly', 'thisFileType', 'isUploadFile', 'isMultiple', 'restrictUploads', 'Uploadable'], + props: ['disableds', 'disabled','acceptcode', 'thisFileUploadUrl','size', 'readonly', 'thisFileType', 'isUploadFile', 'isMultiple', 'restrictUploads', 'Uploadable'], data() { return { visible: false, @@ -98,6 +98,15 @@ return false } } + // 根据大小拦截 + if(this.size){ + const isLt2KB = file.size / 1024 /1024 < this.size + let name = file.name + if (!isLt2KB) { + this.$message.error(name + this.$t('uploadedfilelarger') + this.size + 'M') + return false + } + } if (this.isMultiple) { if ((this.myfileList && this.myfileList.length == 1) || this.myfileList && this.myfileList.length > 1) { this.$message.warning(this.$t('onlyOnefileUploaded')) From fa91deefdfd6ad0f9ea5fd9794e22a2d2c502f95 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Thu, 30 Mar 2023 13:54:01 +0800 Subject: [PATCH 563/645] =?UTF-8?q?67377=20=E6=B3=95=E8=A7=84=E5=B7=A5?= =?UTF-8?q?=E7=A8=8B=E5=B8=88=E5=8F=91=E8=B5=B7=E4=BB=BB=E5=8A=A1=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E5=B0=86=E6=B8=85=E5=8D=95=E7=A1=AE=E8=AE=A4=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E5=BE=85=E5=8A=9E=E8=BD=AC=E5=B7=B2=E5=8A=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/project/enums/OperatorTypeEnum.java | 5 +++++ .../impl/ProjectLawsInventoryEOServiceImpl.java | 15 +++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java index f39631239..a053a49f1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java @@ -76,6 +76,11 @@ public enum OperatorTypeEnum { LAWS_INVENTORY_STUDIO_EXPEDITING("法规清单-studio催办","lawsInventoryStudioExpediting"), LAWS_INVENTORY_REGULATION_OWNER_EXPEDITING("法规清单-法规工程师催办","lawsInventoryRegulationOwnerExpediting"), LAWS_INVENTORY_ENGINEERING_INTERFACE_PERSON_EXPEDITING("法规清单-工程接口人催办","lawsInventoryEngineeringInterfacePersonExpediting"), + + /** + * 待办中心-将法规工程师的法规清单确认待办任务转为已办 + */ + TO_DO_CENTER_FG_CONVERT_TO_HAVE_DONE("待办中心，法规工程师待办任务转为已办","toDoCenterFgConvertToHaveDone"), ; String name; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 95884b422..34bc2d6d0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -3194,6 +3194,21 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl pidUpdateWrap = new LambdaUpdateWrapper<>(); + pidUpdateWrap.eq(ProcessInfoDetailEO::getFlowType,FlowTypeEnum.QDQR.getValue()); + pidUpdateWrap.eq(ProcessInfoDetailEO::getProjectLawsInventoryId,projectLawsInventoryId); + pidUpdateWrap.set(ProcessInfoDetailEO::getStatus,TaskStatusEnum.HAVE_DONE.getValue()); + this.processInfoDetailEOService.update(pidUpdateWrap); + } + } + return new Result<>().success("调用成功！"); } From e47a206703815bf98d3eedd1b1db80bbd307643a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Thu, 30 Mar 2023 13:57:03 +0800 Subject: [PATCH 564/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E8=BD=A6=E8=BE=86=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/modules/ota/controller/OtaBaSjListController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java index edc26fec1..c527fc18f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java @@ -83,7 +83,7 @@ public class OtaBaSjListController extends JeroController Date: Thu, 30 Mar 2023 14:00:19 +0800 Subject: [PATCH 565/645] =?UTF-8?q?67627=20=E8=AE=A4=E8=AF=81=E6=B8=85?= =?UTF-8?q?=E5=8D=95-=E8=B0=83=E5=8F=96=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProjectCertificationInventoryEOServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index 42836a268..3905c9ac6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -2663,6 +2663,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl Date: Thu, 30 Mar 2023 14:00:37 +0800 Subject: [PATCH 566/645] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=A2=9E=E5=8A=A0=E4=B8=89=E4=B8=AA=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=EF=BC=8C=E5=B9=B6=E5=88=A4=E6=96=AD=E5=AD=97=E7=AC=A6?= =?UTF-8?q?=E9=95=BF=E5=BA=A6=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ctCertificationInventoryEOServiceImpl.java | 69 +++++++++++++++---- 1 file changed, 55 insertions(+), 14 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index 42836a268..91deef4e0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -2711,13 +2711,13 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl 200){ + String message = ""; + if(CutEnum.CN.getValue().equals(projectCertificationInventoryEOTemp.getCut())){ + message = errorMsg + "报告编号不能超过200个字符, "; + }else{ + message = errorMsg + " The Report No cannot contain more than 200 characters, "; + } + msgList.add(message); + } + } + //产品型号 + if(StringUtils.isNotBlank(productModel)){ + if(productModel.length() > 200){ + String message = ""; + if(CutEnum.CN.getValue().equals(projectCertificationInventoryEOTemp.getCut())){ + message = errorMsg + "产品型号不能超过200个字符, "; + }else{ + message = errorMsg + " The Product Model cannot contain more than 200 characters, "; + } + msgList.add(message); + } + } + //生产企业名称 + if(StringUtils.isNotBlank(productionEnterpriseName)){ + if(productionEnterpriseName.length() > 200){ + String message = ""; + if(CutEnum.CN.getValue().equals(projectCertificationInventoryEOTemp.getCut())){ + message = errorMsg + "生产企业名称不能超过200个字符, "; + }else{ + message = errorMsg + " The Name Of Manufacturer cannot contain more than 200 characters, "; + } + msgList.add(message); + } + } //WVTA ID if(StringUtils.isNotBlank(wvtaId)){ - if(wvtaId.length() > 100){ + if(wvtaId.length() > 300){ String message = ""; if(CutEnum.CN.getValue().equals(projectCertificationInventoryEOTemp.getCut())){ - message = errorMsg + "WVTA ID不能超过100个字符, "; + message = errorMsg + "WVTA ID不能超过300个字符, "; }else{ - message = errorMsg + " The WVTA ID cannot contain more than 100 characters, "; + message = errorMsg + " The WVTA ID cannot contain more than 300 characters, "; } msgList.add(message); } @@ -3025,12 +3066,12 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl 100){ + if(category.length() > 300){ String message = ""; if(CutEnum.CN.getValue().equals(projectCertificationInventoryEOTemp.getCut())){ - message = errorMsg + "类别不能超过100个字符, "; + message = errorMsg + "类别不能超过300个字符, "; }else{ - message = errorMsg + " The Category cannot contain more than 100 characters, "; + message = errorMsg + " The Category cannot contain more than 300 characters, "; } msgList.add(message); } @@ -3049,9 +3090,9 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl 100){ String message = ""; if(CutEnum.CN.getValue().equals(projectCertificationInventoryEOTemp.getCut())){ - message = errorMsg + "检验项目不能超过100个字符, "; + message = errorMsg + "检验项目不能超过300个字符, "; }else{ - message = errorMsg + " The InspectionItem cannot contain more than 100 characters, "; + message = errorMsg + " The InspectionItem cannot contain more than 300 characters, "; } msgList.add(message); } @@ -3067,12 +3108,12 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl 100){ + if(configItem.length() > 300){ String message = ""; if(CutEnum.CN.getValue().equals(projectCertificationInventoryEOTemp.getCut())){ message = errorMsg + "配置项不能超过100个字符, "; }else{ - message = errorMsg + " The ConfigItem cannot contain more than 100 characters, "; + message = errorMsg + " The ConfigItem cannot contain more than 300 characters, "; } msgList.add(message); } From 32d69722cc7343677cffa6431c7d18b06c68eccd Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Thu, 30 Mar 2023 14:00:41 +0800 Subject: [PATCH 567/645] bug 67634 --- .../vehicleregistration/components/maintenance.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/otamanagement/vehicleregistration/components/maintenance.vue b/jero-web/src/views/otamanagement/vehicleregistration/components/maintenance.vue index 69d150010..ddba93e87 100644 --- a/jero-web/src/views/otamanagement/vehicleregistration/components/maintenance.vue +++ b/jero-web/src/views/otamanagement/vehicleregistration/components/maintenance.vue @@ -168,7 +168,7 @@ export default { ids:this.ids } this.confirmLoading = true - postAction('ota/otaBaSjList/batchRecord', query).then((res) => { + postAction('ota/otaBaCxList/batchRecord', query).then((res) => { if (res.success) { this.$message.success(this.$t('OperationSuccessful')) this.visible = false From 28a026b4a4c74071d3c5f95d9c720c3f3653731d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Thu, 30 Mar 2023 14:04:19 +0800 Subject: [PATCH 568/645] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=B8=82=E5=9C=BA?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95-=E8=B0=83=E5=8F=96?= =?UTF-8?q?=E7=9A=84=E6=8F=90=E7=A4=BA=E8=AF=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 2 ++ jero-web/src/common/lang/zh-cn.js | 2 ++ .../components/transferList.vue | 8 ++++---- .../components/transferListvirtal.vue | 17 ++++++++++++++++- 4 files changed, 24 insertions(+), 5 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index b07dc98e7..17314e220 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1739,5 +1739,7 @@ module.exports = { verifyConformanceConfirmation:'Verify conformance confirmation', designConformanceVerification:'Design conformance verification', nomorethan:'No more than 10', + uploadedfilelarger:'The uploaded file is larger than 50 MB', + marketCertificationList:'Market Certification List', uploadedfilelarger:'The uploaded file is larger than', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 37ca1e33e..d0446cff7 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1842,4 +1842,6 @@ module.exports = { designConformanceVerification:'设计符合性确认', nomorethan:'不能超过10个', uploadedfilelarger:'文件大于', + uploadedfilelarger:'文件大于50M', + marketCertificationList:'市场认证清单', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/transferList.vue b/jero-web/src/views/projectManagement/components/certificationList/components/transferList.vue index f1fda8f8b..548f3c44d 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/transferList.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/transferList.vue @@ -15,10 +15,10 @@
-
- {{$t('CertificationListName')}} +
+ {{$t('marketCertificationList')}}
-
@@ -87,7 +87,7 @@ selectedRowKeys: [], columns: [ { - title: this.$t('CertificationListName'), + title: this.$t('marketCertificationList'), dataIndex: 'name', align: 'left', ellipsis: true, diff --git a/jero-web/src/views/virtualAuthenticationList/components/transferListvirtal.vue b/jero-web/src/views/virtualAuthenticationList/components/transferListvirtal.vue index c26d49d02..8a661ce0e 100644 --- a/jero-web/src/views/virtualAuthenticationList/components/transferListvirtal.vue +++ b/jero-web/src/views/virtualAuthenticationList/components/transferListvirtal.vue @@ -242,7 +242,22 @@ export default { }).then((res) => { if (res.success) { this.confirmLoading = false - this.$message.success(this.$t('OperationSuccessful')) + if (res.result && res.result.length > 0) { + let detailedWarningList = [] + res.result.forEach(val => { + detailedWarningList.push( + < div > { val } < /div>) + }) + this.$warning({ + content: ( + < div > + { detailedWarningList } + < /div> + ) + }) + } else { + this.$message.success(this.$t('OperationSuccessful')) + } this.visible = false this.selectedRowKeys = [] this.$emit('transferListFormHomo') From 77e594bae44dfde4b4c846ca49f129b48d4487f1 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Thu, 30 Mar 2023 14:10:27 +0800 Subject: [PATCH 569/645] =?UTF-8?q?67211=20=E6=B3=95=E8=A7=84=E5=B7=A5?= =?UTF-8?q?=E7=A8=8B=E5=B8=88=E5=82=AC=E5=8A=9E=E8=B4=A3=E4=BB=BB=E4=BA=BA?= =?UTF-8?q?=EF=BC=8C=E6=B6=88=E6=81=AF=E6=A8=A1=E6=9D=BF=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 --- .../service/impl/ProjectLawsInventoryEOServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 34bc2d6d0..01db4e5b0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -9741,7 +9741,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl Date: Thu, 30 Mar 2023 14:13:18 +0800 Subject: [PATCH 570/645] =?UTF-8?q?67222=20=E9=A1=B9=E7=9B=AE=E5=BA=93-?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95-=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E7=9B=AE=E5=BD=95=20=E8=AF=B4=E6=98=8E=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E9=95=BF=E5=BA=A6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_2nd_period.sql | 3 +++ 1 file changed, 3 insertions(+) diff --git a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql index 079c40133..ea739fe22 100644 --- a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql +++ b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql @@ -434,3 +434,6 @@ ALTER TABLE `project_related_personnel` ALTER TABLE `project_task_planning` ADD COLUMN `certification_submission` datetime(0) NULL COMMENT '认证提交' AFTER `attestation_start_time`; +-- 项目库-认证清单-认证目录 说明字段长度修改 2023-3-30 未同步生产环境 +ALTER TABLE `project_certification_directory` + MODIFY COLUMN `explain_info` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '说明' AFTER `detection_report_location`; \ No newline at end of file From e7e328fb8f293788c5ca3c66390ee08c6921623f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Thu, 30 Mar 2023 14:20:29 +0800 Subject: [PATCH 571/645] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85-?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95-=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E9=87=8D=E7=BD=AE=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectManagement/components/certificationList/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue index 0c407627d..e4b0bf2b9 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -162,7 +162,7 @@
- + {{ $t('processReset') }}
From 6e904708a934a7bd67420f817f611d2e56003aea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Thu, 30 Mar 2023 14:23:33 +0800 Subject: [PATCH 572/645] =?UTF-8?q?OTA=E6=9F=A5=E7=9C=8B=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/zh-cn.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index d0446cff7..96ae8a37e 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -604,7 +604,7 @@ module.exports = { StandardBreakdown: '标准分解单', searchInResults: '结果中检索', searchContent: '搜索内容', - viewFile: '查看文件', + viewFile: '查看已上传文件', fileFormatIncorrect: '文件格式不正确', pleaseUploadFile: '请上传文件', documentSplitList: '文档拆分列表展示', From ca8f9cde04735187f88c8a3e67faa8da2db47047 Mon Sep 17 00:00:00 2001 From: yuekuo Date: Thu, 30 Mar 2023 14:27:30 +0800 Subject: [PATCH 573/645] =?UTF-8?q?=E5=8A=A8=E5=8A=9B=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=8F=AF=E5=88=A0=EF=BC=8C=E5=9B=9E=E6=98=BE=E6=AD=A3=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/basicInformation.vue | 30 +++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue index e2dbcf92d..27d90dfd9 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue @@ -156,7 +156,7 @@ {{$t('Vehicledynamictype')}}
- + @@ -165,7 +165,7 @@ - + @@ -326,6 +326,7 @@ import { message } from 'ant-design-vue' this.form.cpxh=res.result.cpxh this.form.txzd=res.result.txzd this.form.txzd=res.result.txzd + this.form.cdotasj=res.result.cdotasj this.form.id=res.result.id if(this.$route.query.type == 1 && res.result.cxmb == null){ this.form.cxmb = this.form.ggpc+'-'+ this.form.cpmc+'-'+this.form.cpxh @@ -338,8 +339,14 @@ import { message } from 'ant-design-vue' if(res.result.dllx2 == null){ res.result.dllx2 = undefined } + + if(res.result.cplb == null){ + res.result.cplb = undefined + } this.form.dllx1=res.result.dllx1 this.form.dllx2=res.result.dllx2 + this.form.cplb=res.result.cplb + this.getDllx2() // this.changeSelect() this.$forceUpdate() } @@ -366,6 +373,7 @@ import { message } from 'ant-design-vue' if(otaId==null || otaId == undefined){ otaId='' } + postAction('/ota/otaBaCxJbxx/add',{ otaId:otaId,...this.form}).then( res => { if(res.code == 200){ localStorage.setItem('otaId', res.result.otaId) @@ -387,6 +395,24 @@ import { message } from 'ant-design-vue' }else{ this. projectNameList2=['其他'] } + }, + getDllx2(){ + if(this.form.dllx1==undefined){ + this.projectNameList=[] + } + if(this.form.dllx1=='传统动力汽车'){ + this. projectNameList2=['汽油','柴油'] + } + if(this.form.dllx1=='节能汽车'){ + this. projectNameList2=['混合动力','天然气','甲醇','其他'] + } + if(this.form.dllx1=='新能源汽车'){ + this. projectNameList2=['纯电动','插电式混合动力','燃料电池'] + } + if(this.form.dllx1=='其他'){ + this. projectNameList2=['其他'] + } + }, update(){ From c172464493669cf1be4bfeed095e5a7b8c6d3ba6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Thu, 30 Mar 2023 14:30:51 +0800 Subject: [PATCH 574/645] =?UTF-8?q?OTA=E6=9F=A5=E7=9C=8B=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vehicleinformation/components/safetyPrecautions.vue | 4 ++-- .../vehicleinformation/components/upgradeRequirements.vue | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue index 54953b5d8..d57a5aa42 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue @@ -253,7 +253,7 @@ import ImportFile from '@/components/ImportFileData/index' this.$message.success(this.$t('SavedSuccessfully')) this.getData() } - + }) }, last(){ @@ -284,7 +284,7 @@ import ImportFile from '@/components/ImportFileData/index' } button{ - width: 89px; + //width: 89px; border-radius: 4px; cursor: pointer; background: #00B3BE; diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue index 70cdeba6a..42d0199c9 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue @@ -299,7 +299,7 @@ export default { this.$message.success(this.$t('SavedSuccessfully')) this.getData() } - + }) }, last() { @@ -323,7 +323,7 @@ export default { } button { - width: 89px; + /*width: 89px;*/ border-radius: 4px; cursor: pointer; background: #00B3BE; From add30a9e686d86c7c386899c4859c36227ce5fd4 Mon Sep 17 00:00:00 2001 From: yuekuo Date: Thu, 30 Mar 2023 14:47:19 +0800 Subject: [PATCH 575/645] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/upgradeimpactassessment.vue | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue index 5d06e9870..6bc25cb36 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue @@ -170,6 +170,7 @@ import { getAction, postAction, deleteAction,downloadFile } from '@/api/manage' import ImportFile from '@/components/ImportFileData/index' import uploadFile from '@/components/uploadFile/file' +import { result } from 'lodash' export default { name: 'beupgradedonline', @@ -375,6 +376,9 @@ this.$forceUpdate() } getAction('/ota/otaBaSjSjyxpg/queryByOtaId',{otaIdT:otaIdT,otaId:otaId}).then(res=>{ if(res.code==200){ + if(res.result.zxsj==0){ + res.result.zxsj=null + } this.form=res.result==null ? { sjmd:'', // fhgd:1, @@ -395,6 +399,9 @@ this.$forceUpdate() otaId='' } this.form.otaId=otaId + if(this.form.zxsj==undefined){ + this.form.zxsj=0 + } postAction('/ota/otaBaSjSjyxpg/add',this.form).then(res=>{ if(res.code==200){ this.$message.success(this.$t('SavedSuccessfully')) From 0574c903e094469080620fdd20949a694b286eb2 Mon Sep 17 00:00:00 2001 From: yuekuo Date: Thu, 30 Mar 2023 14:54:47 +0800 Subject: [PATCH 576/645] =?UTF-8?q?=E5=8A=A8=E5=8A=9B=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../upgradeactivityrecord/components/upgradetargetmodel.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue index 6a806d92a..54ccc17db 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue @@ -316,8 +316,8 @@ import ImportFile from '@/components/ImportFileData/index' this.form.cpmc = item.cpmc this.form.cpxh = item.cpxh getAction('/ota/otaBaCxJbxx/queryByOtaId',{otaIdT:'',otaId:item.id}).then(res=>{ - this.form.dllx1=res.result.dllx1 - this.form.dllx2=res.result.dllx2 + this.form.dllx1=res.result.dllx1 == null?undefined:res.result.dllx1 + this.form.dllx2=res.result.dllx2== null?undefined:res.result.dllx2 this.$forceUpdate() }) } From 3b086554f0905186c579c379342f16b4b65ef229 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Thu, 30 Mar 2023 14:58:51 +0800 Subject: [PATCH 577/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E8=BD=A6=E8=BE=86=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ota/service/impl/OtaBaSjListServiceImpl.java | 5 +++-- .../service/impl/OtaBaSjSjmbcxServiceImpl.java | 15 ++++++++++++++- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java index 6bb47d691..f28c2da4c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java @@ -187,11 +187,12 @@ public class OtaBaSjListServiceImpl extends ServiceImpl Date: Thu, 30 Mar 2023 15:02:49 +0800 Subject: [PATCH 578/645] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=91=8A=E7=9F=A5?= =?UTF-8?q?=E5=9B=9E=E6=98=BE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vehicleinformation/components/recordparameters.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue index d5b38ab0f..7022f50c4 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue @@ -866,9 +866,9 @@ export default { downloadFile('ota/otaBaCxList/exportTemplate', '驾驶辅助系统基础备案参数' + '.zip', {}) }, getData(){ - if(this.$route.query.type == 1){ - return - } + // if(this.$route.query.type == 1){ + // return + // } let otaIdT=localStorage.getItem('otaIdT') if(otaIdT==null){ otaIdT='' From 59a0f7649ed83585b2869c3811a45f7655cefcc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Thu, 30 Mar 2023 15:09:04 +0800 Subject: [PATCH 579/645] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E5=BA=93=E7=AE=A1=E7=90=86=E7=9A=84=E5=A4=87=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/parameter/managementdetails/index.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jero-web/src/views/parameter/managementdetails/index.vue b/jero-web/src/views/parameter/managementdetails/index.vue index 2b8cea82a..f6fa244d4 100644 --- a/jero-web/src/views/parameter/managementdetails/index.vue +++ b/jero-web/src/views/parameter/managementdetails/index.vue @@ -344,7 +344,8 @@ let configDataList = [] for (let i = 0; i < selectedRowKeysValue.length; i++) { configDataList.push({ - id: selectedRowKeysValue[i].id + id: selectedRowKeysValue[i].id, + remarks:selectedRowKeysValue[i].remarks }) if (selectedRowKeysValue[i].configIds && selectedRowKeysValue[i].configIds.length > 0) { for (let j = 0; j < selectedRowKeysValue[i].configIds.length; j++) { From 1c699781db45afa6376950e37eab0a6137745da6 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Thu, 30 Mar 2023 15:19:15 +0800 Subject: [PATCH 580/645] bug 67651 --- jero-web/src/views/otamanagement/upgradeactivity/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/otamanagement/upgradeactivity/index.vue b/jero-web/src/views/otamanagement/upgradeactivity/index.vue index 07caabdb7..ea2c98ab9 100644 --- a/jero-web/src/views/otamanagement/upgradeactivity/index.vue +++ b/jero-web/src/views/otamanagement/upgradeactivity/index.vue @@ -315,7 +315,7 @@ export default { title: this.$t('operation'), align: 'left', fixed: 'right', - width: 220, + width: 280, scopedSlots: { customRender: 'operation' } } ], From 02dfee780f45f70370abc21abedca2fba1ca016e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Thu, 30 Mar 2023 15:36:30 +0800 Subject: [PATCH 581/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E8=BD=A6=E8=BE=86=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/OtaBaCxJbxxServiceImpl.java | 1 + .../impl/OtaBaSjGgnrfsServiceImpl.java | 38 +++++++------ .../impl/OtaBaSjSjxtbhServiceImpl.java | 1 + .../impl/OtaBaSjSjyxpgServiceImpl.java | 53 ++++++++----------- .../modules/ota/utils/ComparisonUtil.java | 14 ++++- 5 files changed, 53 insertions(+), 54 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java index bd2c6f8ee..8e7b1db64 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java @@ -84,6 +84,7 @@ public class OtaBaCxJbxxServiceImpl extends ServiceImpl reList = cu.comparisonRecord(otaBaCxJbxx.getOtaId(), OtaModuleEnum.CX_CXJBXX, otaBaCxJbxxOld, otaBaCxJbxx, sysDictService); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjGgnrfsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjGgnrfsServiceImpl.java index 1a92b0884..45402ae5b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjGgnrfsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjGgnrfsServiceImpl.java @@ -28,6 +28,7 @@ import java.io.File; import java.util.Date; import java.util.List; import java.util.Objects; +import java.util.UUID; /** * @Description: 升级备案-用户告知内容及方式 @@ -143,6 +144,22 @@ public class OtaBaSjGgnrfsServiceImpl extends ServiceImpl reList = cu.comparisonRecord(otaBaSjSjyxpg.getOtaId(), OtaModuleEnum.SJ_SJYXPG, otaBaSjSjyxpgOld, otaBaSjSjyxpg, sysDictService); reList.addAll(cu.comparisonRecord(otaBaSjSjyxpg.getOtaId(), newYzcl, oldYzcl, OtaModuleEnum.SJ_SJMBCL, "验证材料", ossFileService)); reList.addAll(cu.comparisonRecord(otaBaSjSjyxpg.getOtaId(), newZmcl, oldZmcl, OtaModuleEnum.SJ_SJMBCL, "证明材料", ossFileService)); + deleteById(otaBaSjSjyxpg.getId()); saveOrUpdate(otaBaSjSjyxpg); otaBaCxTxjlService.saveBatch(reList); } @@ -152,6 +149,24 @@ public class OtaBaSjSjyxpgServiceImpl extends ServiceImpl { res = ""; for (int i = 0; i < newValStr.length; i++) { if (i == newValStr.length - 1) { - res += sysDictService.queryDictTextByKey(ote.getType(), newValStr[i]); + String s = sysDictService.queryDictTextByKey(ote.getType(), newValStr[i]); + if (StringUtils.isNotEmpty(s)) { + res += s; + } else { + res += "空"; + } } else { - res += sysDictService.queryDictTextByKey(ote.getType(), newValStr[i]) + ","; + String s = sysDictService.queryDictTextByKey(ote.getType(), newValStr[i]); + if (StringUtils.isNotEmpty(s)) { + res += s + ","; + } else { + res += "空,"; + } } } } From 42d30ee55a427afc436c196f18716bb036c00700 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Thu, 30 Mar 2023 15:58:29 +0800 Subject: [PATCH 582/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E8=BD=A6=E8=BE=86=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java index 8e7b1db64..b09e65bcf 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java @@ -85,6 +85,7 @@ public class OtaBaCxJbxxServiceImpl extends ServiceImpl reList = cu.comparisonRecord(otaBaCxJbxx.getOtaId(), OtaModuleEnum.CX_CXJBXX, otaBaCxJbxxOld, otaBaCxJbxx, sysDictService); From b6a28cd3d1ca5a18b4e92d5a89c2238acaecc88d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Thu, 30 Mar 2023 16:10:43 +0800 Subject: [PATCH 583/645] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E5=BA=93=E7=AE=A1=E7=90=86=E7=9A=84=E5=A4=87=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 2 +- jero-web/src/common/lang/zh-cn.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 17314e220..48b56f2dd 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1723,7 +1723,7 @@ module.exports = { cantTransferToYourself:"Can't transfer to yourself", theDataYouInitiate:'The data you selected does not meet the process initiation criteria. Please recheck and initiate', dataWithProcessReleasedCannotBeReset:'Data with a process status of list to be released cannot be reset', - reasonForReturnOfDesignCompliance:'Reason for return of design compliance', + reasonForReturnOfDesignCompliance:'Reason for compliance return', noteone:'Note: CSV format is supported. The value is within 20M and the number is 1 to 10', notetwo:'\n1. Provide the modified or expanded batch of "Announcement" and supporting materials;\n2. Verification materials shall be submitted to ensure that products meet the relevant requirements of national laws and regulations, technologies, standards and technical specifications;\n', notethree:'Provide supporting materials', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 96ae8a37e..fd19f1afe 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1826,7 +1826,7 @@ module.exports = { notecsv:'注:支持CSV格式，大小20M以内', theDataYouInitiate:'您所选的数据，均不符合流程发起条件，请重新检查后发起', dataWithProcessReleasedCannotBeReset:'流程状态为清单待发布的数据不能被重置', - reasonForReturnOfDesignCompliance:'设计符合性确认退回原因', + reasonForReturnOfDesignCompliance:'符合性退回原因', notetwo:'\n1、提供变更或扩展后的《公告》批次及证明材料;\n2、应提交验证材料，保障产品符合国家法律法规、技术、标准及技术规范等相关要求;\n', notethree:'\n提供证明材料\n', verifyComplianceConfirmReturnReason:'验证符合性确认退回原因', From b55744b27ea5ba5ec3eff1eeea476770117da221 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Thu, 30 Mar 2023 16:12:53 +0800 Subject: [PATCH 584/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E8=BD=A6=E8=BE=86=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/modules/ota/utils/ComparisonUtil.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java index 79b94530d..bd956e9a8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java @@ -196,13 +196,11 @@ public class ComparisonUtil { if (!newStr.equals(oldStr)) { Object newVal = field.get(newClazz); String newTitleStr = "空"; - if (ObjectUtils.isNotEmpty(newVal)) { - Field tableField = newClazz.getClass().getDeclaredField(tableTitle); - tableField.setAccessible(true); - Object newTitleVal = tableField.get(newClazz); - if (ObjectUtils.isNotEmpty(newTitleVal)) { - newTitleStr = newTitleVal.toString(); - } + Field tableField = newClazz.getClass().getDeclaredField(tableTitle); + tableField.setAccessible(true); + Object newTitleVal = tableField.get(newClazz); + if (ObjectUtils.isNotEmpty(newTitleVal)) { + newTitleStr = newTitleVal.toString(); } String content = newTitleStr + "-" + title + "由'" + oldStr + "'改为'" + newStr + "'"; resList.add(new OtaBaCxTxjl(otaId, otaModuleEnum.getName(), content)); From 1fbdff1be0010f8e73264db6c1e5da9878a9cd13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Thu, 30 Mar 2023 16:23:18 +0800 Subject: [PATCH 585/645] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E5=BA=93=E7=AE=A1=E7=90=86=E7=9A=84id=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/CollectionType/index.vue | 15 +++++++++++-- .../CollectionTypeDisabled/index.vue | 22 +++++++++++++++---- 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/jero-web/src/components/CollectionType/index.vue b/jero-web/src/components/CollectionType/index.vue index 21fee26a9..b00044d8c 100644 --- a/jero-web/src/components/CollectionType/index.vue +++ b/jero-web/src/components/CollectionType/index.vue @@ -966,8 +966,19 @@ } }) }, - generateRandom() { - return Math.random().toString(32) + generateRandom(size = 16) { + let urlAlphabet = + 'useandom-26T198340PX75pxJACKVERYMINDBUSHWOLF_GQZbfghjklqvwyzrict' + + let id = '' + // A compact alternative for `for (var i = 0; i < step; i++)`. + let i = size + while (i--) { + // `| 0` is more compact and faster than `Math.floor()`. + id += urlAlphabet[(Math.random() * 64) | 0] + } + return id + // return Math.random().toString(32) }, addconfig() { let paramsConfigData = Object.keys(this.detailDate.paramsConfigData) diff --git a/jero-web/src/components/CollectionTypeDisabled/index.vue b/jero-web/src/components/CollectionTypeDisabled/index.vue index 8369d66cd..d37359513 100644 --- a/jero-web/src/components/CollectionTypeDisabled/index.vue +++ b/jero-web/src/components/CollectionTypeDisabled/index.vue @@ -728,8 +728,8 @@
-
+
{ if (res.type === 'pull_more') { From 8a4833f813656157bb6c8bf011baed3081b853f9 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Thu, 30 Mar 2023 16:23:35 +0800 Subject: [PATCH 586/645] =?UTF-8?q?bug=2067654=20=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/upgradetargetmodel.vue | 5 ++--- .../vehicleinformation/components/basicInformation.vue | 7 +++++-- .../vehicleinformation/components/safetyPrecautions.vue | 1 + .../vehicleinformation/components/upgradeRequirements.vue | 1 + 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue index 54ccc17db..bf9c32c44 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue @@ -168,7 +168,7 @@ import ImportFile from '@/components/ImportFileData/index' confirmLoading: false, disabled: false, form:{ - qymc:'' + qymc:'安徽江淮汽车集团股份有限公司' }, url: { exportData: '/ota/otaBaSjSjmbcx/exportData', @@ -215,8 +215,7 @@ import ImportFile from '@/components/ImportFileData/index' this.form.bapc=undefined this.form.dllx1=undefined this.form.dllx2=undefined - // this.form.qymc='安徽江淮汽车集团股份有限公司' - this.form.qymc='' + this.form.qymc='安徽江淮汽车集团股份有限公司' }else{ this.form=res.result if(res.result.dllx1==null){ diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue index 27d90dfd9..573c06e46 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue @@ -36,10 +36,10 @@ @@ -245,7 +245,7 @@ import { message } from 'ant-design-vue' cxmb:undefined, txzd:'', djbh:'', - qymc:'', + qymc:'安徽江淮汽车集团股份有限公司', cplb:undefined, cpsb:'', ggpc:'', @@ -343,6 +343,9 @@ import { message } from 'ant-design-vue' if(res.result.cplb == null){ res.result.cplb = undefined } + if(res.result.qymc == null){ + res.result.qymc = '安徽江淮汽车集团股份有限公司' + } this.form.dllx1=res.result.dllx1 this.form.dllx2=res.result.dllx2 this.form.cplb=res.result.cplb diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue index d57a5aa42..0a195ba8e 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue @@ -207,6 +207,7 @@ import ImportFile from '@/components/ImportFileData/index' this.dataSource[2].info= res.result.sjsbcs this.dataSource[3].info= res.result.xxaqjz if(res.result.zmclList.length != 0){ + this.dataSource[0].uploadName = res.result.zmclList this.dataSource[0].certifyingmaterials = this.$t('viewFile') } this.fileList.uploadName = res.result.zmclList diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue index 42d0199c9..621c91ba3 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue @@ -229,6 +229,7 @@ export default { this.dataSource[8].relevantverification=Number(res.result.sjgg) this.dataSource[9].relevantverification=Number(res.result.sjzt) if(res.result.zmclList.length != 0){ + this.dataSource[0].uploadName = res.result.zmclList this.dataSource[0].certifyingmaterials = this.$t('viewFile') } this.fileList.uploadName = res.result.zmclList From 08c28df2271ae4ec135766918b4ed10347c4e675 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Thu, 30 Mar 2023 16:29:41 +0800 Subject: [PATCH 587/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E8=BD=A6=E8=BE=86=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/ota/controller/OtaBaCxListController.java | 4 +++- .../jero/modules/ota/controller/OtaBaSjListController.java | 4 +++- .../main/java/com/jero/modules/ota/enums/OtaTitleEnum.java | 2 +- .../modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java | 3 --- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java index 3cf8577c8..5e080b288 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java @@ -106,7 +106,9 @@ public class OtaBaCxListController extends JeroController> queryList() { - List list = otaBaCxListService.queryList(); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.orderByDesc(OtaBaCxList::getCreateTime); + List list = otaBaCxListService.list(queryWrapper); return Result.OK(list); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java index c527fc18f..51bd9d829 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java @@ -102,7 +102,9 @@ public class OtaBaSjListController extends JeroController> queryList() { - List list = otaBaSjListService.queryList(); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.orderByDesc(OtaBaSjList::getCreateTime); + List list = otaBaSjListService.list(queryWrapper); return Result.OK(list); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java index 194b039e6..7145c18d1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java @@ -14,7 +14,7 @@ public enum OtaTitleEnum { BZ("bz", "备注", "0"), CXMB("cxmb", "车型模板", "0"), - QYMC("qymc", "企业名称", "0"), +// QYMC("qymc", "企业名称", "0"), DJBH("djbh", "产品登记编号", "0"), CPLB("cplb", "产品类别", "product_category"), DLLX1("dllx1", "车辆动力类型", "0"), diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java index 45349c897..dc098de37 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java @@ -93,9 +93,6 @@ public class OtaBaSjSjmbcxServiceImpl extends ServiceImpl reList = cu.comparisonRecord(otaBaSjSjmbcx.getOtaId(), OtaModuleEnum.SJ_SJMBCX, otaBaSjSjmbcxOld, otaBaSjSjmbcx, sysDictService); - if (StringUtils.isEmpty(otaBaSjSjmbcx.getQymc())) { - otaBaSjSjmbcx.setQymc("安徽江淮汽车集团股份有限公司"); - } saveOrUpdate(otaBaSjSjmbcx); otaBaCxTxjlService.saveBatch(reList); return otaBaSjSjmbcx; From b5780eceeeb6104d291bf3d4a3b000909e7a4cd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Thu, 30 Mar 2023 16:34:39 +0800 Subject: [PATCH 588/645] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E5=BA=93=E7=AE=A1=E7=90=86=E7=9A=84id=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 1 + .../certificationListMaintenance.vue | 6 +++--- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 48b56f2dd..b5d1ddb5f 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1742,4 +1742,5 @@ module.exports = { uploadedfilelarger:'The uploaded file is larger than 50 MB', marketCertificationList:'Market Certification List', uploadedfilelarger:'The uploaded file is larger than', + marketCertificationListDetails:'Market Certification List Details', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index fd19f1afe..90e3f0ee0 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1844,4 +1844,5 @@ module.exports = { uploadedfilelarger:'文件大于', uploadedfilelarger:'文件大于50M', marketCertificationList:'市场认证清单', + marketCertificationListDetails:'市场认证清单详情', } \ No newline at end of file diff --git a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue index ddc60716c..2dc59154c 100644 --- a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue +++ b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue @@ -354,7 +354,7 @@ }, created() { if (this.$route.query.title == '市场认证清单详情') { - document.title = this.$t('virtualAuthenticationListDetails') + document.title = this.$t('marketCertificationListDetails') this.columns.splice(7, 1) } else { document.title = this.$t('certificationListMaintenance') @@ -393,7 +393,7 @@ }, //模板下载 handleModule() { - downloadFile(this.url.exportTemplate, this.$t('VirtualAuthenticationList') + this.$t('importTemplate') + '.xls', {}) + downloadFile(this.url.exportTemplate, this.$t('certificationList') + this.$t('importTemplate') + '.xls', {}) }, //调取 transferClick() { @@ -411,7 +411,7 @@ ids: selectedRowKeys.join(','), authDummyInventoryBaseId: this.$route.query.id } - downloadFile(this.url.exportData, this.$route.query.name + this.$t('VirtualAuthenticationList') + '.zip', query, this.Deselect) + downloadFile(this.url.exportData, this.$route.query.name + this.$t('certificationList') + '.zip', query, this.Deselect) }, Deselect() { this.selectedRowKeys = [] From b8b88190f538797aadc8c010a379c7ca96b73c4f Mon Sep 17 00:00:00 2001 From: cuijiaming <1410452759@qq.com> Date: Thu, 30 Mar 2023 16:35:14 +0800 Subject: [PATCH 589/645] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=BF=85=E5=A1=AB=E9=A1=B9=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E5=92=8C=E7=BC=96=E5=8F=B7=E9=AA=8C=E8=AF=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ctCertificationInventoryEOServiceImpl.java | 86 +++++++++++++++---- 1 file changed, 69 insertions(+), 17 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index f86813fb3..489cae778 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -2859,6 +2859,49 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl 1) { dataList.add(rowList); } @@ -3518,8 +3561,10 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl datas, ProjectCertificationInventoryEO projectCertificationInventoryEOTemp) { - //1. 验证标准号在文档库中是否存在 + + List serialNumberList = datas.stream().map(ProjectCertificationInventoryEO::getSerialNumber).collect(Collectors.toList()); + //1. 验证标准号在文档库中是否存在 LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.in(BussDocumentLibraryEO::getSerialNumber,serialNumberList); List bussDocumentLibraryEOList = iBussDocumentLibraryEOService.list(wrapper); @@ -3537,24 +3582,31 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl collect = bussDocumentLibraryEOList.stream() - .filter(e -> e.getSerialNumber().equals(projectCertificationInventoryEO.getSerialNumber())).collect(Collectors.toList()); - projectCertificationInventoryEO.setBussDocumentLibraryId(collect.get(0).getId()); + //验证编号在法规清单中是否存在 + LambdaQueryWrapper lwrapper = new LambdaQueryWrapper<>(); + lwrapper.in(ProjectLawsInventoryEO::getSerialNumber,serialNumberList); + List projectLawsInventoryEOList = projectLawsInventoryEOService.list(lwrapper); + List LawSerialNumberListTemp = projectLawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getSerialNumber).distinct().collect(Collectors.toList()); + if(serialNumberList.size() != LawSerialNumberListTemp.size()){ + //存在法规清单中没有的数据 + List collect = projectLawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getSerialNumber).collect(Collectors.toList()); + List serialNumbers = serialNumberList.stream().filter(e -> !collect.contains(e)).collect(Collectors.toList()); + if(serialNumbers.size() > 0){ + if(CutEnum.CN.getValue().equals(datas.get(0).getCut())){ + throw new JeroBootException(StringUtils.join(serialNumbers,",")+"法规清单中不存在,不能添加"); + }else{ + throw new JeroBootException(StringUtils.join(serialNumbers,",")+" does not exist in the project laws and cannot be added"); + } + } + }else{ + for (ProjectCertificationInventoryEO projectCertificationInventoryEO : datas) { + List collect = bussDocumentLibraryEOList.stream() + .filter(e -> e.getSerialNumber().equals(projectCertificationInventoryEO.getSerialNumber())).collect(Collectors.toList()); + projectCertificationInventoryEO.setBussDocumentLibraryId(collect.get(0).getId()); + } } } -// //2. 验证标准号在法规清单中是否添加过 -// LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); -// lambdaQueryWrapper.in(ProjectCertificationInventoryEO::getSerialNumber,serialNumberList).in(ProjectCertificationInventoryEO::getProjectLibraryId,projectCertificationInventoryEOTemp.getProjectLibraryId()); -// List projectCertificationInventoryEOList = this.list(lambdaQueryWrapper); -// List serialNumberTempList = projectCertificationInventoryEOList.stream().map(ProjectCertificationInventoryEO::getSerialNumber).collect(Collectors.toList()); -// if(projectCertificationInventoryEOList.size() > 0){ -// if(CutEnum.CN.getValue().equals(datas.get(0).getCut())){ -// throw new JeroBootException(StringUtils.join(serialNumberTempList,",")+"已存在,不能重复添加"); -// }else{ -// throw new JeroBootException(StringUtils.join(serialNumberTempList,",")+" already exists and cannot be added again"); -// } -// } + } /** From a60df3bb36170c00fbbf5365e35bc3d5d9e585f7 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Thu, 30 Mar 2023 16:42:38 +0800 Subject: [PATCH 590/645] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E6=8A=A5=E9=94=99=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/otamanagement/upgradeactivity/components/gnxtwh.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/otamanagement/upgradeactivity/components/gnxtwh.vue b/jero-web/src/views/otamanagement/upgradeactivity/components/gnxtwh.vue index e077321bb..c7c034892 100644 --- a/jero-web/src/views/otamanagement/upgradeactivity/components/gnxtwh.vue +++ b/jero-web/src/views/otamanagement/upgradeactivity/components/gnxtwh.vue @@ -291,7 +291,7 @@ export default { this.confirmLoading = false this.bussLogList() } else { - this.$message.warning(this.$t('operationFailed')) + this.$message.warning(res.message) this.confirmLoading = false } }) From 7763795a5053fb886727481b2bebfd271c359d20 Mon Sep 17 00:00:00 2001 From: yuekuo Date: Thu, 30 Mar 2023 17:15:38 +0800 Subject: [PATCH 591/645] =?UTF-8?q?=E9=80=89=E6=8B=A9=E8=BD=A6=E5=9E=8B?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../otamanagement/upgradeactivity/index.vue | 2 +- .../thetargetvehicleofthisupgrade.vue | 5 ++- .../components/upgradetargetmodel.vue | 42 +++++++++++++++++-- .../components/basicInformation.vue | 6 ++- .../vehicleregistration/index.vue | 2 +- 5 files changed, 49 insertions(+), 8 deletions(-) diff --git a/jero-web/src/views/otamanagement/upgradeactivity/index.vue b/jero-web/src/views/otamanagement/upgradeactivity/index.vue index ea2c98ab9..a3f5994a6 100644 --- a/jero-web/src/views/otamanagement/upgradeactivity/index.vue +++ b/jero-web/src/views/otamanagement/upgradeactivity/index.vue @@ -428,7 +428,7 @@ export default { localStorage.removeItem('otaIdT') this.$router.push({ path: '/upgradeactivityrecord', - query: {} + query: { type:2} }) }, viewProcessClick(row) { diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue index 4367f3867..b08e2102d 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue @@ -140,6 +140,9 @@ export default { } getAction('/ota/otaBaSjSjmbcl/queryByOtaId',{otaIdT:otaIdT,otaId:otaId}).then(res=>{ if(res.code==200){ + if(res.result==null){ + res.result={} + } this.formInline.zsl=res.result.zsl this.formInline.vinList=res.result.vinList this.formInline.csv=res.result.csv @@ -148,7 +151,7 @@ export default { res.result.scrqjs=res.result.scrqjs == null ? "" : res.result.scrqjs this.formInline.dateofproduction.push(res.result.scrqks) this.formInline.dateofproduction.push(res.result.scrqjs) - this.formInline.id = res.result.vinList + this.formInline.id = res.result.id this.$forceUpdate() } diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue index bf9c32c44..9908fc679 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue @@ -130,7 +130,7 @@ - + @@ -216,8 +216,23 @@ import ImportFile from '@/components/ImportFileData/index' this.form.dllx1=undefined this.form.dllx2=undefined this.form.qymc='安徽江淮汽车集团股份有限公司' + // if(this.$route.query.type == 1 && res.result.cxmb == null){ + // this.form.cxmb=this.form.ggpc+'-'+ this.form.cpmc+'-'+this.form.cpxh + // } + }else{ + this.form=res.result + if(this.$route.query.type == 1 && res.result.cxmb == null){ + this.form.cxmb = this.form.babh+'-'+ this.form.bapc+'-'+this.form.cpxh + }else { + if(this.$route.query.type == 2 && res.result.cxmb == null){ + this.form.cxmb = this.form.babh+'-'+ this.form.bapc+'-'+this.form.cpxh + }else{ + this.form.cxmb = res.result.cxmb ? res.result.cxmb : undefined + } + } + if(res.result.dllx1==null){ this.form.dllx1=undefined @@ -242,6 +257,11 @@ import ImportFile from '@/components/ImportFileData/index' if(otaId==null){ otaId='' } + // if(this.form.bapc!=null && this.form.bapc!=undefined && this.form.bapc!=''){ + // this.$nextTick(()=>{ + // this.$refs.ruleForm.clearValidate('bapc') + // }) + // } this.$refs.ruleForm.validate(valid=>{ if(valid){ this.selectListPc.map(item=>{ @@ -256,12 +276,19 @@ import ImportFile from '@/components/ImportFileData/index' this.getData() } }) + }else{ + this.form.bapc=undefined } }) }, next(){ this.save() + // if(this.form.bapc!=null && this.form.bapc!=undefined && this.form.bapc!=''){ + // this.$nextTick(()=>{ + // this.$refs.ruleForm.clearValidate('bapc') + // }) + // } this.$refs.ruleForm.validate(valid=>{ if(valid){ this.$emit('basicInformationForm') @@ -289,7 +316,7 @@ import ImportFile from '@/components/ImportFileData/index' res.result.forEach(item=>{ let obj={} obj.id=item.id - obj.cpdjbh=item.cpdjbh + obj.cpdjbh=item.cpdjbh+'-'+item.ggpc+'-'+item.cpxh this.selectListMb.push(obj) }) } @@ -317,13 +344,20 @@ import ImportFile from '@/components/ImportFileData/index' getAction('/ota/otaBaCxJbxx/queryByOtaId',{otaIdT:'',otaId:item.id}).then(res=>{ this.form.dllx1=res.result.dllx1 == null?undefined:res.result.dllx1 this.form.dllx2=res.result.dllx2== null?undefined:res.result.dllx2 - this.$forceUpdate() }) } }) this.$forceUpdate() }, - update(){ + update(val){ + this.$forceUpdate() + localStorage.removeItem('otaId') + localStorage.removeItem('otaIdT') + localStorage.setItem('otaIdT',val) + + this.getData() + }, + update2(){ this.$forceUpdate() } } diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue index 573c06e46..a66145229 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue @@ -331,7 +331,11 @@ import { message } from 'ant-design-vue' if(this.$route.query.type == 1 && res.result.cxmb == null){ this.form.cxmb = this.form.ggpc+'-'+ this.form.cpmc+'-'+this.form.cpxh }else { - this.form.cxmb = res.result.cxmb ? res.result.cxmb : undefined + if(this.$route.query.type == 2 && res.result.cxmb == null){ + this.form.cxmb = this.form.ggpc+'-'+ this.form.cpmc+'-'+this.form.cpxh + }else{ + this.form.cxmb = res.result.cxmb ? res.result.cxmb : undefined + } } if(res.result.dllx1 == null ){ res.result.dllx1 = undefined diff --git a/jero-web/src/views/otamanagement/vehicleregistration/index.vue b/jero-web/src/views/otamanagement/vehicleregistration/index.vue index c3b9810aa..f3278c7d0 100644 --- a/jero-web/src/views/otamanagement/vehicleregistration/index.vue +++ b/jero-web/src/views/otamanagement/vehicleregistration/index.vue @@ -385,7 +385,7 @@ export default { localStorage.removeItem('otaIdT') this.$router.push({ path: '/vehicleinformation', - query: { type:1} + query: { type:2} }) }, viewProcessClick(row) { From 58aa8598afc0e77dc16f3fb4647f7af796387179 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Thu, 30 Mar 2023 17:25:07 +0800 Subject: [PATCH 592/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E8=BD=A6=E8=BE=86=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ota/controller/OtaBaCxListController.java | 2 +- .../controller/OtaBaSjGnxtwhController.java | 251 +++++++++--------- .../ota/service/IOtaBaSjGnxtwhService.java | 4 +- .../impl/OtaBaSjGnxtwhServiceImpl.java | 59 +++- 4 files changed, 190 insertions(+), 126 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java index 5e080b288..b7a9c3405 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java @@ -87,7 +87,7 @@ public class OtaBaCxListController extends JeroController { - @Autowired - private IOtaBaSjGnxtwhService otaBaSjGnxtwhService; - - /** - * 分页列表查询 - * - * @param otaBaSjGnxtwh - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @AutoLog(value = "车型备案-功能系统维护-分页列表查询") - @ApiOperation(value="车型备案-功能系统维护-分页列表查询", notes="车型备案-功能系统维护-分页列表查询") - @GetMapping(value = "/page") - public Result queryPageList(OtaBaSjGnxtwh otaBaSjGnxtwh, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(otaBaSjGnxtwh, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - queryWrapper.orderByDesc("create_time"); - IPage pageList = otaBaSjGnxtwhService.page(page, queryWrapper); - return Result.OK(pageList); - } + @Autowired + private IOtaBaSjGnxtwhService otaBaSjGnxtwhService; /** - * 列表查询 - * - * @return - */ - @AutoLog(value = "车型备案-功能系统维护-列表查询") - @ApiOperation(value="车型备案-功能系统维护-列表查询", notes="车型备案-功能系统维护-列表查询") - @GetMapping(value = "/list") - public Result> queryList() { + * 分页列表查询 + * + * @param otaBaSjGnxtwh + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "车型备案-功能系统维护-分页列表查询") + @ApiOperation(value = "车型备案-功能系统维护-分页列表查询", notes = "车型备案-功能系统维护-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(OtaBaSjGnxtwh otaBaSjGnxtwh, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(otaBaSjGnxtwh, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + queryWrapper.orderByDesc("create_time"); + IPage pageList = otaBaSjGnxtwhService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "车型备案-功能系统维护-列表查询") + @ApiOperation(value = "车型备案-功能系统维护-列表查询", notes = "车型备案-功能系统维护-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { List list = otaBaSjGnxtwhService.queryList(); return Result.OK(list); - } - - /** - * 添加 - * - * @param otaBaSjGnxtwh - * @return - */ - @AutoLog(value = "车型备案-功能系统维护-添加") - @ApiOperation(value="车型备案-功能系统维护-添加", notes="车型备案-功能系统维护-添加") - @PostMapping(value = "/add") - public Result add(@Validated @RequestBody OtaBaSjGnxtwh otaBaSjGnxtwh) { - otaBaSjGnxtwhService.add(otaBaSjGnxtwh); - return Result.OK("添加成功！"); - } - - /** - * 编辑 - * - * @param otaBaSjGnxtwh - * @return - */ - @AutoLog(value = "车型备案-功能系统维护-编辑") - @ApiOperation(value="车型备案-功能系统维护-编辑", notes="车型备案-功能系统维护-编辑") - @PutMapping(value = "/edit") - public Result edit(@Validated @RequestBody OtaBaSjGnxtwh otaBaSjGnxtwh) { - otaBaSjGnxtwhService.editById(otaBaSjGnxtwh); - return Result.OK("编辑成功!"); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @AutoLog(value = "车型备案-功能系统维护-通过id删除") - @ApiOperation(value="车型备案-功能系统维护-通过id删除", notes="车型备案-功能系统维护-通过id删除") - @DeleteMapping(value = "/delete") - public Result delete(@RequestParam(name="id",required=true) String id) { - otaBaSjGnxtwhService.deleteById(id); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @AutoLog(value = "车型备案-功能系统维护-批量删除") - @ApiOperation(value="车型备案-功能系统维护-批量删除", notes="车型备案-功能系统维护-批量删除") - @DeleteMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.otaBaSjGnxtwhService.deleteByIds(Arrays.asList(ids.split(","))); - return Result.OK("批量删除成功!"); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @AutoLog(value = "车型备案-功能系统维护-通过id查询") - @ApiOperation(value="车型备案-功能系统维护-通过id查询", notes="车型备案-功能系统维护-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name="id",required=true) String id) { - OtaBaSjGnxtwh otaBaSjGnxtwh = otaBaSjGnxtwhService.queryById(id); - if(otaBaSjGnxtwh==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(otaBaSjGnxtwh); - } + } /** - * 导出excel - * - * @param request - * @param otaBaSjGnxtwh - */ + * 添加 + * + * @param otaBaSjGnxtwh + * @return + */ + @AutoLog(value = "车型备案-功能系统维护-添加") + @ApiOperation(value = "车型备案-功能系统维护-添加", notes = "车型备案-功能系统维护-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody OtaBaSjGnxtwh otaBaSjGnxtwh) { + try { + otaBaSjGnxtwhService.add(otaBaSjGnxtwh); + } catch (Exception e) { + return Result.error(e.getMessage()); + } + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param otaBaSjGnxtwh + * @return + */ + @AutoLog(value = "车型备案-功能系统维护-编辑") + @ApiOperation(value = "车型备案-功能系统维护-编辑", notes = "车型备案-功能系统维护-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody OtaBaSjGnxtwh otaBaSjGnxtwh) { + try { + otaBaSjGnxtwhService.editById(otaBaSjGnxtwh); + } catch (Exception e) { + return Result.error(e.getMessage()); + } + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "车型备案-功能系统维护-通过id删除") + @ApiOperation(value = "车型备案-功能系统维护-通过id删除", notes = "车型备案-功能系统维护-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name = "id", required = true) String id) { + otaBaSjGnxtwhService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "车型备案-功能系统维护-批量删除") + @ApiOperation(value = "车型备案-功能系统维护-批量删除", notes = "车型备案-功能系统维护-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) { + this.otaBaSjGnxtwhService.deleteByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "车型备案-功能系统维护-通过id查询") + @ApiOperation(value = "车型备案-功能系统维护-通过id查询", notes = "车型备案-功能系统维护-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name = "id", required = true) String id) { + OtaBaSjGnxtwh otaBaSjGnxtwh = otaBaSjGnxtwhService.queryById(id); + if (otaBaSjGnxtwh == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(otaBaSjGnxtwh); + } + + /** + * 导出excel + * + * @param request + * @param otaBaSjGnxtwh + */ @RequestMapping(value = "/exportXls") public ModelAndView exportXls(HttpServletRequest request, OtaBaSjGnxtwh otaBaSjGnxtwh) { return super.exportXls(request, otaBaSjGnxtwh, OtaBaSjGnxtwh.class, "车型备案-功能系统维护"); } /** - * 通过excel导入数据 - * - * @param request - * @param response - * @return - */ + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ @RequestMapping(value = "/importExcel", method = RequestMethod.POST) public Result importExcel(HttpServletRequest request, HttpServletResponse response) { return super.importExcel(request, response, OtaBaSjGnxtwh.class); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjGnxtwhService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjGnxtwhService.java index 557d2f6ff..904083e4b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjGnxtwhService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjGnxtwhService.java @@ -19,7 +19,7 @@ public interface IOtaBaSjGnxtwhService extends IService { * @param otaBaSjGnxtwh * @return */ - void add(OtaBaSjGnxtwh otaBaSjGnxtwh); + void add(OtaBaSjGnxtwh otaBaSjGnxtwh) throws Exception; /** * 更新 @@ -27,7 +27,7 @@ public interface IOtaBaSjGnxtwhService extends IService { * @param otaBaSjGnxtwh * @return */ - void editById(OtaBaSjGnxtwh otaBaSjGnxtwh); + void editById(OtaBaSjGnxtwh otaBaSjGnxtwh) throws Exception; /** * 通过id删除 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjGnxtwhServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjGnxtwhServiceImpl.java index 50f834b56..8dc9643e2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjGnxtwhServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjGnxtwhServiceImpl.java @@ -1,8 +1,10 @@ package com.jero.modules.ota.service.impl; +import com.jero.common.exception.JeroBootException; import com.jero.modules.ota.entity.OtaBaSjGnxtwh; import com.jero.modules.ota.mapper.OtaBaSjGnxtwhMapper; import com.jero.modules.ota.service.IOtaBaSjGnxtwhService; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import java.util.List; @@ -26,10 +28,28 @@ public class OtaBaSjGnxtwhServiceImpl extends ServiceImpl list = list(); + for (OtaBaSjGnxtwh wh : list) { + if (kzq.getId().equals(wh.getId())) { + continue; + } + String[] strs = wh.getDykzq().split(","); + String[] strs1 = kzq.getDykzq().split(","); + for (String str : strs) { + for (String str1 : strs1) { + if (str.equals(str1)) { + return str; + } + } + } + } + return null; + } @Override public String queryGnxtByKzq(String kzq) { From 3606f0fd9ebd37d966d6d6c3ac7ef47c1f75dbfb Mon Sep 17 00:00:00 2001 From: cuijiaming <1410452759@qq.com> Date: Thu, 30 Mar 2023 17:30:19 +0800 Subject: [PATCH 593/645] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E5=AF=BC=E5=85=A5=E5=BF=85=E5=A1=AB=E9=A1=B9?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E5=92=8C=E7=BC=96=E5=8F=B7=E9=AA=8C=E8=AF=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AuthDummyInventoryInfoEOServiceImpl.java | 109 +++++------ ...ctCertificationInventoryEOServiceImpl.java | 175 +++++++++--------- 2 files changed, 141 insertions(+), 143 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java index b0475e591..b72277131 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java @@ -658,6 +658,43 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl 1) { dataList.add(rowList); } @@ -797,86 +834,54 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl 100){ + if(wvtaId.length() > 300){ String message = ""; if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEOTemp.getCut())){ - message = errorMsg + "WVTA ID不能超过100个字符, "; + message = errorMsg + "WVTA ID不能超过300个字符, "; }else{ - message = errorMsg + " The WVTA ID cannot contain more than 100 characters, "; + message = errorMsg + " The WVTA ID cannot contain more than 300 characters, "; } msgList.add(message); } - } else { - String message = ""; - if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEOTemp.getCut())){ - message = errorMsg + "WVTA ID不能为空, "; - }else{ - message = errorMsg + " The WVTA ID cannot null, "; - } - msgList.add(message); } //类别 if(StringUtils.isNotBlank(category)){ - if(category.length() > 100){ + if(category.length() > 300){ String message = ""; if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEOTemp.getCut())){ - message = errorMsg + "类别不能超过100个字符, "; + message = errorMsg + "类别不能超过300个字符, "; }else{ - message = errorMsg + " The Category cannot contain more than 100 characters, "; + message = errorMsg + " The Category cannot contain more than 300 characters, "; } msgList.add(message); } - }else { - String message = ""; - if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEOTemp.getCut())){ - message = errorMsg + "类别不能为空, "; - }else{ - message = errorMsg + " The Category cannot null, "; - } - msgList.add(message); } //检验项目 if(StringUtils.isNotBlank(inspectionItem)){ - if(inspectionItem.length() > 100){ + if(inspectionItem.length() > 300){ String message = ""; if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEOTemp.getCut())){ - message = errorMsg + "检验项目不能超过100个字符, "; + message = errorMsg + "检验项目不能超过300个字符, "; }else{ - message = errorMsg + " The InspectionItem cannot contain more than 100 characters, "; + message = errorMsg + " The InspectionItem cannot contain more than 300 characters, "; } msgList.add(message); } - }else { - String message = ""; - if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEOTemp.getCut())){ - message = errorMsg + "检验项目不能为空, "; - }else{ - message = errorMsg + " The InspectionItem cannot null, "; - } - msgList.add(message); } //配置项 if(StringUtils.isNotBlank(configItem)){ - if(configItem.length() > 100){ + if(configItem.length() > 300){ String message = ""; if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEOTemp.getCut())){ - message = errorMsg + "配置项不能超过100个字符, "; + message = errorMsg + "配置项不能超过300个字符, "; }else{ - message = errorMsg + " The ConfigItem cannot contain more than 100 characters, "; + message = errorMsg + " The ConfigItem cannot contain more than 300 characters, "; } msgList.add(message); } - }else { - String message = ""; - if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEOTemp.getCut())){ - message = errorMsg + "配置项不能为空, "; - }else{ - message = errorMsg + " The ConfigItem cannot null, "; - } - msgList.add(message); } //责任领域 if(StringUtils.isNotBlank(dutyTerritory)){ @@ -884,14 +889,6 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl objectMap = iProjectRelatedPersonnelService.queryPersonByProjectId(projectCertificationInventoryEOTemp.getProjectLibraryId(), value); @@ -3209,30 +3214,32 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpllongdate){ flag = false; if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){ - errorMsg += nameCn + "不能导入今天之前的日期"; + errorMsg += nameCn + "不能导入今天之前的日期, "; }else{ - errorMsg += nameEn + " Cannot import dates before today "; + errorMsg += nameEn + " Cannot import dates before today, "; } msgList.add(errorMsg); } @@ -3476,9 +3485,9 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl Date: Thu, 30 Mar 2023 17:45:02 +0800 Subject: [PATCH 594/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E8=BD=A6=E8=BE=86=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java | 2 ++ .../jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java | 2 +- .../modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java index aa786c249..849cc8289 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java @@ -90,6 +90,8 @@ public class OtaBaCxAqcsServiceImpl extends ServiceImpl aeoList = JSONArray.parseArray(otaBaCxAqcsOld.getZmcl(), AttachmentEO.class); otaBaCxAqcsOld.setZmclList(aeoList); } + deleteById(otaBaCxAqcs.getId()); + deleteById(otaBaCxAqcsOld.getId()); saveOrUpdate(otaBaCxAqcs); ComparisonUtil cu = new ComparisonUtil(); if (ObjectUtils.isEmpty(otaBaCxAqcsOld)) { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java index b09e65bcf..a8dc2d4c2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java @@ -286,7 +286,7 @@ public class OtaBaCxJbxxServiceImpl extends ServiceImpl sjmkList = OtaBaCxSjmkService.queryByOtaId(otaId); int startRow = 63; for (OtaBaCxSjmk sjmk : sjmkList) { - row = s.getRow(startRow); + row = s.createRow(startRow); cell = row.createCell(0); cell.setCellValue(sjmk.getBjmc()); cell = row.createCell(1); From 97d03f5368637c2c6eae3e03511a2c2af2cc3083 Mon Sep 17 00:00:00 2001 From: yuekuo Date: Thu, 30 Mar 2023 18:00:46 +0800 Subject: [PATCH 595/645] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/upgradetargetmodel.vue | 30 +++++++++++-------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue index 9908fc679..e778df4c5 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue @@ -168,7 +168,8 @@ import ImportFile from '@/components/ImportFileData/index' confirmLoading: false, disabled: false, form:{ - qymc:'安徽江淮汽车集团股份有限公司' + qymc:'安徽江淮汽车集团股份有限公司', + bapc:undefined }, url: { exportData: '/ota/otaBaSjSjmbcx/exportData', @@ -336,17 +337,22 @@ import ImportFile from '@/components/ImportFileData/index' }, changeId(value,option){ - this.selectListPc.map(item=>{ - if(item.id==value){ - this.form.cpsb = item.cpsb - this.form.cpmc = item.cpmc - this.form.cpxh = item.cpxh - getAction('/ota/otaBaCxJbxx/queryByOtaId',{otaIdT:'',otaId:item.id}).then(res=>{ - this.form.dllx1=res.result.dllx1 == null?undefined:res.result.dllx1 - this.form.dllx2=res.result.dllx2== null?undefined:res.result.dllx2 - }) - } - }) + + this.$nextTick(()=>{ + this.form={...this.form} + this.$refs.ruleForm.validateField('bapc') + }) + this.selectListPc.map(item=>{ + if(item.id==value){ + this.form.cpsb = item.cpsb + this.form.cpmc = item.cpmc + this.form.cpxh = item.cpxh + getAction('/ota/otaBaCxJbxx/queryByOtaId',{otaIdT:'',otaId:item.id}).then(res=>{ + this.form.dllx1=res.result.dllx1 == null?undefined:res.result.dllx1 + this.form.dllx2=res.result.dllx2== null?undefined:res.result.dllx2 + }) + } + }) this.$forceUpdate() }, update(val){ From b93d9efcaf0d3559082d06b16637681680e77632 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Thu, 30 Mar 2023 18:06:29 +0800 Subject: [PATCH 596/645] =?UTF-8?q?66963=20=E4=B8=8A=E6=8A=A5=E5=BA=93?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E6=95=B0=E6=8D=AE=EF=BC=8C=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=92=8C=E6=B7=BB=E5=8A=A0=E7=9A=84=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=E8=AE=B0=E5=BD=95=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ParamsReportDetailEOServiceImpl.java | 160 +++++++++++++++++- 1 file changed, 151 insertions(+), 9 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 9724c1dcf..2bef73cf0 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 @@ -1793,11 +1793,28 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl> configDataVOList = (List>) paramsReportConfigDataMap.get("list"); + logCnContent.append("将"); + logEnContent.append(" set "); + + logCnContent.append(paramsReportConfigEO.getConfigName()).append("的"); + logEnContent.append(paramsReportConfigEO.getConfigName()); Map paramsConfigDataVOMap = (Map) paramsReportConfigDataMap.get("paramsConfigData"); @@ -1831,6 +1853,8 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl> configDataVOList = (List>) paramsConfigDataMap.getValue(); + + if (CollectionUtil.isNotEmpty(configDataVOList)) { Integer orderNum = (Integer) configDataVOList.get(0).get("orderNum"); @@ -1999,22 +2023,106 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl 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); } +// +// logCnContent.append(paramsReportConfigEO.getConfigName()).append("的"); +// logEnContent.append(paramsReportConfigEO.getConfigName()); } + QueryWrapper prcdQueryWrap = new QueryWrapper<>(); + prcdQueryWrap.lambda().eq(ParamsReportConfigDataEO::getParamsConfigId,paramsReportConfigEOId); + prcdQueryWrap.lambda().eq(ParamsReportConfigDataEO::getParamsCollectManifestId,paramsCollectManifestId); + List prcdEoList = this.paramsReportConfigDataEOService.list(prcdQueryWrap); + if(CollectionUtils.isNotEmpty(prcdEoList)){ + List paramsConfigDataIdList = paramsConfigDataVOMap.entrySet().stream().map(e -> e.getKey()).distinct().collect(Collectors.toList()); - logCnContent.append(paramsReportConfigEO.getConfigName()).append("的"); - logEnContent.append(paramsReportConfigEO.getConfigName()); + List newAddPcdDataIdList = paramsConfigDataVOMap.entrySet().stream().map(e -> e.getKey()).filter(e -> { + boolean flag = false; + // 如果key的长度是16位，则是新添加的 + if (e.length() == 16) { + flag = true; + } + return flag; + }).distinct().collect(Collectors.toList()); + + if(CollectionUtils.isNotEmpty(newAddPcdDataIdList)){ + StringBuilder dataValueSb = new StringBuilder(); + for (String newAddPcdDataId : newAddPcdDataIdList) { + List> configDataVOList = (List>) paramsConfigDataVOMap.get(newAddPcdDataId); + for (Map paramsConfigDataVO : configDataVOList) { + String type = (String) paramsConfigDataVO.get("type"); + + String dataValue = ""; + if(ObjectUtils.isNotEmpty(paramsConfigDataVO.get("dataValue"))){ + dataValue = String.valueOf(paramsConfigDataVO.get("dataValue")); + } + // 如果是附件 单独处理 + if(StringUtils.equals(type,ConfigDataTypeEnum.FILE.getValue())){ + + } + dataValueSb.append("\"").append(dataValue).append("\","); + } + } + + String dataValue = ""; + if(StringUtils.isNotBlank(dataValueSb.toString())){ + dataValue = dataValueSb.toString().substring(0,dataValueSb.length()-1); + } + + addLogCnContent.append("在").append(paramsReportConfigEO.getConfigName()).append("中添加了").append(dataValue).append("，"); + addLogEnContent.append("在").append(paramsReportConfigEO.getConfigName()).append("中添加了").append(dataValue).append(","); + + addFlag = true; + } + + // 判断有没有被减掉的（删除的） + List deletePrcdEoList = prcdEoList.stream().filter(prcdEo -> { + boolean flag = true; + for (String paramsConfigDataId : paramsConfigDataIdList) { + if(StringUtils.equals(prcdEo.getId(),paramsConfigDataId)){ + flag = false; + break; + } + } + return flag; + }).collect(Collectors.toList()); + + // 如果有被删的数据 增加log记录 + if(CollectionUtils.isNotEmpty(deletePrcdEoList)){ + StringBuilder dataValueSb = new StringBuilder(); + for (ParamsReportConfigDataEO paramsReportConfigDataEO : deletePrcdEoList) { + if(StringUtils.isNotBlank(paramsReportConfigDataEO.getTextData())){ + dataValueSb.append("\"").append(paramsReportConfigDataEO.getTextData()).append("\","); + } + if(StringUtils.isNotBlank(paramsReportConfigDataEO.getPullData())){ + dataValueSb.append("\"").append(paramsReportConfigDataEO.getPullData()).append("\","); + } + if(StringUtils.isNotBlank(paramsReportConfigDataEO.getFileConnectId())){ + dataValueSb.append("\"").append(paramsReportConfigDataEO.getFileConnectId()).append("\","); + } + } + String dataValue = ""; + if(StringUtils.isNotBlank(dataValueSb.toString())){ + dataValue = dataValueSb.toString().substring(0,dataValueSb.length()-1); + } + deleteLogCnContent.append("在").append(paramsReportConfigEO.getConfigName()).append("中删除了").append(dataValue).append("，"); + deleteLogEnContent.append("在").append(paramsReportConfigEO.getConfigName()).append("中删除了").append(dataValue).append(","); + + deleteFlag = true; + } + } + + + QueryWrapper removeConfigDataWrap = new QueryWrapper<>(); + removeConfigDataWrap.lambda().eq(ParamsReportConfigDataEO::getParamsConfigId,paramsReportConfigEOId); + removeConfigDataWrap.lambda().eq(ParamsReportConfigDataEO::getParamsCollectManifestId,paramsCollectManifestId); + this.paramsReportConfigDataEOService.remove(removeConfigDataWrap); //******************这里是当前配置的循环结束了****************** //判断结尾是不是该配置的名字--如果是(说明该配置没有被改变)需要从logCnContent中删除该配置名字 @@ -2037,7 +2145,7 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl Date: Thu, 30 Mar 2023 18:24:12 +0800 Subject: [PATCH 597/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E8=BD=A6=E8=BE=86=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java | 2 ++ .../main/java/com/jero/modules/ota/utils/ImportFileUtil.java | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java index f32cfaf19..3c66c29a9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java @@ -9,6 +9,7 @@ import com.jero.modules.ota.entity.OtaBaCxLsjl; import com.jero.modules.ota.mapper.OtaBaCxListMapper; import com.jero.modules.ota.service.*; import com.jero.modules.ota.utils.ImportFileUtil; +import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.apache.ibatis.logging.Log; @@ -214,6 +215,7 @@ public class OtaBaCxListServiceImpl extends ServiceImpl Date: Thu, 30 Mar 2023 18:28:28 +0800 Subject: [PATCH 598/645] =?UTF-8?q?67335=20=E8=AE=A4=E8=AF=81=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E6=94=B6=E9=9B=86=E6=B8=85=E5=8D=95=EF=BC=8C=E5=A1=AB?= =?UTF-8?q?=E5=86=99=E4=BA=BA=E6=8F=90=E4=BA=A4=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ParamsCollectManifestEOServiceImpl.java | 16 ++++++++++++++-- 1 file changed, 14 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 a8deb64c5..923a209a6 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 @@ -1704,8 +1704,20 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl paramsCollectManifestIdList = newConfigDataEOList.stream().map(ParamsConfigDataEO::getParamsCollectManifestId).distinct().collect(Collectors.toList()); + QueryWrapper pcdRemoveWrap = new QueryWrapper<>(); + pcdRemoveWrap.lambda().in(ParamsConfigDataEO::getParamsCollectManifestId,paramsCollectManifestIdList); + this.paramsConfigDataEOService.remove(pcdRemoveWrap); + + newConfigDataEOList.forEach(newConfigDataEO -> { + newConfigDataEO.setId(UUID.randomUUID().toString().replace("-","")); + }); + this.paramsConfigDataEOService.saveOrUpdateBatch(newConfigDataEOList); + } + +// // 批量更新 +// paramsConfigDataEOService.saveOrUpdateBatch(newConfigDataEOList); if (CollectionUtils.isNotEmpty(paramsCollectManifestLogEOList)) { this.paramsCollectManifestLogEOService.saveBatch(paramsCollectManifestLogEOList); From b0bd52c32136759b5d3ba49460848cd990bfc9b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Thu, 30 Mar 2023 19:33:03 +0800 Subject: [PATCH 599/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E8=BD=A6=E8=BE=86=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ota/service/impl/OtaBaCxAqcsServiceImpl.java | 14 +++++++++----- .../ota/service/impl/OtaBaCxJbxxServiceImpl.java | 3 ++- .../service/impl/OtaBaCxJsfzbacsServiceImpl.java | 3 +++ .../service/impl/OtaBaCxKsjjsmccsServiceImpl.java | 11 ++++++++--- .../service/impl/OtaBaCxKsjxtmccsServiceImpl.java | 5 ++++- .../service/impl/OtaBaCxZxsjyqServiceImpl.java | 3 +++ .../jero/modules/ota/utils/ComparisonUtil.java | 15 +++++++++++++++ 7 files changed, 44 insertions(+), 10 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java index 849cc8289..ea7cf9adf 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java @@ -25,6 +25,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import java.io.File; +import java.io.FileOutputStream; import java.io.InputStream; import java.util.List; import java.util.Date; @@ -89,9 +90,9 @@ public class OtaBaCxAqcsServiceImpl extends ServiceImpl aeoList = JSONArray.parseArray(otaBaCxAqcsOld.getZmcl(), AttachmentEO.class); otaBaCxAqcsOld.setZmclList(aeoList); + deleteById(otaBaCxAqcsOld.getId()); } deleteById(otaBaCxAqcs.getId()); - deleteById(otaBaCxAqcsOld.getId()); saveOrUpdate(otaBaCxAqcs); ComparisonUtil cu = new ComparisonUtil(); if (ObjectUtils.isEmpty(otaBaCxAqcsOld)) { @@ -278,19 +279,20 @@ public class OtaBaCxAqcsServiceImpl extends ServiceImpl { return resList; } + public static String queryDictTextByKey(String dictKey, String str, ISysDictService sysDictService) { + StringBuilder sb = new StringBuilder(); + if (StringUtils.isNotEmpty(str)) { + String[] strs = str.split(","); + for (int i = 0; i < strs.length; i++) { + if (i >= strs.length - 1) { + sb.append(sysDictService.queryDictTextByKey(dictKey, strs[i])); + } else { + sb.append(sysDictService.queryDictTextByKey(dictKey, strs[i])).append(","); + } + } + } + return sb.toString(); + } + private String parseDictText(OtaTitleEnum ote, Field field, T clazz, ISysDictService sysDictService) { String res = "空"; try { From b3b0ce4096ea3de196d7460edf8e445859b3a6ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Thu, 30 Mar 2023 19:38:54 +0800 Subject: [PATCH 600/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E8=BD=A6=E8=BE=86=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/ota/entity/OtaBaSjSjfzbh.java | 119 +++++++++++++----- .../impl/OtaBaSjSjfzbhServiceImpl.java | 70 ++++------- 2 files changed, 111 insertions(+), 78 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjSjfzbh.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjSjfzbh.java index 6fab9f1b6..db1ef0c21 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjSjfzbh.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjSjfzbh.java @@ -3,11 +3,13 @@ package com.jero.modules.ota.entity; import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.math.BigDecimal; + import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.StringUtils; import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; import com.jero.common.aspect.annotation.Dict; @@ -21,89 +23,144 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; /** * @Description: 升级备案-本次升级的驾驶辅助功能与参数变化 * @Author: jero-boot - * @Date: 2023-03-17 + * @Date: 2023-03-17 * @Version: V1.0 */ @Data @TableName("ota_ba_sj_sjfzbh") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -@ApiModel(value="ota_ba_sj_sjfzbh对象", description="升级备案-本次升级的驾驶辅助功能与参数变化") +@ApiModel(value = "ota_ba_sj_sjfzbh对象", description = "升级备案-本次升级的驾驶辅助功能与参数变化") public class OtaBaSjSjfzbh implements Serializable { private static final long serialVersionUID = 1L; - /**主键*/ - @TableId(type = IdType.ASSIGN_ID) + /** + * 主键 + */ + @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value = "主键") private java.lang.String id; - /**创建人*/ + /** + * 创建人 + */ @ApiModelProperty(value = "创建人") private java.lang.String createBy; - /**创建日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + /** + * 创建日期 + */ + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "创建日期") private java.util.Date createTime; - /**更新人*/ + /** + * 更新人 + */ @ApiModelProperty(value = "更新人") private java.lang.String updateBy; - /**更新日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + /** + * 更新日期 + */ + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "更新日期") private java.util.Date updateTime; - /**所属部门*/ + /** + * 所属部门 + */ @ApiModelProperty(value = "所属部门") private java.lang.String sysOrgCode; - /**otaId*/ - @Excel(name = "otaId", width = 15) + /** + * otaId + */ + @Excel(name = "otaId", width = 15) @ApiModelProperty(value = "otaId") private java.lang.String otaId; - /**功能名称*/ - @Excel(name = "功能名称", width = 15) + /** + * 功能名称 + */ + @Excel(name = "功能名称", width = 15) @ApiModelProperty(value = "功能名称") private java.lang.String gnmc; - /**升级目的类型*/ - @Excel(name = "升级目的类型", width = 15) + /** + * 升级目的类型 + */ + @Excel(name = "升级目的类型", width = 15) @ApiModelProperty(value = "升级目的类型") private java.lang.String sjmdlx; - /**升级前已变更《公告》参数的对应调整*/ - @Excel(name = "升级前已变更《公告》参数的对应调整", width = 15) + /** + * 升级前已变更《公告》参数的对应调整 + */ + @Excel(name = "升级前已变更《公告》参数的对应调整", width = 15) @ApiModelProperty(value = "升级前已变更《公告》参数的对应调整") private java.lang.String sjqbgcs; - /**升级后已变更《公告》参数的对应调整*/ - @Excel(name = "升级后已变更《公告》参数的对应调整", width = 15) + /** + * 升级后已变更《公告》参数的对应调整 + */ + @Excel(name = "升级后已变更《公告》参数的对应调整", width = 15) @ApiModelProperty(value = "升级后已变更《公告》参数的对应调整") private java.lang.String sjhbgcs; - /**功能变更描述*/ - @Excel(name = "功能变更描述", width = 15) + /** + * 功能变更描述 + */ + @Excel(name = "功能变更描述", width = 15) @ApiModelProperty(value = "功能变更描述") private java.lang.String gnbgms; - /**适用条件变更*/ - @Excel(name = "适用条件变更", width = 15) + /** + * 适用条件变更 + */ + @Excel(name = "适用条件变更", width = 15) @ApiModelProperty(value = "适用条件变更") private java.lang.String sytjbg; - /**升级涉及的电子控制器*/ - @Excel(name = "升级涉及的电子控制器", width = 15) + /** + * 升级涉及的电子控制器 + */ + @Excel(name = "升级涉及的电子控制器", width = 15) @ApiModelProperty(value = "升级涉及的电子控制器") private java.lang.String sjsjkzq; - /**附件*/ - @Excel(name = "附件", width = 15) + /** + * 附件 + */ + @Excel(name = "附件", width = 15) @ApiModelProperty(value = "附件") private java.lang.String fj; + public boolean isNull() { + if (StringUtils.isNotEmpty(gnmc)) { + return false; + } + if (StringUtils.isNotEmpty(sjmdlx)) { + return false; + } + if (StringUtils.isNotEmpty(sjqbgcs)) { + return false; + } + if (StringUtils.isNotEmpty(sjhbgcs)) { + return false; + } + if (StringUtils.isNotEmpty(gnbgms)) { + return false; + } + if (StringUtils.isNotEmpty(sytjbg)) { + return false; + } + if (StringUtils.isNotEmpty(sjsjkzq)) { + return false; + } + return true; + } + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjfzbhServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjfzbhServiceImpl.java index 506a01738..412d0be77 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjfzbhServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjfzbhServiceImpl.java @@ -107,12 +107,6 @@ public class OtaBaSjSjfzbhServiceImpl extends ServiceImpl reList = cu.comparisonListRecord(otaId, OtaModuleEnum.SJ_SJJSMCBH, OtaTitleEnum.GNMC.getName(), oldList, newList, sysDictService); saveOrUpdateBatch(newList); - String fj = (String) json.get("fj"); - OtaBaSjList otaBaSjList = otaBaSjListService.queryById(otaId); - String oldFjStr = otaBaSjList.getSjjsfj(); - otaBaSjList.setSjjsfj(fj); - otaBaSjListService.editById(otaBaSjList); - reList.addAll(cu.comparisonRecord(otaId, fj, oldFjStr, OtaModuleEnum.SJ_SJJSMCBH, "附件", ossFileService)); otaBaCxTxjlService.saveBatch(reList); } @@ -191,10 +185,6 @@ public class OtaBaSjSjfzbhServiceImpl extends ServiceImpl upLoadFiles, String otaId, String cut) throws Exception { - File attFile = null; File upFile = null; for (File f : upLoadFiles) { - if (f.isDirectory() && f.getName().equals("本次升级的驾驶辅助功能与参数变化")) { - attFile = f; - } else if (f.getName().equals("本次升级的驾驶辅助功能与参数变化.xlsx")) { + if (f.getName().equals("本次升级的驾驶辅助功能与参数变化.xlsx")) { upFile = f; } } - if (null == upFile || null == attFile) { + if (null == upFile) { throw new JeroBootException("请上传正确的文件"); } @@ -237,7 +224,7 @@ public class OtaBaSjSjfzbhServiceImpl extends ServiceImpl(); } - List newList = parseFile(upFile, attFile, otaId, cut); + List newList = parseFile(upFile, otaId, cut); ComparisonUtil cu = new ComparisonUtil(); List reList = cu.comparisonListRecord(otaId, OtaModuleEnum.SJ_SJJSMCBH, OtaTitleEnum.GNMC.getName(), oldList, newList, sysDictService); deleteByOtaId(otaId); @@ -245,7 +232,7 @@ public class OtaBaSjSjfzbhServiceImpl extends ServiceImpl parseFile(File upFile, File attFile, String otaId, String cut) throws Exception { + private List parseFile(File upFile, String otaId, String cut) throws Exception { Date now = new Date(); List fzbhList = new ArrayList<>(); Workbook wb = ImportFileUtil.readExcel(upFile); @@ -256,38 +243,27 @@ public class OtaBaSjSjfzbhServiceImpl extends ServiceImpl Date: Thu, 30 Mar 2023 20:30:52 +0800 Subject: [PATCH 601/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E8=BD=A6=E8=BE=86=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/ota/entity/OtaBaCxAqcs.java | 4 + .../modules/ota/entity/OtaBaCxZxsjyq.java | 113 ++++++++++++------ .../service/impl/OtaBaCxAqcsServiceImpl.java | 4 +- .../impl/OtaBaCxJsfzbacsServiceImpl.java | 2 +- .../impl/OtaBaCxZxsjyqServiceImpl.java | 4 +- 5 files changed, 87 insertions(+), 40 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxAqcs.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxAqcs.java index fd3829332..4c0969128 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxAqcs.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxAqcs.java @@ -102,4 +102,8 @@ public class OtaBaCxAqcs implements Serializable { @TableField(exist = false) private List zmclList = new ArrayList<>(); + public void addZmcl(AttachmentEO zmcl) { + this.zmclList.add(zmcl); + } + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxZxsjyq.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxZxsjyq.java index 24984285d..a0f85f1d0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxZxsjyq.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxZxsjyq.java @@ -25,107 +25,146 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; /** * @Description: 车型备案-在线升级要求 * @Author: jero-boot - * @Date: 2023-03-17 + * @Date: 2023-03-17 * @Version: V1.0 */ @Data @TableName("ota_ba_cx_zxsjyq") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -@ApiModel(value="ota_ba_cx_zxsjyq对象", description="车型备案-在线升级要求") +@ApiModel(value = "ota_ba_cx_zxsjyq对象", description = "车型备案-在线升级要求") public class OtaBaCxZxsjyq implements Serializable { private static final long serialVersionUID = 1L; - /**主键*/ - @TableId(type = IdType.ASSIGN_ID) + /** + * 主键 + */ + @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value = "主键") private java.lang.String id; - /**创建人*/ + /** + * 创建人 + */ @ApiModelProperty(value = "创建人") private java.lang.String createBy; - /**创建日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + /** + * 创建日期 + */ + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "创建日期") private java.util.Date createTime; - /**更新人*/ + /** + * 更新人 + */ @ApiModelProperty(value = "更新人") private java.lang.String updateBy; - /**更新日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + /** + * 更新日期 + */ + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "更新日期") private java.util.Date updateTime; - /**所属部门*/ + /** + * 所属部门 + */ @ApiModelProperty(value = "所属部门") private java.lang.String sysOrgCode; - /**otaId*/ - @Excel(name = "otaId", width = 15) + /** + * otaId + */ + @Excel(name = "otaId", width = 15) @ApiModelProperty(value = "otaId") private java.lang.String otaId; - /**保护升级包*/ - @Excel(name = "保护升级包", width = 15) + /** + * 保护升级包 + */ + @Excel(name = "保护升级包", width = 15) @ApiModelProperty(value = "保护升级包") private java.lang.String bhsjb; - /**保护车辆版本*/ - @Excel(name = "保护车辆版本", width = 15) + /** + * 保护车辆版本 + */ + @Excel(name = "保护车辆版本", width = 15) @ApiModelProperty(value = "保护车辆版本") private java.lang.String bhclbb; - /**车辆更新能力*/ - @Excel(name = "车辆更新能力", width = 15) + /** + * 车辆更新能力 + */ + @Excel(name = "车辆更新能力", width = 15) @ApiModelProperty(value = "车辆更新能力") private java.lang.String clgxnl; - /**车辆升级条件*/ - @Excel(name = "车辆升级条件", width = 15) + /** + * 车辆升级条件 + */ + @Excel(name = "车辆升级条件", width = 15) @ApiModelProperty(value = "车辆升级条件") private java.lang.String clsjtj; - /**车辆升级所需电量*/ - @Excel(name = "车辆升级所需电量", width = 15) + /** + * 车辆升级所需电量 + */ + @Excel(name = "车辆升级所需电量", width = 15) @ApiModelProperty(value = "车辆升级所需电量") private java.lang.String clsjdl; - /**升级保护车辆安全*/ - @Excel(name = "升级保护车辆安全", width = 15) + /** + * 升级保护车辆安全 + */ + @Excel(name = "升级保护车辆安全", width = 15) @ApiModelProperty(value = "升级保护车辆安全") private java.lang.String sjbhaq; - /**升级所满足的安全条件*/ - @Excel(name = "升级所满足的安全条件", width = 15) + /** + * 升级所满足的安全条件 + */ + @Excel(name = "升级所满足的安全条件", width = 15) @ApiModelProperty(value = "升级所满足的安全条件") private java.lang.String sjantj; - /**升级失败安全状态*/ - @Excel(name = "升级失败安全状态", width = 15) + /** + * 升级失败安全状态 + */ + @Excel(name = "升级失败安全状态", width = 15) @ApiModelProperty(value = "升级失败安全状态") private java.lang.String sjsbaq; - /**升级公告*/ - @Excel(name = "升级公告", width = 15) + /** + * 升级公告 + */ + @Excel(name = "升级公告", width = 15) @ApiModelProperty(value = "升级公告") private java.lang.String sjgg; - /**升级结果状态*/ - @Excel(name = "升级结果状态", width = 15) + /** + * 升级结果状态 + */ + @Excel(name = "升级结果状态", width = 15) @ApiModelProperty(value = "升级结果状态") private java.lang.String sjzt; - /**证明材料*/ - @Excel(name = "证明材料", width = 15) + /** + * 证明材料 + */ + @Excel(name = "证明材料", width = 15) @ApiModelProperty(value = "证明材料") private java.lang.String zmcl; @TableField(exist = false) private List zmclList = new ArrayList<>(); + public void addZmcl(AttachmentEO zmcl) { + this.zmclList.add(zmcl); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java index ea7cf9adf..d6876166b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java @@ -79,13 +79,14 @@ public class OtaBaCxAqcsServiceImpl extends ServiceImpl 0) { JSONArray obj = new JSONArray(); for (AttachmentEO aeo : otaBaCxAqcs.getZmclList()) { obj.add(aeo); } otaBaCxAqcs.setZmcl(obj.toString()); + }else{ + otaBaCxAqcs.setZmcl(""); } if (ObjectUtils.isNotEmpty(otaBaCxAqcsOld) && StringUtils.isNotEmpty(otaBaCxAqcsOld.getZmcl())) { List aeoList = JSONArray.parseArray(otaBaCxAqcsOld.getZmcl(), AttachmentEO.class); @@ -265,6 +266,7 @@ public class OtaBaCxAqcsServiceImpl extends ServiceImpl 0) { JSONArray obj = new JSONArray(); for (AttachmentEO aeo : otaBaCxZxsjyq.getZmclList()) { obj.add(aeo); } otaBaCxZxsjyq.setZmcl(obj.toString()); + } else { + otaBaCxZxsjyq.setZmcl(""); } if (ObjectUtils.isNotEmpty(otaBaCxZxsjyqOld) && StringUtils.isNotEmpty(otaBaCxZxsjyqOld.getZmcl())) { List aeoList = JSONArray.parseArray(otaBaCxZxsjyqOld.getZmcl(), AttachmentEO.class); @@ -271,6 +272,7 @@ public class OtaBaCxZxsjyqServiceImpl extends ServiceImpl Date: Thu, 30 Mar 2023 21:12:03 +0800 Subject: [PATCH 602/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E8=BD=A6=E8=BE=86=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ota/service/IOtaBaSjSjmbclService.java | 2 +- .../ota/service/IOtaBaSjSjyxpgService.java | 2 +- .../service/impl/OtaBaSjListServiceImpl.java | 10 ++- .../impl/OtaBaSjSjmbclServiceImpl.java | 42 +++++++-- .../impl/OtaBaSjSjmbcxServiceImpl.java | 17 +++- .../impl/OtaBaSjSjyxpgServiceImpl.java | 88 ++++++++++++++++++- 6 files changed, 149 insertions(+), 12 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjmbclService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjmbclService.java index 2b63a87ef..6d7d6a66c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjmbclService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjmbclService.java @@ -73,5 +73,5 @@ public interface IOtaBaSjSjmbclService extends IService { OtaBaSjSjmbcl importData(MultipartFile file, String otaId, String cut) throws Exception; - void exportData(File file, String otaId, String cut) throws Exception; + void exportData(File file, File mbclAttFile, String otaId, String cut) throws Exception; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjyxpgService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjyxpgService.java index fa3a37a04..78419ac34 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjyxpgService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjyxpgService.java @@ -73,5 +73,5 @@ public interface IOtaBaSjSjyxpgService extends IService { OtaBaSjSjyxpg parseFileList(List upLoadFiles, String otaId, String cut) throws Exception; - void exportData(File file, String otaId, String cut) throws Exception; + void exportData(File file, File attFile, File attFile2, String otaId, String cut) throws Exception; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java index f28c2da4c..9d4b01f65 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java @@ -190,12 +190,16 @@ public class OtaBaSjListServiceImpl extends ServiceImpl attList = JSONArray.parseArray(attStr, AttachmentEO.class); + if (ObjectUtils.isNotEmpty(attList)) { + for (AttachmentEO aeo : attList) { + List ossFileList = ossFileService.getFileInfos(aeo.getId()); + for (OSSFile ossFile : ossFileList) { + String filePath = ossFile.getUrl(); + boolean b = CosBootUtil.doesObjectExist(filePath); + if (b) { + InputStream download = CosBootUtil.download(filePath); + ImportFileUtil.writeToLocal(mbclAttFile.getCanonicalPath() + "/" + ossFile.getFileName(), download); + } + } + } + } + wb.write(new FileOutputStream(file)); + wb.close(); + } } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java index dc098de37..76a4b9dc6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java @@ -245,9 +245,24 @@ public class OtaBaSjSjmbcxServiceImpl extends ServiceImpl attList = JSONArray.parseArray(attStr, AttachmentEO.class); + if (ObjectUtils.isNotEmpty(attList)) { + for (AttachmentEO aeo : attList) { + List ossFileList = ossFileService.getFileInfos(aeo.getId()); + for (OSSFile ossFile : ossFileList) { + String filePath = ossFile.getUrl(); + boolean b = CosBootUtil.doesObjectExist(filePath); + if (b) { + InputStream download = CosBootUtil.download(filePath); + ImportFileUtil.writeToLocal(attFile1.getCanonicalPath() + "/" + ossFile.getFileName(), download); + } + } + } + } + } + String attStr1 = pg.getBgfj(); + if(StringUtils.isNotEmpty(attStr1)){ + List attList = JSONArray.parseArray(attStr1, AttachmentEO.class); + if (ObjectUtils.isNotEmpty(attList)) { + for (AttachmentEO aeo : attList) { + List ossFileList = ossFileService.getFileInfos(aeo.getId()); + for (OSSFile ossFile : ossFileList) { + String filePath = ossFile.getUrl(); + boolean b = CosBootUtil.doesObjectExist(filePath); + if (b) { + InputStream download = CosBootUtil.download(filePath); + ImportFileUtil.writeToLocal(attFile2.getCanonicalPath() + "/" + ossFile.getFileName(), download); + } + } + } + } + } + + wb.write(new FileOutputStream(file)); + wb.close(); + } } } From 5ac8fb595f48e4be70ade39464c319b47661c087 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Thu, 30 Mar 2023 21:39:32 +0800 Subject: [PATCH 603/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E8=BD=A6=E8=BE=86=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ota/service/IOtaBaSjGgnrfsService.java | 2 +- .../impl/OtaBaSjGgnrfsServiceImpl.java | 70 +++++++++++++++++-- .../service/impl/OtaBaSjListServiceImpl.java | 10 ++- .../impl/OtaBaSjSjfzbhServiceImpl.java | 30 +++++++- .../impl/OtaBaSjSjxtbhServiceImpl.java | 40 ++++++++++- 5 files changed, 142 insertions(+), 10 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjGgnrfsService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjGgnrfsService.java index 8f0b59aea..e37910f4c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjGgnrfsService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjGgnrfsService.java @@ -72,4 +72,4 @@ public interface IOtaBaSjGgnrfsService extends IService { void parseFileList(List upLoadFiles, String otaId, String cut) throws Exception; - void exportData(File file, String otaId, String cut) throws Exception;} + void exportData(File file, File fsAttFile, String otaId, String cut) throws Exception;} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjGgnrfsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjGgnrfsServiceImpl.java index 45402ae5b..3b056ab13 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjGgnrfsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjGgnrfsServiceImpl.java @@ -1,12 +1,13 @@ package com.jero.modules.ota.service.impl; +import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.exception.JeroBootException; +import com.jero.common.util.oss.CosBootUtil; +import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; -import com.jero.modules.ota.entity.OtaBaCxTxjl; -import com.jero.modules.ota.entity.OtaBaSjGgnrfs; -import com.jero.modules.ota.entity.OtaBaSjSjyxpg; +import com.jero.modules.ota.entity.*; import com.jero.modules.ota.enums.OtaModuleEnum; import com.jero.modules.ota.mapper.OtaBaSjGgnrfsMapper; import com.jero.modules.ota.service.IOtaBaCxTxjlService; @@ -17,6 +18,10 @@ import com.jero.modules.ota.utils.ImportFileUtil; import com.jero.modules.system.service.ISysDictService; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.apache.poi.ss.usermodel.Workbook; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -25,6 +30,8 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.File; +import java.io.FileOutputStream; +import java.io.InputStream; import java.util.Date; import java.util.List; import java.util.Objects; @@ -230,7 +237,62 @@ public class OtaBaSjGgnrfsServiceImpl extends ServiceImpl attList = JSONArray.parseArray(attStr, AttachmentEO.class); + if (ObjectUtils.isNotEmpty(attList)) { + for (AttachmentEO aeo : attList) { + List ossFileList = ossFileService.getFileInfos(aeo.getId()); + for (OSSFile ossFile : ossFileList) { + String filePath = ossFile.getUrl(); + boolean b = CosBootUtil.doesObjectExist(filePath); + if (b) { + InputStream download = CosBootUtil.download(filePath); + ImportFileUtil.writeToLocal(attFile.getCanonicalPath() + "/" + ossFile.getFileName(), download); + } + } + } + } + wb.write(new FileOutputStream(file)); + wb.close(); + } } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java index 9d4b01f65..15d0f58eb 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java @@ -195,18 +195,22 @@ public class OtaBaSjListServiceImpl extends ServiceImpl fzbhList = this.getByOtaId(otaId); + if (ObjectUtils.isNotEmpty(fzbhList)) { + Workbook wb = ImportFileUtil.readExcel(file); + Sheet s = wb.getSheetAt(0); + Row row; + Cell cell; + int start = 4; + for (OtaBaSjSjfzbh bh : fzbhList) { + row = s.createRow(start); + cell = row.createCell(0); + cell.setCellValue(bh.getGnmc()); + cell = row.createCell(1); + cell.setCellValue(bh.getSjmdlx()); + cell = row.createCell(2); + cell.setCellValue(bh.getSjqbgcs()); + cell = row.createCell(3); + cell.setCellValue(bh.getSjhbgcs()); + cell = row.createCell(4); + cell.setCellValue(bh.getGnbgms()); + cell = row.createCell(5); + cell.setCellValue(bh.getSytjbg()); + cell = row.createCell(6); + cell.setCellValue(bh.getSjsjkzq()); + start++; + } + wb.write(new FileOutputStream(file)); + wb.close(); + } } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java index d32663796..dc2b13036 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java @@ -27,6 +27,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import java.io.File; +import java.io.FileOutputStream; import java.lang.reflect.Field; import java.util.*; @@ -284,6 +285,43 @@ public class OtaBaSjSjxtbhServiceImpl extends ServiceImpl bhList = this.getByOtaId(otaId); + if (ObjectUtils.isNotEmpty(bhList)) { + Workbook wb = ImportFileUtil.readExcel(file); + Sheet s = wb.getSheetAt(0); + Row row; + Cell cell; + int start = 4; + for (OtaBaSjSjxtbh bh : bhList) { + row = s.createRow(start); + cell = row.createCell(0); + cell.setCellValue(bh.getXtmc()); + cell = row.createCell(1); + cell.setCellValue(bh.getSjqbgcs()); + cell = row.createCell(2); + cell.setCellValue(bh.getSjhbgcs()); + cell = row.createCell(3); + cell.setCellValue(bh.getSjkzqmc()); + cell = row.createCell(4); + cell.setCellValue(bh.getYjbb()); + cell = row.createCell(5); + cell.setCellValue(bh.getSjqrjbb()); + cell = row.createCell(6); + cell.setCellValue(bh.getSjhrjbb()); + cell = row.createCell(7); + cell.setCellValue(bh.getSjqczxt()); + cell = row.createCell(8); + cell.setCellValue(bh.getSjhczxt()); + cell = row.createCell(9); + cell.setCellValue(bh.getSjbyzsj()); + cell = row.createCell(10); + cell.setCellValue(bh.getSjbdx()); + cell = row.createCell(11); + cell.setCellValue(bh.getSfcfsj()); + start++; + } + wb.write(new FileOutputStream(file)); + wb.close(); + } } } From 419a381fa44173a94c6cf770cad8021e5048f3f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Thu, 30 Mar 2023 21:47:02 +0800 Subject: [PATCH 604/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E8=BD=A6=E8=BE=86=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ota/service/IOtaBaCxQtService.java | 3 ++ .../ota/service/IOtaBaSjQtsjxxService.java | 4 +++ .../service/impl/OtaBaCxListServiceImpl.java | 5 ++++ .../service/impl/OtaBaCxQtServiceImpl.java | 22 +++++++++++++- .../service/impl/OtaBaSjListServiceImpl.java | 6 ++++ .../impl/OtaBaSjQtsjxxServiceImpl.java | 30 +++++++++++++++++++ 6 files changed, 69 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxQtService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxQtService.java index 87c533712..b6ae4e6a2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxQtService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxQtService.java @@ -3,6 +3,7 @@ package com.jero.modules.ota.service; import com.jero.modules.ota.entity.OtaBaCxQt; import com.baomidou.mybatisplus.extension.service.IService; +import java.io.File; import java.util.List; /** @@ -61,4 +62,6 @@ public interface IOtaBaCxQtService extends IService { List queryList(); OtaBaCxQt queryByOtaId(String otaId, String otaIdT); + + void exportData(File file, String otaId, String cut) throws Exception; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjQtsjxxService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjQtsjxxService.java index b446c94f9..6b36226f4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjQtsjxxService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjQtsjxxService.java @@ -3,6 +3,8 @@ package com.jero.modules.ota.service; import com.jero.modules.ota.entity.OtaBaCxQt; import com.jero.modules.ota.entity.OtaBaSjQtsjxx; import com.baomidou.mybatisplus.extension.service.IService; + +import java.io.File; import java.util.List; /** @@ -61,4 +63,6 @@ public interface IOtaBaSjQtsjxxService extends IService { List queryList(); OtaBaSjQtsjxx queryByOtaId(String otaId, String otaIdT); + + void exportData(File file, String otaId, String cut) throws Exception; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java index 3c66c29a9..50c3d0fbd 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java @@ -60,6 +60,9 @@ public class OtaBaCxListServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); @@ -135,4 +143,16 @@ public class OtaBaCxQtServiceImpl extends ServiceImpl implements IOtaBaSjQtsjxxService { + private static final SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd"); @Autowired private IOtaBaCxTxjlService otaBaCxTxjlService; @@ -134,4 +144,24 @@ public class OtaBaSjQtsjxxServiceImpl extends ServiceImpl Date: Thu, 30 Mar 2023 22:12:17 +0800 Subject: [PATCH 605/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E8=BD=A6=E8=BE=86=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/OtaBaSjGgnrfsServiceImpl.java | 8 +-- .../service/impl/OtaBaSjListServiceImpl.java | 6 +- .../impl/OtaBaSjSjmbclServiceImpl.java | 8 +-- .../impl/OtaBaSjSjyxpgServiceImpl.java | 60 +++++++++---------- 4 files changed, 38 insertions(+), 44 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjGgnrfsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjGgnrfsServiceImpl.java index 3b056ab13..2cd2a3801 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjGgnrfsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjGgnrfsServiceImpl.java @@ -277,10 +277,10 @@ public class OtaBaSjGgnrfsServiceImpl extends ServiceImpl attList = JSONArray.parseArray(attStr, AttachmentEO.class); - if (ObjectUtils.isNotEmpty(attList)) { - for (AttachmentEO aeo : attList) { - List ossFileList = ossFileService.getFileInfos(aeo.getId()); + if(StringUtils.isNotEmpty(attStr)){ + String[] strs = attStr.split(","); + for (String str : strs) { + List ossFileList = ossFileService.getFileInfos(str); for (OSSFile ossFile : ossFileList) { String filePath = ossFile.getUrl(); boolean b = CosBootUtil.doesObjectExist(filePath); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java index 2178ab1c9..84def1daf 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java @@ -187,7 +187,7 @@ public class OtaBaSjListServiceImpl extends ServiceImpl attList = JSONArray.parseArray(attStr, AttachmentEO.class); - if (ObjectUtils.isNotEmpty(attList)) { - for (AttachmentEO aeo : attList) { - List ossFileList = ossFileService.getFileInfos(aeo.getId()); + if (StringUtils.isNotEmpty(attStr)) { + String[] strs = attStr.split(","); + for (String str : strs) { + List ossFileList = ossFileService.getFileInfos(str); for (OSSFile ossFile : ossFileList) { String filePath = ossFile.getUrl(); boolean b = CosBootUtil.doesObjectExist(filePath); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjyxpgServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjyxpgServiceImpl.java index 0acf2c91e..dcd0e7a11 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjyxpgServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjyxpgServiceImpl.java @@ -291,7 +291,7 @@ public class OtaBaSjSjyxpgServiceImpl extends ServiceImpl attList = JSONArray.parseArray(attStr, AttachmentEO.class); - if (ObjectUtils.isNotEmpty(attList)) { - for (AttachmentEO aeo : attList) { - List ossFileList = ossFileService.getFileInfos(aeo.getId()); - for (OSSFile ossFile : ossFileList) { - String filePath = ossFile.getUrl(); - boolean b = CosBootUtil.doesObjectExist(filePath); - if (b) { - InputStream download = CosBootUtil.download(filePath); - ImportFileUtil.writeToLocal(attFile1.getCanonicalPath() + "/" + ossFile.getFileName(), download); - } - } - } - } - } String attStr1 = pg.getBgfj(); - if(StringUtils.isNotEmpty(attStr1)){ - List attList = JSONArray.parseArray(attStr1, AttachmentEO.class); - if (ObjectUtils.isNotEmpty(attList)) { - for (AttachmentEO aeo : attList) { - List ossFileList = ossFileService.getFileInfos(aeo.getId()); - for (OSSFile ossFile : ossFileList) { - String filePath = ossFile.getUrl(); - boolean b = CosBootUtil.doesObjectExist(filePath); - if (b) { - InputStream download = CosBootUtil.download(filePath); - ImportFileUtil.writeToLocal(attFile2.getCanonicalPath() + "/" + ossFile.getFileName(), download); - } + if (StringUtils.isNotEmpty(attStr1)) { + String[] strs = attStr1.split(","); + for (String str : strs) { + List ossFileList = ossFileService.getFileInfos(str); + for (OSSFile ossFile : ossFileList) { + String filePath = ossFile.getUrl(); + boolean b = CosBootUtil.doesObjectExist(filePath); + if (b) { + InputStream download = CosBootUtil.download(filePath); + ImportFileUtil.writeToLocal(attFile1.getCanonicalPath() + "/" + ossFile.getFileName(), download); + } + } + } + } + String attStr2 = pg.getBgfj(); + if (StringUtils.isNotEmpty(attStr2)) { + String[] strs = attStr2.split(","); + for (String str : strs) { + List ossFileList = ossFileService.getFileInfos(str); + for (OSSFile ossFile : ossFileList) { + String filePath = ossFile.getUrl(); + boolean b = CosBootUtil.doesObjectExist(filePath); + if (b) { + InputStream download = CosBootUtil.download(filePath); + ImportFileUtil.writeToLocal(attFile2.getCanonicalPath() + "/" + ossFile.getFileName(), download); } } } } - wb.write(new FileOutputStream(file)); wb.close(); } From e8f44f1a5d6fa267de52e40708070dfc2fa51548 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Fri, 31 Mar 2023 02:36:43 +0800 Subject: [PATCH 606/645] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=97=B2=E4=BD=93?= =?UTF-8?q?=E5=92=8C=E8=A2=AB=E4=BB=A3=E6=9B=BF=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ota/controller/OtaBaCxListController.java | 6 +- .../jero/modules/ota/enums/OtaTitleEnum.java | 400 +++++++++--------- .../ota/service/IOtaBaCxAqcsService.java | 4 +- .../ota/service/IOtaBaCxJbxxService.java | 6 +- .../ota/service/IOtaBaCxJsfzbacsService.java | 4 +- .../ota/service/IOtaBaCxKsjjsmccsService.java | 4 +- .../ota/service/IOtaBaCxKsjxtmccsService.java | 4 +- .../ota/service/IOtaBaCxListService.java | 2 +- .../ota/service/IOtaBaCxZxsjyqService.java | 4 +- .../service/impl/OtaBaCxAqcsServiceImpl.java | 19 +- .../service/impl/OtaBaCxJbxxServiceImpl.java | 54 ++- .../impl/OtaBaCxJsfzbacsServiceImpl.java | 20 +- .../impl/OtaBaCxKsjjsmccsServiceImpl.java | 15 +- .../impl/OtaBaCxKsjxtmccsServiceImpl.java | 17 +- .../service/impl/OtaBaCxListServiceImpl.java | 15 +- .../impl/OtaBaCxZxsjyqServiceImpl.java | 15 +- .../modules/ota/utils/ComparisonUtil.java | 50 +++ .../modules/ota/utils/ImportFileUtil.java | 33 +- 18 files changed, 399 insertions(+), 273 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java index b7a9c3405..7c5fe7bef 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java @@ -237,13 +237,15 @@ public class OtaBaCxListController extends JeroController importData(@RequestParam(value = "file", required = false) MultipartFile file, @RequestParam(value = "cut", required = false) String cut) throws Exception { + StringBuilder errMsg = new StringBuilder(); + errMsg.append("导入成功！ 提示信息:"); try { - this.otaBaCxListService.importData(file, cut); + this.otaBaCxListService.importData(file, cut, errMsg); } catch (Exception e) { e.printStackTrace(); return Result.error(e.getMessage()); } - return Result.OK("导入成功"); + return Result.error(errMsg.toString()); } @ApiOperation(value = "车型及功能备案列表-数据导出") diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java index 7145c18d1..ef7da7c50 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java @@ -3,215 +3,221 @@ package com.jero.modules.ota.enums; public enum OtaTitleEnum { - CPDJBH("cpdjbh", "产品登记编号", "0"), - GGPC("ggpc", "公告批次", "0"), - CPSB("cpsb", "产品商标", "0"), - CPMC("cpmc", "产品名称", "0"), - CPXH("cpxh", "产品型号", "0"), - BAZT("bazt", "备案状态", "recordstatus"), - BATJSJ("batjsj", "备案提交时间", "0"), - CJSJ("cjsj", "创建时间", "0"), - BZ("bz", "备注", "0"), + CPDJBH("cpdjbh", "产品登记编号", "0", "Product registration number", 50), + GGPC("ggpc", "公告批次", "0", "Notice batch", 500), + CPSB("cpsb", "产品商标", "0", "Product Trademark", 50), + CPMC("cpmc", "产品名称", "0", "Product Name", 50), + CPXH("cpxh", "产品型号", "0", "Product Model", 50), + BAZT("bazt", "备案状态", "recordstatus", "Record status", 0), + BATJSJ("batjsj", "备案提交时间", "0", "Filing time", 50), + CJSJ("cjsj", "创建时间", "0", "Create Time", 50), + BZ("bz", "备注", "0", "remarks", 500), - CXMB("cxmb", "车型模板", "0"), -// QYMC("qymc", "企业名称", "0"), - DJBH("djbh", "产品登记编号", "0"), - CPLB("cplb", "产品类别", "product_category"), - DLLX1("dllx1", "车辆动力类型", "0"), - DLLX2("dllx2", "车辆动力类型", "0"), - TXZD("txzd", "通信终端", "communication_terminal"), - CDOTASJ("cdotasj", "车端OTA升级管理系统", "0"), + CXMB("cxmb", "车型模板", "0", "Model template", 500), + // QYMC("qymc", "企业名称", "0","enterprise name ",0), + DJBH("djbh", "产品登记编号", "0", "Product Registration Number ", 50), + CPLB("cplb", "产品类别", "product_category", "Product category", 0), + DLLX1("dllx1", "车辆动力类型", "0", "Vehicle Power Type", 50), + DLLX2("dllx2", "车辆动力类型", "0", "Vehicle Power Type", 50), + TXZD("txzd", "通信终端", "communication_terminal", "communication terminal", 0), + CDOTASJ("cdotasj", "车端OTA升级管理系统", "0", "OTA Upgrade Management System", 500), - BHSJB("bhsjb", "激光雷达-应保护升级包的真实性和完整性，以合理地防止其受到损害，并合理地防止无效升级", "2"), - BHCLBB("bhclbb", "激光雷达-应保护车辆上的软件版本（集），防止未经授权的修改", "2"), - CLGXNL("clgxnl", "升级功能要求-车辆应具备更新软件版本（集）的能力，应通过使用电子通信接口，至少用过标准接口（如OBD端口），以标准化的方式易于读取", "2"), - CLSJTJ("clsjtj", "升级功能要求-应确保车辆在执行软件升级之前满足先决条件", "2"), - CLSJDL("clsjdl", "升级功能要求-应确保只有当车辆有充足电量完成升级过程时，才能执行软件升级(包括可能恢复到以前版本或使车辆进入安全状态所需的电量)", "2"), - SJBHAQ("sjbhaq", "升级功能要求-当执行升级可能影响车辆安全时，应在升级执行过程中通过技术手段确保车辆安全", "2"), - SJANTJ("sjantj", "升级功能要求-若升级的执行影响驾驶安全，至少应满足： (a)确保升级执行期间无法驾驶车辆； (b)确保驾驶员不能使用任何可能影响车辆安全或成功执行升级的车辆功能", "2"), - SJSBAQ("sjsbaq", "升级功能要求-车辆能够恢复到以前的可用版本，或确保车辆处于安全状态。", "2"), - SJGG("sjgg", "用户告知要求-在升级执行前，应告知车辆用户升级信息，告知的信息应包括： (a)升级目的； (b)车辆功能升级所实施的任何变更； (c)完成升级执行的预计时间； (d)升级执行期间可能不可用的任何车辆功能； (e)可能帮助车辆用户安全执行升级的任何指导信息。", "2"), - SJZT("sjzt", "用户告知要求-在执行升级后，车辆应： (a)告知车辆用户车辆升级的结果(成功或失败)； (b)若升级成功，告知车辆用户已实施的变更，用户手册(如果适用)的任何相关更新。", "2"), + BHSJB("bhsjb", "激光雷达-应保护升级包的真实性和完整性，以合理地防止其受到损害，并合理地防止无效升级", "2", "LiDAR - Shall protect the authenticity and integrity of the upgrade package to reasonably prevent damage to it and reasonably prevent ineffective upgrades", 0), + BHCLBB("bhclbb", "激光雷达-应保护车辆上的软件版本（集），防止未经授权的修改", "2", "Lidar - Software Versions on Vehicles should be protected (set) against unauthorized modifications", 0), + CLGXNL("clgxnl", "升级功能要求-车辆应具备更新软件版本（集）的能力，应通过使用电子通信接口，至少用过标准接口（如OBD端口），以标准化的方式易于读取", "2", "Upgrade function Requirements - The vehicle shall have the ability to update the software version (set) and shall be easily read in a standardized manner by using an electronic communication interface that has at least used a standard interface (such as an OBD port)", 0), + CLSJTJ("clsjtj", "升级功能要求-应确保车辆在执行软件升级之前满足先决条件", "2", "Upgrade function Requirements - should ensure that vehicle meets prerequisites before performing software upgrade", 0), + CLSJDL("clsjdl", "升级功能要求-应确保只有当车辆有充足电量完成升级过程时，才能执行软件升级(包括可能恢复到以前版本或使车辆进入安全状态所需的电量)", "2", "Upgrade Function Requirements - It shall be ensured that software upgrades (including the amount of power that may be required to restore to a previous version or bring the vehicle into a safe condition) are performed only when the vehicle has sufficient power to complete the upgrade process", 0), + SJBHAQ("sjbhaq", "升级功能要求-当执行升级可能影响车辆安全时，应在升级执行过程中通过技术手段确保车辆安全", "2", "Upgrade function Requirements - When performing an upgrade may affect the safety of the vehicle, the safety of the vehicle shall be ensured by technical means during the execution of the upgrade", 0), + SJANTJ("sjantj", "升级功能要求-若升级的执行影响驾驶安全，至少应满足： (a)确保升级执行期间无法驾驶车辆； (b)确保驾驶员不能使用任何可能影响车辆安全或成功执行升级的车辆功能", "2", "", 0), + SJSBAQ("sjsbaq", "升级功能要求-车辆能够恢复到以前的可用版本，或确保车辆处于安全状态。", "2", "Upgrade Function Requirements - If the execution of the upgrade affects driving safety, it shall at least: (a) ensure that the vehicle cannot be driven during the execution of the upgrade; (b) Ensure that the driver cannot use any vehicle feature that may affect the safety of the vehicle or the successful execution of the upgrade", 0), + SJGG("sjgg", "用户告知要求-在升级执行前，应告知车辆用户升级信息，告知的信息应包括： (a)升级目的； (b)车辆功能升级所实施的任何变更； (c)完成升级执行的预计时间； (d)升级执行期间可能不可用的任何车辆功能； (e)可能帮助车辆用户安全执行升级的任何指导信息。", "2", "", 0), + SJZT("sjzt", "用户告知要求-在执行升级后，车辆应： (a)告知车辆用户车辆升级的结果(成功或失败)； (b)若升级成功，告知车辆用户已实施的变更，用户手册(如果适用)的任何相关更新。", "2", "Upgrade feature requirements - The ability to restore the vehicle to a previously available version, or to ensure that the vehicle is in a safe condition.", 0), - BHJZ("bhjz", "真实性、完整性保护机制", "protection_mechanism"), - FSXJZ("fsxjz", "防失效保护机制", "fail_safe_mechanism"), - SJSBCS("sjsbcs", "升级失败后车辆安全措施", "upgrade_failure"), - XXAQJZ("xxaqjz", "信息安全机制", "Information_security_mechanism"), + BHJZ("bhjz", "真实性、完整性保护机制", "protection_mechanism", "", 0), + FSXJZ("fsxjz", "防失效保护机制", "fail_safe_mechanism", "", 0), + SJSBCS("sjsbcs", "升级失败后车辆安全措施", "upgrade_failure", "", 0), + XXAQJZ("xxaqjz", "信息安全机制", "Information_security_mechanism", "", 0), - XTLB("xtlb", "系统类别", "0"), - SFKSJ("sfksj", "是否可升级", "2"), - SJBGCS("sjbgcs", "升级可能变更的《公告》技术参数", "0"), - //TPT("tpt", "系统-电子控制器架构拓扑图(附件需含拓扑图介绍)", "0"), - KZQMC("kzqmc", "电子控制器名称", "0"), - AQWZXDJ("aqwzxdj", "电子控制器汽车安全完整性等级(ASIL)", "0"), - KZQSCQY("kzqscqy", "电子控制器生产企业", "0"), - KZQXH("kzqxh", "电子控制器型号", "0"), - YJBBXX("yjbbxx", "硬件版本信息", "0"), - CSRJBBH("csrjbbh", "初始软件版本号", "0"), - CSRJBWZSJ("csrjbwzsj", "初始软件包的完整性验证数据", "0"), - SJSFYX("sjsfyx", "升级是否影响整车安全、节能、环保、防盗等性能", "0"), - CZXTLX("czxtlx", "操作系统类型", "0"), - CZXTSCQY("czxtscqy", "操作系统生产企业", "0"), - CZXTBBH("czxtbbh", "软件版本号", "0"), + XTLB("xtlb", "系统类别", "0", "System class", 50), + SFKSJ("sfksj", "是否可升级", "2", "Whether it can be upgraded", 0), + SJBGCS("sjbgcs", "升级可能变更的《公告》技术参数", "0", "Upgrade Bulletin technical parameters that may change", 500), + //TPT("tpt", "系统-电子控制器架构拓扑图(附件需含拓扑图介绍)", "0","",0), + KZQMC("kzqmc", "电子控制器名称", "0", "Electronic controller name", 50), + AQWZXDJ("aqwzxdj", "电子控制器汽车安全完整性等级(ASIL)", "0", "", 50), + KZQSCQY("kzqscqy", "电子控制器生产企业", "0", "", 50), + KZQXH("kzqxh", "电子控制器型号", "0", "", 50), + YJBBXX("yjbbxx", "硬件版本信息", "0", "", 50), + CSRJBBH("csrjbbh", "初始软件版本号", "0", "", 50), + CSRJBWZSJ("csrjbwzsj", "初始软件包的完整性验证数据", "0", "", 50), + SJSFYX("sjsfyx", "升级是否影响整车安全、节能、环保、防盗等性能", "0", "", 50), + CZXTLX("czxtlx", "操作系统类型", "0", "", 50), + CZXTSCQY("czxtscqy", "操作系统生产企业", "0", "", 50), + CZXTBBH("czxtbbh", "软件版本号", "0", "", 50), - GNMC("gnmc", "功能名称", "0"), - PZQK("pzqk", "配置情况", "2"), - JSZDHJB("jszdhjb", "驾驶自动化级别", "driving_automation_level"), - SJGGCS("sjggcs", "升级可能变更的《公告》技术参数", "0"), - GNMS("gnms", "功能描述", "0"), - SYTJ("sytj", "适用条件（边界条件）", "0"), - RJKFQY("rjkfqy", "软件开发企业", "0"), - CSYZSJ("csyzsj", "初始软件包的完整性验证数据", "0"), - FJ("fj", "附件", "0"), + GNMC("gnmc", "功能名称", "0", "", 50), + PZQK("pzqk", "配置情况", "2", "", 0), + JSZDHJB("jszdhjb", "驾驶自动化级别", "driving_automation_level", "", 0), + SJGGCS("sjggcs", "升级可能变更的《公告》技术参数", "0", "", 500), + GNMS("gnms", "功能描述", "0", "", 500), + SYTJ("sytj", "适用条件（边界条件）", "0", "", 500), + RJKFQY("rjkfqy", "软件开发企业", "0", "", 50), + CSYZSJ("csyzsj", "初始软件包的完整性验证数据", "0", "", 500), + FJ("fj", "附件", "0", "", 0), - WLAQYQ_PZ("jgldPz", "激光雷达-配置", "2"), - WLAQYQ_SL("jgldSl", "激光雷达-数量", "0"), - WLAQYQ_BZWZ("jgldBzwz", "激光雷达-布置位置", "0"), - WLAQYQ_GGXH("jgldGgxh", "激光雷达-规格型号", "0"), - WLAQYQ_SCQY("jgldScqy", "激光雷达-生产企业", "0"), - HMBLD_PZ("hmbldPz", "毫米波雷达-配置", "2"), - HMBLD_SL("hmbldSl", "毫米波雷达-数量", "0"), - HMBLD_BZWZ("hmbldBzwz", "毫米波雷达-布置位置", "0"), - HMBLD_GGXH("hmbldGgxh", "毫米波雷达-规格型号", "0"), - HMBLD_SCQY("hmbldScqy", "毫米波雷达-生产企业", "0"), - CSBLD_PZ("csbldPz", "超声波雷达-配置", "2"), - CSBLD_SL("csbldSl", "超声波雷达-数量", "0"), - CSBLD_BZWZ("csbldBzwz", "超声波雷达-布置位置", "0"), - CSBLD_GGXH("csbldGgxh", "超声波雷达-规格型号", "0"), - CSBLD_SCQY("csbldScqy", "超声波雷达-生产企业", "0"), - SXTHS_PZ("sxthsPz", "摄像头-倒车影像/360(环视)-配置", "2"), - SXTHS_SL("sxthsSl", "摄像头-倒车影像/360(环视)-数量", "0"), - SXTHS_BZWZ("sxthsBzwz", "摄像头-倒车影像/360(环视)-布置位置", "0"), - SXTHS_GGXH("sxthsGgxh", "摄像头-倒车影像/360(环视)-规格型号", "0"), - SXTHS_SCQY("sxthsScqy", "摄像头-倒车影像/360(环视)-生产企业", "0"), - SXTDSD_PZ("sxtdsdPz", "摄像头-单目/双目/多目-配置", "2"), - SXTDSD_SL("sxtdsdSl", "摄像头-单目双目多目-数量", "0"), - SXTDSD_BZWZ("sxtdsdBzwz", "摄像头-单目双多目-布置位置", "0"), - SXTDSD_GGXH("sxtdsdGgxh", "摄像头-单目/双目/多目-规格型号", "0"), - SXTDSD_SCQY("sxtdsdScqy", "摄像头-单目/双目/多目-生产企业", "0"), - JSYJK_PZ("jsyjkPz", "驾驶员注意力监测系统DMS-驾驶员监控摄像头-配置", "2"), - JSYJK_SL("jsyjkSl", "驾驶员注意力监测系统DMS-驾驶员监控摄像头-数量", "0"), - JSYJK_BZWZ("jsyjkBzwz", "驾驶员注意力监测系统DMS-驾驶员监控摄像头-布置位置", "0"), - JSYJK_GGXH("jsyjkGgxh", "驾驶员注意力监测系统DMS-驾驶员监控摄像头-规格型号", "0"), - JSYJK_SCQY("jsyjkScqy", "驾驶员注意力监测系统DMS-驾驶员监控摄像头-生产企业", "0"), - JSYHW_PZ("jsyhwPz", "驾驶员注意力监测系统DMS-驾驶员监控红外传感器-配置", "2"), - JSYHW_SL("jsyhwSl", "驾驶员注意力监测系统DMS-驾驶员监控红外传感器-数量", "0"), - JSYHW_BZWZ("jsyhwBzwz", "驾驶员注意力监测系统DMS-驾驶员监控红外传感器-布置位置", "0"), - JSYHW_GGXH("jsyhwGgxh", "驾驶员注意力监测系统DMS-驾驶员监控红外传感器-规格型号", "0"), - JSYHW_SCQY("jsyhwScqy", "驾驶员注意力监测系统DMS-驾驶员监控红外传感器-生产企业", "0"), - CZWXDW_PZ("czwxdwPz", "定位及导航系统-车载卫星定位设备（接收卫星信号及辅助定位信号的装置，PPP/GNSS/RTK）-配置", "2"), - CZWXDW_GGXH("czwxdwGgxh", "定位及导航系统-车载卫星定位设备（接收卫星信号及辅助定位信号的装置，PPP/GNSS/RTK）-规格型号", "0"), - CZWXDW_SCQY("czwxdwScqy", "定位及导航系统-车载卫星定位设备（接收卫星信号及辅助定位信号的装置，PPP/GNSS/RTK）-生产企业", "0"), - GXDH_PZ("gxdhPz", "定位及导航系统-惯性导航系统-配置", "2"), - GXDH_GGXH("gxdhGgxh", "定位及导航系统-惯性导航系统-规格型号", "0"), - GXDH_SCQY("gxdhScqy", "定位及导航系统-惯性导航系统-生产企业", "0"), - LSJ_PZ("lsjPz", "定位及导航系统-轮速计-配置", "2"), - LSJ_GGXH("lsjGgxh", "定位及导航系统-轮速计-规格型号", "0"), - LSJ_SCQY("lsjScqy", "定位及导航系统-轮速计-生产企业", "0"), - GJDDT_PZ("gjddtPz", "定位及导航系统-高精度地图-配置", "2"), - GJDDT_GGXH("gjddtGgxh", "定位及导航系统-高精度地图-规格型号", "0"), - GJDDT_SCQY("gjddtScqy", "定位及导航系统-高精度地图-生产企业", "0"), - DZWL_PZ("dzwlPz", "定位及导航系统-电子围栏-配置", "2"), - DZWL_DXXGCS("dzwlDxxgcs", "定位及导航系统-电子围栏-定性描述相关场所", "0"), - CZTX_PZ("cztxPz", "车载通信系统-配置", "2"), - CZTX_XTMC("cztxXtmc", "车载通信系统-系统名称", "0"), - CZTX_GGXH("cztxGgxh", "车载通信系统-规格型号", "0"), - CZTX_SCQY("cztxScqy", "车载通信系统-生产企业", "0"), - CZTX_BBH("cztxBbh", "车载通信系统-版本号", "0"), - CZTX_KFQY("cztxKfqy", "车载通信系统-软件开发企业", "0"), - JSFZCZJ_PZ("jsfzczjPz", "驾驶辅助系统操纵件、指示器及信号装置-驾驶辅助功能操纵件-配置", "2"), - JSFZCZJ_MC("jsfzczjMc", "驾驶辅助系统操纵件、指示器及信号装置-驾驶辅助功能操纵件-操纵件名称", "0"), - JSFZCZJ_YJXH("jsfzczjYjxh", "驾驶辅助系统操纵件、指示器及信号装置-驾驶辅助功能操纵件-硬件规格型号", "0"), - JSFZCZJ_SCQY("jsfzczjScqy", "驾驶辅助系统操纵件、指示器及信号装置-驾驶辅助功能操纵件-生产企业", "0"), - JSFZZSQ_PZ("jsfzzsqPz", "驾驶辅助系统操纵件、指示器及信号装置-驾驶辅助功能指示器/信号装置-配置", "2"), - JSFZZSQ_MC("jsfzzsqMc", "驾驶辅助系统操纵件、指示器及信号装置-驾驶辅助功能指示器/信号装置-指示器/信号装置名称", "0"), - JSFZZSQ_YJXH("jsfzzsqYjxh", "驾驶辅助系统操纵件、指示器及信号装置-驾驶辅助功能指示器/信号装置-硬件规格型号", "0"), - JSFZZSQ_SCQY("jsfzzsqScqy", "驾驶辅助系统操纵件、指示器及信号装置-驾驶辅助功能指示器/信号装置-生产企业", "0"), - FXPTSTS_PZ("fxptstsPz", "驾驶辅助系统操纵件、指示器及信号装置-方向盘脱手提示器/信号装置-配置", "2"), - FXPTSTS_MC("fxptstsMc", "驾驶辅助系统操纵件、指示器及信号装置-方向盘脱手提示器/信号装置-指示器/信号装置名称", "0"), - FXPTSTS_YJXH("fxptstsYjxh", "驾驶辅助系统操纵件、指示器及信号装置-方向盘脱手提示器/信号装置-硬件规格型号", "0"), - FXPTSTS_SCQY("fxptstsScqy", "驾驶辅助系统操纵件、指示器及信号装置-方向盘脱手提示器/信号装置-生产企业", "0"), - JSYZYLTS_PZ("jsyzyltsPz", "驾驶辅助系统操纵件、指示器及信号装置-驾驶员注意力提醒指示器/信号装置-配置", "2"), - JSYZYLTS_MC("jsyzyltsMc", "驾驶辅助系统操纵件、指示器及信号装置-驾驶员注意力提醒指示器/信号装置-指示器/信号装置名称", "0"), - JSYZYLTS_YJXH("jsyzyltsYjxh", "驾驶辅助系统操纵件、指示器及信号装置-驾驶员注意力提醒指示器/信号装置-硬件规格型号", "0"), - JSYZYLTS_SCQY("jsyzyltsScqy", "驾驶辅助系统操纵件、指示器及信号装置-驾驶员注意力提醒指示器/信号装置-生产企业", "0"), - DSSAD_PZ("dssadPz", "自动驾驶数据记录系统(DSSAD)-系统配置", "2"), - DSSAD_GGXH("dssadGgxh", "自动驾驶数据记录系统(DSSAD)-规格型号", "0"), - DSSAD_SCQY("dssadScqy", "自动驾驶数据记录系统(DSSAD)-生产企业", "0"), - EDR_PZ("edrPz", "事件数据记录系统(EDR)-配置", "2"), - EDR_GGXH("edrGgxh", "事件数据记录系统(EDR)-规格型号", "0"), - EDR_SCQY("edrScqy", "事件数据记录系统(EDR)-生产企业", "0"), + WLAQYQ_PZ("jgldPz", "激光雷达-配置", "2", "", 0), + WLAQYQ_SL("jgldSl", "激光雷达-数量", "0", "", 50), + WLAQYQ_BZWZ("jgldBzwz", "激光雷达-布置位置", "0", "", 50), + WLAQYQ_GGXH("jgldGgxh", "激光雷达-规格型号", "0", "", 0), + WLAQYQ_SCQY("jgldScqy", "激光雷达-生产企业", "0", "", 50), + HMBLD_PZ("hmbldPz", "毫米波雷达-配置", "2", "", 0), + HMBLD_SL("hmbldSl", "毫米波雷达-数量", "0", "", 50), + HMBLD_BZWZ("hmbldBzwz", "毫米波雷达-布置位置", "0", "", 50), + HMBLD_GGXH("hmbldGgxh", "毫米波雷达-规格型号", "0", "", 50), + HMBLD_SCQY("hmbldScqy", "毫米波雷达-生产企业", "0", "", 50), + CSBLD_PZ("csbldPz", "超声波雷达-配置", "2", "", 0), + CSBLD_SL("csbldSl", "超声波雷达-数量", "0", "", 50), + CSBLD_BZWZ("csbldBzwz", "超声波雷达-布置位置", "0", "", 50), + CSBLD_GGXH("csbldGgxh", "超声波雷达-规格型号", "0", "", 50), + CSBLD_SCQY("csbldScqy", "超声波雷达-生产企业", "0", "", 50), + SXTHS_PZ("sxthsPz", "摄像头-倒车影像/360(环视)-配置", "2", "", 0), + SXTHS_SL("sxthsSl", "摄像头-倒车影像/360(环视)-数量", "0", "", 50), + SXTHS_BZWZ("sxthsBzwz", "摄像头-倒车影像/360(环视)-布置位置", "0", "", 50), + SXTHS_GGXH("sxthsGgxh", "摄像头-倒车影像/360(环视)-规格型号", "0", "", 50), + SXTHS_SCQY("sxthsScqy", "摄像头-倒车影像/360(环视)-生产企业", "0", "", 50), + SXTDSD_PZ("sxtdsdPz", "摄像头-单目/双目/多目-配置", "2", "", 50), + SXTDSD_SL("sxtdsdSl", "摄像头-单目双目多目-数量", "0", "", 50), + SXTDSD_BZWZ("sxtdsdBzwz", "摄像头-单目双多目-布置位置", "0", "", 50), + SXTDSD_GGXH("sxtdsdGgxh", "摄像头-单目/双目/多目-规格型号", "0", "", 50), + SXTDSD_SCQY("sxtdsdScqy", "摄像头-单目/双目/多目-生产企业", "0", "", 50), + JSYJK_PZ("jsyjkPz", "驾驶员注意力监测系统DMS-驾驶员监控摄像头-配置", "2", "", 0), + JSYJK_SL("jsyjkSl", "驾驶员注意力监测系统DMS-驾驶员监控摄像头-数量", "0", "", 50), + JSYJK_BZWZ("jsyjkBzwz", "驾驶员注意力监测系统DMS-驾驶员监控摄像头-布置位置", "0", "", 50), + JSYJK_GGXH("jsyjkGgxh", "驾驶员注意力监测系统DMS-驾驶员监控摄像头-规格型号", "0", "", 50), + JSYJK_SCQY("jsyjkScqy", "驾驶员注意力监测系统DMS-驾驶员监控摄像头-生产企业", "0", "", 50), + JSYHW_PZ("jsyhwPz", "驾驶员注意力监测系统DMS-驾驶员监控红外传感器-配置", "2", "", 0), + JSYHW_SL("jsyhwSl", "驾驶员注意力监测系统DMS-驾驶员监控红外传感器-数量", "0", "", 50), + JSYHW_BZWZ("jsyhwBzwz", "驾驶员注意力监测系统DMS-驾驶员监控红外传感器-布置位置", "0", "", 50), + JSYHW_GGXH("jsyhwGgxh", "驾驶员注意力监测系统DMS-驾驶员监控红外传感器-规格型号", "0", "", 50), + JSYHW_SCQY("jsyhwScqy", "驾驶员注意力监测系统DMS-驾驶员监控红外传感器-生产企业", "0", "", 50), + CZWXDW_PZ("czwxdwPz", "定位及导航系统-车载卫星定位设备（接收卫星信号及辅助定位信号的装置，PPP/GNSS/RTK）-配置", "2", "", 0), + CZWXDW_GGXH("czwxdwGgxh", "定位及导航系统-车载卫星定位设备（接收卫星信号及辅助定位信号的装置，PPP/GNSS/RTK）-规格型号", "0", "", 50), + CZWXDW_SCQY("czwxdwScqy", "定位及导航系统-车载卫星定位设备（接收卫星信号及辅助定位信号的装置，PPP/GNSS/RTK）-生产企业", "0", "", 50), + GXDH_PZ("gxdhPz", "定位及导航系统-惯性导航系统-配置", "2", "", 0), + GXDH_GGXH("gxdhGgxh", "定位及导航系统-惯性导航系统-规格型号", "0", "", 50), + GXDH_SCQY("gxdhScqy", "定位及导航系统-惯性导航系统-生产企业", "0", "", 50), + LSJ_PZ("lsjPz", "定位及导航系统-轮速计-配置", "2", "", 0), + LSJ_GGXH("lsjGgxh", "定位及导航系统-轮速计-规格型号", "0", "", 50), + LSJ_SCQY("lsjScqy", "定位及导航系统-轮速计-生产企业", "0", "", 50), + GJDDT_PZ("gjddtPz", "定位及导航系统-高精度地图-配置", "2", "", 0), + GJDDT_GGXH("gjddtGgxh", "定位及导航系统-高精度地图-规格型号", "0", "", 50), + GJDDT_SCQY("gjddtScqy", "定位及导航系统-高精度地图-生产企业", "0", "", 50), + DZWL_PZ("dzwlPz", "定位及导航系统-电子围栏-配置", "2", "", 0), + DZWL_DXXGCS("dzwlDxxgcs", "定位及导航系统-电子围栏-定性描述相关场所", "0", "", 50), + CZTX_PZ("cztxPz", "车载通信系统-配置", "2", "", 0), + CZTX_XTMC("cztxXtmc", "车载通信系统-系统名称", "0", "", 50), + CZTX_GGXH("cztxGgxh", "车载通信系统-规格型号", "0", "", 50), + CZTX_SCQY("cztxScqy", "车载通信系统-生产企业", "0", "", 50), + CZTX_BBH("cztxBbh", "车载通信系统-版本号", "0", "", 50), + CZTX_KFQY("cztxKfqy", "车载通信系统-软件开发企业", "0", "", 50), + JSFZCZJ_PZ("jsfzczjPz", "驾驶辅助系统操纵件、指示器及信号装置-驾驶辅助功能操纵件-配置", "2", "", 0), + JSFZCZJ_MC("jsfzczjMc", "驾驶辅助系统操纵件、指示器及信号装置-驾驶辅助功能操纵件-操纵件名称", "0", "", 50), + JSFZCZJ_YJXH("jsfzczjYjxh", "驾驶辅助系统操纵件、指示器及信号装置-驾驶辅助功能操纵件-硬件规格型号", "0", "", 50), + JSFZCZJ_SCQY("jsfzczjScqy", "驾驶辅助系统操纵件、指示器及信号装置-驾驶辅助功能操纵件-生产企业", "0", "", 50), + JSFZZSQ_PZ("jsfzzsqPz", "驾驶辅助系统操纵件、指示器及信号装置-驾驶辅助功能指示器/信号装置-配置", "2", "", 0), + JSFZZSQ_MC("jsfzzsqMc", "驾驶辅助系统操纵件、指示器及信号装置-驾驶辅助功能指示器/信号装置-指示器/信号装置名称", "0", "", 50), + JSFZZSQ_YJXH("jsfzzsqYjxh", "驾驶辅助系统操纵件、指示器及信号装置-驾驶辅助功能指示器/信号装置-硬件规格型号", "0", "", 50), + JSFZZSQ_SCQY("jsfzzsqScqy", "驾驶辅助系统操纵件、指示器及信号装置-驾驶辅助功能指示器/信号装置-生产企业", "0", "", 50), + FXPTSTS_PZ("fxptstsPz", "驾驶辅助系统操纵件、指示器及信号装置-方向盘脱手提示器/信号装置-配置", "2", "", 0), + FXPTSTS_MC("fxptstsMc", "驾驶辅助系统操纵件、指示器及信号装置-方向盘脱手提示器/信号装置-指示器/信号装置名称", "0", "", 50), + FXPTSTS_YJXH("fxptstsYjxh", "驾驶辅助系统操纵件、指示器及信号装置-方向盘脱手提示器/信号装置-硬件规格型号", "0", "", 50), + FXPTSTS_SCQY("fxptstsScqy", "驾驶辅助系统操纵件、指示器及信号装置-方向盘脱手提示器/信号装置-生产企业", "0", "", 50), + JSYZYLTS_PZ("jsyzyltsPz", "驾驶辅助系统操纵件、指示器及信号装置-驾驶员注意力提醒指示器/信号装置-配置", "2", "", 0), + JSYZYLTS_MC("jsyzyltsMc", "驾驶辅助系统操纵件、指示器及信号装置-驾驶员注意力提醒指示器/信号装置-指示器/信号装置名称", "0", "", 50), + JSYZYLTS_YJXH("jsyzyltsYjxh", "驾驶辅助系统操纵件、指示器及信号装置-驾驶员注意力提醒指示器/信号装置-硬件规格型号", "0", "", 50), + JSYZYLTS_SCQY("jsyzyltsScqy", "驾驶辅助系统操纵件、指示器及信号装置-驾驶员注意力提醒指示器/信号装置-生产企业", "0", "", 50), + DSSAD_PZ("dssadPz", "自动驾驶数据记录系统(DSSAD)-系统配置", "2", "", 0), + DSSAD_GGXH("dssadGgxh", "自动驾驶数据记录系统(DSSAD)-规格型号", "0", "", 50), + DSSAD_SCQY("dssadScqy", "自动驾驶数据记录系统(DSSAD)-生产企业", "0", "", 50), + EDR_PZ("edrPz", "事件数据记录系统(EDR)-配置", "2", "", 0), + EDR_GGXH("edrGgxh", "事件数据记录系统(EDR)-规格型号", "0", "", 50), + EDR_SCQY("edrScqy", "事件数据记录系统(EDR)-生产企业", "0", "", 50), - BJMC("bjmc", "部件名称", "0"), - YJGGXH("yjggxh", "硬件规格型号", "0"), - YJSCQY("yjscqy", "硬件生产企业", "0"), - RJBB("rjbb", "软件版本", "0"), - BZWZ("bzwz", "布置位置", "0"), + BJMC("bjmc", "部件名称", "0", "", 50), + YJGGXH("yjggxh", "硬件规格型号", "0", "", 50), + YJSCQY("yjscqy", "硬件生产企业", "0", "", 50), + RJBB("rjbb", "软件版本", "0", "", 50), + BZWZ("bzwz", "布置位置", "0", "", 50), - SJBBHCS("sjbbhcs", "软件版本（集）识别与存储", "0"), + SJBBHCS("sjbbhcs", "软件版本（集）识别与存储", "0", "", 500), - BABH("babh", "备案编号", "0"), - BAPC("bapc", "备案批次", "0"), - ZSL("zsl", "总数量", "0"), - SCRQKS("scrqks", "生产日期开始", "3"), - SCRQJS("scrqjs", "生产日期结束", "3"), - VIN_LIST("vinList", "VIN码清单", "0"), - SJMD("sjmd", "升级目的", "uipgrade_purpose"), - SFBGCS("sfbgcs", "是否变更对应车型的《公告》技术参数", "2"), - JSXNBH("jsxnbh", "是否涉及性能变化", "2"), - FHGD("fhgd", "是否符合国家法律、行政法规、规章规定，以及道路机动车辆公告管理相关国家技术标准及安全技术条件等", "2"), - ZDJSXG("zdjsxg", "是否涉及汽车自动驾驶功能相关升级", "2"), - JRXXG("jrxxg", "兼容性评估相关", "2"), - ZXSJ("zxsj", "如何执行升级", "conditions_upgrades"), - AQJZ("aqjz", "升级失败或中断后，车辆采取的安全机制", "upgrade_failed"), - SFYXAQ("sfyxaq", "升级活动是否影响车辆安全", "2"), - YHQR("yhqr", "升级活动是否提供用户确认选项", "2"), - SJBCS("sjbcs", "升级包测试", "package_test"), - AQKKX("aqkkx", "是否已验证确认在线升级活动的安全性和可靠性", "2"), - // BGFJ("bgfj", "提供变更或扩展后的《公告》批次及证明材料", "0"), -// CLFJ("clfj", "提供证明材料", "0"), - XTMC("xtmc", "系统名称", "0"), - SJQBGCS("sjqbgcs", "升级前已变更《公告》参数的对应调整", "0"), - SJHBGCS("sjhbgcs", "升级后已变更《公告》参数的对应调整", "0"), - SJKZQMC("sjkzqmc", "升级的电子控制器名称", "0"), - YJBB("yjbb", "适配的硬件版本", "0"), - SJQRJBB("sjqrjbb", "软件版本号升级前", "0"), - SJHRJBB("sjhrjbb", "软件版本号升级后", "0"), - SJQCZXT("sjqczxt", "操作系统版本号升级前", "0"), - SJHCZXT("sjhczxt", "操作系统版本号升级后", "0"), - CSRJSJ("csrjsj", "初始软件包的完整性数据", "0"), - SJBYZSJ("sjbyzsj", "升级包完整性验证数据", "0"), - SJBDX("sjbdx", "升级包大小", "0"), - SFCFSJ("sfcfsj", "是否差分升级", "0"), - SJMDLX("sjmdlx", "升级目的类型", "0"), - GNBGMS("gnbgms", "功能变更描述", "0"), - SYTJBG("sytjbg", "适用条件变更", "0"), - SJSJKZQ("sjsjkzq", "升级涉及的电子控制器", "0"), - GXBH("gxbh", "由于软件升级活动而导致的车辆功能的任何变化", "0"), - SJSJ("sjsj", "升级执行预计时间(分钟)", "0"), - SJKY("sjky", "升级执行期问，车辆是否可用", "0"), - SJBKYGN("sjbkygn", "升级执行期间不可用的车辆功能", "0"), - ZDXX("zdxx", "帮助车辆用户安全执行升级的任何指导信息", "0"), - SJSFCG("sjsfcg", "告知用户升级成功或失败", "2"), - GZBG("gzbg", "告知实施的变更", "2"), - GZSCNR("gzscnr", "告知了对用户手册的全部更新内容", "2"), - GZYHFS("gzyhfs", "告知用户方式（可多选）", "user_notification_mode"), - // XGWJ("xgwj", "用户告知相关文件", "0"), - RWMC("rwmc", "任务名称", "0"), - SJFBSJ("sjfbsj", "升级发布时间", "3"), - SJJZSJ("sjjzsj", "升级计划截止时间", "3"); + BABH("babh", "备案编号", "0", "", 50), + BAPC("bapc", "备案批次", "0", "", 50), + ZSL("zsl", "总数量", "0", "", 50), + SCRQKS("scrqks", "生产日期开始", "3", "", 0), + SCRQJS("scrqjs", "生产日期结束", "3", "", 0), + VIN_LIST("vinList", "VIN码清单", "0", "", 500), + SJMD("sjmd", "升级目的", "uipgrade_purpose", "", 0), + SFBGCS("sfbgcs", "是否变更对应车型的《公告》技术参数", "2", "", 0), + JSXNBH("jsxnbh", "是否涉及性能变化", "2", "", 0), + FHGD("fhgd", "是否符合国家法律、行政法规、规章规定，以及道路机动车辆公告管理相关国家技术标准及安全技术条件等", "2", "", 0), + ZDJSXG("zdjsxg", "是否涉及汽车自动驾驶功能相关升级", "2", "", 0), + JRXXG("jrxxg", "兼容性评估相关", "2", "", 0), + ZXSJ("zxsj", "如何执行升级", "conditions_upgrades", "", 0), + AQJZ("aqjz", "升级失败或中断后，车辆采取的安全机制", "upgrade_failed", "", 0), + SFYXAQ("sfyxaq", "升级活动是否影响车辆安全", "2", "", 0), + YHQR("yhqr", "升级活动是否提供用户确认选项", "2", "", 0), + SJBCS("sjbcs", "升级包测试", "package_test", "", 0), + AQKKX("aqkkx", "是否已验证确认在线升级活动的安全性和可靠性", "2", "", 0), + // BGFJ("bgfj", "提供变更或扩展后的《公告》批次及证明材料", "0","",0), +// CLFJ("clfj", "提供证明材料", "0","",0), + XTMC("xtmc", "系统名称", "0", "", 50), + SJQBGCS("sjqbgcs", "升级前已变更《公告》参数的对应调整", "0", "", 500), + SJHBGCS("sjhbgcs", "升级后已变更《公告》参数的对应调整", "0", "", 500), + SJKZQMC("sjkzqmc", "升级的电子控制器名称", "0", "", 50), + YJBB("yjbb", "适配的硬件版本", "0", "", 50), + SJQRJBB("sjqrjbb", "软件版本号升级前", "0", "", 50), + SJHRJBB("sjhrjbb", "软件版本号升级后", "0", "", 50), + SJQCZXT("sjqczxt", "操作系统版本号升级前", "0", "", 50), + SJHCZXT("sjhczxt", "操作系统版本号升级后", "0", "", 50), + CSRJSJ("csrjsj", "初始软件包的完整性数据", "0", "", 500), + SJBYZSJ("sjbyzsj", "升级包完整性验证数据", "0", "", 500), + SJBDX("sjbdx", "升级包大小", "0", "", 50), + SFCFSJ("sfcfsj", "是否差分升级", "0", "", 50), + SJMDLX("sjmdlx", "升级目的类型", "0", "", 0), + GNBGMS("gnbgms", "功能变更描述", "0", "", 500), + SYTJBG("sytjbg", "适用条件变更", "0", "", 500), + SJSJKZQ("sjsjkzq", "升级涉及的电子控制器", "0", "", 500), + GXBH("gxbh", "由于软件升级活动而导致的车辆功能的任何变化", "0", "", 500), + SJSJ("sjsj", "升级执行预计时间(分钟)", "0", "", 50), + SJKY("sjky", "升级执行期问，车辆是否可用", "0", "", 50), + SJBKYGN("sjbkygn", "升级执行期间不可用的车辆功能", "0", "", 50), + ZDXX("zdxx", "帮助车辆用户安全执行升级的任何指导信息", "0", "", 500), + SJSFCG("sjsfcg", "告知用户升级成功或失败", "2", "", 0), + GZBG("gzbg", "告知实施的变更", "2", "", 0), + GZSCNR("gzscnr", "告知了对用户手册的全部更新内容", "2", "", 0), + GZYHFS("gzyhfs", "告知用户方式（可多选）", "user_notification_mode", "", 0), + // XGWJ("xgwj", "用户告知相关文件", "0","",0), + RWMC("rwmc", "任务名称", "0", "", 500), + SJFBSJ("sjfbsj", "升级发布时间", "3", "", 0), + SJJZSJ("sjjzsj", "升级计划截止时间", "3", "", 0); String name; String value; //0为不处理。1为数据字典2为处理是否 是1 否2 String type; + String valueEn; - OtaTitleEnum(String name, String value, String type) { + //字段限制长度 + int len; + + OtaTitleEnum(String name, String value, String type, String valueEn, int len) { this.name = name; this.value = value; this.type = type; + this.valueEn = valueEn; + this.len = len; } public String getName() { @@ -239,6 +245,22 @@ public enum OtaTitleEnum { this.type = type; } + public String getValueEn() { + return valueEn; + } + + public void setValueEn(String valueEn) { + this.valueEn = valueEn; + } + + public int getLen() { + return len; + } + + public void setLen(int len) { + this.len = len; + } + public static OtaTitleEnum getOtaTitleEnum(String name) { for (OtaTitleEnum e : values()) { if (e.getName().equals(name)) { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxAqcsService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxAqcsService.java index 30fbd0593..58359daad 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxAqcsService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxAqcsService.java @@ -68,9 +68,9 @@ public interface IOtaBaCxAqcsService extends IService { void exportTemplate(HttpServletResponse response, HttpServletRequest request); - OtaBaCxAqcs importData(MultipartFile file, String otaId, String cut) throws Exception; + OtaBaCxAqcs importData(MultipartFile file, String otaId, String cut, StringBuilder errMsg) throws Exception; - OtaBaCxAqcs parseFileList(List upLoadFiles, String otaId, String cut) throws Exception; + OtaBaCxAqcs parseFileList(List upLoadFiles, String otaId, String cut, StringBuilder errMsg) throws Exception; void exportData(File file, File attFile, String otaId, String cut) throws Exception; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxJbxxService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxJbxxService.java index edaeaa803..360d3f1c0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxJbxxService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxJbxxService.java @@ -41,6 +41,8 @@ public interface IOtaBaCxJbxxService extends IService { */ void deleteById(String id); + void deleteByOtaId(String id); + /** * 批量删除 * @@ -68,9 +70,9 @@ public interface IOtaBaCxJbxxService extends IService { void exportTemplate(HttpServletResponse response, HttpServletRequest request) throws Exception; - OtaBaCxJbxx importData(MultipartFile file, String otaId, String cut) throws Exception; + OtaBaCxJbxx importData(MultipartFile file, String otaId, String cut, StringBuilder errMsg) throws Exception; - OtaBaCxJbxx parseFileList(List upLoadFiles, String otaId, String cut) throws Exception; + OtaBaCxJbxx parseFileList(List upLoadFiles, String otaId, String cut, StringBuilder errMsg) throws Exception; void exportData(File file, String otaId, String cut) throws Exception; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxJsfzbacsService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxJsfzbacsService.java index 96b487e1f..b08b0ea21 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxJsfzbacsService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxJsfzbacsService.java @@ -68,9 +68,9 @@ public interface IOtaBaCxJsfzbacsService extends IService { void exportTemplate(HttpServletResponse response, HttpServletRequest request); - void importData(MultipartFile file, String otaId, String cut) throws Exception; + void importData(MultipartFile file, String otaId, String cut, StringBuilder errMsg) throws Exception; - void parseFileList(List upLoadFiles, String otaId, String cut) throws Exception; + void parseFileList(List upLoadFiles, String otaId, String cut, StringBuilder errMsg) throws Exception; void exportData(File file, String otaId, String cut) throws Exception; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxKsjjsmccsService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxKsjjsmccsService.java index b38a10abb..5b423a3f9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxKsjjsmccsService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxKsjjsmccsService.java @@ -68,9 +68,9 @@ public interface IOtaBaCxKsjjsmccsService extends IService { void exportTemplate(HttpServletResponse response, HttpServletRequest request); - void importData(MultipartFile file, String otaId, String cut) throws Exception; + void importData(MultipartFile file, String otaId, String cut, StringBuilder errMsg) throws Exception; - void parseFileList(List upLoadFiles, String otaId, String cut) throws Exception; + void parseFileList(List upLoadFiles, String otaId, String cut, StringBuilder errMsg) throws Exception; void exportData(File file, File attFile, String otaId, String cut) throws Exception; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxKsjxtmccsService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxKsjxtmccsService.java index 3a5133cd0..97cf02357 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxKsjxtmccsService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxKsjxtmccsService.java @@ -68,9 +68,9 @@ public interface IOtaBaCxKsjxtmccsService extends IService { void exportTemplate(HttpServletResponse response, HttpServletRequest request); - void importData(MultipartFile file, String otaId, String cut) throws Exception; + void importData(MultipartFile file, String otaId, String cut, StringBuilder errMsg) throws Exception; - void parseFileList(List upLoadFiles, String otaId, String cut) throws Exception; + void parseFileList(List upLoadFiles, String otaId, String cut, StringBuilder errMsg) throws Exception; void exportData(File file, File attFile, String otaId, String cut) throws Exception; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxListService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxListService.java index 2d6663673..b55d818df 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxListService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxListService.java @@ -68,7 +68,7 @@ public interface IOtaBaCxListService extends IService { void exportTemplate(HttpServletResponse response, HttpServletRequest request); - void importData(MultipartFile file, String cut) throws Exception; + void importData(MultipartFile file, String cut, StringBuilder errMsg) throws Exception; void exportData(String otaId, HttpServletResponse response, HttpServletRequest request) throws Exception; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxZxsjyqService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxZxsjyqService.java index f8e6cb910..7b79dc017 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxZxsjyqService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxZxsjyqService.java @@ -69,9 +69,9 @@ public interface IOtaBaCxZxsjyqService extends IService { void exportTemplate(HttpServletResponse response, HttpServletRequest request); - OtaBaCxZxsjyq importData(MultipartFile file, String otaId, String cut) throws Exception; + OtaBaCxZxsjyq importData(MultipartFile file, String otaId, String cut, StringBuilder errMsg) throws Exception; - OtaBaCxZxsjyq parseFileList(List upLoadFiles, String otaId, String cut) throws Exception; + OtaBaCxZxsjyq parseFileList(List upLoadFiles, String otaId, String cut, StringBuilder errMsg) throws Exception; void exportData(File file, File attFile,String otaId, String cut) throws Exception; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java index d6876166b..bdeb49541 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java @@ -209,14 +209,14 @@ public class OtaBaCxAqcsServiceImpl extends ServiceImpl upLoadFiles = ImportFileUtil.importZip(file, cut, uploadPath); - OtaBaCxAqcs aqcs = parseFileList(upLoadFiles, otaId, cut); + OtaBaCxAqcs aqcs = parseFileList(upLoadFiles, otaId, cut, errMsg); return aqcs; } @Override - public OtaBaCxAqcs parseFileList(List upLoadFiles, String otaId, String cut) throws Exception { + public OtaBaCxAqcs parseFileList(List upLoadFiles, String otaId, String cut, StringBuilder errMsg) throws Exception { File attFile = null; File upFile = null; for (File f : upLoadFiles) { @@ -229,13 +229,13 @@ public class OtaBaCxAqcsServiceImpl extends ServiceImpl list = ImportFileUtil.uploadFiles1(attFile, strs, ossFileService); + String attStr = ImportFileUtil.getCellValue(cell, wb); + String[] strs = attStr.split(","); + + List list = ImportFileUtil.uploadFiles1(attFile, strs, ossFileService,errMsg, "证明材料", cut); JSONArray obj = new JSONArray(); for (OSSFile f : list) { AttachmentEO aeo = new AttachmentEO(); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java index db580562c..2b36d28d4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java @@ -117,6 +117,13 @@ public class OtaBaCxJbxxServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(OtaBaCxJbxx::getOtaId, id); + remove(queryWrapper); + } + /** * 批量删除 * @@ -174,14 +181,14 @@ public class OtaBaCxJbxxServiceImpl extends ServiceImpl upLoadFiles = ImportFileUtil.importZip(file, cut, uploadPath); - OtaBaCxJbxx jbxx = parseFileList(upLoadFiles, otaId, cut); + OtaBaCxJbxx jbxx = parseFileList(upLoadFiles, otaId, cut, errMsg); return jbxx; } @Override - public OtaBaCxJbxx parseFileList(List upLoadFiles, String otaId, String cut) throws Exception { + public OtaBaCxJbxx parseFileList(List upLoadFiles, String otaId, String cut, StringBuilder errMsg) throws Exception { File upFile = null; for (File f : upLoadFiles) { if (f.getName().equals("车型基本信息.xlsx")) { @@ -189,41 +196,47 @@ public class OtaBaCxJbxxServiceImpl extends ServiceImpl 50) { + throw new JeroBootException("产品编号字数超过50"); + } jbxx.setDjbh(cpbh); - row = s.getRow(3); - cell = row.getCell(1); - jbxx.setCplb(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(4); cell = row.getCell(1); String ggpc = ImportFileUtil.getCellValue(cell, wb); - if (StringUtils.isEmpty(cpbh)) { - throw new JeroBootException("公告批次不能为空"); + if (StringUtils.isNotEmpty(ggpc)) { + List xxList = this.list(); + for (OtaBaCxJbxx xx : xxList) { + if (ggpc.equals(xx.getGgpc())) { + throw new JeroBootException("公告批次重复"); + } + } } - jbxx.setGgpc(ImportFileUtil.getCellValue(cell, wb)); - + jbxx.setGgpc(ggpc); + row = s.getRow(1); + cell = row.getCell(1); + jbxx.setQymc(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(3); + cell = row.getCell(1); + jbxx.setCplb(ImportFileUtil.getCellValue(cell, wb)); row = s.getRow(5); cell = row.getCell(1); jbxx.setCpsb(ImportFileUtil.getCellValue(cell, wb)); @@ -245,6 +258,9 @@ public class OtaBaCxJbxxServiceImpl extends ServiceImpl reList = cu.comparisonRecord(otaId, OtaModuleEnum.CX_JSFZXTJCBACS, otaBaCxJsfzbacsOld, otaBaCxJsfzbacs, sysDictService); @@ -239,7 +239,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); @@ -253,14 +253,14 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl upLoadFiles = ImportFileUtil.importZip(file, cut, uploadPath); - parseFileList(upLoadFiles, otaId, cut); + parseFileList(upLoadFiles, otaId, cut, errMsg); } @Override - public void parseFileList(List upLoadFiles, String otaId, String cut) throws Exception { + public void parseFileList(List upLoadFiles, String otaId, String cut, StringBuilder errMsg) throws Exception { File upFile = null; for (File f : upLoadFiles) { if (f.getName().equals("驾驶辅助系统基础备案参数.xlsx")) { @@ -270,7 +270,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl oldList = OtaBaCxSjmkService.queryByOtaId(otaId); OtaBaCxSjmkService.deleteByOtaId(otaId); - List sjmkList = parseList(upFile, otaId, cut); + List sjmkList = parseList(upFile, otaId, cut, errMsg); if (ObjectUtils.isEmpty(oldList)) { oldList = new ArrayList<>(); } @@ -294,7 +294,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl parseList(File upFile, String otaId, String cut) throws Exception { + private List parseList(File upFile, String otaId, String cut, StringBuilder errMsg) throws Exception { Date now = new Date(); List sjmkList = new ArrayList<>(); Workbook wb = ImportFileUtil.readExcel(upFile); @@ -326,13 +326,15 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl upLoadFiles = ImportFileUtil.importZip(file, cut, uploadPath); - parseFileList(upLoadFiles, otaId, cut); + parseFileList(upLoadFiles, otaId, cut, errMsg); } @Override - public void parseFileList(List upLoadFiles, String otaId, String cut) throws Exception { + public void parseFileList(List upLoadFiles, String otaId, String cut, StringBuilder errMsg) throws Exception { File attFile = null; File upFile = null; for (File f : upLoadFiles) { @@ -264,7 +264,7 @@ public class OtaBaCxKsjjsmccsServiceImpl extends ServiceImpl(); } - List mccsList = parseFile(upFile, attFile, otaId, cut); + List mccsList = parseFile(upFile, attFile, otaId, cut, errMsg); ComparisonUtil cu = new ComparisonUtil(); List reList = cu.comparisonListRecord(otaId, OtaModuleEnum.CX_KZXSJDJSFZGNMCYCS, OtaTitleEnum.GNMC.getName(), oldList, mccsList, sysDictService); deleteByOtaId(otaId); @@ -273,7 +273,7 @@ public class OtaBaCxKsjjsmccsServiceImpl extends ServiceImpl parseFile(File upFile, File attFile, String otaId, String cut) throws Exception { + private List parseFile(File upFile, File attFile, String otaId, String cut, StringBuilder errMsg) throws Exception { Date now = new Date(); List mccsList = new ArrayList<>(); Workbook wb = ImportFileUtil.readExcel(upFile); @@ -291,7 +291,7 @@ public class OtaBaCxKsjjsmccsServiceImpl extends ServiceImpl upLoadFiles = ImportFileUtil.importZip(file, cut, uploadPath); - parseFileList(upLoadFiles, otaId, cut); + parseFileList(upLoadFiles, otaId, cut, errMsg); } @Override - public void parseFileList(List upLoadFiles, String otaId, String cut) throws Exception { + public void parseFileList(List upLoadFiles, String otaId, String cut, StringBuilder errMsg) throws Exception { File attFile = null; File upFile = null; for (File f : upLoadFiles) { @@ -331,7 +331,7 @@ public class OtaBaCxKsjxtmccsServiceImpl extends ServiceImpl(); } - List mccsList = parseFile(upFile, attFile, otaId, cut); + List mccsList = parseFile(upFile, attFile, otaId, cut, errMsg); ComparisonUtil cu = new ComparisonUtil(); List reList = cu.comparisonListRecord(otaId, OtaModuleEnum.CX_KSJDXTMCYCS, OtaTitleEnum.XTLB.getName(), oldList, mccsList, sysDictService); deleteByOtaId(otaId); @@ -339,7 +339,7 @@ public class OtaBaCxKsjxtmccsServiceImpl extends ServiceImpl parseFile(File upFile, File attFile, String otaId, String cut) throws Exception { + private List parseFile(File upFile, File attFile, String otaId, String cut, StringBuilder errMsg) throws Exception { Date now = new Date(); List mccsList = new ArrayList<>(); Workbook wb = ImportFileUtil.readExcel(upFile); @@ -357,7 +357,7 @@ public class OtaBaCxKsjxtmccsServiceImpl extends ServiceImpl fileList = ImportFileUtil.importZip(file, cut, uploadPath); - OtaBaCxJbxx jbxx = otaBaCxJbxxService.parseFileList(fileList, "", cut); + OtaBaCxJbxx jbxx = otaBaCxJbxxService.parseFileList(fileList, "", cut, errMsg); String otaId = jbxx.getOtaId(); if (StringUtils.isNotEmpty(otaId)) { - otaBaCxZxsjyqService.parseFileList(fileList, otaId, cut); - otaBaCxAqcsService.parseFileList(fileList, otaId, cut); - otaBaCxKsjxtmccsService.parseFileList(fileList, otaId, cut); - otaBaCxKsjjsmccsService.parseFileList(fileList, otaId, cut); - otaBaCxJsfzbacsService.parseFileList(fileList, otaId, cut); + otaBaCxZxsjyqService.parseFileList(fileList, otaId, cut, errMsg); + otaBaCxAqcsService.parseFileList(fileList, otaId, cut, errMsg); + otaBaCxKsjxtmccsService.parseFileList(fileList, otaId, cut, errMsg); + otaBaCxKsjjsmccsService.parseFileList(fileList, otaId, cut, errMsg); + otaBaCxJsfzbacsService.parseFileList(fileList, otaId, cut, errMsg); } else { throw new JeroBootException("导入失败"); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxZxsjyqServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxZxsjyqServiceImpl.java index b44a208fe..a2fec666d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxZxsjyqServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxZxsjyqServiceImpl.java @@ -201,14 +201,14 @@ public class OtaBaCxZxsjyqServiceImpl extends ServiceImpl upLoadFiles = ImportFileUtil.importZip(file, cut, uploadPath); - OtaBaCxZxsjyq otaBaCxZxsjyq = parseFileList(upLoadFiles, otaId, cut); + OtaBaCxZxsjyq otaBaCxZxsjyq = parseFileList(upLoadFiles, otaId, cut, errMsg); return otaBaCxZxsjyq; } @Override - public OtaBaCxZxsjyq parseFileList(List upLoadFiles, String otaId, String cut) throws Exception { + public OtaBaCxZxsjyq parseFileList(List upLoadFiles, String otaId, String cut, StringBuilder errMsg) throws Exception { File attFile = null; File upFile = null; for (File f : upLoadFiles) { @@ -221,13 +221,13 @@ public class OtaBaCxZxsjyqServiceImpl extends ServiceImpl list = ImportFileUtil.uploadFiles1(attFile, strs, ossFileService); + List list = ImportFileUtil.uploadFiles1(attFile, strs, ossFileService, errMsg, "证明材料", cut); JSONArray obj = new JSONArray(); for (OSSFile f : list) { AttachmentEO aeo = new AttachmentEO(); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java index 4061f8312..737870be8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java @@ -177,6 +177,56 @@ public class ComparisonUtil { return resList; } + public void checkAttError(String[] strs, StringBuilder errMsg, String title, String cut) { + for (String str:strs) { + if(!str.endsWith(".doc")&&!str.endsWith(".docx")&&!str.endsWith(".pdf")&&!str.endsWith(".DOC")&&!str.endsWith(".DOCX")&&!str.endsWith(".PDF")){ + errMsg.append(title + " 支持doc/docx/pdf格式 , "); + } + } + } + + public void checkError(T clazz, StringBuilder errMsg, ISysDictService sysDictService, String cut) { + Field[] fields = clazz.getClass().getDeclaredFields(); + for (Field field : fields) { + OtaTitleEnum ote = OtaTitleEnum.getOtaTitleEnum(field.getName()); + if (null == ote) { + continue; + } + String title = ote.getValue(); + field.setAccessible(true); + try { + Object val = field.get(clazz); + if (ObjectUtils.isNotEmpty(val)) { + String str = val.toString(); + if ("0".equals(ote.getType())) { + if (str.length() > ote.getLen()) { + errMsg.append(title + " 的长度超过了 " + ote.getLen() + ", "); + field.set(clazz, ""); + } + } else if ("2".equals(ote.getType())) { + if (!"是".equals(str) && !"否".equals(str)) { + errMsg.append(title + " 必须填写是或否 , "); + field.set(clazz, ""); + } + } else if ("3".equals(ote.getType())) { + //不处理 + } else { + String[] strs = str.split(","); + for (String s : strs) { + String res = sysDictService.queryDictItemByValue(ote.getType(), s, cut); + if (StringUtils.isEmpty(res)) { + errMsg.append(title + " 填写了无法识别的选项 , "); + field.set(clazz, ""); + } + } + } + } + } catch (IllegalAccessException e) { + e.printStackTrace(); + } + } + } + public List comparisonCertRecord(String otaId, OtaModuleEnum otaModuleEnum, String tableTitle, T oldClazz, T newClazz, ISysDictService sysDictService) { List resList = new ArrayList<>(); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ImportFileUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ImportFileUtil.java index 34aef3db0..9d05199bb 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ImportFileUtil.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ImportFileUtil.java @@ -91,10 +91,7 @@ public class ImportFileUtil { List fileList = new ArrayList<>(); File fileNew = ImportFileUtil.copyZip(file, cut, uploadPath); for (File file1 : fileNew.listFiles()) { - if (file1.getName().contains(".xls") || file1.getName().contains(".xlsx") || file1.isDirectory() - || file1.getName().contains(".docx") || file1.getName().contains(".doc")) { - fileList.add(file1); - } + fileList.add(file1); } return fileList; } @@ -278,13 +275,23 @@ public class ImportFileUtil { return mFile; } - public static List uploadFiles1(File attFile, String[] strs, IOSSFileService ossFileService) throws Exception { + public static List uploadFiles1(File attFile, String[] strs, IOSSFileService ossFileService, StringBuilder errMsg, String title, String cut) throws Exception { List res = new ArrayList<>(); for (int i = 0; i < strs.length; i++) { if (StringUtils.isNotEmpty(strs[i])) { File file = ImportFileUtil.findFile(attFile, strs[i]); if (null == file) { - throw new JeroBootException("找不到文件：" + strs[i]); + errMsg.append(title + " 找不到文件 , "); + continue; + } + if (!file.getName().endsWith(".doc") && !file.getName().endsWith(".docx") && !file.getName().endsWith(".pdf") + && !file.getName().endsWith(".DOC") && !file.getName().endsWith(".DOCX") && !file.getName().endsWith(".PDF")) { + errMsg.append(title + " 只支持doc/docx/pdf格式 , "); + continue; + } + if (file.length() > 50 * 1024 * 1024) { + errMsg.append(title + " 上传文件不可以超过50MB , "); + continue; } OSSFile ossFile = ossFileService.uploadLocalOfCos(ImportFileUtil.createMfileByFile(file), "", null, null); if (ObjectUtils.isNotEmpty(ossFile)) { @@ -304,13 +311,23 @@ public class ImportFileUtil { return res; } - public static String uploadFiles(File attFile, String[] strs, IOSSFileService ossFileService) throws Exception { + public static String uploadFiles(File attFile, String[] strs, IOSSFileService ossFileService, StringBuilder errMsg, String title, String cut) throws Exception { String res = ""; for (int i = 0; i < strs.length; i++) { if (StringUtils.isNotEmpty(strs[i])) { File file = ImportFileUtil.findFile(attFile, strs[i]); if (null == file) { - throw new JeroBootException("找不到文件：" + strs[i]); + errMsg.append(title + " 找不到文件 , "); + continue; + } + if (!file.getName().endsWith(".doc") && !file.getName().endsWith(".docx") && !file.getName().endsWith(".pdf") + && !file.getName().endsWith(".DOC") && !file.getName().endsWith(".DOCX") && !file.getName().endsWith(".PDF")) { + errMsg.append(title + " 只支持doc/docx/pdf格式 , "); + continue; + } + if (file.length() > 50 * 1024 * 1024) { + errMsg.append(title + " 上传文件不可以超过50MB , "); + continue; } OSSFile ossFile = ossFileService.uploadLocalOfCos(ImportFileUtil.createMfileByFile(file), "", null, null); if (ObjectUtils.isNotEmpty(ossFile)) { From 35937db22a05e571e012b7956dbce043e378baba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Fri, 31 Mar 2023 02:52:03 +0800 Subject: [PATCH 607/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ota/controller/OtaBaSjListController.java | 5 +- .../ota/service/IOtaBaSjGgnrfsService.java | 79 ++++++++++--------- .../ota/service/IOtaBaSjListService.java | 2 +- .../ota/service/IOtaBaSjSjfzbhService.java | 4 +- .../ota/service/IOtaBaSjSjmbclService.java | 4 +- .../ota/service/IOtaBaSjSjmbcxService.java | 4 +- .../ota/service/IOtaBaSjSjxtbhService.java | 4 +- .../ota/service/IOtaBaSjSjyxpgService.java | 4 +- .../impl/OtaBaSjGgnrfsServiceImpl.java | 10 +-- .../service/impl/OtaBaSjListServiceImpl.java | 16 ++-- .../impl/OtaBaSjSjfzbhServiceImpl.java | 13 +-- .../impl/OtaBaSjSjmbclServiceImpl.java | 10 +-- .../impl/OtaBaSjSjmbcxServiceImpl.java | 12 +-- .../impl/OtaBaSjSjxtbhServiceImpl.java | 12 +-- .../impl/OtaBaSjSjyxpgServiceImpl.java | 10 +-- 15 files changed, 99 insertions(+), 90 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java index 51bd9d829..4bcd03f36 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java @@ -233,13 +233,14 @@ public class OtaBaSjListController extends JeroController importData(@RequestParam(value = "file", required = false) MultipartFile file, @RequestParam(value = "cut", required = false) String cut) throws Exception { + StringBuilder errMsg = new StringBuilder(); try { - this.otaBaSjListService.importData(file, cut); + this.otaBaSjListService.importData(file, cut, errMsg); } catch (Exception e) { e.printStackTrace(); return Result.error(e.getMessage()); } - return Result.OK("导入成功"); + return Result.error(errMsg.toString()); } @ApiOperation(value = "升级备案-数据导出") diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjGgnrfsService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjGgnrfsService.java index e37910f4c..0f41d278d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjGgnrfsService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjGgnrfsService.java @@ -12,64 +12,65 @@ import java.util.List; /** * @Description: 升级备案-用户告知内容及方式 * @Author: jero-boot - * @Date: 2023-03-17 + * @Date: 2023-03-17 * @Version: V1.0 */ public interface IOtaBaSjGgnrfsService extends IService { - /** - * 保存 - * - * @param otaBaSjGgnrfs - * @return - */ + /** + * 保存 + * + * @param otaBaSjGgnrfs + * @return + */ void add(OtaBaSjGgnrfs otaBaSjGgnrfs); - /** - * 更新 - * - * @param otaBaSjGgnrfs - * @return - */ + /** + * 更新 + * + * @param otaBaSjGgnrfs + * @return + */ void editById(OtaBaSjGgnrfs otaBaSjGgnrfs); - /** - * 通过id删除 - * - * @param id - * @return - */ + /** + * 通过id删除 + * + * @param id + * @return + */ void deleteById(String id); - /** - * 批量删除 - * - * @param ids - * @return - */ + /** + * 批量删除 + * + * @param ids + * @return + */ void deleteByIds(List ids); - /** - * 通过id查询 - * - * @param id - * @return - */ + /** + * 通过id查询 + * + * @param id + * @return + */ OtaBaSjGgnrfs queryById(String id); /** - * 列表查询 - * - * @return - */ + * 列表查询 + * + * @return + */ List queryList(); OtaBaSjGgnrfs queryByOtaId(String otaId, String otaIdT); - void exportTemplate(HttpServletResponse response, HttpServletRequest request) throws Exception; + void exportTemplate(HttpServletResponse response, HttpServletRequest request) throws Exception; - void importData(MultipartFile file, String otaId, String cut) throws Exception; + void importData(MultipartFile file, String otaId, String cut, StringBuilder errMsg) throws Exception; - void parseFileList(List upLoadFiles, String otaId, String cut) throws Exception; + void parseFileList(List upLoadFiles, String otaId, String cut, StringBuilder errMsg) throws Exception; - void exportData(File file, File fsAttFile, String otaId, String cut) throws Exception;} + void exportData(File file, File fsAttFile, String otaId, String cut) throws Exception; +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjListService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjListService.java index d7b14bae9..8546e69e4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjListService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjListService.java @@ -70,7 +70,7 @@ public interface IOtaBaSjListService extends IService { void exportTemplate(HttpServletResponse response, HttpServletRequest request) throws Exception; - void importData(MultipartFile file, String cut) throws Exception; + void importData(MultipartFile file, String cut, StringBuilder errMsg) throws Exception; void exportData(String otaId, HttpServletResponse response, HttpServletRequest request) throws Exception; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjfzbhService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjfzbhService.java index ff3bfa535..a660411a0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjfzbhService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjfzbhService.java @@ -69,9 +69,9 @@ public interface IOtaBaSjSjfzbhService extends IService { void exportTemplate(HttpServletResponse response, HttpServletRequest request) throws Exception; - void importData(MultipartFile file, String otaId, String cut) throws Exception; + void importData(MultipartFile file, String otaId, String cut, StringBuilder errMsg) throws Exception; - void parseFileList(List upLoadFiles, String otaId, String cut) throws Exception; + void parseFileList(List upLoadFiles, String otaId, String cut, StringBuilder errMsg) throws Exception; void exportData(File file, String otaId, String cut) throws Exception; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjmbclService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjmbclService.java index 6d7d6a66c..31d68ecb2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjmbclService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjmbclService.java @@ -69,9 +69,9 @@ public interface IOtaBaSjSjmbclService extends IService { void exportTemplate(HttpServletResponse response, HttpServletRequest request) throws Exception; - OtaBaSjSjmbcl parseFileList(List upLoadFiles, String otaId, String cut) throws Exception; + OtaBaSjSjmbcl parseFileList(List upLoadFiles, String otaId, String cut, StringBuilder errMsg) throws Exception; - OtaBaSjSjmbcl importData(MultipartFile file, String otaId, String cut) throws Exception; + OtaBaSjSjmbcl importData(MultipartFile file, String otaId, String cut, StringBuilder errMsg) throws Exception; void exportData(File file, File mbclAttFile, String otaId, String cut) throws Exception; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjmbcxService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjmbcxService.java index 32be72b65..4695ad5bc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjmbcxService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjmbcxService.java @@ -70,9 +70,9 @@ public interface IOtaBaSjSjmbcxService extends IService { void exportTemplate(HttpServletResponse response, HttpServletRequest request) throws Exception; - OtaBaSjSjmbcx importData(MultipartFile file, String otaId, String cut) throws Exception; + OtaBaSjSjmbcx importData(MultipartFile file, String otaId, String cut, StringBuilder errMsg) throws Exception; - OtaBaSjSjmbcx parseFileList(List upLoadFiles, String otaId, String cut) throws Exception; + OtaBaSjSjmbcx parseFileList(List upLoadFiles, String otaId, String cut, StringBuilder errMsg) throws Exception; void exportData(File file, String otaId, String cut) throws Exception; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjxtbhService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjxtbhService.java index 17b9bb40e..02b5f148d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjxtbhService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjxtbhService.java @@ -67,9 +67,9 @@ public interface IOtaBaSjSjxtbhService extends IService { void exportTemplate(HttpServletResponse response, HttpServletRequest request) throws Exception; - void importData(MultipartFile file, String otaId, String cut) throws Exception; + void importData(MultipartFile file, String otaId, String cut, StringBuilder errMsg) throws Exception; - void parseFileList(List upLoadFiles, String otaId, String cut) throws Exception; + void parseFileList(List upLoadFiles, String otaId, String cut, StringBuilder errMsg) throws Exception; void exportData(File file, String otaId, String cut) throws Exception; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjyxpgService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjyxpgService.java index 78419ac34..cd020b1ce 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjyxpgService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjyxpgService.java @@ -69,9 +69,9 @@ public interface IOtaBaSjSjyxpgService extends IService { void exportTemplate(HttpServletResponse response, HttpServletRequest request) throws Exception; - OtaBaSjSjyxpg importData(MultipartFile file, String otaId, String cut) throws Exception; + OtaBaSjSjyxpg importData(MultipartFile file, String otaId, String cut, StringBuilder errMsg) throws Exception; - OtaBaSjSjyxpg parseFileList(List upLoadFiles, String otaId, String cut) throws Exception; + OtaBaSjSjyxpg parseFileList(List upLoadFiles, String otaId, String cut, StringBuilder errMsg) throws Exception; void exportData(File file, File attFile, File attFile2, String otaId, String cut) throws Exception; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjGgnrfsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjGgnrfsServiceImpl.java index 2cd2a3801..331e66439 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjGgnrfsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjGgnrfsServiceImpl.java @@ -194,13 +194,13 @@ public class OtaBaSjGgnrfsServiceImpl extends ServiceImpl upLoadFiles = ImportFileUtil.importZip(file, cut, uploadPath); - parseFileList(upLoadFiles, otaId, cut); + parseFileList(upLoadFiles, otaId, cut,errMsg); } @Override - public void parseFileList(List upLoadFiles, String otaId, String cut) throws Exception { + public void parseFileList(List upLoadFiles, String otaId, String cut, StringBuilder errMsg) throws Exception{ File attFile = null; for (File f : upLoadFiles) { if (f.isDirectory() && f.getName().equals("用户告知内容及方式")) { @@ -210,11 +210,11 @@ public class OtaBaSjGgnrfsServiceImpl extends ServiceImpl fileList = ImportFileUtil.importZip(file, cut, uploadPath); - OtaBaSjSjmbcx mbcx = otaBaSjSjmbcxService.parseFileList(fileList, "", cut); + OtaBaSjSjmbcx mbcx = otaBaSjSjmbcxService.parseFileList(fileList, "", cut, errMsg); String otaId = mbcx.getOtaId(); if (StringUtils.isNotEmpty(otaId)) { - otaBaSjSjmbclService.parseFileList(fileList, otaId, cut); - otaBaSjSjmbcxService.parseFileList(fileList, otaId, cut); - otaBaSjSjyxpgService.parseFileList(fileList, otaId, cut); - otaBaSjSjxtbhService.parseFileList(fileList, otaId, cut); - otaBaSjSjfzbhService.parseFileList(fileList, otaId, cut); - otaBaSjGgnrfsService.parseFileList(fileList, otaId, cut); + otaBaSjSjmbclService.parseFileList(fileList, otaId, cut, errMsg); + otaBaSjSjmbcxService.parseFileList(fileList, otaId, cut, errMsg); + otaBaSjSjyxpgService.parseFileList(fileList, otaId, cut, errMsg); + otaBaSjSjxtbhService.parseFileList(fileList, otaId, cut, errMsg); + otaBaSjSjfzbhService.parseFileList(fileList, otaId, cut, errMsg); + otaBaSjGgnrfsService.parseFileList(fileList, otaId, cut, errMsg); } else { throw new JeroBootException("导入失败"); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjfzbhServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjfzbhServiceImpl.java index e4e9e4dcd..cda41306c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjfzbhServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjfzbhServiceImpl.java @@ -204,13 +204,13 @@ public class OtaBaSjSjfzbhServiceImpl extends ServiceImpl upLoadFiles = ImportFileUtil.importZip(file, cut, uploadPath); - parseFileList(upLoadFiles, otaId, cut); + parseFileList(upLoadFiles, otaId, cut,errMsg); } @Override - public void parseFileList(List upLoadFiles, String otaId, String cut) throws Exception { + public void parseFileList(List upLoadFiles, String otaId, String cut, StringBuilder errMsg) throws Exception { File upFile = null; for (File f : upLoadFiles) { if (f.getName().equals("本次升级的驾驶辅助功能与参数变化.xlsx")) { @@ -225,7 +225,7 @@ public class OtaBaSjSjfzbhServiceImpl extends ServiceImpl(); } - List newList = parseFile(upFile, otaId, cut); + List newList = parseFile(upFile, otaId, cut,errMsg); ComparisonUtil cu = new ComparisonUtil(); List reList = cu.comparisonListRecord(otaId, OtaModuleEnum.SJ_SJJSMCBH, OtaTitleEnum.GNMC.getName(), oldList, newList, sysDictService); deleteByOtaId(otaId); @@ -233,7 +233,7 @@ public class OtaBaSjSjfzbhServiceImpl extends ServiceImpl parseFile(File upFile, String otaId, String cut) throws Exception { + private List parseFile(File upFile, String otaId, String cut, StringBuilder errMsg) throws Exception { Date now = new Date(); List fzbhList = new ArrayList<>(); Workbook wb = ImportFileUtil.readExcel(upFile); @@ -264,6 +264,9 @@ public class OtaBaSjSjfzbhServiceImpl extends ServiceImpl upLoadFiles, String otaId, String cut) throws Exception { + public OtaBaSjSjmbcl parseFileList(List upLoadFiles, String otaId, String cut, StringBuilder errMsg) throws Exception { File upFile = null; for (File f : upLoadFiles) { if (f.getName().equals("本次升级涉及的目标车辆.xlsx")) { @@ -191,13 +191,13 @@ public class OtaBaSjSjmbclServiceImpl extends ServiceImpl upLoadFiles = ImportFileUtil.importZip(file, cut, uploadPath); - OtaBaSjSjmbcl mbcl = parseFileList(upLoadFiles, otaId, cut); + OtaBaSjSjmbcl mbcl = parseFileList(upLoadFiles, otaId, cut, errMsg); return mbcl; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java index 76a4b9dc6..e9ef5aa34 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java @@ -179,14 +179,14 @@ public class OtaBaSjSjmbcxServiceImpl extends ServiceImpl upLoadFiles = ImportFileUtil.importZip(file, cut, uploadPath); - OtaBaSjSjmbcx mbcx = parseFileList(upLoadFiles, otaId, cut); + OtaBaSjSjmbcx mbcx = parseFileList(upLoadFiles, otaId, cut, errMsg); return mbcx; } @Override - public OtaBaSjSjmbcx parseFileList(List upLoadFiles, String otaId, String cut) throws Exception { + public OtaBaSjSjmbcx parseFileList(List upLoadFiles, String otaId, String cut, StringBuilder errMsg) throws Exception { File upFile = null; for (File f : upLoadFiles) { if (f.getName().equals("升级目标车型.xlsx")) { @@ -196,13 +196,13 @@ public class OtaBaSjSjmbcxServiceImpl extends ServiceImpl upLoadFiles = ImportFileUtil.importZip(file, cut, uploadPath); - parseFileList(upLoadFiles, otaId, cut); + parseFileList(upLoadFiles, otaId, cut,errMsg); } @Override - public void parseFileList(List upLoadFiles, String otaId, String cut) throws Exception { + public void parseFileList(List upLoadFiles, String otaId, String cut, StringBuilder errMsg) throws Exception{ File upFile = null; for (File f : upLoadFiles) { if (f.getName().equals("本次升级的系统名称与变更参数.xlsx")) { @@ -221,7 +221,7 @@ public class OtaBaSjSjxtbhServiceImpl extends ServiceImpl newList = parseFile(upFile, otaId, cut); + List newList = parseFile(upFile, otaId, cut,errMsg); List oldList = getByOtaId(otaId); if (ObjectUtils.isEmpty(oldList)) { oldList = new ArrayList<>(); @@ -233,7 +233,7 @@ public class OtaBaSjSjxtbhServiceImpl extends ServiceImpl parseFile(File upFile, String otaId, String cut) throws Exception { + private List parseFile(File upFile, String otaId, String cut, StringBuilder errMsg) throws Exception{ Date now = new Date(); List list = new ArrayList<>(); Workbook wb = ImportFileUtil.readExcel(upFile); @@ -271,6 +271,8 @@ public class OtaBaSjSjxtbhServiceImpl extends ServiceImpl upLoadFiles = ImportFileUtil.importZip(file, cut, uploadPath); - OtaBaSjSjyxpg sjyxpg = parseFileList(upLoadFiles, otaId, cut); + OtaBaSjSjyxpg sjyxpg = parseFileList(upLoadFiles, otaId, cut, errMsg); return sjyxpg; } - private OtaBaSjSjyxpg parseFile(File upFile, File attFile1, File attFile2, String cut) throws Exception { + private OtaBaSjSjyxpg parseFile(File upFile, File attFile1, File attFile2, String cut, StringBuilder errMsg) throws Exception { OtaBaSjSjyxpg sjyxpg = new OtaBaSjSjyxpg(); InputStream is = new FileInputStream(upFile); XWPFDocument doc = new XWPFDocument(is); @@ -253,7 +253,7 @@ public class OtaBaSjSjyxpgServiceImpl extends ServiceImpl upLoadFiles, String otaId, String cut) throws Exception { + public OtaBaSjSjyxpg parseFileList(List upLoadFiles, String otaId, String cut, StringBuilder errMsg) throws Exception { File upFile = null; File attFile = null; File attFile1 = null; @@ -284,7 +284,7 @@ public class OtaBaSjSjyxpgServiceImpl extends ServiceImpl Date: Fri, 31 Mar 2023 03:09:58 +0800 Subject: [PATCH 608/645] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ota/controller/OtaBaCxAqcsController.java | 5 ++-- .../ota/controller/OtaBaCxJbxxController.java | 5 ++-- .../controller/OtaBaCxJsfzbacsController.java | 5 ++-- .../OtaBaCxKsjjsmccsController.java | 5 ++-- .../OtaBaCxKsjxtmccsController.java | 5 ++-- .../controller/OtaBaCxZxsjyqController.java | 5 ++-- .../controller/OtaBaSjGgnrfsController.java | 5 ++-- .../controller/OtaBaSjSjfzbhController.java | 5 ++-- .../controller/OtaBaSjSjmbclController.java | 5 ++-- .../controller/OtaBaSjSjmbcxController.java | 5 ++-- .../controller/OtaBaSjSjxtbhController.java | 5 ++-- .../controller/OtaBaSjSjyxpgController.java | 5 ++-- .../impl/OtaBaSjSjmbcxServiceImpl.java | 27 +++++++++++++------ 13 files changed, 55 insertions(+), 32 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxAqcsController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxAqcsController.java index f61314193..6fc60dfed 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxAqcsController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxAqcsController.java @@ -203,16 +203,17 @@ public class OtaBaCxAqcsController extends JeroController importData(@RequestParam(value = "file", required = false) MultipartFile file, @RequestParam(value = "cut", required = false) String cut, @RequestParam(value = "otaId", required = false) String otaId) throws Exception { + StringBuilder errMsg = new StringBuilder(); try { String[] params = otaId.split("\\?"); otaId = params[0].equals("null") ? "" : params[0]; cut = params[1].replace("cut=", ""); - this.otaBaCxJsfzbacsService.importData(file, otaId, cut); + this.otaBaCxJsfzbacsService.importData(file, otaId, cut, errMsg); } catch (Exception e) { e.printStackTrace(); return Result.error(e.getMessage()); } - return Result.OK(); + return Result.error(errMsg.toString()); } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxKsjjsmccsController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxKsjjsmccsController.java index b307e438d..8e5842398 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxKsjjsmccsController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxKsjjsmccsController.java @@ -200,16 +200,17 @@ public class OtaBaCxKsjjsmccsController extends JeroController importData(@RequestParam(value = "file", required = false) MultipartFile file, @RequestParam(value = "cut", required = false) String cut, @RequestParam(value = "otaId", required = false) String otaId) throws Exception { + StringBuilder errMsg = new StringBuilder(); try { String[] params = otaId.split("\\?"); otaId = params[0].equals("null") ? "" : params[0]; cut = params[1].replace("cut=", ""); - this.otaBaCxKsjjsmccsService.importData(file, otaId, cut); + this.otaBaCxKsjjsmccsService.importData(file, otaId, cut, errMsg); } catch (Exception e) { e.printStackTrace(); return Result.error(e.getMessage()); } - return Result.OK(); + return Result.error(errMsg.toString()); } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxKsjxtmccsController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxKsjxtmccsController.java index 027109d46..1f711357d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxKsjxtmccsController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxKsjxtmccsController.java @@ -202,16 +202,17 @@ public class OtaBaCxKsjxtmccsController extends JeroController importData(@RequestParam(value = "file", required = false) MultipartFile file, @RequestParam(value = "cut", required = false) String cut, @RequestParam(value = "otaId", required = false) String otaId) throws Exception { + StringBuilder errMsg = new StringBuilder(); try { String[] params = otaId.split("\\?"); otaId = params[0].equals("null") ? "" : params[0]; cut = params[1].replace("cut=", ""); - this.otaBaCxKsjxtmccsService.importData(file, otaId, cut); + this.otaBaCxKsjxtmccsService.importData(file, otaId, cut, errMsg); } catch (Exception e) { e.printStackTrace(); return Result.error(e.getMessage()); } - return Result.OK(); + return Result.error(errMsg.toString()); } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxZxsjyqController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxZxsjyqController.java index 2c4d488ec..d43f3164e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxZxsjyqController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxZxsjyqController.java @@ -197,17 +197,18 @@ public class OtaBaCxZxsjyqController extends JeroController importData(@RequestParam(value = "file", required = false) MultipartFile file, @RequestParam(value = "cut", required = false) String cut, @RequestParam(value = "otaId", required = false) String otaId) throws Exception { + StringBuilder errMsg = new StringBuilder(); OtaBaCxZxsjyq res; try { String[] params = otaId.split("\\?"); otaId = params[0].equals("null") ? "" : params[0]; cut = params[1].replace("cut=", ""); - res = this.otaBaCxZxsjyqService.importData(file, otaId, cut); + res = this.otaBaCxZxsjyqService.importData(file, otaId, cut, errMsg); } catch (Exception e) { e.printStackTrace(); return Result.error(e.getMessage()); } - return Result.OK(res); + return Result.error(errMsg.toString()); } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjGgnrfsController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjGgnrfsController.java index bd9c51908..028a45963 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjGgnrfsController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjGgnrfsController.java @@ -202,16 +202,17 @@ public class OtaBaSjGgnrfsController extends JeroController importData(@RequestParam(value = "file", required = false) MultipartFile file, @RequestParam(value = "cut", required = false) String cut, @RequestParam(value = "otaId", required = false) String otaId) throws Exception { + StringBuilder errMsg = new StringBuilder(); try { String[] params = otaId.split("\\?"); otaId = params[0].equals("null") ? "" : params[0]; cut = params[1].replace("cut=", ""); - this.otaBaSjGgnrfsService.importData(file, otaId, cut); + this.otaBaSjGgnrfsService.importData(file, otaId, cut, errMsg); } catch (Exception e) { e.printStackTrace(); return Result.error(e.getMessage()); } - return Result.OK(); + return Result.error(errMsg.toString()); } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjfzbhController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjfzbhController.java index 092843d4f..53b0b05ee 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjfzbhController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjfzbhController.java @@ -200,16 +200,17 @@ public class OtaBaSjSjfzbhController extends JeroController importData(@RequestParam(value = "file", required = false) MultipartFile file, @RequestParam(value = "cut", required = false) String cut, @RequestParam(value = "otaId", required = false) String otaId) throws Exception { + StringBuilder errMsg = new StringBuilder(); try { String[] params = otaId.split("\\?"); otaId = params[0].equals("null") ? "" : params[0]; cut = params[1].replace("cut=", ""); - this.otaBaSjSjfzbhService.importData(file, otaId, cut); + this.otaBaSjSjfzbhService.importData(file, otaId, cut, errMsg); } catch (Exception e) { e.printStackTrace(); return Result.error(e.getMessage()); } - return Result.OK(); + return Result.error(errMsg.toString()); } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjmbclController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjmbclController.java index a0282f7b1..f72893bd1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjmbclController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjmbclController.java @@ -195,16 +195,17 @@ public class OtaBaSjSjmbclController extends JeroController importData(@RequestParam(value = "file", required = false) MultipartFile file, @RequestParam(value = "cut", required = false) String cut, @RequestParam(value = "otaId", required = false) String otaId) throws Exception { + StringBuilder errMsg = new StringBuilder(); OtaBaSjSjmbcl res; try { String[] params = otaId.split("\\?"); otaId = params[0].equals("null") ? "" : params[0]; cut = params[1].replace("cut=", ""); - res = this.otaBaSjSjmbclService.importData(file, otaId, cut); + res = this.otaBaSjSjmbclService.importData(file, otaId, cut, errMsg); } catch (Exception e) { e.printStackTrace(); return Result.error(e.getMessage()); } - return Result.OK(res); + return Result.error(errMsg.toString()); } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjmbcxController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjmbcxController.java index da1396afe..aad8350d5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjmbcxController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjmbcxController.java @@ -196,17 +196,18 @@ public class OtaBaSjSjmbcxController extends JeroController importData(@RequestParam(value = "file", required = false) MultipartFile file, @RequestParam(value = "cut", required = false) String cut, @RequestParam(value = "otaId", required = false) String otaId) throws Exception { + StringBuilder errMsg = new StringBuilder(); OtaBaSjSjmbcx res; try { String[] params = otaId.split("\\?"); otaId = params[0].equals("null") ? "" : params[0]; cut = params[1].replace("cut=", ""); - res = this.otaBaSjSjmbcxService.importData(file, otaId, cut); + res = this.otaBaSjSjmbcxService.importData(file, otaId, cut, errMsg); } catch (Exception e) { e.printStackTrace(); return Result.error(e.getMessage()); } - return Result.OK(res); + return Result.error(errMsg.toString()); } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjxtbhController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjxtbhController.java index 8aaf94b89..93a1d106a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjxtbhController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjxtbhController.java @@ -202,16 +202,17 @@ public class OtaBaSjSjxtbhController extends JeroController importData(@RequestParam(value = "file", required = false) MultipartFile file, @RequestParam(value = "cut", required = false) String cut, @RequestParam(value = "otaId", required = false) String otaId) throws Exception { + StringBuilder errMsg = new StringBuilder(); try { String[] params = otaId.split("\\?"); otaId = params[0].equals("null") ? "" : params[0]; cut = params[1].replace("cut=", ""); - this.otaBaSjSjxtbhService.importData(file, otaId, cut); + this.otaBaSjSjxtbhService.importData(file, otaId, cut, errMsg); } catch (Exception e) { e.printStackTrace(); return Result.error(e.getMessage()); } - return Result.OK(); + return Result.error(errMsg.toString()); } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjyxpgController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjyxpgController.java index 903148732..f869ab979 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjyxpgController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjyxpgController.java @@ -201,17 +201,18 @@ public class OtaBaSjSjyxpgController extends JeroController importData(@RequestParam(value = "file", required = false) MultipartFile file, @RequestParam(value = "cut", required = false) String cut, @RequestParam(value = "otaId", required = false) String otaId) throws Exception { + StringBuilder errMsg = new StringBuilder(); OtaBaSjSjyxpg res; try { String[] params = otaId.split("\\?"); otaId = params[0].equals("null") ? "" : params[0]; cut = params[1].replace("cut=", ""); - res = this.otaBaSjSjyxpgService.importData(file, params[0], cut); + res = this.otaBaSjSjyxpgService.importData(file, params[0], cut, errMsg); } catch (Exception e) { e.printStackTrace(); return Result.error(e.getMessage()); } - return Result.OK(res); + return Result.error(errMsg.toString()); } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java index e9ef5aa34..e8082eb79 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java @@ -209,7 +209,14 @@ public class OtaBaSjSjmbcxServiceImpl extends ServiceImpl 50) { + throw new JeroBootException("升级备案编号字数超过50"); + } + mbcx.setBabh(cpbh); row = s.getRow(2); cell = row.getCell(2); mbcx.setQymc(ImportFileUtil.getCellValue(cell, wb)); @@ -220,19 +227,23 @@ public class OtaBaSjSjmbcxServiceImpl extends ServiceImpl 50) { + throw new JeroBootException("车型及功能备案《公告》批次字数超过50"); + } + mbcx.setBapc(pc); //查找车型备案的同批次数据 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(OtaBaCxJbxx::getGgpc, pc); OtaBaCxJbxx jbxx = otaBaCxJbxxService.getOne(queryWrapper, false); if (ObjectUtils.isEmpty(jbxx)) { - throw new JeroBootException("车型及功能备案《公告》批次:" + jbxx + " 无法找到车型备案数据"); + errMsg.append("车型及功能备案《公告》批次:" + pc + " 无法找到车型备案数据"); + } else { + mbcx.setCpsb(jbxx.getCpsb()); + mbcx.setCpmc(jbxx.getCpmc()); + mbcx.setCpxh(jbxx.getCpxh()); + mbcx.setDllx1(jbxx.getDllx1()); + mbcx.setDllx2(jbxx.getDllx2()); } - mbcx.setBapc(pc); - mbcx.setCpsb(jbxx.getCpsb()); - mbcx.setCpmc(jbxx.getCpmc()); - mbcx.setCpxh(jbxx.getCpxh()); - mbcx.setDllx1(jbxx.getDllx1()); - mbcx.setDllx2(jbxx.getDllx2()); ComparisonUtil cu = new ComparisonUtil(); cu.checkError(mbcx, errMsg, sysDictService, cut); return mbcx; From 97882d56c7d0406837b83b7b3ead4d55a1ddda50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Fri, 31 Mar 2023 09:09:15 +0800 Subject: [PATCH 609/645] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E5=A4=87=E6=A1=88-=E6=9C=AC=E6=AC=A1=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=E7=9A=84=E9=A9=BE=E9=A9=B6=E8=BE=85=E5=8A=A9=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E4=B8=8E=E5=8F=82=E6=95=B0=E5=8F=98=E5=8C=96?= =?UTF-8?q?-=E4=B8=8A=E4=BC=A0=E9=99=84=E4=BB=B6=E6=B3=A8=E9=87=8A?= =?UTF-8?q?=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auxiliaryupgradehavechanged.vue | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue index 917b25a8e..564ee46cf 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue @@ -53,15 +53,16 @@
- - {{ (fileList === 'null' || fileList === '' || - fileList == null) ? $t('uploadattachment') : $t('viewUploadedFiles') - }} - -
-

{{$t('note')}}

-

    {{$t('format')}}

-
+ + + + + + + + + +
{{$t('preservation')}} From 9736a0dfda5b2571e49bc323c88be927f8ef9801 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Fri, 31 Mar 2023 09:15:48 +0800 Subject: [PATCH 610/645] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E6=B8=85=E5=8D=95-=E6=B7=BB=E5=8A=A0=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=AF=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../certificationList/components/addModel.vue | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue index a3013d2a5..9c55878d8 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue @@ -685,7 +685,22 @@ Action(url, query).then((res) => { if (res.success) { this.confirmLoading = false - this.$message.success(this.$t('OperationSuccessful')) + if (res.result && res.result.length > 0) { + let detailedWarningList = [] + res.result.forEach(val => { + detailedWarningList.push( + < div > { val } < /div>) + }) + this.$warning({ + content: ( + < div > + { detailedWarningList } + < /div> + ) + }) + } else { + this.$message.success(this.$t('OperationSuccessful')) + } this.visible = false this.$emit('addModelForm') } else { From fe44eb4858ccff3533907d5faf2779f65f84bcf1 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Fri, 31 Mar 2023 09:28:48 +0800 Subject: [PATCH 611/645] bug 64467 --- jero-web/src/views/projectManagement/dialog/parametercolumn.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/projectManagement/dialog/parametercolumn.vue b/jero-web/src/views/projectManagement/dialog/parametercolumn.vue index 43395bb1d..c61e3fe7e 100644 --- a/jero-web/src/views/projectManagement/dialog/parametercolumn.vue +++ b/jero-web/src/views/projectManagement/dialog/parametercolumn.vue @@ -61,7 +61,7 @@ :pagination='false' :loading='loading' :scroll='{x: 600,y:400}' - :rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}' + :rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange,columnTitle:" "}' @change='handleTableChange'> Date: Fri, 31 Mar 2023 09:31:00 +0800 Subject: [PATCH 612/645] =?UTF-8?q?=E5=9B=9E=E6=98=BE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/thetargetvehicleofthisupgrade.vue | 2 +- .../components/upgradetargetmodel.vue | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue index b08e2102d..e153908bb 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue @@ -114,7 +114,7 @@ export default { return { confirmLoading: false, disabled: false, - formInline:{}, + formInline:{zsl:""}, url: { exportData: '/ota/otaBaSjSjmbcl/exportData', importZipUrl: '/ota/otaBaSjSjmbcl/importData?otaId=' + localStorage.getItem('otaId'),//导入 diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue index e778df4c5..b152c546f 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue @@ -234,17 +234,17 @@ import ImportFile from '@/components/ImportFileData/index' } } - if(res.result.dllx1==null){ + if(res.result.dllx1==null ||res.result.dllx1==""){ this.form.dllx1=undefined } - if(res.result.dllx2==null){ + if(res.result.dllx2==null ||res.result.dllx2==""){ this.form.dllx2=undefined } - if(res.result.cxmb==null){ + if(res.result.cxmb==null||res.result.cxmb==""){ this.form.cxmb=undefined } - if(res.result.bapc==null){ + if(res.result.bapc==null||res.result.bapc==""){ this.form.bapc=undefined } this.$forceUpdate() @@ -348,8 +348,8 @@ import ImportFile from '@/components/ImportFileData/index' this.form.cpmc = item.cpmc this.form.cpxh = item.cpxh getAction('/ota/otaBaCxJbxx/queryByOtaId',{otaIdT:'',otaId:item.id}).then(res=>{ - this.form.dllx1=res.result.dllx1 == null?undefined:res.result.dllx1 - this.form.dllx2=res.result.dllx2== null?undefined:res.result.dllx2 + this.form.dllx1=res.result.dllx1 == null|| res.result.dllx1=="" ?undefined:res.result.dllx1 + this.form.dllx2=res.result.dllx2== null|| res.result.dllx2==""?undefined:res.result.dllx2 }) } }) @@ -360,7 +360,6 @@ import ImportFile from '@/components/ImportFileData/index' localStorage.removeItem('otaId') localStorage.removeItem('otaIdT') localStorage.setItem('otaIdT',val) - this.getData() }, update2(){ From 63115a38440eab402be38189bca979a6847863d2 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Fri, 31 Mar 2023 10:08:50 +0800 Subject: [PATCH 613/645] =?UTF-8?q?=E7=9F=A5=E8=AF=86=E5=88=86=E4=BA=AB?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A0=87=E5=87=86=E4=BF=A1=E6=81=AF=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../problemKnowledgeBase/components/listAddModel.vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/listAddModel.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/listAddModel.vue index 844c05870..686a16c12 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/listAddModel.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/listAddModel.vue @@ -21,7 +21,7 @@ v-model="queryParam.serial_number">
- + - - {{ !toggleSearchStatus ? $t('open') : $t('away') }} - - + + + + {{$t('reset')}} {{$t('query')}} Date: Fri, 31 Mar 2023 10:19:47 +0800 Subject: [PATCH 614/645] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E4=B8=8D=E8=83=BD=E4=B8=BA=E7=A9=BA=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/projectManagement/components/addModel.vue | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/jero-web/src/views/projectManagement/components/addModel.vue b/jero-web/src/views/projectManagement/components/addModel.vue index 0cd3de35b..d7735e43c 100644 --- a/jero-web/src/views/projectManagement/components/addModel.vue +++ b/jero-web/src/views/projectManagement/components/addModel.vue @@ -329,6 +329,13 @@ trigger: 'blur' } ], + projectVersion:[ + { + required: true, + message: this.$t('projectVersion') + this.$t('cannotEmpty'), + trigger: 'blur' + } + ], digitalPlatform: [ { max: 100, From b03fa7b5169ee417cbf7acd883d648a29a47c2fa Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Fri, 31 Mar 2023 10:21:14 +0800 Subject: [PATCH 615/645] =?UTF-8?q?=E5=AF=B9=E5=A4=96=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=95=BF=E5=BA=A6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/externalReports/index.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jero-web/src/views/externalReports/index.vue b/jero-web/src/views/externalReports/index.vue index 920677cbc..dacac5793 100644 --- a/jero-web/src/views/externalReports/index.vue +++ b/jero-web/src/views/externalReports/index.vue @@ -385,7 +385,7 @@ ellipsis: true, dataIndex: 'fileName', scopedSlots: { customRender: 'fileName' }, - width: 200 + width: 400 }, { title: this.$t('fileDeclaration'), @@ -393,7 +393,7 @@ ellipsis: true, dataIndex: 'fileDescription', scopedSlots: { customRender: 'projectName' }, - width: 300 + width: 400 }, { title: this.$t('uploadedBy'), @@ -412,14 +412,14 @@ align: 'left', ellipsis: true, dataIndex: 'createTime', - width: 250 + width: 150 }, { title: this.$t('operation'), align: 'left', fixed: 'right', ellipsis: true, - width: 250, + width: 150, scopedSlots: { customRender: 'operation' } } ], From c57c18d144b94a8919cc52bbdf0f1c18756777ff Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Fri, 31 Mar 2023 10:27:10 +0800 Subject: [PATCH 616/645] =?UTF-8?q?67326=E3=80=8167317=20=E6=B3=95?= =?UTF-8?q?=E8=A7=84=E6=B8=85=E5=8D=95=E5=AF=BC=E5=85=A5=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 --- .../system/service/ISysUserService.java | 2 + .../service/impl/SysUserServiceImpl.java | 13 ++ .../ProjectLawsInventoryEOServiceImpl.java | 165 ++++++++++++------ 3 files changed, 130 insertions(+), 50 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java index fb1881817..6d88c32c4 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java @@ -319,4 +319,6 @@ public interface ISysUserService extends IService { * @return */ String getUsernameByUserId(List sysUserList, String userId); + + List querySysUserByUserNameList(List userNameList); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java index 4f8cc64cb..5a145e722 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java @@ -797,4 +797,17 @@ public class SysUserServiceImpl extends ServiceImpl impl } return result; } + + @Override + public List querySysUserByUserNameList(List userNameList) { + List result = new ArrayList<>(); + if(CollectionUtils.isNotEmpty(userNameList)){ + userNameList = userNameList.stream().distinct().collect(Collectors.toList()); + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().in(SysUser::getUsername,userNameList); + result = this.list(queryWrapper); + } + return result; + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 01db4e5b0..e3a7242c3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -6790,6 +6790,13 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl userNameList = new ArrayList<>(); + String designDutyIds = dataList.stream().map(ProjectLawsInventoryEO::getDesignDutyId).collect(Collectors.joining(",")); + String verifyDutyIds = dataList.stream().map(ProjectLawsInventoryEO::getVerifyDutyId).collect(Collectors.joining(",")); + userNameList.addAll(Arrays.asList(designDutyIds.split(","))); + userNameList.addAll(Arrays.asList(verifyDutyIds.split(","))); + List sysUserList = this.sysUserService.querySysUserByUserNameList(userNameList); + //编号验证 verifySerialNumber(dataList,projectLawsInventoryEOTemp,dataSource); for (ProjectLawsInventoryEO projectLawsInventoryEO : dataList) { @@ -6917,52 +6924,54 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl objectMap = iProjectRelatedPersonnelService.queryPersonByProjectId(projectLawsInventoryEOTemp.getProjectLibraryId(), value); + + //法规工程师 + List> mapLawList = (List>) objectMap.get("lawEngineerList"); + //认证工程师 + List> mapCertificationList = (List>) objectMap.get("certificationEngineerList"); + //工程接口人 + List> mapPersonList = (List>) objectMap.get("engineeringInterfacePersonList"); + //所有人 + List> allPersonList = (List>) objectMap.get("allPersonList"); + projectLawsInventoryEO.setDutyTerritory(value); + + // 如果责任领域存在，再匹配这些人员 + //法规工程师 + if(StringUtils.isNotBlank(regulationOwnerId)){ + nameCn = "法规工程师"; + nameEn = "regulatory engineer"; + //验证人员是否存在 + personnelVerify(projectLawsInventoryEO, errorMsg, msgList, regulationOwnerId, mapLawList,nameCn,nameEn, ProjectRoleEnum.REGULATI_ENGINEER.getValue()); + } + + //认证工程师 + if(StringUtils.isNotBlank(homologationEngineerId)){ + nameCn = "认证工程师"; + nameEn = "certification engineer "; + //验证人员是否存在 + personnelVerify(projectLawsInventoryEO, errorMsg, msgList, homologationEngineerId, mapCertificationList,nameCn,nameEn,ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue()); + } + + //工程接口人 + if(StringUtils.isNotBlank(engineeringInterfacePerson)){ + nameCn = "工程接口人"; + nameEn = "Engineering Interface "; + //验证人员是否存在 + personnelVerify(projectLawsInventoryEO, errorMsg, msgList, engineeringInterfacePerson, mapPersonList,nameCn,nameEn,ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue()); + } } } - //工程接口人(责任领域下的工程接口人) - Map objectMap = iProjectRelatedPersonnelService.queryPersonByProjectId(projectLawsInventoryEOTemp.getProjectLibraryId(), value); - - //法规工程师 - List> mapLawList = (List>) objectMap.get("lawEngineerList"); - //认证工程师 - List> mapCertificationList = (List>) objectMap.get("certificationEngineerList"); - //工程接口人 - List> mapPersonList = (List>) objectMap.get("engineeringInterfacePersonList"); - //所有人 - List> allPersonList = (List>) objectMap.get("allPersonList"); - - String nameCn = ""; - String nameEn = ""; - //法规工程师 - if(StringUtils.isNotBlank(regulationOwnerId)){ - nameCn = "法规工程师"; - nameEn = "regulatory engineer"; - //验证人员是否存在 - personnelVerify(projectLawsInventoryEO, errorMsg, msgList, regulationOwnerId, mapLawList,nameCn,nameEn, ProjectRoleEnum.REGULATI_ENGINEER.getValue()); - } - - //认证工程师 - if(StringUtils.isNotBlank(homologationEngineerId)){ - nameCn = "认证工程师"; - nameEn = "certification engineer "; - //验证人员是否存在 - personnelVerify(projectLawsInventoryEO, errorMsg, msgList, homologationEngineerId, mapCertificationList,nameCn,nameEn,ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue()); - } - - //工程接口人 - if(StringUtils.isNotBlank(engineeringInterfacePerson)){ - nameCn = "工程接口人"; - nameEn = "Engineering Interface "; - //验证人员是否存在 - personnelVerify(projectLawsInventoryEO, errorMsg, msgList, engineeringInterfacePerson, mapPersonList,nameCn,nameEn,ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue()); - } - //设计 //交付物类型 @@ -6979,19 +6988,19 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl msgList, + String userName, + List sysUserList, + String nameCn,String nameEn, + String fieldNumber) { + //单选 + if(userName.contains(",")){ + if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){ + errorMsg += nameCn + "导入只能填写一个用户名, "; + }else{ + errorMsg += "Only one user name can be entered for"+ nameEn +"import, "; + } + msgList.add(errorMsg); + } + if(sysUserList.size() != 0){ + int count = 0; + for (SysUser sysUser : sysUserList) { + if(StringUtils.equals(userName,sysUser.getUsername())){ + count ++; + if(ProjectRoleEnum.DESIGNDUTY.getValue().equals(fieldNumber)) { + projectLawsInventoryEO.setDesignDutyId(sysUser.getId()); + }else if(ProjectRoleEnum.VERIFYDUTY.getValue().equals(fieldNumber)){ + projectLawsInventoryEO.setVerifyDutyId(sysUser.getId()); + } + break; + } + } + if(count == 0){ + if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){ + errorMsg += nameCn+userName+"在系统中不存在， "; + }else{ + errorMsg += nameEn+userName+"Does not exist in the system, "; + } + msgList.add(errorMsg); + } + }else{ + if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){ + errorMsg += nameCn+userName+"在系统中不存在， "; + }else{ + errorMsg += nameEn+userName+"Does not exist in the system, "; + } + msgList.add(errorMsg); + } + } } From f847b60dd556aa3211f3104ed3a65cd89415a6b7 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Fri, 31 Mar 2023 10:38:43 +0800 Subject: [PATCH 617/645] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/projectManagement/projectStatusBoard/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/jero-web/src/views/projectManagement/projectStatusBoard/index.vue b/jero-web/src/views/projectManagement/projectStatusBoard/index.vue index 57c25a03a..735cfdab6 100644 --- a/jero-web/src/views/projectManagement/projectStatusBoard/index.vue +++ b/jero-web/src/views/projectManagement/projectStatusBoard/index.vue @@ -513,6 +513,7 @@ export default { window.open(newUrl.href, '_blank') }, projectInfoClick(item){ + item.projectName = item.showName let newUrl = this.$router.resolve({ path: '/ProjectDetails', query: item From 5d3f8c67fef1c28d33e112bd195176e373bd8053 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Fri, 31 Mar 2023 10:47:10 +0800 Subject: [PATCH 618/645] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E6=B8=85=E5=8D=95-=E6=B7=BB=E5=8A=A0=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=AF=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/certificationList/components/addModel.vue | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue index 9c55878d8..ae8c48599 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue @@ -21,6 +21,7 @@ +
From 2db6f031fc292970f22c2f090ba83dd503e124fe Mon Sep 17 00:00:00 2001 From: yuekuo Date: Fri, 31 Mar 2023 10:48:02 +0800 Subject: [PATCH 619/645] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/zh-cn.js | 5 +- .../components/upgradetargetmodel.vue | 606 +++++++++--------- .../components/beupgradedonline.vue | 8 +- .../components/recordparameters.vue | 176 ++--- 4 files changed, 404 insertions(+), 391 deletions(-) diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 90e3f0ee0..bdf7b4c0f 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1602,7 +1602,7 @@ module.exports = { environmentalprotection:'升级是否影响整车安全、节能、环保、防盗等性能', operatingsystemtype:'操作系统类型', operatingsystemmanufacturer:'操作系统生产企业', - operatingsystemversion:'软件版本号', + operatingsystemversion:'操作系统版本号', addcontroller:'添加控制器', addsystem:'添加系统', functionname:'功能名称', @@ -1792,7 +1792,8 @@ module.exports = { designComplianceReviewAdmin:'设计符合性审查', missionAccomplished:'任务完成', yesisselected:'如选择“有”，请输入', - forwardXquantity:'如前向X数量，后向X数量，右向X数量等', + haveisselected:'如选择“是”，请输入', + forwardXquantity:'如前向x数量、后向x数量、后左x数量、后右x数量等', upgraderecordnumber:'升级备案编号', Modelandfunctionrecord:'车型及功能备案《公告》批次', taskTypeMismatch:'任务类型不匹配', diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue index b152c546f..34055d829 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue @@ -3,11 +3,12 @@
- +
- - {{$t('templateDownload')}} + + {{ $t('templateDownload') }}
@@ -17,11 +18,13 @@
- {{$t('selectTheVehicleTemplate')}} + {{ $t('selectTheVehicleTemplate') }}
- - + + {{ item.cpdjbh }} @@ -37,13 +40,14 @@
- * - {{$t('upgraderecordnumber')}} + * + {{ $t('upgraderecordnumber') }}
- - + +
@@ -51,11 +55,12 @@
- {{$t('theNameOfFirm')}} + {{ $t('theNameOfFirm') }}
- +
@@ -64,11 +69,13 @@
* - {{$t('Modelandfunctionrecord')}} + {{ $t('Modelandfunctionrecord') }}
- - + + {{ item.ggpc }} @@ -78,10 +85,11 @@
- {{$t('producttrademark')}} + {{ $t('producttrademark') }}
- +
@@ -89,10 +97,11 @@
- {{$t('productname')}} + {{ $t('productname') }}
- +
@@ -100,10 +109,11 @@
- {{$t('productModel')}} + {{ $t('productModel') }}
- +
@@ -111,9 +121,9 @@
- {{$t('Vehicledynamictype')}} + {{ $t('Vehicledynamictype') }}
- + - - - {{ item }} - - + + + {{ item }} + + - - - - {{ item }} - @@ -148,305 +156,309 @@
- {{$t('preservation')}} - {{$t('next')}} + {{ $t('preservation') }} + {{ $t('next') }}
\ No newline at end of file +} \ No newline at end of file diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue index 57d84655e..ad8a466a4 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue @@ -74,7 +74,7 @@ - + @@ -263,12 +263,12 @@ import ImportFile from '@/components/ImportFileData/index' scopedSlots: { customRender: 'softwaredevelopmententerprise' }, }, { - title: this.$t('operatingsystemversion'), + title: this.$t('softwareversionnumber'), align: 'left', - dataIndex: 'operatingsystemversion', + dataIndex: 'softwareversionnumber', ellipsis: true, width: 170, - scopedSlots: { customRender: 'operatingsystemversion' }, + scopedSlots: { customRender: 'softwareversionnumber' }, }, { title: this.$t('inflammatorydata'), diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue index 7022f50c4..7de401508 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue @@ -96,116 +96,116 @@ {{$t('configuration')}} - {{ $t('yes') }} - {{ $t('not') }} + {{ $t('have') }} + {{ $t('nothing') }} - {{ $t('yes') }} - {{ $t('not') }} + {{ $t('have') }} + {{ $t('nothing') }} - {{ $t('yes') }} - {{ $t('not') }} + {{ $t('have') }} + {{ $t('nothing') }} - {{ $t('yes') }} - {{ $t('not') }} + {{ $t('have') }} + {{ $t('nothing') }} - {{ $t('yes') }} - {{ $t('not') }} + {{ $t('have') }} + {{ $t('nothing') }} - {{ $t('yes') }} - {{ $t('not') }} + {{ $t('have') }} + {{ $t('nothing') }} - {{ $t('yes') }} - {{ $t('not') }} + {{ $t('have') }} + {{ $t('nothing') }} - {{ $t('yes') }} - {{ $t('not') }} + {{ $t('have') }} + {{ $t('nothing') }} - {{ $t('yes') }} - {{ $t('not') }} + {{ $t('have') }} + {{ $t('nothing') }} - {{ $t('yes') }} - {{ $t('not') }} + {{ $t('have') }} + {{ $t('nothing') }} - {{ $t('yes') }} - {{ $t('not') }} + {{ $t('have') }} + {{ $t('nothing') }} - {{ $t('yes') }} - {{ $t('not') }} + {{ $t('have') }} + {{ $t('nothing') }} - {{ $t('yes') }} - {{ $t('not') }} + {{ $t('have') }} + {{ $t('nothing') }} - {{ $t('yes') }} - {{ $t('not') }} + {{ $t('have') }} + {{ $t('nothing') }} - {{ $t('yes') }} - {{ $t('not') }} + {{ $t('have') }} + {{ $t('nothing') }} - {{ $t('yes') }} - {{ $t('not') }} + {{ $t('have') }} + {{ $t('nothing') }} - {{ $t('yes') }} - {{ $t('not') }} + {{ $t('have') }} + {{ $t('nothing') }} - {{ $t('yes') }} - {{ $t('not') }} + {{ $t('have') }} + {{ $t('nothing') }} - {{ $t('yes') }} - {{ $t('not') }} + {{ $t('have') }} + {{ $t('nothing') }}
@@ -304,7 +304,7 @@ export default { componentname: this.$t('networksecurityrequirements'), configuration: this.$t('ineffectiveupgrades'), ParameterName: this.$t('Quantity'), - fillincontent:this.$t('yesisselected'), + fillincontent:this.$t('haveisselected'), }, { key: 'jgldBzwz', @@ -320,7 +320,7 @@ export default { componentname: this.$t('networksecurityrequirements'), configuration: this.$t('ineffectiveupgrades'), ParameterName: this.$t('specificationmodel'), - fillincontent:this.$t('yesisselected'), + fillincontent:this.$t('haveisselected'), }, { key: 'jgldScqy', @@ -328,7 +328,7 @@ export default { componentname: this.$t('networksecurityrequirements'), configuration: this.$t('productionenterprise'), ParameterName: this.$t('productionenterprise'), - fillincontent:this.$t('yesisselected'), + fillincontent:this.$t('haveisselected'), }, { key: 'hmbldSl', @@ -336,7 +336,7 @@ export default { componentname: this.$t('networksecurityrequirements'), configuration: this.$t('ineffectiveupgrades'), ParameterName: this.$t('Quantity'), - fillincontent:this.$t('yesisselected'), + fillincontent:this.$t('haveisselected'), }, { key: 'hmbldBzwz', @@ -352,7 +352,7 @@ export default { componentname: this.$t('networksecurityrequirements'), configuration: this.$t('ineffectiveupgrades'), ParameterName: this.$t('specificationmodel'), - fillincontent:this.$t('yesisselected'), + fillincontent:this.$t('haveisselected'), }, { key: 'hmbldScqy', @@ -360,7 +360,7 @@ export default { componentname: this.$t('networksecurityrequirements'), configuration: this.$t('productionenterprise'), ParameterName: this.$t('productionenterprise'), - fillincontent:this.$t('yesisselected'), + fillincontent:this.$t('haveisselected'), }, { key: 'csbldSl', @@ -368,7 +368,7 @@ export default { componentname: this.$t('networksecurityrequirements'), configuration: this.$t('ineffectiveupgrades'), ParameterName: this.$t('Quantity'), - fillincontent:this.$t('yesisselected'), + fillincontent:this.$t('haveisselected'), }, { key: 'csbldBzwz', @@ -384,7 +384,7 @@ export default { componentname: this.$t('networksecurityrequirements'), configuration: this.$t('ineffectiveupgrades'), ParameterName: this.$t('specificationmodel'), - fillincontent:this.$t('yesisselected'), + fillincontent:this.$t('haveisselected'), }, { key: 'csbldScqy', @@ -392,7 +392,7 @@ export default { componentname: this.$t('networksecurityrequirements'), configuration: this.$t('productionenterprise'), ParameterName: this.$t('productionenterprise'), - fillincontent:this.$t('yesisselected'), + fillincontent:this.$t('haveisselected'), }, { key: 'sxthsSl', @@ -400,7 +400,7 @@ export default { componentname: this.$t('networksecurityrequirements'), configuration: this.$t('ineffectiveupgrades'), ParameterName: this.$t('Quantity'), - fillincontent:this.$t('yesisselected'), + fillincontent:this.$t('haveisselected'), }, { key: 'sxthsBzwz', @@ -416,7 +416,7 @@ export default { componentname: this.$t('networksecurityrequirements'), configuration: this.$t('ineffectiveupgrades'), ParameterName: this.$t('specificationmodel'), - fillincontent:this.$t('yesisselected'), + fillincontent:this.$t('haveisselected'), }, { key: 'sxthsScqy', @@ -424,7 +424,7 @@ export default { componentname: this.$t('networksecurityrequirements'), configuration: this.$t('productionenterprise'), ParameterName: this.$t('productionenterprise'), - fillincontent:this.$t('yesisselected'), + fillincontent:this.$t('haveisselected'), }, { key: 'sxtdsdSl', @@ -432,7 +432,7 @@ export default { componentname: this.$t('networksecurityrequirements'), configuration: this.$t('ineffectiveupgrades'), ParameterName: this.$t('Quantity'), - fillincontent:this.$t('yesisselected'), + fillincontent:this.$t('haveisselected'), }, { key: 'sxtdsdBzwz', @@ -448,7 +448,7 @@ export default { componentname: this.$t('networksecurityrequirements'), configuration: this.$t('ineffectiveupgrades'), ParameterName: this.$t('specificationmodel'), - fillincontent:this.$t('yesisselected'), + fillincontent:this.$t('haveisselected'), }, { key: 'sxtdsdScqy', @@ -456,7 +456,7 @@ export default { componentname: this.$t('networksecurityrequirements'), configuration: this.$t('productionenterprise'), ParameterName: this.$t('productionenterprise'), - fillincontent:this.$t('yesisselected'), + fillincontent:this.$t('haveisselected'), }, { key: 'jsyjkSl', @@ -464,7 +464,7 @@ export default { componentname: this.$t('networksecurityrequirements'), configuration: this.$t('ineffectiveupgrades'), ParameterName: this.$t('Quantity'), - fillincontent:this.$t('yesisselected'), + fillincontent:this.$t('haveisselected'), }, { key: 'jsyjkBzwz', @@ -480,7 +480,7 @@ export default { componentname: this.$t('networksecurityrequirements'), configuration: this.$t('ineffectiveupgrades'), ParameterName: this.$t('specificationmodel'), - fillincontent:this.$t('yesisselected'), + fillincontent:this.$t('haveisselected'), }, { key: 'jsyjkScqy', @@ -488,7 +488,7 @@ export default { componentname: this.$t('networksecurityrequirements'), configuration: this.$t('productionenterprise'), ParameterName: this.$t('productionenterprise'), - fillincontent:this.$t('yesisselected'), + fillincontent:this.$t('haveisselected'), }, { key: 'jsyhwSl', @@ -496,7 +496,7 @@ export default { componentname: this.$t('networksecurityrequirements'), configuration: this.$t('ineffectiveupgrades'), ParameterName: this.$t('Quantity'), - fillincontent:this.$t('yesisselected'), + fillincontent:this.$t('haveisselected'), }, { key: 'jsyhwBzwz', @@ -512,7 +512,7 @@ export default { componentname: this.$t('networksecurityrequirements'), configuration: this.$t('ineffectiveupgrades'), ParameterName: this.$t('specificationmodel'), - fillincontent:this.$t('yesisselected'), + fillincontent:this.$t('haveisselected'), }, { key: 'jsyhwScqy', @@ -520,7 +520,7 @@ export default { componentname: this.$t('networksecurityrequirements'), configuration: this.$t('productionenterprise'), ParameterName: this.$t('productionenterprise'), - fillincontent:this.$t('yesisselected'), + fillincontent:this.$t('haveisselected'), }, { key: 'czwxdwGgxh', @@ -528,7 +528,7 @@ export default { componentname: this.$t('networksecurityrequirements'), configuration: this.$t('ineffectiveupgrades'), ParameterName: this.$t('specificationmodel'), - fillincontent:this.$t('yesisselected'), + fillincontent:this.$t('haveisselected'), }, { key: 'czwxdwScqy', @@ -536,7 +536,7 @@ export default { componentname: this.$t('networksecurityrequirements'), configuration: this.$t('ineffectiveupgrades'), ParameterName: this.$t('productionenterprise'), - fillincontent:this.$t('yesisselected'), + fillincontent:this.$t('haveisselected'), }, { key: 'gxdhGgxh', @@ -544,7 +544,7 @@ export default { componentname: this.$t('networksecurityrequirements'), configuration: this.$t('ineffectiveupgrades'), ParameterName: this.$t('specificationmodel'), - fillincontent:this.$t('yesisselected'), + fillincontent:this.$t('haveisselected'), }, { key: 'gxdhScqy', @@ -552,7 +552,7 @@ export default { componentname: this.$t('networksecurityrequirements'), configuration: this.$t('ineffectiveupgrades'), ParameterName: this.$t('productionenterprise'), - fillincontent:this.$t('yesisselected'), + fillincontent:this.$t('haveisselected'), }, { key: 'lsjGgxh', @@ -560,7 +560,7 @@ export default { componentname: this.$t('networksecurityrequirements'), configuration: this.$t('ineffectiveupgrades'), ParameterName: this.$t('specificationmodel'), - fillincontent:this.$t('yesisselected'), + fillincontent:this.$t('haveisselected'), }, { key: 'lsjScqy', @@ -568,7 +568,7 @@ export default { componentname: this.$t('networksecurityrequirements'), configuration: this.$t('ineffectiveupgrades'), ParameterName: this.$t('productionenterprise'), - fillincontent:this.$t('yesisselected'), + fillincontent:this.$t('haveisselected'), }, { key: 'gjddtGgxh', @@ -576,7 +576,7 @@ export default { componentname: this.$t('networksecurityrequirements'), configuration: this.$t('ineffectiveupgrades'), ParameterName: this.$t('VersionNumber'), - fillincontent:this.$t('yesisselected'), + fillincontent:this.$t('haveisselected'), }, { key: 'gjddtScqy', @@ -584,7 +584,7 @@ export default { componentname: this.$t('networksecurityrequirements'), configuration: this.$t('ineffectiveupgrades'), ParameterName: this.$t('productionenterprise'), - fillincontent:this.$t('yesisselected'), + fillincontent:this.$t('haveisselected'), }, { key: 'dzwlDxxgcs', @@ -592,7 +592,7 @@ export default { componentname: this.$t('networksecurityrequirements'), configuration: this.$t('ineffectiveupgrades'), ParameterName: this.$t('qualitativelydescriberelevantplaces'), - fillincontent:this.$t('yesisselected'), + fillincontent:this.$t('haveisselected'), }, { key: 'cztxXtmc', @@ -600,7 +600,7 @@ export default { componentname: this.$t('networksecurityrequirements'), configuration: this.$t('ineffectiveupgrades'), ParameterName: this.$t('systemname'), - fillincontent:this.$t('yesisselected'), + fillincontent:this.$t('haveisselected'), }, { key: 'cztxGgxh', @@ -616,7 +616,7 @@ export default { componentname: this.$t('networksecurityrequirements'), configuration: this.$t('ineffectiveupgrades'), ParameterName: this.$t('systemproductionenterprise'), - fillincontent:this.$t('yesisselected'), + fillincontent:this.$t('haveisselected'), }, { key: 'cztxBbh', @@ -624,7 +624,7 @@ export default { componentname: this.$t('networksecurityrequirements'), configuration: this.$t('ineffectiveupgrades'), ParameterName: this.$t('softwareversionnumber'), - fillincontent:this.$t('yesisselected'), + fillincontent:this.$t('haveisselected'), }, { key: 'cztxKfqy', @@ -632,7 +632,7 @@ export default { componentname: this.$t('networksecurityrequirements'), configuration: this.$t('ineffectiveupgrades'), ParameterName: this.$t('softwaredevelopmententerprise'), - fillincontent:this.$t('yesisselected'), + fillincontent:this.$t('haveisselected'), }, { key: 'jsfzczjMc', @@ -640,7 +640,7 @@ export default { componentname: this.$t('networksecurityrequirements'), configuration: this.$t('ineffectiveupgrades'), ParameterName: this.$t('controlname'), - fillincontent:this.$t('yesisselected'), + fillincontent:this.$t('haveisselected'), }, { key: 'jsfzczjYjxh', @@ -648,7 +648,7 @@ export default { componentname: this.$t('networksecurityrequirements'), configuration: this.$t('ineffectiveupgrades'), ParameterName: this.$t('hardwarespecificationmodel'), - fillincontent:this.$t('yesisselected'), + fillincontent:this.$t('haveisselected'), }, { key: 'jsfzczjScqy', @@ -656,7 +656,7 @@ export default { componentname: this.$t('networksecurityrequirements'), configuration: this.$t('ineffectiveupgrades'), ParameterName: this.$t('productionenterprise'), - fillincontent:this.$t('yesisselected'), + fillincontent:this.$t('haveisselected'), }, { key: 'jsfzzsqMc', @@ -664,7 +664,7 @@ export default { componentname: this.$t('networksecurityrequirements'), configuration: this.$t('ineffectiveupgrades'), ParameterName: this.$t('nameofindicatorsignaldevice'), - fillincontent:this.$t('yesisselected'), + fillincontent:this.$t('haveisselected'), }, { key: 'jsfzzsqYjxh', @@ -672,7 +672,7 @@ export default { componentname: this.$t('networksecurityrequirements'), configuration: this.$t('ineffectiveupgrades'), ParameterName: this.$t('hardwarespecificationmodel'), - fillincontent:this.$t('yesisselected'), + fillincontent:this.$t('haveisselected'), }, { key: 'jsfzzsqScqy', @@ -680,7 +680,7 @@ export default { componentname: this.$t('networksecurityrequirements'), configuration: this.$t('ineffectiveupgrades'), ParameterName: this.$t('productionenterprise'), - fillincontent:this.$t('yesisselected'), + fillincontent:this.$t('haveisselected'), }, { key: 'fxptstsMc', @@ -688,7 +688,7 @@ export default { componentname: this.$t('networksecurityrequirements'), configuration: this.$t('ineffectiveupgrades'), ParameterName: this.$t('nameofindicatorsignaldevice'), - fillincontent:this.$t('yesisselected'), + fillincontent:this.$t('haveisselected'), }, { key: 'fxptstsYjxh', @@ -696,7 +696,7 @@ export default { componentname: this.$t('networksecurityrequirements'), configuration: this.$t('ineffectiveupgrades'), ParameterName: this.$t('hardwarespecificationmodel'), - fillincontent:this.$t('yesisselected'), + fillincontent:this.$t('haveisselected'), }, { key: 'fxptstsScqy', @@ -704,7 +704,7 @@ export default { componentname: this.$t('networksecurityrequirements'), configuration: this.$t('ineffectiveupgrades'), ParameterName: this.$t('productionenterprise'), - fillincontent:this.$t('yesisselected'), + fillincontent:this.$t('haveisselected'), }, { key: 'jsyzyltsMc', @@ -712,7 +712,7 @@ export default { componentname: this.$t('networksecurityrequirements'), configuration: this.$t('ineffectiveupgrades'), ParameterName: this.$t('nameofindicatorsignaldevice'), - fillincontent:this.$t('yesisselected'), + fillincontent:this.$t('haveisselected'), }, { key: 'jsyzyltsYjxh', @@ -720,7 +720,7 @@ export default { componentname: this.$t('networksecurityrequirements'), configuration: this.$t('ineffectiveupgrades'), ParameterName: this.$t('hardwarespecificationmodel'), - fillincontent:this.$t('yesisselected'), + fillincontent:this.$t('haveisselected'), }, { key: 'jsyzyltsScqy', @@ -728,7 +728,7 @@ export default { componentname: this.$t('networksecurityrequirements'), configuration: this.$t('ineffectiveupgrades'), ParameterName: this.$t('productionenterprise'), - fillincontent:this.$t('yesisselected'), + fillincontent:this.$t('haveisselected'), }, { key: 'dssadGgxh', @@ -736,7 +736,7 @@ export default { componentname: this.$t('networksecurityrequirements'), configuration: this.$t('ineffectiveupgrades'), ParameterName: this.$t('specificationmodel'), - fillincontent:this.$t('yesisselected'), + fillincontent:this.$t('haveisselected'), }, { key: 'dssadScqy', @@ -744,7 +744,7 @@ export default { componentname: this.$t('networksecurityrequirements'), configuration: this.$t('ineffectiveupgrades'), ParameterName: this.$t('productionenterprise'), - fillincontent:this.$t('yesisselected'), + fillincontent:this.$t('haveisselected'), }, { key: 'edrGgxh', @@ -752,7 +752,7 @@ export default { componentname: this.$t('networksecurityrequirements'), configuration: this.$t('ineffectiveupgrades'), ParameterName: this.$t('specificationmodel'), - fillincontent:this.$t('yesisselected'), + fillincontent:this.$t('haveisselected'), }, { key: 'edrScqy', @@ -760,7 +760,7 @@ export default { componentname: this.$t('networksecurityrequirements'), configuration: this.$t('ineffectiveupgrades'), ParameterName: this.$t('productionenterprise'), - fillincontent:this.$t('yesisselected'), + fillincontent:this.$t('haveisselected'), }, ], queryParam: {}, From 2cb9e0c9e67aac6b370ba697c7f44b41888c936e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Fri, 31 Mar 2023 10:49:01 +0800 Subject: [PATCH 620/645] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=88=97=E5=AE=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/OcrTable/index.vue | 2 +- .../src/components/SplitDetailTable/index.vue | 4 +++- jero-web/src/components/SplitTable/index.vue | 2 +- jero-web/src/components/tableDate/index.vue | 2 +- .../collectionOfRegulatoryOpinions/index.vue | 8 ++++---- .../classificationMaintenanceModel.vue | 4 ++-- .../components/countryCardRelease.vue | 4 ++-- .../components/problemKnowledgeBaseRelease.vue | 4 ++-- .../components/RegulationMonthlyFill.vue | 10 +++++----- .../components/RegulationMonthlyManagement.vue | 12 ++++++------ .../components/modules/fillTable.vue | 4 ++-- .../technologyAssessment/index.vue | 8 ++++---- .../views/documentManage/collection/index.vue | 8 ++++---- .../views/documentManage/subscribtion/index.vue | 8 ++++---- .../views/documentTools/virtualList/index.vue | 6 +++--- jero-web/src/views/externalReports/index.vue | 16 ++++++++-------- .../views/parameter/ParameterTemplate/index.vue | 12 ++++++------ .../views/parameter/escalationlibrary/index.vue | 8 ++++---- .../views/parameter/parameterexport/index.vue | 6 +++--- .../src/views/parameter/parameterlist/index.vue | 12 ++++++------ .../src/views/processCenter/procedure/index.vue | 6 +++--- .../components/TaskParameterCollection.vue | 14 +++++++------- .../components/listOfRelevantPersonnel.vue | 2 +- .../projectManagement/projectLibrary/index.vue | 6 +++--- jero-web/src/views/regulationsKanban/index.vue | 4 ++-- jero-web/src/views/system/DictList.vue | 6 +++--- jero-web/src/views/system/PermissionList.vue | 10 +++++----- .../components/SentList.vue | 12 ++++++------ .../components/dealtWith.vue | 14 +++++++------- .../components/doneList.vue | 12 ++++++------ .../components/SentList.vue | 12 ++++++------ .../components/dealtWith.vue | 10 +++++----- .../components/doneList.vue | 12 ++++++------ .../views/virtualAuthenticationList/index.vue | 6 +++--- .../certificationListMaintenance.vue | 4 ++-- 35 files changed, 136 insertions(+), 134 deletions(-) diff --git a/jero-web/src/components/OcrTable/index.vue b/jero-web/src/components/OcrTable/index.vue index c8c247f7e..099fe7199 100644 --- a/jero-web/src/components/OcrTable/index.vue +++ b/jero-web/src/components/OcrTable/index.vue @@ -172,7 +172,7 @@ dataIndex: res.db_field_name, align: 'left', ellipsis: true, - width: 170, + width: 192, sorter: res.sort }) if (res.click) { diff --git a/jero-web/src/components/SplitDetailTable/index.vue b/jero-web/src/components/SplitDetailTable/index.vue index 12e043bf7..c1771e9f3 100644 --- a/jero-web/src/components/SplitDetailTable/index.vue +++ b/jero-web/src/components/SplitDetailTable/index.vue @@ -182,7 +182,9 @@ sorter: res.sort, width: 100 }) - + if (res.db_field_name=='technology_territory'){ + this.columns[index].width= 293 + } if (res.urlClick) { this.columns[index].scopedSlots = { customRender: 'urlClick' diff --git a/jero-web/src/components/SplitTable/index.vue b/jero-web/src/components/SplitTable/index.vue index aa1286217..069c7cb3b 100644 --- a/jero-web/src/components/SplitTable/index.vue +++ b/jero-web/src/components/SplitTable/index.vue @@ -196,7 +196,7 @@ align: 'left', ellipsis: true, sorter: res.sort, - width: 170 + width: 224, }) if (res.db_field_name == '') { // scope.row.itermsConditions ? scope.row.itermsConditions.replace(/<.*?>/ig, ' ') : '' diff --git a/jero-web/src/components/tableDate/index.vue b/jero-web/src/components/tableDate/index.vue index 834810282..5e371f49d 100644 --- a/jero-web/src/components/tableDate/index.vue +++ b/jero-web/src/components/tableDate/index.vue @@ -165,7 +165,7 @@ align: 'left', ellipsis: true, sorter: res.sort, - width: 170 + width: 215, }) if (res.click) { this.columns[index].scopedSlots = { diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue index d723a70cc..31cca5e65 100644 --- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue @@ -73,12 +73,12 @@ - {{$t('query')}} - {{$t('reset')}} - + {{ !toggleSearchStatus ? $t('open') : $t('away') }} - + + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceModel.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceModel.vue index d158b727b..974b4ba89 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceModel.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceModel.vue @@ -89,14 +89,14 @@ title: this.$t('problemLabel'), dataIndex: 'problemLabel', align: 'left', - width: 240, + width: 370, ellipsis: true }, { title: this.$t('personCharge'), dataIndex: 'chargePersonIdName', align: 'left', - width: 240, + width: 323, ellipsis: true }, { diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue index ce8c36aa8..4cee2e809 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue @@ -59,8 +59,8 @@ - {{$t('query')}} - {{$t('reset')}} + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue index ad1d489e9..113b01301 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue @@ -41,9 +41,9 @@
- {{$t('query')}} - {{$t('reset')}} + {{$t('reset')}} + {{$t('query')}}
diff --git a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue index b6bb2768d..d52d5dfa0 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue @@ -36,8 +36,8 @@ - {{$t('query')}} - {{$t('reset')}} + {{$t('reset')}} + {{$t('query')}} @@ -185,12 +185,12 @@ align: 'left', dataIndex: 'titleCn', ellipsis: true, - width: 170 + width: 200 }, { title: this.$t('englishTitle'), align: 'left', - width: 170, + width: 205, ellipsis: true, dataIndex: 'titleEn' }, @@ -212,7 +212,7 @@ title: this.$t('exportStatus'), align: 'left', ellipsis: true, - width: 170, + width: 250, dataIndex: 'exportStateName' }, { diff --git a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue index 2f78012f6..4c6b0b78c 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue @@ -14,8 +14,8 @@ - {{$t('query')}} - {{$t('reset')}} + {{$t('reset')}} + {{$t('query')}} @@ -121,7 +121,7 @@ title: this.$t('RegulationMonthlyName'), align: 'left', dataIndex: 'name', - width: 190, + width: 485, ellipsis: true, scopedSlots: { customRender: 'RegulationMonthlyName' } }, @@ -129,21 +129,21 @@ title: this.$t('monthlyLanguage'), align: 'left', dataIndex: 'language', - width: 170, + width: 195, ellipsis: true, scopedSlots: { customRender: 'language' } }, { title: this.$t('releaseStatus'), align: 'left', - width: 140, + width: 175, ellipsis: true, dataIndex: 'issueStatus_dictText' }, { title: this.$t('uploadTime'), align: 'left', - width: 170, + width: 305, ellipsis: true, dataIndex: 'createTime' }, diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue index 7ff7da9b1..d7d00a710 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue @@ -88,12 +88,12 @@ align: 'left', dataIndex: 'titleCn', ellipsis: true, - width: 320 + width: 330 }, { title: this.$t('englishTitle'), align: 'left', - width: 320, + width: 460, ellipsis: true, dataIndex: 'titleEn' }, diff --git a/jero-web/src/views/businessSupport/technologyAssessment/index.vue b/jero-web/src/views/businessSupport/technologyAssessment/index.vue index e901f3f0a..bf305061e 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/index.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/index.vue @@ -74,12 +74,12 @@ - {{$t('query')}} - {{$t('reset')}} - + {{ !toggleSearchStatus ? $t('open') : $t('away') }} - + + {{$t('reset')}} + {{$t('query')}} diff --git a/jero-web/src/views/documentManage/collection/index.vue b/jero-web/src/views/documentManage/collection/index.vue index 541994b2e..7acfbc953 100644 --- a/jero-web/src/views/documentManage/collection/index.vue +++ b/jero-web/src/views/documentManage/collection/index.vue @@ -131,20 +131,20 @@ align: 'left', sorter: true, ellipsis: true, - width: 180 + width: 335 }, { title: this.$t('title'), align: 'left', scopedSlots: { customRender: 'serialtitle' }, - width: 180, + width: 510, ellipsis: true, dataIndex: 'title' }, { title: this.$t('status'), align: 'left', - width: 180, + width: 254, ellipsis: true, sorter: true, dataIndex: 'state' @@ -152,7 +152,7 @@ { title: this.$t('collectionTime'), align: 'left', - width: 180, + width: 299, ellipsis: true, sorter: true, dataIndex: 'createTime' diff --git a/jero-web/src/views/documentManage/subscribtion/index.vue b/jero-web/src/views/documentManage/subscribtion/index.vue index 7c384187b..8ccd666be 100644 --- a/jero-web/src/views/documentManage/subscribtion/index.vue +++ b/jero-web/src/views/documentManage/subscribtion/index.vue @@ -127,7 +127,7 @@ dataIndex: 'serialNumber', key: 'serialNumber', align: 'left', - width: 180, + width: 335, scopedSlots: { customRender: 'serialNumber' }, sorter:true, ellipsis: true @@ -135,7 +135,7 @@ { title: this.$t('title'), align: 'left', - width: 180, + width: 510, dataIndex: 'title', scopedSlots: { customRender: 'serialtitle' }, ellipsis: true @@ -143,7 +143,7 @@ { title: this.$t('status'), align: 'left', - width: 180, + width: 254, dataIndex: 'state', sorter:true, ellipsis: true @@ -151,7 +151,7 @@ { title: this.$t('subscriptionTime'), align: 'left', - width: 180, + width: 299, dataIndex: 'createTime', sorter:true, ellipsis: true diff --git a/jero-web/src/views/documentTools/virtualList/index.vue b/jero-web/src/views/documentTools/virtualList/index.vue index 06ba96031..86038148a 100644 --- a/jero-web/src/views/documentTools/virtualList/index.vue +++ b/jero-web/src/views/documentTools/virtualList/index.vue @@ -221,14 +221,14 @@ title: this.$t('VirtualListName'), align: 'left', dataIndex: 'name', - width: 260, + width: 484, ellipsis: true, scopedSlots: { customRender: 'VirtualListName' } }, { title: this.$t('listStatus'), align: 'left', - width: 260, + width: 540, ellipsis: true, dataIndex: 'state_dictText' }, @@ -243,7 +243,7 @@ title: this.$t('operation'), align: 'left', fixed: 'right', - width: 400, + width: 280, scopedSlots: { customRender: 'operation' } } ], diff --git a/jero-web/src/views/externalReports/index.vue b/jero-web/src/views/externalReports/index.vue index dacac5793..06aa39799 100644 --- a/jero-web/src/views/externalReports/index.vue +++ b/jero-web/src/views/externalReports/index.vue @@ -99,12 +99,12 @@ - {{ $t('query') }} - {{ $t('reset') }} - + {{ !toggleSearchStatus ? $t('open') : $t('away') }} + {{ $t('reset') }} + {{ $t('query') }} @@ -385,7 +385,7 @@ ellipsis: true, dataIndex: 'fileName', scopedSlots: { customRender: 'fileName' }, - width: 400 + width: 200 }, { title: this.$t('fileDeclaration'), @@ -393,7 +393,7 @@ ellipsis: true, dataIndex: 'fileDescription', scopedSlots: { customRender: 'projectName' }, - width: 400 + width: 300 }, { title: this.$t('uploadedBy'), @@ -412,14 +412,14 @@ align: 'left', ellipsis: true, dataIndex: 'createTime', - width: 150 + width: 250 }, { title: this.$t('operation'), align: 'left', fixed: 'right', ellipsis: true, - width: 150, + width: 250, scopedSlots: { customRender: 'operation' } } ], diff --git a/jero-web/src/views/parameter/ParameterTemplate/index.vue b/jero-web/src/views/parameter/ParameterTemplate/index.vue index 4d8a7997e..c92787cee 100644 --- a/jero-web/src/views/parameter/ParameterTemplate/index.vue +++ b/jero-web/src/views/parameter/ParameterTemplate/index.vue @@ -164,7 +164,7 @@ export default { { title: this.$t('zoneOfApplication'), align: 'left', - width: 160, + width: 235, ellipsis: true, sorter:true, dataIndex: 'region_dictText', @@ -172,7 +172,7 @@ export default { { title: this.$t('parameterTemplate'), align: 'left', - width: 180, + width: 252, ellipsis: true, sorter:true, dataIndex: 'paramsTemplateName', @@ -184,7 +184,7 @@ export default { ellipsis: true, dataIndex: 'description', // scopedSlots: { customRender: 'titleName' } - width: 192 + width: 350 }, // { // title: this.$t('zoneOfApplication'), @@ -195,7 +195,7 @@ export default { // }, { title: this.$t('creater'), - align: 'center', + align: 'left', width: 120, ellipsis: true, dataIndex: 'createBy' @@ -204,14 +204,14 @@ export default { title: this.$t('created'), align: 'left', dataIndex: 'createTime', - width: 160, + width: 200, sorter:true, ellipsis: true, }, { title: this.$t('updated'), align: 'left', - width: 160, + width: 200, ellipsis: true, sorter:true, dataIndex: 'updateTime' diff --git a/jero-web/src/views/parameter/escalationlibrary/index.vue b/jero-web/src/views/parameter/escalationlibrary/index.vue index 13527dda3..15ec07c03 100644 --- a/jero-web/src/views/parameter/escalationlibrary/index.vue +++ b/jero-web/src/views/parameter/escalationlibrary/index.vue @@ -160,7 +160,7 @@ { title: this.$t('entryName'), align: 'left', - width: 210, + width: 405, dataIndex: 'projectName', sorter:true, scopedSlots: { customRender: 'projectName' } @@ -168,20 +168,20 @@ { title: this.$t('ListTitle'), align: 'left', - width: 380, + width: 553, dataIndex: 'title', }, { title: this.$t('Version'), align: 'left', - width: 382, + width: 384, dataIndex: 'version' }, { title: this.$t('operation'), align: 'left', fixed: 'right', - width: 200, + width: 220, scopedSlots: { customRender: 'operation' } } ], diff --git a/jero-web/src/views/parameter/parameterexport/index.vue b/jero-web/src/views/parameter/parameterexport/index.vue index e30099472..c8cc582da 100644 --- a/jero-web/src/views/parameter/parameterexport/index.vue +++ b/jero-web/src/views/parameter/parameterexport/index.vue @@ -170,7 +170,7 @@ export default { dataIndex: 'templateName', sorter:true, ellipsis: true, - width: 201, + width: 368, scopedSlots: { customRender: 'templateName' } }, { @@ -178,12 +178,12 @@ export default { align: 'left', dataIndex: 'description', ellipsis: true, - width: 192, + width: 372, scopedSlots: { customRender: 'projectName' } }, { title: this.$t('zoneOfApplication'), - align: 'center', + align: 'left', dataIndex: 'region_dictText', ellipsis: true, sorter:true, diff --git a/jero-web/src/views/parameter/parameterlist/index.vue b/jero-web/src/views/parameter/parameterlist/index.vue index 2ffda150a..e7e02a093 100644 --- a/jero-web/src/views/parameter/parameterlist/index.vue +++ b/jero-web/src/views/parameter/parameterlist/index.vue @@ -161,7 +161,7 @@ export default { { title: this.$t('NiONumber'), align: 'left', - width: 130, + width: 190, dataIndex: 'nioNumber', sorter: true, ellipsis: true, @@ -170,7 +170,7 @@ export default { title: this.$t('ParameterName'), align: 'left', dataIndex: 'paramsName', - width: 160, + width: 268, ellipsis: true, }, { @@ -178,14 +178,14 @@ export default { align: 'left', dataIndex: 'description', ellipsis: true, - width: 180, + width: 380, // scopedSlots: { customRender: 'titleName' } }, { title: this.$t('areaOfResponsibility'), align: 'left', dataIndex: 'dutyTerritory_dictText', - width: 150, + width: 259, sorter: true, ellipsis: true, }, @@ -194,14 +194,14 @@ export default { align: 'left', dataIndex: 'createTime', sorter: true, - width: 180, + width: 265, ellipsis: true, }, { title: this.$t('operation'), align: 'left', fixed: 'right', - width: 120, + width: 200, scopedSlots: { customRender: 'operation' } } ], diff --git a/jero-web/src/views/processCenter/procedure/index.vue b/jero-web/src/views/processCenter/procedure/index.vue index c7c4ae320..92c716948 100644 --- a/jero-web/src/views/processCenter/procedure/index.vue +++ b/jero-web/src/views/processCenter/procedure/index.vue @@ -132,21 +132,21 @@ dataIndex: 'name', align: 'left', ellipsis: true, - width: 240 + width: 466 }, { title: this.$t('ProcessType'), dataIndex: 'categoryName', align: 'left', ellipsis: true, - width: 240 + width: 518 }, { title: this.$t('createTime'), dataIndex: 'createTime', align: 'left', ellipsis: true, - width: 240, + width: 308, customRender: function(t, r, index) { return moment(t).format('YYYY-MM-DD HH:mm:ss') } diff --git a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue index da03e081c..9e6979a44 100644 --- a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue +++ b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue @@ -158,13 +158,13 @@ title: this.$t('title'), align: 'left', dataIndex: 'title', - width: 240, + width: 280, scopedSlots: { customRender: 'paramsManifestClick' } }, { title: this.$t('status'), align: 'left', - width: 80, + width: 100, ellipsis: true, sorter:true, dataIndex: 'state' @@ -172,14 +172,14 @@ { title: this.$t('parameterTemplateName'), align: 'left', - width: 180, + width: 200, ellipsis: true, dataIndex: 'paramsTemplateName' }, { title: this.$t('relatedProjectVersion'), align: 'left', - width: 120, + width: 150, ellipsis: true, sorter:true, dataIndex: 'projectVersion' @@ -188,7 +188,7 @@ title: this.$t('collectionCompletionTime'), align: 'left', dataIndex: 'finishTime', - width: 180, + width: 200, ellipsis: true, sorter:true, scopedSlots: { customRender: 'collectionCompletionTime' } @@ -196,7 +196,7 @@ { title: this.$t('Version'), align: 'left', - width: 80, + width: 100, ellipsis: true, sorter:true, dataIndex: 'version' @@ -211,7 +211,7 @@ { title: this.$t('created'), align: 'left', - width: 160, + width: 200, ellipsis: true, sorter:true, dataIndex: 'createTime' diff --git a/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue b/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue index 1cf7194cd..d2bf32a73 100644 --- a/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue +++ b/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue @@ -342,7 +342,7 @@ align: 'left', dataIndex: 'remark', ellipsis: true, - width: 153 + width: 188 }, { title: this.$t('operation'), diff --git a/jero-web/src/views/projectManagement/projectLibrary/index.vue b/jero-web/src/views/projectManagement/projectLibrary/index.vue index fe8b22da4..2b0fd0d3a 100644 --- a/jero-web/src/views/projectManagement/projectLibrary/index.vue +++ b/jero-web/src/views/projectManagement/projectLibrary/index.vue @@ -217,7 +217,7 @@ title: this.$t('entryName'), align: 'left', dataIndex: 'projectName', - width: 260, + width: 300, sorter:true, ellipsis: true, scopedSlots: { customRender: 'projectName' } @@ -254,7 +254,7 @@ { title: this.$t('explain'), align: 'left', - width: 280, + width: 300, ellipsis: true, dataIndex: 'explanation' }, @@ -276,7 +276,7 @@ { title: this.$t('DigitalPlatform'), align: 'left', - width: 180, + width: 205, ellipsis: true, sorter:true, dataIndex: 'digitalPlatform' diff --git a/jero-web/src/views/regulationsKanban/index.vue b/jero-web/src/views/regulationsKanban/index.vue index 2f6e21cb8..94538f5e0 100644 --- a/jero-web/src/views/regulationsKanban/index.vue +++ b/jero-web/src/views/regulationsKanban/index.vue @@ -195,7 +195,7 @@ export default { align: 'left', ellipsis: true, dataIndex: 'state_dicText', - width: 120 + width: 150 }, // { // title: this.$t('category'), @@ -206,7 +206,7 @@ export default { title: this.$t('technicalField'), align: 'left', dataIndex: 'technologyTerritory_dicText', - width: 250, + width: 634, ellipsis: true, scopedSlots: { customRender: 'technicalField' } }, diff --git a/jero-web/src/views/system/DictList.vue b/jero-web/src/views/system/DictList.vue index 0ff139f8e..bb18fa641 100644 --- a/jero-web/src/views/system/DictList.vue +++ b/jero-web/src/views/system/DictList.vue @@ -130,7 +130,7 @@ title: this.$t('DictionaryName'), align: 'left', dataIndex: 'dictName', - width: 160, + width: 486, ellipsis: true }, // { @@ -150,14 +150,14 @@ title: this.$t('DictionaryNumber'), align: 'left', dataIndex: 'dictCode', - width: 160, + width: 248, ellipsis: true }, { title: this.$t('describe'), align: 'left', dataIndex: 'description', - width: 160, + width: 375, ellipsis: true }, { diff --git a/jero-web/src/views/system/PermissionList.vue b/jero-web/src/views/system/PermissionList.vue index 7a00593c8..824353618 100644 --- a/jero-web/src/views/system/PermissionList.vue +++ b/jero-web/src/views/system/PermissionList.vue @@ -120,7 +120,7 @@ align: 'left', key: 'menuEn', ellipsis: true, - width: 180 + width: 255 }, { title: 'icon', @@ -128,14 +128,14 @@ align: 'left', key: 'icon', ellipsis: true, - width: 180 + width: 210 }, { title: this.$t('assembly'), dataIndex: 'component', align: 'left', key: 'component', - width: 240, + width: 317, ellipsis: true, scopedSlots: { customRender: 'component' } }, @@ -144,7 +144,7 @@ dataIndex: 'url', align: 'left', key: 'url', - width: 240, + width: 280, ellipsis: true, scopedSlots: { customRender: 'url' } }, @@ -152,7 +152,7 @@ title: this.$t('sort'), dataIndex: 'sortNo', align: 'left', - width: 80, + width: 169, ellipsis: true, key: 'sortNo' }, diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue index c547327ad..c1c5293f3 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue @@ -65,7 +65,7 @@ dataIndex: 'projectName', scopedSlots: { customRender: 'RelatedItems' }, ellipsis: true, - width: 130 + width: 392 }, { title: this.$t('standardInformation'), @@ -73,28 +73,28 @@ dataIndex: 'standardInfo', scopedSlots: { customRender: 'standardInformation' }, ellipsis: true, - width: 330 + width: 353 }, { title: this.$t('taskType'), align: 'left', dataIndex: 'flowTypeShow', ellipsis: true, - width: 170 + width: 241 }, { title: this.$t('Tasknode'), align: 'left', dataIndex: 'taskDefinitionKeyName', ellipsis: true, - width: 150 + width: 208 }, { title: this.$t('Sponsor'), align: 'left', dataIndex: 'createBy', ellipsis: true, - width: 130 + width: 201 }, // { // title: this.$t('LastProcessor'), @@ -115,7 +115,7 @@ align: 'left', dataIndex: 'endTime', ellipsis: true, - width: 150 + width: 108 }, // { // title: this.$t('taskStatus'), diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue index ab9143c9f..1abb6b6b9 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue @@ -78,7 +78,7 @@ dataIndex: 'projectName', ellipsis: true, scopedSlots: { customRender: 'RelatedItems' }, - width: 150 + width: 339 }, { title: this.$t('standardInformation'), @@ -86,42 +86,42 @@ dataIndex: 'standardInfo', ellipsis: true, scopedSlots: { customRender: 'standardInformation' }, - width: 260 + width: 265 }, { title: this.$t('taskType'), align: 'left', dataIndex: 'flowTypeShow', ellipsis: true, - width: 170 + width: 183 }, { title: this.$t('Tasknode'), align: 'left', dataIndex: 'taskDefinitionKeyName', ellipsis: true, - width: 170 + width: 183 }, { title: this.$t('typeOfDeliverables'), align: 'left', dataIndex: 'deliverableTypeName', ellipsis: true, - width: 170 + width: 183 }, { title: this.$t('Sponsor'), align: 'left', dataIndex: 'createBy', ellipsis: true, - width: 100 + width: 108 }, { title: this.$t('TaskCutOffTime'), align: 'left', dataIndex: 'endTime', ellipsis: true, - width: 160, + width: 172, scopedSlots: { customRender: 'endTime' } }, // { diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue index 615696db6..43dedbe51 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue @@ -71,7 +71,7 @@ dataIndex: 'projectName', ellipsis: true, scopedSlots: { customRender: 'RelatedItems' }, - width: 130 + width: 392 }, { title: this.$t('standardInformation'), @@ -79,28 +79,28 @@ dataIndex: 'standardInfo', ellipsis: true, scopedSlots: { customRender: 'standardInformation' }, - width: 330 + width: 353 }, { title: this.$t('taskType'), align: 'left', dataIndex: 'flowTypeShow', ellipsis: true, - width: 170 + width: 241 }, { title: this.$t('Tasknode'), align: 'left', dataIndex: 'taskDefinitionKeyName', ellipsis: true, - width: 130 + width: 208 }, { title: this.$t('Sponsor'), align: 'left', dataIndex: 'createBy', ellipsis: true, - width: 130 + width: 201 }, // { // title: this.$t('CurrentProcessor'), @@ -114,7 +114,7 @@ align: 'left', dataIndex: 'endTime', ellipsis: true, - width: 150 + width: 108 }, // { // title: this.$t('taskStatus'), diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue index f19f702a1..6835a9d02 100644 --- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue +++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue @@ -60,42 +60,42 @@ dataIndex: 'standardInfo', scopedSlots: { customRender: 'standardInformation' }, ellipsis: true, - width: 330 + width: 333 }, { title: this.$t('taskType'), align: 'left', dataIndex: 'flowTypeShow', ellipsis: true, - width: 130 + width: 254 }, { title: this.$t('LastProcessor'), align: 'left', dataIndex: 'lastAssigneeName', ellipsis: true, - width: 130 + width: 229 }, { title: this.$t('CurrentProcessor'), align: 'left', dataIndex: 'assigneeName', ellipsis: true, - width: 130 + width: 238 }, { title: this.$t('TaskCutOffTime'), align: 'left', dataIndex: 'endTime', ellipsis: true, - width: 150 + width: 204 }, { title: this.$t('taskStatus'), align: 'left', dataIndex: 'statusShow', ellipsis: true, - width: 130 + width: 246 }, { title: this.$t('operation'), diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue index 2d54fcac8..4ce20ea0d 100644 --- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue +++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue @@ -58,28 +58,28 @@ dataIndex: 'standardInfo', scopedSlots: { customRender: 'standardInformation' }, ellipsis: true, - width: 330 + width: 463 }, { title: this.$t('taskType'), align: 'left', dataIndex: 'flowTypeShow', ellipsis: true, - width: 130 + width: 332 }, { title: this.$t('Sponsor'), align: 'left', dataIndex: 'createBy', ellipsis: true, - width: 130 + width: 209 }, { title: this.$t('TaskCutOffTime'), align: 'left', dataIndex: 'endTime', ellipsis: true, - width: 150, + width: 230, scopedSlots: { customRender: 'endTime' } }, { @@ -87,7 +87,7 @@ align: 'left', dataIndex: 'statusShow', ellipsis: true, - width: 130 + width: 269 }, { title: this.$t('operation'), diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue index f421926a9..232ad5387 100644 --- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue +++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue @@ -57,42 +57,42 @@ dataIndex: 'standardInfo', ellipsis: true, scopedSlots: { customRender: 'standardInformation' }, - width: 330 + width: 393 }, { title: this.$t('taskType'), align: 'left', dataIndex: 'flowTypeShow', ellipsis: true, - width: 130 + width: 292 }, { title: this.$t('Sponsor'), align: 'left', dataIndex: 'createBy', ellipsis: true, - width: 130 + width: 212 }, { title: this.$t('CurrentProcessor'), align: 'left', dataIndex: 'assigneeName', ellipsis: true, - width: 130 + width: 215 }, { title: this.$t('TaskCutOffTime'), align: 'left', dataIndex: 'endTime', ellipsis: true, - width: 150 + width: 151 }, { title: this.$t('taskStatus'), align: 'left', dataIndex: 'statusShow', ellipsis: true, - width: 130 + width: 241 }, { title: this.$t('operation'), diff --git a/jero-web/src/views/virtualAuthenticationList/index.vue b/jero-web/src/views/virtualAuthenticationList/index.vue index 45293970d..62d806967 100644 --- a/jero-web/src/views/virtualAuthenticationList/index.vue +++ b/jero-web/src/views/virtualAuthenticationList/index.vue @@ -215,14 +215,14 @@ title: this.$t('CertificationListName'), align: 'left', dataIndex: 'name', - width: 260, + width: 480, ellipsis: true, scopedSlots: { customRender: 'CertificationListName' } }, { title: this.$t('listStatus'), align: 'left', - width: 260, + width: 536, ellipsis: true, dataIndex: 'state_dictText' }, @@ -237,7 +237,7 @@ title: this.$t('operation'), align: 'left', fixed: 'right', - width: 400, + width: 280, scopedSlots: { customRender: 'operation' } } ] diff --git a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue index 2dc59154c..f71c23b26 100644 --- a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue +++ b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue @@ -293,7 +293,7 @@ align: 'left', dataIndex: 'category', width: 200, - fixed: 'left', + // fixed: 'left', ellipsis: true }, { @@ -302,7 +302,7 @@ dataIndex: 'inspectionItem', width: 200, ellipsis: true, - fixed: 'left', + // fixed: 'left', scopedSlots: { customRender: 'inspectionItems' } }, { From 8d7276fd1ea9e8620697be285f4b73c9b0bc64d6 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Fri, 31 Mar 2023 11:09:16 +0800 Subject: [PATCH 621/645] =?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-=E5=A1=AB=E5=86=99?= =?UTF-8?q?=E4=BA=BA=E5=AF=BC=E5=85=A5=E5=BF=85=E5=A1=AB=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E3=80=8266949?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ParamsCollectManifestEOServiceImpl.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 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 923a209a6..bc43e2ea1 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 @@ -5940,14 +5940,14 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl resultMap = new HashMap<>(); // 校验必填 - if (IsMustEnum.YES.getValue().equals(mustInput) && StringUtils.isEmpty(value)) { + /*if (IsMustEnum.YES.getValue().equals(mustInput) && StringUtils.isEmpty(value)) { if (CutEnum.CN.getValue().equals(cut)) { errorMsg += configName + "为必填项,不能为空；"; } else { errorMsg += configName + " is mandatory and cannot be empty; "; } countError++; - } + }*/ String fileName = value; if (StringUtils.isNotBlank(fileName)) { @@ -5984,14 +5984,14 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl resultMap = new HashMap<>(); // 校验必填 - if (IsMustEnum.YES.getValue().equals(mustInput) && StringUtils.isEmpty(value)) { + /*if (IsMustEnum.YES.getValue().equals(mustInput) && StringUtils.isEmpty(value)) { if (CutEnum.CN.getValue().equals(cut)) { errorMsg += configName + "为必填项,不能为空；"; } else { errorMsg += configName + " is mandatory and cannot be empty; "; } countError++; - } + }*/ // 校验长度 if (StringUtils.isNotBlank(value) && value.length() > Long.parseLong(dbLength)) { From 6e905f9b336c32212d9f609b9a358fd6cd2fead4 Mon Sep 17 00:00:00 2001 From: yuekuo Date: Fri, 31 Mar 2023 11:27:47 +0800 Subject: [PATCH 622/645] =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/upgradetargetmodel.vue | 60 ++++++++++--------- 1 file changed, 31 insertions(+), 29 deletions(-) diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue index 34055d829..9a0a26e79 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue @@ -43,13 +43,11 @@ * {{ $t('upgraderecordnumber') }}
-
- + + style="width:100%" :max-length="50"> -
@@ -57,12 +55,12 @@
{{ $t('theNameOfFirm') }}
-
+ + disabled style="width:100%" :max-length="50"> +
-
@@ -123,32 +121,33 @@
{{ $t('Vehicledynamictype') }}
- - - + +
+
+ {{ item }} +
+
+ + + {{ item }} + + +
+
+ + - - - - {{ item }} - - - - +
@@ -430,6 +429,7 @@ export default { width: calc(100% - 130px); display: inline-block; margin-top: 2px; + max-width: 486px; } .box-input { @@ -461,4 +461,6 @@ export default { .Required { color: red; margin-right: 3px; -} \ No newline at end of file +} + + \ No newline at end of file From 7d4edacf2a71b6c1be9d31f83fd0bd9b8abee9d7 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Fri, 31 Mar 2023 11:48:32 +0800 Subject: [PATCH 623/645] bug 67621 --- .../components/usernotification.vue | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue index a1ba7c8ec..0ebe13f88 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue @@ -155,9 +155,10 @@
- {{$t('usernotificationmode')}} +

{{$t('usernotificationmode')}}

+
- +
- {{$t('userinformstherelevantfile')}} +

{{$t('userinformstherelevantfile')}}

+
- + {{ (formInline.xgwj === 'null' || formInline.xgwj === '' || formInline.xgwj == null) ? $t('uploadattachment') : $t('viewUploadedFiles') From 7fc7c84473085cda0ab829df6250cc74890d5734 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Fri, 31 Mar 2023 13:26:30 +0800 Subject: [PATCH 624/645] =?UTF-8?q?OTA=E7=AE=A1=E7=90=86=E5=B7=A5=E5=85=B7?= =?UTF-8?q?-=E8=BD=A6=E5=9E=8B=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF-?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/basicInformation.vue | 34 +++++++++++-------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue index a66145229..d4cebc19b 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue @@ -155,17 +155,19 @@
{{$t('Vehicledynamictype')}}
- - - - {{ item }} - - - - - + +
+
+ + + {{ item }} + + +
+
+ @@ -175,7 +177,9 @@ --> - +
+
+
@@ -343,7 +347,7 @@ import { message } from 'ant-design-vue' if(res.result.dllx2 == null){ res.result.dllx2 = undefined } - + if(res.result.cplb == null){ res.result.cplb = undefined } @@ -380,7 +384,7 @@ import { message } from 'ant-design-vue' if(otaId==null || otaId == undefined){ otaId='' } - + postAction('/ota/otaBaCxJbxx/add',{ otaId:otaId,...this.form}).then( res => { if(res.code == 200){ localStorage.setItem('otaId', res.result.otaId) @@ -419,7 +423,7 @@ import { message } from 'ant-design-vue' if(this.form.dllx1=='其他'){ this. projectNameList2=['其他'] } - + }, update(){ From 082521657e487fc10e7c3cfc078ca8cca7501084 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Fri, 31 Mar 2023 13:43:13 +0800 Subject: [PATCH 625/645] =?UTF-8?q?=E5=A6=82=E6=9E=9C=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E8=AE=BE=E7=BD=AE=E4=BA=86=E5=B7=A5=E7=A8=8B?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BA=BA,=E5=A6=82=E6=9E=9C=E8=B4=A3?= =?UTF-8?q?=E4=BB=BB=E4=BA=BA=E6=98=AF=E7=A9=BA=EF=BC=8C=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=B8=A6=E5=85=A5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/job/InventoryAffirmJob.java | 2 +- ...ctCertificationInventoryEOServiceImpl.java | 28 +++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java index e326545a5..5868282ee 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java @@ -86,7 +86,7 @@ public class InventoryAffirmJob implements Job { queryWrapperInventory.and(queryWrapper -> { queryWrapper.lambda().eq(ProjectLawsInventoryEO::getDesignFlowStatus, ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()); queryWrapper.or(or -> { - or.lambda().eq(ProjectLawsInventoryEO::getDesignFlowStatus, ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()); + or.lambda().eq(ProjectLawsInventoryEO::getVerifyFlowStatus, ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()); }); }); List projectLawsInventoryEOList = this.projectLawsInventoryEOMapper.selectList(queryWrapperInventory); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index 43a5b0a77..404055c17 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -373,11 +373,39 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl idList = Arrays.asList(ids.split(",")); + QueryWrapper pciQueryWrap = new QueryWrapper<>(); + pciQueryWrap.lambda().in(ProjectCertificationInventoryEO::getId,idList); + List pciEoList = this.list(pciQueryWrap); + List updateList = new ArrayList<>(); for (String id : idList) { ProjectCertificationInventoryEO updateProjectCertificationInventoryEO = new ProjectCertificationInventoryEO(); BeanUtils.copyProperties(projectCertificationInventoryEO,updateProjectCertificationInventoryEO); updateProjectCertificationInventoryEO.setId(id); + + /** + * 2023-03-30 17.36新增该需求。 + * 如果用户批量设置了工程接口人字段 + * 那就需要判断所选数据中责任人是否为空 + * 如果责任人字段为空时 需要将工程接口人带入到所选数据的责任人字段中 + */ + if(StringUtils.isNotBlank(projectCertificationInventoryEO.getSdt())){ + List pciEoListTemp = pciEoList.stream().filter(pciEo -> { + boolean flag = false; + if (StringUtils.equals(pciEo.getId(), id)) { + flag = true; + } + return flag; + }).collect(Collectors.toList()); + + if(CollectionUtils.isNotEmpty(pciEoListTemp)){ + ProjectCertificationInventoryEO pciEo = pciEoListTemp.get(0); + if(StringUtils.isEmpty(pciEo.getDutyPerson())){ + updateProjectCertificationInventoryEO.setDutyPerson(projectCertificationInventoryEO.getSdt()); + } + } + } + updateList.add(updateProjectCertificationInventoryEO); } From 10bf8d92795a4b1adab683b582ff1c480cf81175 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Fri, 31 Mar 2023 14:29:15 +0800 Subject: [PATCH 626/645] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E6=B8=85=E5=8D=95-=E6=B7=BB=E5=8A=A0=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=AF=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/zh-cn.js | 2 +- .../certificationListMaintenance.vue | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index bdf7b4c0f..08346013d 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -918,7 +918,7 @@ module.exports = { virtualAuthenticationListDetails: '虚拟认证清单详情', VirtualAuthenticationList: '虚拟认证清单', maintainVirtualList: '维护市场清单', - certificationListMaintenance: '认证清单维护', + certificationListMaintenance: '市场认证清单维护', reasonsForRejection: '驳回原因', inconformity: '不符合', toTrack: '待追踪', diff --git a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue index f71c23b26..d6f76858b 100644 --- a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue +++ b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue @@ -3,7 +3,7 @@
- {{isTrue ? $t('certificationListMaintenance'):$t('virtualAuthenticationListDetails')}} + {{isTrue ? $t('certificationListMaintenance'):$t('marketCertificationListDetails')}}
@@ -393,7 +393,7 @@ }, //模板下载 handleModule() { - downloadFile(this.url.exportTemplate, this.$t('certificationList') + this.$t('importTemplate') + '.xls', {}) + downloadFile(this.url.exportTemplate, this.$t('marketCertificationList') + this.$t('importTemplate') + '.xls', {}) }, //调取 transferClick() { @@ -411,7 +411,7 @@ ids: selectedRowKeys.join(','), authDummyInventoryBaseId: this.$route.query.id } - downloadFile(this.url.exportData, this.$route.query.name + this.$t('certificationList') + '.zip', query, this.Deselect) + downloadFile(this.url.exportData, this.$route.query.name + this.$t('marketCertificationList') + '.zip', query, this.Deselect) }, Deselect() { this.selectedRowKeys = [] From 1d9a08b2c31edb2277da4c5e16eb177b6245a895 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Fri, 31 Mar 2023 14:37:59 +0800 Subject: [PATCH 627/645] =?UTF-8?q?66936=20=E8=99=9A=E6=8B=9F=E6=B3=95?= =?UTF-8?q?=E8=A7=84=E6=B8=85=E5=8D=95=EF=BC=8C=E5=AF=BC=E5=85=A5=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E3=80=81=E6=A8=A1=E6=9D=BF=E4=B8=8B=E8=BD=BD=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dummy/entity/DummyInventoryInfoEO.java | 12 ++--- .../dummy/entity/DummyInventoryInfoEOEn.java | 6 +-- .../impl/DummyInventoryInfoEOServiceImpl.java | 50 ++++++++++--------- 3 files changed, 36 insertions(+), 32 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEO.java index 4b0c27a13..1ed1f31ef 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEO.java @@ -215,7 +215,7 @@ public class DummyInventoryInfoEO implements Serializable { private java.lang.String designDeliverableTemplateName; /**设计符合性确认-发起人*/ - @Excel(name = "设计-发起人", width = 15,dicCode ="fa1_qi3_ren2") +// @Excel(name = "设计-发起人", width = 15,dicCode ="fa1_qi3_ren2") @ApiModelProperty(value = "设计符合性确认-发起人") //@Dict(dicCode ="fa1_qi3_ren2") private java.lang.String designInitiator; @@ -235,7 +235,7 @@ public class DummyInventoryInfoEO implements Serializable { private String designRemark; /**prehomo确认-交付物类型*/ - @Excel(name = "Prehomo-交付物类型", width = 15,dicCode ="deliverable_template") +// @Excel(name = "Prehomo-交付物类型", width = 15,dicCode ="deliverable_template") @ApiModelProperty(value = "prehomo确认-交付物类型") // @Dict(dicCode ="deliverable_template") private java.lang.String prehomoDeliverableType; @@ -253,7 +253,7 @@ public class DummyInventoryInfoEO implements Serializable { private java.lang.String prehomoDeliverableTemplateName; /**prehomo确认-发起人*/ - @Excel(name = "Prehomo-发起人", width = 15,dicCode ="fa1_qi3_ren2") +// @Excel(name = "Prehomo-发起人", width = 15,dicCode ="fa1_qi3_ren2") @ApiModelProperty(value = "prehomo确认-发起人") //@Dict(dicCode ="fa1_qi3_ren2") private java.lang.String prehomoInitiator; @@ -261,7 +261,7 @@ public class DummyInventoryInfoEO implements Serializable { private String prehomoInitiator_dictText; /**prehomo确认-责任人*/ - @Excel(name = "Prehomo-责任人", width = 15,dicCode ="ze2_ren4_ren2") +// @Excel(name = "Prehomo-责任人", width = 15,dicCode ="ze2_ren4_ren2") @ApiModelProperty(value = "prehomo确认-责任人") //@Dict(dicCode ="ze2_ren4_ren2") private java.lang.String prehomoDuty; @@ -269,7 +269,7 @@ public class DummyInventoryInfoEO implements Serializable { private String prehomoDuty_dictText; //prehomo确认-交付物说明 - @Excel(name = "prehomo确认-交付物说明", width = 20) +// @Excel(name = "prehomo确认-交付物说明", width = 20) private String prehomoRemark; /**验证符合性确认-交付物类型*/ @@ -290,7 +290,7 @@ public class DummyInventoryInfoEO implements Serializable { private java.lang.String verifyDeliverableTemplateName; /**验证符合性确认-发起人*/ - @Excel(name = "验证-发起人", width = 15,dicCode ="fa1_qi3_ren2") +// @Excel(name = "验证-发起人", width = 15,dicCode ="fa1_qi3_ren2") @ApiModelProperty(value = "验证符合性确认-发起人") //@Dict(dicCode ="fa1_qi3_ren2") private java.lang.String verifyInitiator; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEOEn.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEOEn.java index d723a4612..a9643b2ca 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEOEn.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEOEn.java @@ -187,7 +187,7 @@ public class DummyInventoryInfoEOEn implements Serializable { /**设计符合性确认-发起人*/ - @Excel(name = "Design Initiator", width = 30) +// @Excel(name = "Design Initiator", width = 30) @ApiModelProperty(value = "设计符合性确认-发起人") @Dict(dicCode ="fa1_qi3_ren2") private String designInitiator; @@ -218,7 +218,7 @@ public class DummyInventoryInfoEOEn implements Serializable { private String prehomoDeliverableTemplateName; /**prehomo确认-发起人*/ - @Excel(name = "Prehomo Initiator", width = 30) +// @Excel(name = "Prehomo Initiator", width = 30) @ApiModelProperty(value = "prehomo确认-发起人") @Dict(dicCode ="fa1_qi3_ren2") private String prehomoInitiator; @@ -248,7 +248,7 @@ public class DummyInventoryInfoEOEn implements Serializable { private String verifyDeliverableTemplateName; /**验证符合性确认-发起人*/ - @Excel(name = "Verify Initiator", width = 30) +// @Excel(name = "Verify Initiator", width = 30) @ApiModelProperty(value = "验证符合性确认-发起人") @Dict(dicCode ="fa1_qi3_ren2") private String verifyInitiator; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java index ec4d8f52d..929870332 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java @@ -1182,6 +1182,14 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl 8){ String flag = ""; - if(8 < j && j < 14){ + if(8 < j && j < 13){ if(CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())){ flag ="设计"; }else{ @@ -1626,15 +1630,15 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl Date: Fri, 31 Mar 2023 14:40:35 +0800 Subject: [PATCH 628/645] bug 67651 --- jero-web/src/views/otamanagement/upgradeactivity/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/otamanagement/upgradeactivity/index.vue b/jero-web/src/views/otamanagement/upgradeactivity/index.vue index a3f5994a6..0a0362325 100644 --- a/jero-web/src/views/otamanagement/upgradeactivity/index.vue +++ b/jero-web/src/views/otamanagement/upgradeactivity/index.vue @@ -315,7 +315,7 @@ export default { title: this.$t('operation'), align: 'left', fixed: 'right', - width: 280, + width: 230, scopedSlots: { customRender: 'operation' } } ], From 334f4b3d8116c8b6baa84813a50d44d4cd47ead3 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Fri, 31 Mar 2023 14:54:06 +0800 Subject: [PATCH 629/645] =?UTF-8?q?67157=20=E5=BE=85=E5=8A=9E=E4=B8=AD?= =?UTF-8?q?=E5=BF=83=E3=80=81=E5=B7=B2=E5=8A=9E=E3=80=81=E5=B7=B2=E5=8F=91?= =?UTF-8?q?=20=E6=8C=89=E7=85=A7=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E5=80=92=E5=BA=8F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml index 12b8435a6..d19e6b2bd 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml @@ -64,6 +64,7 @@ pi.status, pi.prc_num, pi.prc_name, + pi.create_time, plb.project_name_id, plb.target_market, plb.studio_engineer, @@ -106,7 +107,7 @@ ) temp - order by temp.end_time desc + order by temp.create_time desc