From a5b6ae7f4b8aa3338136eb7d5e6c5010877303e0 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Fri, 27 May 2022 09:41:50 +0800 Subject: [PATCH 01/40] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=B2=E7=9F=A5?= =?UTF-8?q?=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 | 1 + jero-web/src/common/lang/zh-cn.js | 1 + .../projectStatusBoard/index.vue | 36 ++++++++++--------- 3 files changed, 22 insertions(+), 16 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 6448d8ce7..e7ff17155 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -894,4 +894,5 @@ module.exports = { basicInformation:'Basic Information', replyFromProjectContact:'Reply from project contact person', pleaseUpload:'Please Upload', + fullScreenView:'Full Screen View', } \ 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 f2a138480..5f9b01910 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -899,4 +899,5 @@ module.exports = { basicInformation:'基础信息', replyFromProjectContact:'工程接口人回复', pleaseUpload:'请上传', + fullScreenView:'全屏查看', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/projectStatusBoard/index.vue b/jero-web/src/views/projectManagement/projectStatusBoard/index.vue index b67d8d3d5..fb7955efe 100644 --- a/jero-web/src/views/projectManagement/projectStatusBoard/index.vue +++ b/jero-web/src/views/projectManagement/projectStatusBoard/index.vue @@ -34,6 +34,7 @@
{{$t('regulatoryCertificationTaskPlan')}} + {{$t('fullScreenView')}}
{{$t('projectStatusAndProgress')}} + {{$t('fullScreenView')}}
+ + {{text && text.length > 10 ? text.slice(0,10)+'...':text}} + {{this.$t('projectStatus')}}
{{'('+$t('red')+'/'+$t('yellow')+'/'+$t('green')+')'}} @@ -386,12 +390,12 @@ axisTip.innerText = '' axisTip.style.display = 'none' }) - myChart.on('click', (params) => { - let newUrl = this.$router.resolve({ - path: '/TaskPlanList' - }) - window.open(newUrl.href, '_blank') + }, + TaskPlanListClick() { + let newUrl = this.$router.resolve({ + path: '/TaskPlanList' }) + window.open(newUrl.href, '_blank') }, searchQuery() { this.getList() @@ -413,16 +417,10 @@ }) }, projectNameClick() { - return { - on: { - click: () => { - let newUrl = this.$router.resolve({ - path: '/projectStatusAndProgress' - }) - window.open(newUrl.href, '_blank') - } - } - } + let newUrl = this.$router.resolve({ + path: '/projectStatusAndProgress' + }) + window.open(newUrl.href, '_blank') } } } @@ -509,4 +507,10 @@ width: 300px; margin-top: -4px; } + + .fullScreenView { + margin-left: 16px; + color: #21c9cc; + cursor: pointer; + } \ No newline at end of file From 70eab8d1f2c88c5c65a046ed122c14cd915b4004 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Fri, 27 May 2022 09:47:58 +0800 Subject: [PATCH 02/40] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E5=AF=BC=E5=87=BA-=E8=AE=A4=E8=AF=81=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=A4=9A=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dummy/service/impl/DummyInventoryInfoEOServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 4207afeb2..876550792 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 @@ -1141,7 +1141,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl Date: Fri, 27 May 2022 09:49:53 +0800 Subject: [PATCH 03/40] [update] yangshi bug --- jero-web/src/views/parameter/ParameterTemplate/index.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jero-web/src/views/parameter/ParameterTemplate/index.vue b/jero-web/src/views/parameter/ParameterTemplate/index.vue index 8fc2112dd..c6166a038 100644 --- a/jero-web/src/views/parameter/ParameterTemplate/index.vue +++ b/jero-web/src/views/parameter/ParameterTemplate/index.vue @@ -93,7 +93,7 @@
-
+
* {{$t('templateName')}} @@ -481,4 +481,7 @@ export default { background: #fff; border-radius: 0 0 2px 2px; } +.add-text-text{ + margin-top: -14px; +} \ No newline at end of file From 16ec67fcab3550705298b195c847dcd26b386fe6 Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Fri, 27 May 2022 09:55:44 +0800 Subject: [PATCH 04/40] [update] 53115 --- .../src/views/documentManage/splitting/modules/ImportResult.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue b/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue index 262b90821..e2378b2f0 100644 --- a/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue +++ b/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue @@ -127,7 +127,7 @@ ], }, spinning:false, //loading标识 - type:'doc', + type:'pdfdoc', url:{ tableHeader: 'document/bussDocumentLibraryEO/getHeaderOrConditionForSplitResult', //表格头部字段 seachList: 'document/bussDocumentLibraryEO/getHeaderOrConditionForSplitResult', //搜索字段 From 9ff51f2bc6f18eca77bafceea45e4cb9d75b4f5e Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Fri, 27 May 2022 10:02:27 +0800 Subject: [PATCH 05/40] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E5=AF=BC=E5=85=A5-=E8=AE=A4=E8=AF=81=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=A4=9A=E9=80=89?= 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 c4dbb661c..a6041e592 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 @@ -2165,7 +2165,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl Date: Fri, 27 May 2022 10:16:05 +0800 Subject: [PATCH 06/40] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93--=E8=A1=A8?= =?UTF-8?q?=E5=A4=B4=E5=88=97=E8=A1=A8=E8=A1=A8=E5=A4=B4=E6=A0=87=E9=A2=98?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BussDocumentLibraryEOServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index 8a4a9222b..0492d2935 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 @@ -484,6 +484,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl Date: Fri, 27 May 2022 10:17:35 +0800 Subject: [PATCH 07/40] =?UTF-8?q?=E9=A6=96=E5=AD=97=E6=AF=8D=E5=A4=A7?= =?UTF-8?q?=E5=86=99?= 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 0492d2935..1d45d2d59 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 @@ -482,7 +482,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl Date: Fri, 27 May 2022 10:19:15 +0800 Subject: [PATCH 08/40] [update] --- .../views/parameter/ParameterTemplate/components/addModel.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/jero-web/src/views/parameter/ParameterTemplate/components/addModel.vue b/jero-web/src/views/parameter/ParameterTemplate/components/addModel.vue index 48460962b..f3abc119d 100644 --- a/jero-web/src/views/parameter/ParameterTemplate/components/addModel.vue +++ b/jero-web/src/views/parameter/ParameterTemplate/components/addModel.vue @@ -140,6 +140,9 @@ export default { this.title = '新增' this.formInline = {} this.formInline.state = '1' + this.$nextTick(() => { + this.$refs['ruleForm'].resetFields(); + }) }, editModel(value) { this.visible = true From 79ce4c9f2b4740af4f33c174cea9fad626e3171a Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Fri, 27 May 2022 10:32:19 +0800 Subject: [PATCH 09/40] =?UTF-8?q?=E6=A0=91=E5=BD=A2=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/mapper/xml/SysCategoryMapper.xml | 2 +- .../service/impl/SysCategoryServiceImpl.java | 36 ++++++++++++++++--- 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysCategoryMapper.xml b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysCategoryMapper.xml index e14cd1bf6..3264cec41 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysCategoryMapper.xml +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysCategoryMapper.xml @@ -18,7 +18,7 @@ + + diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java index 7c2c307eb..1a4378af4 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java @@ -269,11 +269,10 @@ public class SysCategoryServiceImpl extends ServiceImpl list = new ArrayList<>(); if(StringUtils.isNotBlank(dictId)){ LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); From 90336975366067f098e424a9a153c6a9e7de04c7 Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Fri, 27 May 2022 14:23:47 +0800 Subject: [PATCH 20/40] [update] binaji --- .../parameterlist/components/addModel.vue | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue index 88cef309a..e206a1fa7 100644 --- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue +++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue @@ -428,8 +428,7 @@ export default { Onchangelabel(val) { console.log(val,'lllll') // 新增 - if(this.title = '新增') { - console.log('xinzneg') + if(this.title === '新增') { let _tt = [] val.forEach((item) => { _tt.push({ @@ -442,19 +441,19 @@ export default { }) this.contentList = _tt } else { - // 编辑 + // 编辑 todo // console.log(this.contentListed,'this.contentListed') - // let _tt = [] - // this.contentListed.forEach((item) => { - // _tt.push({ - // textVal: item.textVal, // tab + // val.forEach((item) => { + // this.contentListed.push({ + // textVal: item.text, // tab // certCategory: item.value, // 所属认证类别 - // paramsNumber: item.paramsNumber, // 编号 - // paramsName: item.paramsName, // 参数名称 - // description: item.description// 参数说明 + // paramsNumber: '', // 编号 + // paramsName: '', // 参数名称 + // description: ''// 参数说明 // }) // }) - // this.contentList = _tt + // this.contentList = this.contentListed + // this.contentList = val } }, Onchange() { From f869cafb01f8e24165e054192e5698134b5bdc38 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Fri, 27 May 2022 14:29:35 +0800 Subject: [PATCH 21/40] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=B2=E7=9F=A5?= =?UTF-8?q?=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/dashboard/customContentList.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/dashboard/customContentList.vue b/jero-web/src/views/dashboard/customContentList.vue index 4f227fe91..4d1e3016a 100644 --- a/jero-web/src/views/dashboard/customContentList.vue +++ b/jero-web/src/views/dashboard/customContentList.vue @@ -9,10 +9,10 @@
{{this.$t('MessageContent')}}
- - +
From 203a3e76425a3a467d5f7be7a32c12a242c92e8a Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Fri, 27 May 2022 14:40:16 +0800 Subject: [PATCH 22/40] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95log?= =?UTF-8?q?=E4=B8=AD=E8=8B=B1=E5=88=87=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SysCategoryServiceImpl.java | 14 +- .../impl/DummyInventoryBaseEOServiceImpl.java | 350 ++++++++++++++---- .../impl/DummyInventoryInfoEOServiceImpl.java | 92 +++-- .../modules/dummy/util/DeepCopyListUtil.java | 29 ++ 4 files changed, 377 insertions(+), 108 deletions(-) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/util/DeepCopyListUtil.java diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java index 1a4378af4..aa7d80250 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java @@ -355,9 +355,7 @@ public class SysCategoryServiceImpl extends ServiceImpl e.setSortOrder(e.getSortOrder() + 1)); @@ -400,14 +398,14 @@ public class SysCategoryServiceImpl extends ServiceImpl 1) { + } else if (geOrderNumList.get(i + 1).getSortOrder() - geOrderNumList.get(i).getSortOrder() > 1) { int deleteStart = geOrderNumList.get(i + 1).getSortOrder(); geOrderNumList = geOrderNumList.stream().filter(e -> e.getSortOrder() < deleteStart).collect(Collectors.toList()); - break; - }else{ - break; + if(geOrderNumList.size()!=(i+1)) { + break; + } } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java index 2f03fd3de..7ff33c661 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java @@ -446,7 +446,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl records) { Set technologyTerritorySet = new HashSet<>(); for (DummyInventoryInfoEO dummyInventoryInfoEO : records) { @@ -545,14 +545,22 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl attestationType = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseFieldEnum.ATTESTATION_TYPE.getValue()); - String attestationTypeName = attestationType.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getAttestationType())).map(f -> f.getItemText()).collect(Collectors.joining(",")); - dummyInventoryInfoEO.setAttestationType(attestationTypeName); - }else { + List attestationTypeList = Arrays.asList(dummyInventoryInfoEO.getAttestationType().split(",")); + StringBuilder attestationTypeBuilder = new StringBuilder(); + for (String midAttestationType : attestationTypeList) { + String dutyTerritoryName = attestationType.stream().filter(e -> e.getItemValue().equals(midAttestationType)).map(f -> f.getItemText()).collect(Collectors.joining(",")); + attestationTypeBuilder.append(dutyTerritoryName).append(","); + } + dummyInventoryInfoEO.setAttestationType(attestationTypeBuilder.substring(0, attestationTypeBuilder.toString().length() - 1)); + } + else { dummyInventoryInfoEO.setAttestationType("空"); } + //认证级别 if (StringUtils.isNotBlank(dummyInventoryInfoEO.getAttestationRank())) { List attestationRank = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseFieldEnum.ATTESTATION_RANK.getValue()); @@ -652,6 +660,212 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl records) { + Set technologyTerritorySet = new HashSet<>(); + for (DummyInventoryInfoEO dummyInventoryInfoEO : records) { + //子标题 + if (StringUtils.isBlank(dummyInventoryInfoEO.getSubtitle())) { + dummyInventoryInfoEO.setSubtitle("null"); + } + //WVTA ID + if (StringUtils.isBlank(dummyInventoryInfoEO.getWvtaId())) { + dummyInventoryInfoEO.setWvtaId("null"); + } + //备注 + if (StringUtils.isBlank(dummyInventoryInfoEO.getRemark())) { + dummyInventoryInfoEO.setRemark("null"); + } + //适用增补件 + if (StringUtils.isBlank(dummyInventoryInfoEO.getApplicableSupplement())) { + dummyInventoryInfoEO.setApplicableSupplement("null"); + } + //技术领域 + if (StringUtils.isNotBlank(dummyInventoryInfoEO.getTechnologyTerritory())) { + List list = Arrays.asList(dummyInventoryInfoEO.getTechnologyTerritory().split(",")); + technologyTerritorySet.addAll(list); + } + //树形结构数据字典(技术领域) + List categoryList = new ArrayList<>(); + if (technologyTerritorySet.size() != 0) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(SysCategory::getId, technologyTerritorySet); + categoryList = sysCategoryService.list(wrapper); + } + //技术领域 + if (categoryList.size() != 0 && StringUtils.isNotBlank(dummyInventoryInfoEO.getTechnologyTerritory())) { + List technologyTerritoryList = Arrays.asList(dummyInventoryInfoEO.getTechnologyTerritory().split(",")); + StringBuilder sb = new StringBuilder(); + for (String technologyTerritory : technologyTerritoryList) { + List collect = categoryList.stream().filter(e -> technologyTerritory.equals(e.getId())).collect(Collectors.toList()); + if (collect.size() != 0) { + sb.append(collect.get(0).getEnName() + ","); + } + } + String technologyTerritoryName = null; + if (StringUtils.isNotBlank(sb)) { + technologyTerritoryName = sb.substring(0, sb.length() - 1); + } + dummyInventoryInfoEO.setTechnologyTerritoryName(technologyTerritoryName); + }else{ + dummyInventoryInfoEO.setTechnologyTerritoryName("null"); + } + + //适用范围 + if (StringUtils.isNotBlank(dummyInventoryInfoEO.getShi4Yong4Fan4Wei2())) { + List shi4Yong4Fan4Wei2 = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseFieldEnum.SHI4_YONG4_FAN4_WEI2.getValue()); + List shi4Yong4Fan4Wei2List = Arrays.asList(dummyInventoryInfoEO.getShi4Yong4Fan4Wei2().split(",")); + StringBuilder shi4Yong4Fan4Wei2Builder = new StringBuilder(); + for (String midshi4Yong4Fan4Wei2 : shi4Yong4Fan4Wei2List) { + String shi4Yong4Fan4Wei2EnName = shi4Yong4Fan4Wei2.stream().filter(e -> e.getItemValue().equals(midshi4Yong4Fan4Wei2)).map(f -> f.getEnName()).collect(Collectors.joining(",")); + shi4Yong4Fan4Wei2Builder.append(shi4Yong4Fan4Wei2EnName).append(","); + } + dummyInventoryInfoEO.setShi4Yong4Fan4Wei2(shi4Yong4Fan4Wei2Builder.substring(0, shi4Yong4Fan4Wei2Builder.toString().length() - 1)); + }else{ + dummyInventoryInfoEO.setShi4Yong4Fan4Wei2("null"); + } + //适用地区 + if (StringUtils.isNotBlank(dummyInventoryInfoEO.getRegion())) { + List region = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseFieldEnum.REGION.getValue()); + List regionList = Arrays.asList(dummyInventoryInfoEO.getRegion().split(",")); + StringBuilder regionBuilder = new StringBuilder(); + for (String midRegion : regionList) { + String regionEnName = region.stream().filter(e -> e.getItemValue().equals(midRegion)).map(f -> f.getEnName()).collect(Collectors.joining(",")); + regionBuilder.append(regionEnName).append(","); + } + dummyInventoryInfoEO.setRegion(regionBuilder.substring(0, regionBuilder.toString().length() - 1)); + }else { + dummyInventoryInfoEO.setRegion("null"); + } + //责任领域 + if (StringUtils.isNotBlank(dummyInventoryInfoEO.getDutyTerritory())) { + List dutyTerritory = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseFieldEnum.DUTY_TERRITORY.getValue()); + List dutyTerritoryList = Arrays.asList(dummyInventoryInfoEO.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(","); + } + dummyInventoryInfoEO.setDutyTerritory(dutyTerritoryBuilder.substring(0, dutyTerritoryBuilder.toString().length() - 1)); + } + else { + dummyInventoryInfoEO.setDutyTerritory("null"); + } + //实施类别 + if (StringUtils.isNotBlank(dummyInventoryInfoEO.getImplementType())) { + List implementType = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseFieldEnum.IMPLEMENT_TYPE.getValue()); + String implementTypeEnName = implementType.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getImplementType())).map(f -> f.getItemText()).collect(Collectors.joining(",")); + dummyInventoryInfoEO.setImplementType(implementTypeEnName); + }else { + dummyInventoryInfoEO.setImplementType("null"); + } + //认证类型 + if(StringUtils.isNotBlank(dummyInventoryInfoEO.getAttestationType())) { + List attestationType = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseFieldEnum.ATTESTATION_TYPE.getValue()); + String attestationTypeEnName = attestationType.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getAttestationType())).map(f -> f.getItemText()).collect(Collectors.joining(",")); + dummyInventoryInfoEO.setAttestationType(attestationTypeEnName); + }else { + dummyInventoryInfoEO.setAttestationType("null"); + } + //认证级别 + if (StringUtils.isNotBlank(dummyInventoryInfoEO.getAttestationRank())) { + List attestationRank = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseFieldEnum.ATTESTATION_RANK.getValue()); + String attestationRankEnName = attestationRank.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getAttestationRank())).map(f -> f.getItemText()).collect(Collectors.joining(",")); + dummyInventoryInfoEO.setAttestationRank(attestationRankEnName); + }else { + dummyInventoryInfoEO.setAttestationRank("null"); + } + //新车型实施日期 + if (dummyInventoryInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1() != null) { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd"); + String dateString = sdf.format(dummyInventoryInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1()); + dummyInventoryInfoEO.setXin1Che1Xing2Shi2Shi1Ri4Qi1String(dateString); + }else { + dummyInventoryInfoEO.setXin1Che1Xing2Shi2Shi1Ri4Qi1String("null"); + } + //在产车实施日期 + if (dummyInventoryInfoEO.getImplementTime() != null) { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd"); + String dateString = sdf.format(dummyInventoryInfoEO.getImplementTime()); + dummyInventoryInfoEO.setImplementTimeString(dateString); + }else { + dummyInventoryInfoEO.setImplementTimeString("null"); + } + + //交付物类型 + List deliverableTemplate = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseFieldEnum.DELIVERABLE_TEMPLATE.getValue()); + //设计符合性确认-交付物类型 + if (StringUtils.isNotBlank(dummyInventoryInfoEO.getDesignDeliverableType())) { + String designDeliverableTypeEnName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getDesignDeliverableType())).map(f -> f.getEnName()).collect(Collectors.joining(",")); + dummyInventoryInfoEO.setDesignDeliverableType(designDeliverableTypeEnName); + }else { + dummyInventoryInfoEO.setDesignDeliverableType("null"); + } + //prehomo确认-交付物类型 + if (StringUtils.isNotBlank(dummyInventoryInfoEO.getPrehomoDeliverableType())) { + String prehomoDeliverableTypeEnName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getPrehomoDeliverableType())).map(f -> f.getEnName()).collect(Collectors.joining(",")); + dummyInventoryInfoEO.setPrehomoDeliverableType(prehomoDeliverableTypeEnName); + }else { + dummyInventoryInfoEO.setPrehomoDeliverableType("null"); + } + //验证符合性确认-交付物类型 + if (StringUtils.isNotBlank(dummyInventoryInfoEO.getVerifyDeliverableType())) { + String verifyDeliverableTypeEnName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getVerifyDeliverableType())).map(f -> f.getEnName()).collect(Collectors.joining(",")); + dummyInventoryInfoEO.setVerifyDeliverableType(verifyDeliverableTypeEnName); + }else { + dummyInventoryInfoEO.setVerifyDeliverableType("null"); + } + + //发起人 + List fa1_qi3_ren2 = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseFieldEnum.FA1_QI3_REN2.getValue()); + //设计符合性确认-发起人 + if (StringUtils.isNotBlank(dummyInventoryInfoEO.getDesignInitiator())) { + String designInitiatorEnName = fa1_qi3_ren2.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getDesignInitiator())).map(f -> f.getEnName()).collect(Collectors.joining(",")); + dummyInventoryInfoEO.setDesignInitiator(designInitiatorEnName); + }else { + dummyInventoryInfoEO.setDesignInitiator("null"); + } + //prehomo确认-发起人 + if (StringUtils.isNotBlank(dummyInventoryInfoEO.getPrehomoInitiator())) { + String prehomoInitiatorEnName = fa1_qi3_ren2.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getPrehomoInitiator())).map(f -> f.getEnName()).collect(Collectors.joining(",")); + dummyInventoryInfoEO.setPrehomoInitiator(prehomoInitiatorEnName); + }else { + dummyInventoryInfoEO.setPrehomoInitiator("null"); + } + //验证符合性确认-发起人 + if (StringUtils.isNotBlank(dummyInventoryInfoEO.getVerifyInitiator())) { + String verifyInitiatorEnName = fa1_qi3_ren2.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getVerifyInitiator())).map(f -> f.getEnName()).collect(Collectors.joining(",")); + dummyInventoryInfoEO.setVerifyInitiator(verifyInitiatorEnName); + }else { + dummyInventoryInfoEO.setVerifyInitiator("null"); + } + + //责任人 + List ze2_ren4_ren2 = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseFieldEnum.ZE2_REN2_REN2.getValue()); + //设计符合性确认-责任人 + if (StringUtils.isNotBlank(dummyInventoryInfoEO.getDesignDuty())) { + String designDutyEnName = ze2_ren4_ren2.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getDesignDuty())).map(f -> f.getEnName()).collect(Collectors.joining(",")); + dummyInventoryInfoEO.setDesignDuty(designDutyEnName); + }else { + dummyInventoryInfoEO.setDesignDuty("null"); + } + //prehomo确认-责任人 + if (StringUtils.isNotBlank(dummyInventoryInfoEO.getPrehomoDuty())) { + String prehomoDutyEnName = ze2_ren4_ren2.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getPrehomoDuty())).map(f -> f.getEnName()).collect(Collectors.joining(",")); + dummyInventoryInfoEO.setPrehomoDuty(prehomoDutyEnName); + }else { + dummyInventoryInfoEO.setPrehomoDuty("null"); + } + //验证符合性确认-责任人 + if (StringUtils.isNotBlank(dummyInventoryInfoEO.getVerifyDuty())) { + String verifyDutyEnName = ze2_ren4_ren2.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getVerifyDuty())).map(f -> f.getEnName()).collect(Collectors.joining(",")); + dummyInventoryInfoEO.setVerifyDuty(verifyDutyEnName); + }else { + dummyInventoryInfoEO.setVerifyDuty("null"); + } + + } + } //发送消息 private void sendMsg(Map baseDiff, String idTemp,List> infoDiffList, String addSerialNumber,String deleteSerialNumber,String state,String cut) { @@ -701,7 +915,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl nameList = Arrays.asList(baseDiff.get("name").split(",")); @@ -731,23 +945,35 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl infoDiff : infoDiffList) { if (infoDiff.size() > 1) { - int infoDiffRow = 1; contentInfo += row + ". The Number " + infoDiff.get("serialNumber") + " has been updated as follows : " + "\r\n"; + contentInfo = setInfoDiffListContent(contentInfo,infoDiffList,contentLog); + } + } + } + return contentInfo; + } + + public String setInfoDiffListContent(String contentInfo, List> infoDiffList,String contentLog){ + //设置维护清单的修改消息 + if(CollectionUtils.isNotEmpty(infoDiffList)) { + for (Map infoDiff : infoDiffList) { + if (infoDiff.size() > 1) { + + // contentInfo += row + ". The Number " + infoDiff.get("serialNumber") + " has been updated as follows : " + "\r\n"; //标题 if (StringUtils.isNotBlank(infoDiff.get("title"))) { List list = Arrays.asList(infoDiff.get("title").split(",")); String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); if (StringUtils.isBlank(contentLog)) { - contentInfo += "(" + infoDiffRow + "). Title has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n"; - infoDiffRow++; + contentInfo += DummyInventoryBaseFieldEnum.TITLE.getEnName() +" has been changed from " + infoDiffOld + " to " + infoDiffNew + ","; + }else{ - contentLog += DummyInventoryBaseFieldEnum.SUBTITLE.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ","; + contentLog += DummyInventoryBaseFieldEnum.TITLE.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ","; } } //子标题 @@ -756,8 +982,8 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl infoEOList = new ArrayList<>(); infoEOList.add(dummyInventoryInfoEO); + List infoEOListCopy = new ArrayList<>(); + infoEOListCopy.add(dummyInventoryInfoEOCopy); + //查询数据库里原来的数据 QueryWrapper queryWrapper = new QueryWrapper<>(); List dataList = list(queryWrapper.eq("id", dummyInventoryInfoEO.getId())); + List dataListCopy = DeepCopyListUtil.depCopy(dataList); saveOrUpdate(dummyInventoryInfoEO); - //翻译 + //翻译-中文 dummyInventoryBaseEOService.disposeData(infoEOList); dummyInventoryBaseEOService.disposeData(dataList); + //翻译-英文 + dummyInventoryBaseEOService.disposeDataToEn(infoEOListCopy); + dummyInventoryBaseEOService.disposeDataToEn(dataListCopy); + //比对不同字段 Map infoDiff = ListDiff.compareObject(dataList.get(0),dummyInventoryInfoEO); + Map infoDiffEn = ListDiff.compareObject(dataListCopy.get(0),dummyInventoryInfoEOCopy); //设置更新log List> infoDiffList = new ArrayList<>(); infoDiffList.add(infoDiff); - contentLog = dummyInventoryBaseEOService.setContentInfo(null,null,infoDiffList,null,null,contentLog); - enContentLog=contentLog.replace("由"," changed from ") - .replace("改为"," to "); + List> infoDiffListEn = new ArrayList<>(); + infoDiffListEn.add(infoDiffEn); +// contentLog = dummyInventoryBaseEOService.setContentInfo(null,null,infoDiffList,null,null,contentLog); +// enContentLog=dummyInventoryBaseEOService.setContentInfo(enContentLog,null,infoDiffListEn,null,null,null); + + contentLog = dummyInventoryBaseEOService.setInfoDiffListContent(null,infoDiffList,contentLog); + enContentLog=dummyInventoryBaseEOService.setInfoDiffListContent(enContentLog,infoDiffListEn,null); + dummyLogEOService.updateLog(contentLog, dummyInventoryInfoEO.getDummyInventoryBaseId(),CutEnum.CN.getValue()); dummyLogEOService.updateLog(enContentLog, dummyInventoryInfoEO.getDummyInventoryBaseId(),CutEnum.EN.getValue()); } @@ -368,12 +385,10 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl infoListCopy = DeepCopyListUtil.depCopy(infoList); //根据id查询数据库中完整信息,翻译 -// List idList = Arrays.asList(dummyInventoryInfoEO.getIds().split(",")); -// QueryWrapper queryWrapper = new QueryWrapper<>(); -// List infoList = list(queryWrapper.in("id", idList)); -// String projectId = infoList.get(0).getDummyInventoryBaseId(); dummyInventoryBaseEOService.disposeData(infoList); + dummyInventoryBaseEOService.disposeDataToEn(infoListCopy); //翻译传入的数据 List inputList = new ArrayList<>(); @@ -383,78 +398,79 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl id.equals(e.getId())).collect(Collectors.toList()).get(0); + DummyInventoryInfoEO infoCopy = infoListCopy.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList()).get(0); contentLogBuilder.append(info.getSerialNumber() + ":"); - enContentLogBuilder.append(info.getSerialNumber() + ":"); + enContentLogBuilder.append(infoCopy.getSerialNumber() + ":"); DummyInventoryInfoEO dummyInventoryInfoEOTemp = new DummyInventoryInfoEO(); dummyInventoryInfoEOTemp.setId(id); //实施类别 implementType if(StringUtils.isNotBlank(dummyInventoryInfoEO.getImplementType())) { - if (StringUtils.isBlank(info.getImplementType())){ + /*if (StringUtils.isBlank(info.getImplementType())){ info.setImplementType("空"); - } - if (!info.getImplementType().equals(inputInfoEO.getImplementType())) { + }*/ + if (!info.getImplementType().equals(inputInfoEO.getImplementType()) && !inputInfoEO.getImplementType().equals("空")){ setUpdateContentLog(contentLogBuilder, DummyInventoryBaseFieldEnum.IMPLEMENT_TYPE.getName(), info.getImplementType(), inputInfoEO.getImplementType()); - setUpdateEnContentLog(enContentLogBuilder,DummyInventoryBaseFieldEnum.IMPLEMENT_TYPE.getEnName(), info.getImplementType(), inputInfoEO.getImplementType()); + setUpdateEnContentLog(enContentLogBuilder,DummyInventoryBaseFieldEnum.IMPLEMENT_TYPE.getEnName(), infoCopy.getImplementType(), inputInfoEO.getImplementType()); } } //认证类型 attestationType if(StringUtils.isNotBlank(dummyInventoryInfoEO.getAttestationType())) { - if (StringUtils.isBlank(info.getAttestationType())){ + /*if (StringUtils.isBlank(info.getAttestationType())){ info.setAttestationType("空"); - } - if (!info.getAttestationType().equals(inputInfoEO.getAttestationType())) { + }*/ + if (!info.getAttestationType().equals(inputInfoEO.getAttestationType()) && !inputInfoEO.getAttestationType().equals("空")){ setUpdateContentLog(contentLogBuilder, DummyInventoryBaseFieldEnum.ATTESTATION_TYPE.getName(), info.getAttestationType(), inputInfoEO.getAttestationType()); - setUpdateEnContentLog(enContentLogBuilder, DummyInventoryBaseFieldEnum.ATTESTATION_TYPE.getEnName(), info.getAttestationType(), inputInfoEO.getAttestationType()); + setUpdateEnContentLog(enContentLogBuilder, DummyInventoryBaseFieldEnum.ATTESTATION_TYPE.getEnName(), infoCopy.getAttestationType(), inputInfoEO.getAttestationType()); } } //认证级别 attestationRank if(StringUtils.isNotBlank(dummyInventoryInfoEO.getAttestationRank())) { - if (StringUtils.isBlank(info.getAttestationRank())){ + /*if (StringUtils.isBlank(info.getAttestationRank())){ info.setAttestationRank("空"); - } - if (!info.getAttestationRank().equals(inputInfoEO.getAttestationRank())){ + }*/ + if (!info.getAttestationRank().equals(inputInfoEO.getAttestationRank()) && !inputInfoEO.getAttestationRank().equals("空")){ setUpdateContentLog(contentLogBuilder, DummyInventoryBaseFieldEnum.ATTESTATION_RANK.getName(), info.getAttestationRank(), inputInfoEO.getAttestationRank()); - setUpdateEnContentLog(enContentLogBuilder, DummyInventoryBaseFieldEnum.ATTESTATION_RANK.getEnName(), info.getAttestationRank(), inputInfoEO.getAttestationRank()); + setUpdateEnContentLog(enContentLogBuilder, DummyInventoryBaseFieldEnum.ATTESTATION_RANK.getEnName(), infoCopy.getAttestationRank(), inputInfoEO.getAttestationRank()); } } //责任领域 dutyTerritory if(StringUtils.isNotBlank(dummyInventoryInfoEO.getDutyTerritory())) { - if (StringUtils.isBlank(info.getDutyTerritory())){ + /*if (StringUtils.isBlank(info.getDutyTerritory())){ info.setDutyTerritory("空"); - } - if (!info.getDutyTerritory().equals(inputInfoEO.getDutyTerritory())){ + }*/ + if (!info.getDutyTerritory().equals(inputInfoEO.getDutyTerritory()) && !inputInfoEO.getDutyTerritory().equals("空")){ setUpdateContentLog(contentLogBuilder, DummyInventoryBaseFieldEnum.DUTY_TERRITORY.getName(), info.getDutyTerritory(), inputInfoEO.getDutyTerritory()); - setUpdateEnContentLog(enContentLogBuilder, DummyInventoryBaseFieldEnum.DUTY_TERRITORY.getEnName(), info.getDutyTerritory(), inputInfoEO.getDutyTerritory()); + setUpdateEnContentLog(enContentLogBuilder, DummyInventoryBaseFieldEnum.DUTY_TERRITORY.getEnName(), infoCopy.getDutyTerritory(), inputInfoEO.getDutyTerritory()); } } //适用范围 shi4Yong4Fan4Wei2 if(StringUtils.isNotBlank(dummyInventoryInfoEO.getShi4Yong4Fan4Wei2())){ - if (StringUtils.isBlank(info.getShi4Yong4Fan4Wei2())){ + /*if (StringUtils.isBlank(info.getShi4Yong4Fan4Wei2())){ info.setShi4Yong4Fan4Wei2("空"); - } - if (!info.getShi4Yong4Fan4Wei2().equals(inputInfoEO.getShi4Yong4Fan4Wei2())) { + }*/ + if (!info.getShi4Yong4Fan4Wei2().equals(inputInfoEO.getShi4Yong4Fan4Wei2()) && !inputInfoEO.getShi4Yong4Fan4Wei2().equals("空")){ setUpdateContentLog(contentLogBuilder, DummyInventoryBaseFieldEnum.SHI4_YONG4_FAN4_WEI2.getName(),info.getShi4Yong4Fan4Wei2(),inputInfoEO.getShi4Yong4Fan4Wei2()); - setUpdateEnContentLog(enContentLogBuilder, DummyInventoryBaseFieldEnum.SHI4_YONG4_FAN4_WEI2.getEnName(),info.getShi4Yong4Fan4Wei2(),inputInfoEO.getShi4Yong4Fan4Wei2()); + setUpdateEnContentLog(enContentLogBuilder, DummyInventoryBaseFieldEnum.SHI4_YONG4_FAN4_WEI2.getEnName(),infoCopy.getShi4Yong4Fan4Wei2(),inputInfoEO.getShi4Yong4Fan4Wei2()); } } //技术领域 technologyTerritory if(StringUtils.isNotBlank(dummyInventoryInfoEO.getTechnologyTerritory())){ - if (StringUtils.isBlank(info.getTechnologyTerritoryName())){ + /*if (StringUtils.isBlank(info.getTechnologyTerritoryName())){ info.setTechnologyTerritoryName("空"); - } - if (!info.getTechnologyTerritoryName().equals(inputInfoEO.getTechnologyTerritoryName())) { + }*/ + if (!info.getTechnologyTerritoryName().equals(inputInfoEO.getTechnologyTerritoryName()) && !inputInfoEO.getTechnologyTerritoryName().equals("空")){ setUpdateContentLog(contentLogBuilder, DummyInventoryBaseFieldEnum.TECHNOLOGY_TERRITORY.getName(),info.getTechnologyTerritoryName(),inputInfoEO.getTechnologyTerritoryName()); - setUpdateEnContentLog(enContentLogBuilder, DummyInventoryBaseFieldEnum.TECHNOLOGY_TERRITORY.getEnName(),info.getTechnologyTerritoryName(),inputInfoEO.getTechnologyTerritoryName()); + setUpdateEnContentLog(enContentLogBuilder, DummyInventoryBaseFieldEnum.TECHNOLOGY_TERRITORY.getEnName(),infoCopy.getTechnologyTerritoryName(),inputInfoEO.getTechnologyTerritoryName()); } } //适用地区 region if(StringUtils.isNotBlank(dummyInventoryInfoEO.getRegion())){ - if (StringUtils.isBlank(info.getRegion())){ + /*if (StringUtils.isBlank(info.getRegion())){ info.setRegion("空"); - } - if (!info.getRegion().equals(inputInfoEO.getRegion())) { + }*/ + if (!info.getRegion().equals(inputInfoEO.getRegion()) && !inputInfoEO.getRegion().equals("空")){ setUpdateContentLog(contentLogBuilder, DummyInventoryBaseFieldEnum.REGION.getName(),info.getRegion(),inputInfoEO.getRegion()); - setUpdateEnContentLog(enContentLogBuilder, DummyInventoryBaseFieldEnum.REGION.getEnName(),info.getRegion(),inputInfoEO.getRegion()); + setUpdateEnContentLog(enContentLogBuilder, DummyInventoryBaseFieldEnum.REGION.getEnName(),infoCopy.getRegion(),inputInfoEO.getRegion()); } } //新车实施日期 @@ -485,7 +501,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl List depCopy(List srcList) { + ByteArrayOutputStream byteOut = new ByteArrayOutputStream(); + try { + ObjectOutputStream out = new ObjectOutputStream(byteOut); + out.writeObject(srcList); + + ByteArrayInputStream byteIn = new ByteArrayInputStream(byteOut.toByteArray()); + ObjectInputStream inStream = new ObjectInputStream(byteIn); + List destList = (List) inStream.readObject(); + return destList; + } catch (Exception e) { + e.printStackTrace(); + } + return null; + } + +} From 3e24bd369d99188b49875f7df542ce60648fc317 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Fri, 27 May 2022 14:47:18 +0800 Subject: [PATCH 23/40] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=B2=E7=9F=A5?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../virtualList/components/virtualListDetails.vue | 6 +++--- .../views/processCenter/components/standardContentList.vue | 6 +++--- .../src/views/projectManagement/components/TaskList.vue | 6 +++--- .../projectManagement/components/listOfRegulations.vue | 6 +++--- .../views/projectManagement/components/nonConformance.vue | 6 +++--- .../src/views/projectManagement/historicalVersion/index.vue | 6 +++--- .../views/projectManagement/projectNonConformance/index.vue | 6 +++--- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue index b01d9b6c0..f92e75487 100644 --- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue +++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue @@ -144,7 +144,7 @@ {{text && text.length > 10 ? text.slice(0,9)+'...':text}} - {{record.designDeliverableType_dictText}}
+ {{record.designDeliverableTypeName}}
@@ -155,7 +155,7 @@ -- - {{record.prehomoDeliverableType_dictText}}
+ {{record.prehomoDeliverableTypeName}}
 @@ -166,7 +166,7 @@ -- - {{record.verifyDeliverableType_dictText}}
+ {{record.verifyDeliverableTypeName}}
 diff --git a/jero-web/src/views/processCenter/components/standardContentList.vue b/jero-web/src/views/processCenter/components/standardContentList.vue index 8a8466017..c17cf6bf8 100644 --- a/jero-web/src/views/processCenter/components/standardContentList.vue +++ b/jero-web/src/views/processCenter/components/standardContentList.vue @@ -141,7 +141,7 @@ InitiatorName: this.standardContentListQuery.designInitiatorName, DutyName: this.standardContentListQuery.designDutyName, DueDate: this.standardContentListQuery.designDueDate, - DeliverableType: this.standardContentListQuery.designDeliverableType_dictText, + DeliverableType: this.standardContentListQuery.designDeliverableTypeName, DeliverableTemplate: this.standardContentListQuery.designDeliverableTemplate, DeliverableTemplateName: this.standardContentListQuery.designDeliverableTemplateName, remark: this.standardContentListQuery.designRemark @@ -151,7 +151,7 @@ InitiatorName: this.standardContentListQuery.prehomoInitiatorName, DutyName: this.standardContentListQuery.prehomoDutyName, DueDate: this.standardContentListQuery.prehomoDueDate, - DeliverableType: this.standardContentListQuery.prehomoDeliverableType_dictText, + DeliverableType: this.standardContentListQuery.prehomoDeliverableTypeName, DeliverableTemplate: this.standardContentListQuery.prehomoDeliverableTemplate, DeliverableTemplateName: this.standardContentListQuery.prehomoDeliverableTemplateName, remark: this.standardContentListQuery.prehomoRemark @@ -161,7 +161,7 @@ InitiatorName: this.standardContentListQuery.verifyInitiatorName, DutyName: this.standardContentListQuery.verifyDutyName, DueDate: this.standardContentListQuery.verifyDueDate, - DeliverableType: this.standardContentListQuery.verifyDeliverableType_dictText, + DeliverableType: this.standardContentListQuery.verifyDeliverableTypeName, DeliverableTemplate: this.standardContentListQuery.verifyDeliverableTemplate, DeliverableTemplateName: this.standardContentListQuery.verifyDeliverableTemplateName, remark: this.standardContentListQuery.verifyRemark diff --git a/jero-web/src/views/projectManagement/components/TaskList.vue b/jero-web/src/views/projectManagement/components/TaskList.vue index 9a11930df..8ff71697b 100644 --- a/jero-web/src/views/projectManagement/components/TaskList.vue +++ b/jero-web/src/views/projectManagement/components/TaskList.vue @@ -297,7 +297,7 @@ flowType: 2, Sponsor: 'designInitiatorName', personLiable: 'designDutyName', - typeOfDeliverables: 'designDeliverableType_dictText', + typeOfDeliverables: 'designDeliverableTypeName', deliverableTemplate: 'designDeliverableTemplate', DueDate: 'designDueDate', remarks: 'designRemark', @@ -321,7 +321,7 @@ id: this.$route.query.id, Sponsor: 'prehomoInitiatorName', personLiable: 'prehomoDutyName', - typeOfDeliverables: 'prehomoDeliverableType_dictText', + typeOfDeliverables: 'prehomoDeliverableTypeName', deliverableTemplate: 'prehomoDeliverableTemplate', DueDate: 'prehomoDueDate', remarks: 'prehomoRemark', @@ -345,7 +345,7 @@ isDisplay: isTrue, Sponsor: 'verifyInitiatorName', personLiable: 'verifyDutyName', - typeOfDeliverables: 'verifyDeliverableType_dictText', + typeOfDeliverables: 'verifyDeliverableTypeName', deliverableTemplate: 'verifyDeliverableTemplate', DueDate: 'verifyDueDate', remarks: 'verifyRemark', diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index e6a513714..b661d8d5b 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -160,7 +160,7 @@ {{ text && text.length > 10 ? text.slice(0, 9) + '...' : text }} - {{ record.designDeliverableType_dictText }}
+ {{ record.designDeliverableTypeName }}
 @@ -172,7 +172,7 @@ - {{ record.prehomoDeliverableType_dictText }}
+ {{ record.prehomoDeliverableTypeName }}
 @@ -184,7 +184,7 @@ - {{ record.verifyDeliverableType_dictText }}
+ {{ record.verifyDeliverableTypeName }}
 diff --git a/jero-web/src/views/projectManagement/components/nonConformance.vue b/jero-web/src/views/projectManagement/components/nonConformance.vue index 82ac313b9..c119a66e5 100644 --- a/jero-web/src/views/projectManagement/components/nonConformance.vue +++ b/jero-web/src/views/projectManagement/components/nonConformance.vue @@ -221,7 +221,7 @@ query.flowType = 2 query.Sponsor = 'designInitiatorName' query.personLiable = 'designDutyName' - query.typeOfDeliverables = 'designDeliverableType_dictText' + query.typeOfDeliverables = 'designDeliverableTypeName' query.deliverableTemplate = 'designDeliverableTemplate' query.DueDate = 'designDueDate' query.remarks = 'designRemark' @@ -230,7 +230,7 @@ query.flowType = 3 query.Sponsor = 'prehomoInitiatorName' query.personLiable = 'prehomoDutyName' - query.typeOfDeliverables = 'prehomoDeliverableType_dictText' + query.typeOfDeliverables = 'prehomoDeliverableTypeName' query.deliverableTemplate = 'prehomoDeliverableTemplate' query.DueDate = 'prehomoDueDate' query.remarks = 'prehomoRemark' @@ -239,7 +239,7 @@ query.flowType = 4 query.Sponsor = 'verifyInitiatorName' query.personLiable = 'verifyDutyName' - query.typeOfDeliverables = 'verifyDeliverableType_dictText' + query.typeOfDeliverables = 'verifyDeliverableTypeName' query.deliverableTemplate = 'verifyDeliverableTemplate' query.DueDate = 'verifyDueDate' query.remarks = 'verifyRemark' diff --git a/jero-web/src/views/projectManagement/historicalVersion/index.vue b/jero-web/src/views/projectManagement/historicalVersion/index.vue index 51d3b91d6..f52c7b1eb 100644 --- a/jero-web/src/views/projectManagement/historicalVersion/index.vue +++ b/jero-web/src/views/projectManagement/historicalVersion/index.vue @@ -61,7 +61,7 @@ {{ text && text.length > 20 ? text.slice(0, 19) + '...' : text }} - {{ record.designDeliverableType_dictText }}
+ {{ record.designDeliverableTypeName }}
 {{ record.designDeliverableTemplateName }} @@ -71,7 +71,7 @@ -- - {{ record.prehomoDeliverableType_dictText }}
+ {{ record.prehomoDeliverableTypeName }}
 {{ record.prehomoDeliverableTemplateName }} @@ -81,7 +81,7 @@ -- - {{ record.verifyDeliverableType_dictText }}
+ {{ record.verifyDeliverableTypeName }}
 {{ record.verifyDeliverableTemplateName }} diff --git a/jero-web/src/views/projectManagement/projectNonConformance/index.vue b/jero-web/src/views/projectManagement/projectNonConformance/index.vue index f822af33a..a16435549 100644 --- a/jero-web/src/views/projectManagement/projectNonConformance/index.vue +++ b/jero-web/src/views/projectManagement/projectNonConformance/index.vue @@ -357,7 +357,7 @@ query.flowType = 2 query.Sponsor = 'designInitiatorName' query.personLiable = 'designDutyName' - query.typeOfDeliverables = 'designDeliverableType_dictText' + query.typeOfDeliverables = 'designDeliverableTypeName' query.deliverableTemplate = 'designDeliverableTemplate' query.DueDate = 'designDueDate' query.remarks = 'designRemark' @@ -366,7 +366,7 @@ query.flowType = 3 query.Sponsor = 'prehomoInitiatorName' query.personLiable = 'prehomoDutyName' - query.typeOfDeliverables = 'prehomoDeliverableType_dictText' + query.typeOfDeliverables = 'prehomoDeliverableTypeName' query.deliverableTemplate = 'prehomoDeliverableTemplate' query.DueDate = 'prehomoDueDate' query.remarks = 'prehomoRemark' @@ -375,7 +375,7 @@ query.flowType = 4 query.Sponsor = 'verifyInitiatorName' query.personLiable = 'verifyDutyName' - query.typeOfDeliverables = 'verifyDeliverableType_dictText' + query.typeOfDeliverables = 'verifyDeliverableTypeName' query.deliverableTemplate = 'verifyDeliverableTemplate' query.DueDate = 'verifyDueDate' query.remarks = 'verifyRemark' From 02f9ddd4e361ccb4e9b3ed815a09cb519b31cda8 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Fri, 27 May 2022 15:02:15 +0800 Subject: [PATCH 24/40] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=B2=E7=9F=A5?= =?UTF-8?q?=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/documentManage/library/index.vue | 3 +-- .../processForm/taskListProcess/index.vue | 12 ++++++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/jero-web/src/views/documentManage/library/index.vue b/jero-web/src/views/documentManage/library/index.vue index 29c0b0b81..51bc071a4 100644 --- a/jero-web/src/views/documentManage/library/index.vue +++ b/jero-web/src/views/documentManage/library/index.vue @@ -165,8 +165,7 @@ }, //下载模板 handleModule() { - - downloadFile('document/bussDocumentLibraryEO/exportTemplate', this.$t('importTemplate')+this.$t('importTemplate')+'.xls', {}) + downloadFile('document/bussDocumentLibraryEO/exportTemplate', this.$t('DocumentLibrary')+this.$t('importTemplate')+'.xls', {}) }, //批量删除 handleDel() { diff --git a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue index a64d2367e..d40e10e9f 100644 --- a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue @@ -1,7 +1,7 @@