From 8e89e3d5e50141d35291d7d512760786e6357bad Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Wed, 27 Apr 2022 16:15:28 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E7=9A=84=E6=89=B9=E9=87=8F=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E3=80=81=E5=A4=8D=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectManagement/components/listOfRegulations.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 7e10bb5f7..c4547c2f9 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -528,9 +528,9 @@ updateStatusBatch: '/project/projectLawsInventoryEO/updateStatusBatch', matchRelevantPeople: '/project/projectLawsInventoryEO/matchRelevantPeople', queryPersonByProject: '/project/projectRelatedPersonnel/queryPersonByProjectId', - setBatch: '',//批量设置 - copyUrl: '',//复制 - transferUrl: ''//调取 + setBatch: '/project/projectLawsInventoryEO/setBatch',//批量设置 + copyUrl: '/project/projectLawsInventoryEO/copyInfoByIds',//复制 + transferUrl: '/project/projectLawsInventoryEO/getPageInfoDummy'//调取 }, loading: false, dataSource: [], From 00f0f76862922c4aaf070d401de15f4ac0c7433e Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Wed, 27 Apr 2022 16:15:32 +0800 Subject: [PATCH 02/10] =?UTF-8?q?[add]=20=E5=8F=82=E6=95=B0=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 6 + jero-web/src/common/lang/zh-cn.js | 6 + .../src/components/dict/JMultiSelectTag.vue | 11 +- .../parameterlist/components/addModel.vue | 236 +++++++++++++++++- 4 files changed, 252 insertions(+), 7 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 322abaa9c..7d8371890 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -706,6 +706,12 @@ module.exports = { uploadTime: 'Upload time', enclosure: 'enclosure', // 认证 + attachmentTemplate: 'attachment Template', + controlAlternatives: 'control Alternatives', + controlVerification: 'control Verification', + controlType: 'control Type', + certificationCategory: 'certification Category', + parameterBatch: 'parameter Batch', releaseVersion: 'release Version', parameterTemplate: 'parameter Template', contentDescription: 'content Description', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 4e58b9bbb..5357eeb32 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -712,6 +712,12 @@ module.exports = { uploadTime:'上传时间', enclosure:'附件', // 认证 + attachmentTemplate: '附件模板', + controlAlternatives: '控件备选值', + controlVerification: '控件校验', + controlType: '控件类型', + certificationCategory: '认证类别', + parameterBatch: '参数批次', releaseVersion: '发布版本', parameterTemplate: '参数模板', contentDescription: '内容说明', diff --git a/jero-web/src/components/dict/JMultiSelectTag.vue b/jero-web/src/components/dict/JMultiSelectTag.vue index 463626e24..2f17d8662 100644 --- a/jero-web/src/components/dict/JMultiSelectTag.vue +++ b/jero-web/src/components/dict/JMultiSelectTag.vue @@ -94,8 +94,15 @@ }) this.content=item.join(',') }) - - console.log('value111',this.content) + let arrayLabel = [] + this.dictOptions.forEach((item) => { + this.arrayValue.forEach((val) => { + if(item.value === val) { + arrayLabel.push(item) + } + }) + }) + this.$emit('changelabel', arrayLabel); } } }, diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue index 6d699a2e0..e27d3359b 100644 --- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue +++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue @@ -33,8 +33,8 @@ - - {{ item.text || item.label }} + + {{ item.label }} @@ -76,6 +76,192 @@ + + +
+
+ {{$t('parameterBatch')}} +
+ + + +
+ + +
+
+ {{$t('areaOfResponsibility')}} +
+ + + +
+ + + + +
+
+ {{$t('ParameterDescription')}} +
+ + + +
+ + + + +
+
+ {{$t('certificationCategory')}} +
+ + + +
+ + + + +
+
+ {{$t('controlType')}} +
+ + + + + {{ item.label }} + + + + +
+ + +
+
+ {{$t('controlVerification')}} +
+ + + + + {{ item.label }} + + + + +
+ + + + +
+
+ {{$t('controlAlternatives')}} +
+ + + +
+ + + + +
+
+ {{$t('attachmentTemplate')}} +
+ + + +
+ + + + + + + + +
+
+ {{$t('controlType')}} +
+ + + +
+ + +
+
+ {{$t('controlVerification')}} +
+ + + +
+ + + + +
+
+ {{$t('controlType')}} +
+ + + +
+ + + + + +
@@ -96,11 +282,35 @@ export default { props: ['url'], data() { return { - isRequired: [ + isRequired: [ // 是否必填 {value:1, label: '是' }, {value:0, label: '否' } ], - CategoryTreeList: [], + controlType: [ // 控件类型 + {value:1, label: '文本' }, + {value:2, label: '下拉单选' }, + {value:3, label: '下拉多选' }, + {value:4, label: '附件' }, + {value:5, label: '文本+下拉单选' }, + {value:6, label: '文本+下拉多选' }, + {value:7, label: '文本+附件' }, + {value:8, label: '下拉单选+附件' }, + {value:9, label: '下拉多选+附件' }, + {value:10, label: '文本+下拉单选+附件' }, + ], + controlVerification: [ // 控件校验 + {value:1, label: '无' }, + {value:2, label: '中文' }, + {value:3, label: '正整数' }, + {value:4, label: '正浮点数' }, + {value:5, label: '整数或小数' }, + {value:6, label: '一位小数' }, + {value:7, label: '两位小数' }, + {value:8, label: '三位小数' }, + {value:9, label: '四位小数' }, + ], + CategoryTreeList: [], // 技术领域 + tabCertificationCategory: [], // 认证类别得tab栏 formInline: {}, confirmLoading: false, visible: false, @@ -126,7 +336,8 @@ export default { }, disabled: false, projectNameList: [], - title: '' + title: '', + stateOne: '' } }, mounted() { @@ -134,6 +345,21 @@ export default { this.getSysCategoryTree() }, methods: { + Onchangelabel(val) { + console.log(val,'val。。。') + if(val.length > 0) { + this.tabCertificationCategory = val + } else { + this.tabCertificationCategory = [] + console.log(this.tabCertificationCategory,'this.tabCertificationCategorythis.tabCertificationCategory') + } + }, + Onchange() { + + }, + callback() { + + }, getSysCategoryTree() { getAction('/sys/category/getSysCategoryTree', {}).then((res) => { if (res.success) { From 8206541894a493ccda3056499ff19abcf127ca13 Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Wed, 27 Apr 2022 16:48:24 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E4=BA=BA=E5=91=98-=E5=AF=BC=E5=85=A5=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E8=A6=86=E7=9B=96=E5=8E=9F=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/jero-boot-modules/pom.xml | 5 ++ .../entity/ProjectRelatedPersonnel.java | 8 +- .../ProjectRelatedPersonnelServiceImpl.java | 76 ++++++------------- 3 files changed, 33 insertions(+), 56 deletions(-) diff --git a/jero-boot/jero-boot-modules/pom.xml b/jero-boot/jero-boot-modules/pom.xml index d1605c902..01f3ad0e8 100644 --- a/jero-boot/jero-boot-modules/pom.xml +++ b/jero-boot/jero-boot-modules/pom.xml @@ -161,6 +161,11 @@ prime-jwt 1.3.1 + + com.alibaba + fastjson + 1.2.62 + 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 f725ac89e..a9fc69a41 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 @@ -46,23 +46,23 @@ public class ProjectRelatedPersonnel implements Serializable { /**法规工程师*/ private java.lang.String lawEngineer; @TableField(exist = false) - @Excel(name = "法规工程师,lawEngineerName", width = 30,orderNum = "2") + @Excel(name = "法规工程师,lawEngineerName", width = 15,orderNum = "2") private java.lang.String lawEngineerName; /**工程接口人*/ private java.lang.String engineeringInterfacePerson; @TableField(exist = false) - @Excel(name = "工程接口人,engineeringInterfacePersonName", width = 30,orderNum = "3") + @Excel(name = "工程接口人,engineeringInterfacePersonName", width = 15,orderNum = "3") private java.lang.String engineeringInterfacePersonName; /**认证工程师*/ private java.lang.String certificationEngineer; @TableField(exist = false) - @Excel(name = "认证工程师,certificationEngineerName", width = 30,orderNum = "4") + @Excel(name = "认证工程师,certificationEngineerName", width = 15,orderNum = "4") private java.lang.String certificationEngineerName; /**备注*/ - @Excel(name = "备注,remark", width = 50,orderNum = "5") + @Excel(name = "备注,remark", width = 15,orderNum = "5") private java.lang.String remark; /**创建人*/ diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java index f6cd6ecef..e6c60bbe7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java @@ -492,6 +492,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl lawEngineerUsers = new ArrayList<>(); if (StringUtils.isNotEmpty(projectRelatedPersonnel.getLawEngineerName())){ List lawEngineerNameList = Arrays.asList(projectRelatedPersonnel.getLawEngineerName().split(",")); - if (CollectionUtils.isNotEmpty(lawEngineerNameList)) { + if (CollectionUtils.isNotEmpty(lawEngineerNameList) && StringUtils.isNotBlank(lawEngineerNameList.get(0))) { lawEngineerNameList = lawEngineerNameList.stream().distinct().collect(Collectors.toList()); lawEngineerUsers=sysUserService.queryUserIdListByNameList(lawEngineerNameList); if(lawEngineerUsers.size()!=lawEngineerNameList.size()){ @@ -567,19 +568,14 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl engineeringInterfacePersonUsers = new ArrayList<>(); if (StringUtils.isNotEmpty(projectRelatedPersonnel.getEngineeringInterfacePersonName())){ List engineeringInterfacePersonNameList = Arrays.asList(projectRelatedPersonnel.getEngineeringInterfacePersonName().split(",")); - if (CollectionUtils.isNotEmpty(engineeringInterfacePersonNameList)) { + if (CollectionUtils.isNotEmpty(engineeringInterfacePersonNameList) && StringUtils.isNotBlank(engineeringInterfacePersonNameList.get(0))) { engineeringInterfacePersonNameList = engineeringInterfacePersonNameList.stream().distinct().collect(Collectors.toList()); engineeringInterfacePersonUsers=sysUserService.queryUserIdListByNameList(engineeringInterfacePersonNameList); if(engineeringInterfacePersonUsers.size()!=engineeringInterfacePersonNameList.size()){ @@ -606,19 +602,14 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl certificationEngineerUsers = new ArrayList<>(); if (StringUtils.isNotEmpty(projectRelatedPersonnel.getCertificationEngineerName())){ List certificationEngineerNameList = Arrays.asList(projectRelatedPersonnel.getCertificationEngineerName().split(",")); - if (CollectionUtils.isNotEmpty(certificationEngineerNameList)) { + if (CollectionUtils.isNotEmpty(certificationEngineerNameList) && StringUtils.isNotBlank(certificationEngineerNameList.get(0))) { certificationEngineerNameList = certificationEngineerNameList.stream().distinct().collect(Collectors.toList()); certificationEngineerUsers=sysUserService.queryUserIdListByNameList(certificationEngineerNameList); if(certificationEngineerUsers.size()!=certificationEngineerNameList.size()){ @@ -645,12 +636,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl records = projectRelatedPersonnelMapper.queryById(projectRelatedPersonnel.getId()); for (ProjectRelatedPersonnel data : records) { - if (StringUtils.isBlank(data.getLawEngineer())) {//数据库里法规工程师是空的 - projectRelatedPersonnel.setLawEngineer(projectRelatedPersonnel.getLawEngineer()); - }else{//数据库里不空,原+新 - StringBuilder law = new StringBuilder(data.getLawEngineer()); - String lawString = law.append(",").append(projectRelatedPersonnel.getLawEngineer()).toString(); - //去重 + //法规工程师 + String lawString = projectRelatedPersonnel.getLawEngineer(); + //去重 + if(StringUtils.isNotBlank(lawString)) { List lawList = Arrays.asList(lawString.split(",")); String lawDistinct = lawList.stream().distinct().collect(Collectors.joining(",")); - projectRelatedPersonnel.setLawEngineer(lawDistinct); } - if (StringUtils.isBlank(data.getEngineeringInterfacePerson())) {//数据库里工程接口人是空的 - projectRelatedPersonnel.setEngineeringInterfacePerson(projectRelatedPersonnel.getEngineeringInterfacePerson()); - }else{//数据库里不空,原+新 - StringBuilder interfacePerson = new StringBuilder(data.getEngineeringInterfacePerson()); - String interfaceString = interfacePerson.append(",").append(projectRelatedPersonnel.getEngineeringInterfacePerson()).toString(); - //去重 + //工程接口人 + String interfaceString = projectRelatedPersonnel.getEngineeringInterfacePerson(); + //去重 + if(StringUtils.isNotBlank(interfaceString)) { List interfaceList = Arrays.asList(interfaceString.split(",")); String interfaceDistinct = interfaceList.stream().distinct().collect(Collectors.joining(",")); projectRelatedPersonnel.setEngineeringInterfacePerson(interfaceDistinct); } - if (StringUtils.isBlank(data.getCertificationEngineer())) {//数据库里工程接口人是空的 - projectRelatedPersonnel.setCertificationEngineer(projectRelatedPersonnel.getCertificationEngineer()); - }else{//数据库里不空,原+新 - StringBuilder certification = new StringBuilder(data.getCertificationEngineer()); - String certificationString = certification.append(",").append(projectRelatedPersonnel.getCertificationEngineer()).toString(); - //去重 +// 工程接口人 + String certificationString = projectRelatedPersonnel.getCertificationEngineer(); + //去重 + if(StringUtils.isNotBlank(certificationString)) { List certificationList = Arrays.asList(certificationString.split(",")); - String certificationDistinct= certificationList.stream().distinct().collect(Collectors.joining(",")); + String certificationDistinct = certificationList.stream().distinct().collect(Collectors.joining(",")); projectRelatedPersonnel.setCertificationEngineer(certificationDistinct); } if (StringUtils.isBlank(data.getRemark())) {//数据库里备注是空的 projectRelatedPersonnel.setRemark(projectRelatedPersonnel.getRemark()); - } else {//数据库里备注不是空的 - if (StringUtils.isNotBlank(projectRelatedPersonnel.getRemark())) {//导入的备注不是空的 - } - - if (StringUtils.isNotBlank(projectRelatedPersonnel.getRemark())) {//导入的备注不是是空的,原+新 - StringBuilder remark = new StringBuilder(data.getRemark()); - projectRelatedPersonnel.setRemark(remark.append(",").append(projectRelatedPersonnel.getRemark()).toString()); - } else { - projectRelatedPersonnel.setRemark(data.getRemark()); - } + } else { + projectRelatedPersonnel.setRemark(""); } + Date now = new Date(); projectRelatedPersonnel.setUpdateTime(now); LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); projectRelatedPersonnel.setUpdateBy(sysUser.getUsername()); - saveOrUpdate(projectRelatedPersonnel); + updateById(projectRelatedPersonnel); } } } From 0444a944fa3140467755e7832fb02a4c020f4fdf Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Wed, 27 Apr 2022 17:29:11 +0800 Subject: [PATCH 04/10] =?UTF-8?q?[add]=20=E5=8F=82=E6=95=B0=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../parameterlist/components/addModel.vue | 115 ++++++++++-------- .../views/parameter/parameterlist/index.vue | 10 +- 2 files changed, 69 insertions(+), 56 deletions(-) diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue index e27d3359b..cc8c70416 100644 --- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue +++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue @@ -210,55 +210,55 @@ - - - - - -
-
+ + + + + +
+
{{$t('controlType')}} -
- - - -
- - -
-
- {{$t('controlVerification')}} -
- - - -
- - - - -
-
+
+ + + +
+ + +
+
+ {{$t('controlVerification')}} +
+ + + +
+ + + + +
+
{{$t('controlType')}} -
- - - -
- - - +
+ + + +
+ + + @@ -346,13 +346,26 @@ export default { }, methods: { Onchangelabel(val) { + this.tabCertificationCategory = [] console.log(val,'val。。。') - if(val.length > 0) { - this.tabCertificationCategory = val - } else { - this.tabCertificationCategory = [] - console.log(this.tabCertificationCategory,'this.tabCertificationCategorythis.tabCertificationCategory') - } + val.forEach((item) => { + let valItem = { + valitemOne: item.text, + valitemTwo: item.value, + valitemthree: '', + } + this.tabCertificationCategory.push(valItem) + }) + console.log(this.tabCertificationCategory,'this.tabCertificationCategory') + // if(val.length > 0) { + // + // } + // if(val.length > 0) { + // this.tabCertificationCategory = [] + // } else { + // this.tabCertificationCategory = [] + // console.log(this.tabCertificationCategory,'this.tabCertificationCategorythis.tabCertificationCategory') + // } }, Onchange() { diff --git a/jero-web/src/views/parameter/parameterlist/index.vue b/jero-web/src/views/parameter/parameterlist/index.vue index 4d62fb67b..6fe49dc73 100644 --- a/jero-web/src/views/parameter/parameterlist/index.vue +++ b/jero-web/src/views/parameter/parameterlist/index.vue @@ -109,11 +109,11 @@ export default { dataSource: [], confirmLoading: false, url: { - list: 'params/template/page', - add: 'params/template/add', - edit: 'params/template/edit', - deleteBatch: 'params/template/delete', - deleteAll: 'params/template/deleteBatch' + list: 'params/paramsInfo/page', + add: 'params/paramsInfo/add', + edit: 'params/paramsInfo/edit', + deleteBatch: 'params/paramsInfo/delete', + deleteAll: 'params/paramsInfo/deleteBatch' }, total: 0, pageSize: 10, From ce82ec32aa216ca4905c52dbbde9c896d5590cd0 Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Wed, 27 Apr 2022 17:36:20 +0800 Subject: [PATCH 05/10] =?UTF-8?q?[add]=20=E5=8F=82=E6=95=B0=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/parameter/parameterlist/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/parameter/parameterlist/index.vue b/jero-web/src/views/parameter/parameterlist/index.vue index 6fe49dc73..f926a3418 100644 --- a/jero-web/src/views/parameter/parameterlist/index.vue +++ b/jero-web/src/views/parameter/parameterlist/index.vue @@ -124,12 +124,12 @@ export default { title: this.$t('NiONumber'), align: 'center', width: '10%', - dataIndex: 'region_dictText', + dataIndex: 'nioNumber', }, { title: this.$t('ParameterName'), align: 'center', - dataIndex: 'paramsTemplateName' + dataIndex: 'paramsName' }, { title: this.$t('ParameterDescription'), From 384c6b8bfb41d09ee3abaf4f36984a61a8bbbffc Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Wed, 27 Apr 2022 17:39:53 +0800 Subject: [PATCH 06/10] =?UTF-8?q?[add]=20=E5=8F=82=E6=95=B0=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/parameter/parameterlist/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/parameter/parameterlist/index.vue b/jero-web/src/views/parameter/parameterlist/index.vue index f926a3418..3d377e855 100644 --- a/jero-web/src/views/parameter/parameterlist/index.vue +++ b/jero-web/src/views/parameter/parameterlist/index.vue @@ -139,7 +139,7 @@ export default { { title: this.$t('areaOfResponsibility'), align: 'center', - dataIndex: 'state_dictText' + dataIndex: 'dutyTerritory' }, { title: this.$t('createTime'), From bfcc8a67d957e54aa14b506bf19eee5547764107 Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Wed, 27 Apr 2022 18:07:38 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E5=8F=91=E5=B8=83-=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86+?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93=E7=9B=B8=E5=85=B3=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E5=AF=BC=E5=87=BA-=E8=B4=A3=E4=BB=BB=E9=A2=86=E5=9F=9F?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/system/mapper/SysDictMapper.java | 4 + .../service/IDummyInventoryBaseEOService.java | 2 +- .../impl/DummyInventoryBaseEOServiceImpl.java | 93 ++++++++++--------- .../com/jero/modules/dummy/util/ListDiff.java | 37 ++++++++ .../project/enums/ExportTemplateEnum.java | 2 +- .../ProjectRelatedPersonnelServiceImpl.java | 43 ++++++--- 6 files changed, 121 insertions(+), 60 deletions(-) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/util/ListDiff.java diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDictMapper.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDictMapper.java index a94ef2d79..2aff71a9b 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDictMapper.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDictMapper.java @@ -51,6 +51,10 @@ public interface SysDictMapper extends BaseMapper { public String queryDictKeyByText(@Param("code") String code,@Param("text") String key); + /**根据code查询所有中文名*/ + @Select("select s.item_text from sys_dict_item s where s.dict_id = (select id from sys_dict where dict_code = #{code})") + public List queryDictNameByCode(@Param("code") String code); + @Deprecated public String queryTableDictTextByKey(@Param("table") String table,@Param("text") String text,@Param("code") String code,@Param("key") String key); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyInventoryBaseEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyInventoryBaseEOService.java index 90159ed6d..c001cec47 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyInventoryBaseEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyInventoryBaseEOService.java @@ -36,7 +36,7 @@ public interface IDummyInventoryBaseEOService extends IService records = pageList.getRecords(); List createByList = records.stream().map(DummyInventoryBaseEO::getCreateBy).collect(Collectors.toList()); - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper(); + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.in(SysUser::getUsername, createByList); List userList = sysUserService.list(lambdaQueryWrapper); //订阅标识 @@ -187,7 +188,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl list = new ArrayList<>(); if(dummyInventoryBaseEOList.size() != 0){ - String base = JSONArray.fromObject(dummyInventoryBaseEOList).toString(); + String base = JSONArray.toJSONString(dummyInventoryBaseEOList); DummyContentChangeEO dummyContentChangeEOBase = new DummyContentChangeEO(); dummyContentChangeEOBase.setConnectId(dummyInventoryBaseEO.getId()); dummyContentChangeEOBase.setContentJson(base); list.add(dummyContentChangeEOBase); } if(dummyInventoryInfoEOList.size() != 0){ - String info = JSONArray.fromObject(dummyInventoryInfoEOList).toString(); + String info = JSONArray.toJSONString(dummyInventoryInfoEOList); DummyContentChangeEO dummyContentChangeEOInfo = new DummyContentChangeEO(); dummyContentChangeEOInfo.setParentId(dummyInventoryBaseEO.getId()); dummyContentChangeEOInfo.setContentJson(info); @@ -242,39 +243,53 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl dummyContentChangeEOInfoList = iDummyContentChangeEOService.list(wrapperInfo); - //3.截止到现在发布,期间修改的数据(基础) - //数据为-->dummyInventoryBaseEOList - String dibName = dummyInventoryBaseEOList.get(0).getName(); - String dibUseExplain = dummyInventoryBaseEOList.get(0).getUseExplain(); + //3.对比基础表数据 + //3.1截止到现在发布,期间修改的数据(基础) + //最新的数据为-->dummyInventoryBaseEOList + + //3.2基础表数据对比 + String baseCJ=dummyContentChangeEOBaseList.get(0).getContentJson(); + List baseCJlist = JSONArray.parseArray(baseCJ, DummyInventoryBaseEO.class);//json转list + + //对比,获取值不同的字段 + Map> diff = null; + for(int i=0;i<= baseCJlist.size();i++) { + baseCJlist.get(i); + dummyInventoryBaseEOList.get(i); + diff = ListDiff.compareObject(baseCJlist.get(i), dummyInventoryBaseEOList.get(i)); + System.out.println(diff);//不同的字段原,现,{name=[虚拟清单33331122211, 虚拟清单3333444]} + } + + //4.对比详情表数据 + //4.1截止到现在发布,期间修改的数据(详情) + //现在的数据为-->dummyInventoryInfoEOList + //dummyInventoryInfoEOList + + //4.2详情表数据(一条基础数据可能对应多个详情数据---一对多) + /* String baseCJ=dummyContentChangeEOBaseList.get(0).getContentJson(); + List baseCJlist = JSONArray.parseArray(baseCJ, DummyInventoryBaseEO.class);//json转list + + //对比,获取值不同的字段 + Map> diff = null; + for(int i=0;i<= baseCJlist.size();i++) { + baseCJlist.get(i); + dummyInventoryBaseEOList.get(i); + diff = ListDiff.compareObject(baseCJlist.get(i), dummyInventoryBaseEOList.get(i)); + System.out.println(diff);//不同的字段原,现,{name=[虚拟清单33331122211, 虚拟清单3333444]} + }*/ + + for(DummyContentChangeEO dummyContentChangeEO : dummyContentChangeEOInfoList){ + String infoCJ = dummyContentChangeEO.getContentJson(); + List infoCJlist = JSONArray.parseArray(infoCJ, DummyContentChangeEO.class);//json转list + System.out.println(infoCJlist); + System.out.println(infoCJlist); + + +// JsonDiff.compareJson(infoCJjson,info,null); - //4.截止到现在发布,期间修改的数据(详情) - //数据为-->dummyInventoryInfoEOList - List contentJson = Arrays.asList(dummyContentChangeEOInfoList.get(0).getContentJson().split("},\\{")); - for(String midCJ:contentJson){ - List dccContentJson = Arrays.asList( midCJ.split("\",\"")); - System.out.println(dccContentJson); - } - //5.分别对比基础表数据和详情表数据 - - //5.1.基础表数据对比 - List dibContentJson = Arrays.asList(dummyContentChangeEOBaseList.get(0).getContentJson().split("\",\"")); - - //获取原虚拟清单名称 - String cJName = dibContentJson.get(6); - String trueCJName = disposeContentJson(cJName); - //获取原虚拟清单使用说明 - String cJUseExplain = dibContentJson.get(1); - String trueCJUseExplain = disposeContentJson(cJUseExplain); - //拼接本次发布时的修改信息 - if(!trueCJName.equals(dibName)) { - String cJNameMessage = dummyInventoryBaseEO.getUpdateBy() + "把" + trueCJName + "改为了" + dibName; - } - if(!trueCJUseExplain.equals(dibUseExplain)) { - String cJUseExplainMessage = dummyInventoryBaseEO.getUpdateBy() + "把" + trueCJUseExplain + "改为" + dibUseExplain; } - //5.2详情表数据(一条基础数据可能对应多个详情数据---一对多) //6.数据对比完成后.删除之前保存的dummy_inventory_info中的数据,重新保存最新的数据 @@ -289,12 +304,4 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl { + public static Map> compareObject(T obj1, T Obj2) + throws Exception { + Map> result = new HashMap>(); + + Field[] fs = obj1.getClass().getDeclaredFields(); + for (Field f : fs) { + f.setAccessible(true); + Object v1 = f.get(obj1); + Object v2 = f.get(Obj2); + if( ! equals(v1, v2) /*&& !f.getName().contains("update")*/ + && !f.getName().equals("updateTime") ){ + List resultList=new ArrayList<>(); + resultList.add(v1); + resultList.add(v2); + result.put(f.getName(), resultList); + + } + } + return result; + } + + public static boolean equals(Object obj1, Object obj2) { + if (obj1 == obj2) { + return true; + } + if (obj1 == null || obj2 == null) { + return false; + } + return obj1.equals(obj2); + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ExportTemplateEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ExportTemplateEnum.java index cec962527..8fb305fb6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ExportTemplateEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ExportTemplateEnum.java @@ -4,7 +4,7 @@ package com.jero.modules.project.enums; */ public enum ExportTemplateEnum { - DUTY_TERRITORY("责任领域"," duty_territory"), + DUTY_TERRITORY("责任领域","duty_territory"), DUTY_TERRITORY_FIELD_of_PRODUCTION("生产领域","field_of_production"), // LAW_ENGINEER("法规工程师","lawEngineerName"), // ENGINEER_INTERFACE_PERSON("工程接口人","engineeringInterfacePersonName"), diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java index e6c60bbe7..2f2c089b0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java @@ -9,11 +9,11 @@ import com.jero.common.exception.JeroBootException; import com.jero.common.system.vo.LoginUser; import com.jero.modules.enums.DictCodeEnum; import com.jero.modules.project.entity.ProjectRelatedPersonnel; -import com.jero.modules.project.enums.ExportTemplateEnum; import com.jero.modules.project.mapper.ProjectRelatedPersonnelMapper; import com.jero.modules.project.service.IProjectRelatedPersonnelService; import com.jero.modules.project.util.ExcelLangUtils; import com.jero.modules.system.entity.SysUser; +import com.jero.modules.system.mapper.SysDictItemMapper; import com.jero.modules.system.mapper.SysDictMapper; import com.jero.modules.system.mapper.SysUserMapper; import com.jero.modules.system.service.ISysDictService; @@ -60,6 +60,8 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl clazz, String title,String cut){ - List records=new ArrayList<>(); - ProjectRelatedPersonnel projectRelatedPersonnel=new ProjectRelatedPersonnel(); + List records = new ArrayList<>();; + // Step.1 组装查询条件 LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); ExportParams exportParams=null; // Step.2 AutoPoi 导出Excel ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); try { + String fillingExplanationCN="填写说明\n" + + "1.导入数据从第三行开始,第一行为表头,第二行为填写说明,第三行是正式数据\n" + + "2.所有带*号的字段必须填写\n" + + "3.填写人员时，必须使用人员账号进行填写。\n" + + "4.填写的人员账号必须与系统中账号保持一致"; //中英切换模板 - if(CutEnum.CN.getValue().equals(cut)) { - projectRelatedPersonnel.setDutyTerritory(ExportTemplateEnum.DUTY_TERRITORY_FIELD_of_PRODUCTION.getName()); - exportParams=new ExportParams(title , "导出人:" + sysUser.getUsername(), title); + /* if(CutEnum.CN.getValue().equals(cut)) { + + exportParams=new ExportParams(title , fillingExplanationCN, title); }else{ - projectRelatedPersonnel.setDutyTerritory(ExportTemplateEnum.DUTY_TERRITORY_FIELD_of_PRODUCTION.getValue()); - exportParams=new ExportParams(title , "Exporter:" + sysUser.getUsername(), title); - } - projectRelatedPersonnel.setLawEngineerName("ning.chen,xinhui.wei"); - projectRelatedPersonnel.setEngineeringInterfacePersonName("ning.chen,xinhui.wei"); - projectRelatedPersonnel.setCertificationEngineerName("ning.chen,xinhui.wei"); - projectRelatedPersonnel.setRemark("xxxxx"); - if(projectRelatedPersonnel != null) { - records.add(projectRelatedPersonnel); + + exportParams=new ExportParams(title , ExportTemplateEnum.FILLING_EXPLANATION_EN.getName(), title); + }*/ + exportParams=new ExportParams(); + exportParams.setSheetName(title); + //查标签内容里的责任领域数据 + List dictItemNameList = sysDictMapper.queryDictNameByCode(DictCodeEnum.DUTY_TERRITORY.getValue()); + //新建相关人员表里的责任领域数据 + if (CollectionUtils.isNotEmpty(dictItemNameList)) { + for (String dictItemName : dictItemNameList) { + ProjectRelatedPersonnel projectRelatedPersonnel=new ProjectRelatedPersonnel(); + projectRelatedPersonnel.setDutyTerritory(dictItemName); + records.add(projectRelatedPersonnel); + } } + mv.addObject(NormalExcelConstants.FILE_NAME, title); //此处设置的filename无效 ,前端会重更新设置一下 mv.addObject(NormalExcelConstants.CLASS, clazz);//!!!!这里设置中英切换 mv.addObject(NormalExcelConstants.PARAMS,exportParams); From 80464b97bfd4a55aa6e1eb3c2e69ee1fd9e5242c Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Wed, 27 Apr 2022 18:17:58 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E4=B8=AD=E8=8B=B1=E6=96=87=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 | 3 +++ jero-web/src/common/lang/zh-cn.js | 3 +++ .../processList/tabComponents/alreadyProcess/index.vue | 4 ++-- .../processList/tabComponents/alreadySend/index.vue | 4 ++-- .../processList/tabComponents/monitorProcess/index.vue | 4 ++-- .../processList/tabComponents/processCenter/index.vue | 2 +- .../projectManagement/components/listOfRelevantPersonnel.vue | 2 +- 7 files changed, 14 insertions(+), 8 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 7d8371890..ae4016e82 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -726,4 +726,7 @@ module.exports = { taskDataConfirmation: 'Please select the data whose list confirmation status is accepted and task confirmation status is not initiated or rejected, and the regulatory engineer and certification engineer are not empty', selectIssuer:'Select issuer', sendBack:'send back', + taskConfirmationProcess:'Task confirmation process', + notFinished:'not finished', + Finished:'Finished', } \ 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 5357eeb32..95af1cc85 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -731,4 +731,7 @@ module.exports = { operationNode:'操作节点', selectIssuer:'选择下发人', sendBack:'退回', + taskConfirmationProcess:'任务确认流程', + notFinished:'未完成', + Finished:'已完成', } \ No newline at end of file diff --git a/jero-web/src/views/processCenter/processList/tabComponents/alreadyProcess/index.vue b/jero-web/src/views/processCenter/processList/tabComponents/alreadyProcess/index.vue index 4220196f2..d3d400b48 100644 --- a/jero-web/src/views/processCenter/processList/tabComponents/alreadyProcess/index.vue +++ b/jero-web/src/views/processCenter/processList/tabComponents/alreadyProcess/index.vue @@ -15,7 +15,7 @@ {{prcTypeName[text]}} - {{text && text == 0 ? '未完成':'已完成'}} + {{text && text == 0 ? $t('notFinished'):$t('Finished')}} {{$t('See')}} @@ -49,7 +49,7 @@ pageSize: 10, selectedRowKeys: [], prcTypeName: { - 1: '任务确认流程' + 1: this.$t('taskConfirmationProcess') }, columns: [ { diff --git a/jero-web/src/views/processCenter/processList/tabComponents/alreadySend/index.vue b/jero-web/src/views/processCenter/processList/tabComponents/alreadySend/index.vue index d7ca9c247..2bff799a8 100644 --- a/jero-web/src/views/processCenter/processList/tabComponents/alreadySend/index.vue +++ b/jero-web/src/views/processCenter/processList/tabComponents/alreadySend/index.vue @@ -15,7 +15,7 @@ {{prcTypeName[text]}} - {{text && text == 0 ? '未完成':'已完成'}} + {{text && text == 0 ? $t('notFinished'):$t('Finished')}} {{$t('See')}} @@ -50,7 +50,7 @@ pageSize: 10, selectedRowKeys: [], prcTypeName: { - 1: '任务确认流程' + 1: this.$t('taskConfirmationProcess') }, columns: [ { diff --git a/jero-web/src/views/processCenter/processList/tabComponents/monitorProcess/index.vue b/jero-web/src/views/processCenter/processList/tabComponents/monitorProcess/index.vue index 83b38fac5..dc0a74b2e 100644 --- a/jero-web/src/views/processCenter/processList/tabComponents/monitorProcess/index.vue +++ b/jero-web/src/views/processCenter/processList/tabComponents/monitorProcess/index.vue @@ -15,7 +15,7 @@ {{prcTypeName[text]}} - {{text && text == 0 ? '未完成':'已完成'}} + {{text && text == 0 ? $t('notFinished'):$t('Finished')}} {{$t('See')}} @@ -50,7 +50,7 @@ pageSize: 10, selectedRowKeys: [], prcTypeName: { - 1: '任务确认流程' + 1: this.$t('taskConfirmationProcess') }, columns: [ { diff --git a/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue b/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue index b6b4a61ca..c09adcfe2 100644 --- a/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue +++ b/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue @@ -47,7 +47,7 @@ pageSize: 10, selectedRowKeys: [], prcTypeName: { - 1: '任务确认流程' + 1: this.$t('taskConfirmationProcess') }, columns: [ { diff --git a/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue b/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue index 84b13c034..c86d77d03 100644 --- a/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue +++ b/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue @@ -17,7 +17,7 @@ {{$t('export')}} -
+
From e3b4d941646c30b22a8d0c57d9f0ff388eaa7772 Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Wed, 27 Apr 2022 18:38:47 +0800 Subject: [PATCH 09/10] =?UTF-8?q?[add]=20=E5=8F=82=E6=95=B0=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../parameterlist/components/addModel.vue | 92 ++++++++++--------- 1 file changed, 50 insertions(+), 42 deletions(-) diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue index cc8c70416..841c5d98b 100644 --- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue +++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue @@ -20,7 +20,7 @@
@@ -31,7 +31,7 @@ {{$t('Required')}} - + {{ item.label }} @@ -52,7 +52,7 @@ @@ -84,7 +84,7 @@ :title="$t('parameterBatch')">{{$t('parameterBatch')}} - {{$t('areaOfResponsibility')}} - @@ -131,7 +131,7 @@ :title="$t('ParameterName')">{{$t('certificationCategory')}} - {{$t('controlType')}} - - + + {{ item.label }} @@ -166,7 +166,7 @@ {{$t('controlVerification')}} - + {{ item.label }} @@ -187,7 +187,7 @@ @@ -201,10 +201,13 @@ :title="$t('attachmentTemplate')">{{$t('attachmentTemplate')}} - + + + + + {{ $t('clickUpload') }} + @@ -212,32 +215,32 @@ - +
{{$t('controlType')}} + :title="$t('standard')">{{$t('standard')}}
+ v-model="item.textVal" + :placeholder="$t('PleaseEnter')+$t('standard')"/>
- {{$t('controlVerification')}} + {{$t('ParameterName')}}
+ v-model="item.paramsName" + :placeholder="$t('PleaseEnter')+$t('ParameterName')"/>
@@ -247,13 +250,13 @@
{{$t('controlType')}} + :title="$t('ParameterDescription')">{{$t('ParameterDescription')}}
+ v-model="item.description" + :placeholder="$t('PleaseEnter')+$t('ParameterDescription')"/>
@@ -310,7 +313,7 @@ export default { {value:9, label: '四位小数' }, ], CategoryTreeList: [], // 技术领域 - tabCertificationCategory: [], // 认证类别得tab栏 + certCategoryParamsInfoEOList: [], // 认证类别得tab栏 formInline: {}, confirmLoading: false, visible: false, @@ -345,27 +348,32 @@ export default { this.getSysCategoryTree() }, methods: { + clickButtonToUpload(item) { + // this.$refs.uploadFile.perentHandleFunc() + // this.$refs.uploadFile.state = item.flag + // this.$refs.uploadFile.visible = true + // this.uploadName = item.db_field_name + // getAction('sys/common/getFileInfos', { id: this.formInline[item.db_field_name] }).then((res) => { + // if (res.success) { + // this.$refs.uploadFile.perentHandleFunc(res.result) + // } else { + // this.$refs.uploadFile.perentHandleFunc() + // } + // }) + }, Onchangelabel(val) { - this.tabCertificationCategory = [] + this.certCategoryParamsInfoEOList = [] console.log(val,'val。。。') val.forEach((item) => { - let valItem = { - valitemOne: item.text, - valitemTwo: item.value, - valitemthree: '', + let _tt = { + textVal: item.text, // tab + certCategory: '', // 所属认证类别 + paramsNumber: '', // 编号 + paramsName: '', // 参数名称 + description: ''// 参数说明 } - this.tabCertificationCategory.push(valItem) + this.certCategoryParamsInfoEOList.push(_tt) }) - console.log(this.tabCertificationCategory,'this.tabCertificationCategory') - // if(val.length > 0) { - // - // } - // if(val.length > 0) { - // this.tabCertificationCategory = [] - // } else { - // this.tabCertificationCategory = [] - // console.log(this.tabCertificationCategory,'this.tabCertificationCategorythis.tabCertificationCategory') - // } }, Onchange() { From a2c03aa59a798487ca9dfcab9885a71cecd075de Mon Sep 17 00:00:00 2001 From: liyawei Date: Wed, 27 Apr 2022 18:46:07 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=A1=B9=E5=AF=BC=E5=87=BA=E4=B8=AD=E8=8B=B1=E6=96=87=E5=88=87?= =?UTF-8?q?=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/config/AutoPoiDictConfig.java | 28 +- .../controller/ParamsInfoEOController.java | 2 + .../cert/template/entity/ParamsInfoEO.java | 4 +- .../template/mapper/ParamsInfoEOMapper.java | 3 + .../mapper/xml/ParamsInfoEOMapper.xml | 41 +++ .../service/IParamsInfoEOService.java | 4 +- .../service/impl/ParamsInfoEOServiceImpl.java | 319 +++++++++++++----- .../cert/template/vo/ParamsInfoEnExport.java | 20 +- .../system/mapper/xml/SysDictMapper.xml | 2 +- .../impl/FileSplitItemsEOServiceImpl.java | 2 + 10 files changed, 325 insertions(+), 100 deletions(-) diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/AutoPoiDictConfig.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/AutoPoiDictConfig.java index 52608ae03..1b249c233 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/AutoPoiDictConfig.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/AutoPoiDictConfig.java @@ -4,6 +4,7 @@ import lombok.extern.slf4j.Slf4j; import com.jero.common.api.CommonAPI; import com.jero.common.system.vo.DictModel; import com.jero.common.util.oConvertUtils; +import org.apache.commons.lang3.StringUtils; import org.jeecgframework.dict.service.AutoPoiDictServiceI; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -31,7 +32,8 @@ public class AutoPoiDictConfig implements AutoPoiDictServiceI { /** * 通过字典查询easypoi，所需字典文本 - * + * + * 特殊说明：英文文本对应dicCode格式：dicCode_en，且dicTable为空 * @Author:scott * @since：2019-04-09 * @return @@ -42,7 +44,11 @@ public class AutoPoiDictConfig implements AutoPoiDictServiceI { List dictList = null; // step.1 如果没有字典表则使用系统字典表 if (oConvertUtils.isEmpty(dicTable)) { - dictList = commonAPI.queryDictItemsByCode(dicCode); + if("en".equals(dicCode.substring(dicCode.lastIndexOf("_")+1))) { + dictList = commonAPI.queryDictItemsByCode(dicCode.substring(0, dicCode.lastIndexOf("_"))); + } else { + dictList = commonAPI.queryDictItemsByCode(dicCode); + } } else { try { dicText = oConvertUtils.getString(dicText, dicCode); @@ -51,9 +57,21 @@ public class AutoPoiDictConfig implements AutoPoiDictServiceI { log.error(e.getMessage(),e); } } - for (DictModel t : dictList) { - if(t!=null){ - dictReplaces.add(t.getText() + "_" + t.getValue()); + if("en".equals(dicCode.substring(dicCode.lastIndexOf("_")+1))) { // 显示英文文本 + for (DictModel t : dictList) { + if (t != null) { + if(StringUtils.isBlank(t.getTextEn())){ // 字典值对应英文文本为空，则显示中文 + dictReplaces.add(t.getText() + "_" + t.getValue()); + } else { + dictReplaces.add(t.getTextEn() + "_" + t.getValue()); + } + } + } + } else { // 显示中文文本 + for (DictModel t : dictList) { + if (t != null) { + dictReplaces.add(t.getText() + "_" + t.getValue()); + } } } if (dictReplaces != null && dictReplaces.size() != 0) { diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java index 6c1d94d50..56bb99597 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java @@ -63,6 +63,8 @@ public class ParamsInfoEOController extends JeroController page = new Page(pageNo, pageSize); IPage pageList = paramsInfoEOService.page(page, queryWrapper); +// List rows = pageList.getRecords(); +// paramsInfoEOService.getTreeDictItemText(rows, cut); return Result.OK(cut, pageList); } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java index ba863e01c..6c1162f49 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java @@ -77,8 +77,8 @@ public class ParamsInfoEO implements Serializable { private String paramsName; /**技术领域*/ - @Excel(name = "*技术领域", width = 15, dicCode = "technology_territory") - @Dict(dicCode = "technology_territory") + @Excel(name = "*技术领域", width = 15) +// @Dict(dicCode = "technology_territory") @ApiModelProperty(value = "技术领域") private String technologyTerritory; diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/ParamsInfoEOMapper.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/ParamsInfoEOMapper.java index 95bce2855..586d63afa 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/ParamsInfoEOMapper.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/ParamsInfoEOMapper.java @@ -1,6 +1,7 @@ package com.jero.modules.cert.template.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jero.modules.cert.template.vo.ParamsInfoEnExport; import com.jero.modules.cert.template.vo.ParamsInfoVO; import com.jero.modules.cert.template.entity.ParamsInfoEO; import org.apache.ibatis.annotations.Param; @@ -16,4 +17,6 @@ import java.util.List; public interface ParamsInfoEOMapper extends BaseMapper { List selectListWithCert(@Param("paramsInfoVO") ParamsInfoVO paramsInfoVO); + + List selectListWithCertForEnExport(@Param("paramsInfoVO") ParamsInfoVO paramsInfoVO); } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsInfoEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsInfoEOMapper.xml index 37b75a019..3867e87ed 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsInfoEOMapper.xml +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsInfoEOMapper.xml @@ -54,6 +54,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + pi.id as id, pi.create_by as create_by, @@ -112,4 +143,14 @@ + + \ No newline at end of file diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/IParamsInfoEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/IParamsInfoEOService.java index 8229dbd75..cea2cdb3b 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/IParamsInfoEOService.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/IParamsInfoEOService.java @@ -1,8 +1,8 @@ package com.jero.modules.cert.template.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.jero.modules.cert.template.vo.ParamsInfoVO; import com.jero.modules.cert.template.entity.ParamsInfoEO; +import com.jero.modules.cert.template.vo.ParamsInfoVO; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -81,4 +81,6 @@ public interface IParamsInfoEOService extends IService { * @param request */ void exportParamsInfo(String cut, ParamsInfoVO paramsInfoVO, String exportExcelName, HttpServletResponse response, HttpServletRequest request); + + void getTreeDictItemText(List paramsInfoEOList, String cut); } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java index 2ebd3b45b..c061d4b37 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java @@ -20,8 +20,10 @@ import com.jero.modules.cert.template.vo.ParamsInfoVO; import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.split.common.ReadExcel; +import com.jero.modules.system.entity.SysCategory; import com.jero.modules.system.entity.SysDictItem; import com.jero.modules.system.service.ISysDictItemService; +import com.jero.modules.system.service.impl.SysCategoryServiceImpl; import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.usermodel.Workbook; import org.jeecgframework.poi.excel.ExcelExportUtil; @@ -59,6 +61,9 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl paramsInfoEOList = baseMapper.selectListWithCert(paramsInfoVO); // 中文数据导出 + getTreeDictItemText(paramsInfoEOList, cut); + List> sheetsList = new ArrayList<>(); + sheetsList = getCnExportSheetsList(paramsInfoEOList, fileNowPath); + workbook = ExcelExportUtil.exportExcel(sheetsList, ExcelType.XSSF); - // 查询导出数据 - List paramsInfoEOList = baseMapper.selectListWithCert(paramsInfoVO); - if (CollectionUtil.isEmpty(paramsInfoEOList)) { - throw new JeroBootException("没有可导出的数据"); - } - - List fileTemplateList = new ArrayList<>(); - for (ParamsInfoEO paramsInfoEO : paramsInfoEOList) { - String fileTemplateConnectId = paramsInfoEO.getFileTemplateConnectId(); - if (StringUtils.isNotBlank(fileTemplateConnectId)) { - List ossFileList = ossFileService.getFileInfosByConnectId(fileTemplateConnectId); - List fileNameList = ossFileList.stream().map(OSSFile::getFileName).collect(Collectors.toList()); - paramsInfoEO.setFileTemplateName(StringUtils.join(fileNameList, ",")); - - fileTemplateList.addAll(ossFileList); - } - } - - // 查询导出参数项中认证类别最大级 - List nioNumber = paramsInfoEOList.stream().map(ParamsInfoEO::getNioNumber).collect(Collectors.toList()); - List certCategoryParamsInfoEOList = certCategoryParamsInfoEOService.selectListByNioNumber(StringUtils.join(nioNumber, ",")); - List certCategoryNameList = new ArrayList<>(); - Map certCategoryMap = new HashMap<>(); - if (CollectionUtil.isNotEmpty(certCategoryParamsInfoEOList)) { - List certCategoryList = certCategoryParamsInfoEOList.stream().map(CertCategoryParamsInfoEO::getCertCategory).distinct().collect(Collectors.toList()); - List sysDictItemList = sysDictItemService.selectItemsByDictCode("cert_category"); - List finalCertCategoryList = certCategoryList; - certCategoryNameList = sysDictItemList.stream().filter(e-> finalCertCategoryList.contains(e.getItemValue())).map(SysDictItem::getItemText).collect(Collectors.toList()); - certCategoryMap = sysDictItemList.stream().filter(e-> finalCertCategoryList.contains(e.getItemValue())).collect(Collectors.toMap(c->c.getItemText(),c->c.getItemValue())); - } - //导出数据 - List> sheetsList = new ArrayList<>(); - - // 创建参数对象（用来设定excel得sheet得内容等信息） - ExportParams bussExportParams = new ExportParams(); - // 设置sheet得名称 - bussExportParams.setSheetName("企业参数表"); - bussExportParams.setType(ExcelType.XSSF); // 解决HSSFRichTextString cannot cast XSSFRichTextString问题 - bussExportParams.setStyle(CommonExcelExportStyler.class); - // 创建sheet1使用得map - Map bussExportMap = new HashMap<>(); - // title的参数为ExportParams类型，目前仅仅在ExportParams中设置了sheetName - bussExportMap.put("title", bussExportParams); - // 模版导出对应得实体类型 - bussExportMap.put("entity", ParamsInfoEO.class); - // sheet中要填充得数据 - bussExportMap.put("data", paramsInfoEOList); - sheetsList.add(bussExportMap); - - // 导出认证类别参数项 - if (CollectionUtil.isNotEmpty(certCategoryNameList)) { - // 所有数据 - List certCategoryParamsInfoListExport = new ArrayList<>(); - for (ParamsInfoEO paramsInfoEO : paramsInfoEOList) { - List categoryParamsInfoEOList = paramsInfoEO.getCertCategoryParamsInfoEOList(); - certCategoryParamsInfoListExport.addAll(categoryParamsInfoEOList); - } - if (CollectionUtil.isNotEmpty(certCategoryParamsInfoListExport)) { - for (String certCategoryName : certCategoryNameList) { - // 当前认证类别数据 - Map finalCertCategoryMap = certCategoryMap; - List certCategoryParamsInfoExport = certCategoryParamsInfoListExport.stream() - .filter(e -> finalCertCategoryMap.get(certCategoryName).equals(e.getCertCategory())) - .collect(Collectors.toList()); - if (CollectionUtil.isNotEmpty(certCategoryParamsInfoExport)) { - ExportParams certExportParams = new ExportParams(); - certExportParams.setSheetName(certCategoryName); - certExportParams.setType(ExcelType.XSSF); // 解决HSSFRichTextString cannot cast XSSFRichTextString问题 - certExportParams.setStyle(CommonExcelExportStyler.class); - Map certExportMap = new HashMap<>(); - certExportMap.put("title", certExportParams); - certExportMap.put("entity", CertCategoryParamsInfoEO.class); - certExportMap.put("data", certCategoryParamsInfoExport); - sheetsList.add(certExportMap); - } - } - } - } - - workbook = ExcelExportUtil.exportExcel(sheetsList, ExcelType.XSSF); - - //下载附件模板对应文件 - if (fileTemplateList != null && !fileTemplateList.isEmpty()) { - fileTemplateList = fileTemplateList.stream().distinct().collect(Collectors.toList()); - downLoadFileList(fileTemplateList,fileNowPath); + } else if (CutEnum.EN.getValue().equals(cut)) { + // 查询导出数据 + List paramsInfoEnExportList = baseMapper.selectListWithCertForEnExport(paramsInfoVO); // 英文数据导出 + getTreeDictItemTextForEnExport(paramsInfoEnExportList); + List> sheetsList = new ArrayList<>(); + sheetsList = getEnExportSheetsList(paramsInfoEnExportList, fileNowPath); + workbook = ExcelExportUtil.exportExcel(sheetsList, ExcelType.XSSF); } @@ -440,6 +374,180 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl> getCnExportSheetsList(List paramsInfoEOList, String fileNowPath) throws IOException { + + if (CollectionUtil.isEmpty(paramsInfoEOList)) { + throw new JeroBootException("没有可导出的数据"); + } + + List fileTemplateList = new ArrayList<>(); + for (ParamsInfoEO paramsInfoEO : paramsInfoEOList) { + String fileTemplateConnectId = paramsInfoEO.getFileTemplateConnectId(); + if (StringUtils.isNotBlank(fileTemplateConnectId)) { + List ossFileList = ossFileService.getFileInfosByConnectId(fileTemplateConnectId); + List fileNameList = ossFileList.stream().map(OSSFile::getFileName).collect(Collectors.toList()); + paramsInfoEO.setFileTemplateName(StringUtils.join(fileNameList, ",")); + + fileTemplateList.addAll(ossFileList); + } + } + + // 查询导出参数项中认证类别最大级 + List nioNumber = paramsInfoEOList.stream().map(ParamsInfoEO::getNioNumber).collect(Collectors.toList()); + List certCategoryParamsInfoEOList = certCategoryParamsInfoEOService.selectListByNioNumber(StringUtils.join(nioNumber, ",")); + List certCategoryNameList = new ArrayList<>(); + Map certCategoryMap = new HashMap<>(); + if (CollectionUtil.isNotEmpty(certCategoryParamsInfoEOList)) { + List certCategoryList = certCategoryParamsInfoEOList.stream().map(CertCategoryParamsInfoEO::getCertCategory).distinct().collect(Collectors.toList()); + List sysDictItemList = sysDictItemService.selectItemsByDictCode("cert_category"); + List finalCertCategoryList = certCategoryList; + certCategoryNameList = sysDictItemList.stream().filter(e-> finalCertCategoryList.contains(e.getItemValue())).map(SysDictItem::getItemText).collect(Collectors.toList()); + certCategoryMap = sysDictItemList.stream().filter(e-> finalCertCategoryList.contains(e.getItemValue())).collect(Collectors.toMap(c->c.getItemText(),c->c.getItemValue())); + } + //导出数据 + List> sheetsList = new ArrayList<>(); + + // 创建参数对象（用来设定excel得sheet得内容等信息） + ExportParams bussExportParams = new ExportParams(); + // 设置sheet得名称 + bussExportParams.setSheetName("企业参数表"); + bussExportParams.setType(ExcelType.XSSF); // 解决HSSFRichTextString cannot cast XSSFRichTextString问题 + bussExportParams.setStyle(CommonExcelExportStyler.class); + // 创建sheet1使用得map + Map bussExportMap = new HashMap<>(); + // title的参数为ExportParams类型，目前仅仅在ExportParams中设置了sheetName + bussExportMap.put("title", bussExportParams); + // 模版导出对应得实体类型 + bussExportMap.put("entity", ParamsInfoEO.class); + // sheet中要填充得数据 + bussExportMap.put("data", paramsInfoEOList); + sheetsList.add(bussExportMap); + + // 导出认证类别参数项 + if (CollectionUtil.isNotEmpty(certCategoryNameList)) { + // 所有数据 + List certCategoryParamsInfoListExport = new ArrayList<>(); + for (ParamsInfoEO paramsInfoEO : paramsInfoEOList) { + List categoryParamsInfoEOList = paramsInfoEO.getCertCategoryParamsInfoEOList(); + certCategoryParamsInfoListExport.addAll(categoryParamsInfoEOList); + } + if (CollectionUtil.isNotEmpty(certCategoryParamsInfoListExport)) { + for (String certCategoryName : certCategoryNameList) { + // 当前认证类别数据 + Map finalCertCategoryMap = certCategoryMap; + List certCategoryParamsInfoExport = certCategoryParamsInfoListExport.stream() + .filter(e -> finalCertCategoryMap.get(certCategoryName).equals(e.getCertCategory())) + .collect(Collectors.toList()); + if (CollectionUtil.isNotEmpty(certCategoryParamsInfoExport)) { + ExportParams certExportParams = new ExportParams(); + certExportParams.setSheetName(certCategoryName); + certExportParams.setType(ExcelType.XSSF); // 解决HSSFRichTextString cannot cast XSSFRichTextString问题 + certExportParams.setStyle(CommonExcelExportStyler.class); + Map certExportMap = new HashMap<>(); + certExportMap.put("title", certExportParams); + certExportMap.put("entity", CertCategoryParamsInfoEO.class); + certExportMap.put("data", certCategoryParamsInfoExport); + sheetsList.add(certExportMap); + } + } + } + } + //下载附件模板对应文件 + if (fileTemplateList != null && !fileTemplateList.isEmpty()) { + fileTemplateList = fileTemplateList.stream().distinct().collect(Collectors.toList()); + downLoadFileList(fileTemplateList,fileNowPath); + } + + return sheetsList; + } + + private List> getEnExportSheetsList(List paramsInfoEnExportList, String fileNowPath) throws IOException { + + if (CollectionUtil.isEmpty(paramsInfoEnExportList)) { + throw new JeroBootException("没有可导出的数据"); + } + + List fileTemplateList = new ArrayList<>(); + for (ParamsInfoEnExport paramsInfoEnExport : paramsInfoEnExportList) { + String fileTemplateConnectId = paramsInfoEnExport.getFileTemplateConnectId(); + if (StringUtils.isNotBlank(fileTemplateConnectId)) { + List ossFileList = ossFileService.getFileInfosByConnectId(fileTemplateConnectId); + List fileNameList = ossFileList.stream().map(OSSFile::getFileName).collect(Collectors.toList()); + paramsInfoEnExport.setFileTemplateName(StringUtils.join(fileNameList, ",")); + + fileTemplateList.addAll(ossFileList); + } + } + + // 查询导出参数项中认证类别最大级 + List nioNumber = paramsInfoEnExportList.stream().map(ParamsInfoEnExport::getNioNumber).collect(Collectors.toList()); + List certCategoryParamsInfoEOList = certCategoryParamsInfoEOService.selectListByNioNumber(StringUtils.join(nioNumber, ",")); + List certCategoryNameList = new ArrayList<>(); + Map certCategoryMap = new HashMap<>(); + if (CollectionUtil.isNotEmpty(certCategoryParamsInfoEOList)) { + List certCategoryList = certCategoryParamsInfoEOList.stream().map(CertCategoryParamsInfoEO::getCertCategory).distinct().collect(Collectors.toList()); + List sysDictItemList = sysDictItemService.selectItemsByDictCode("cert_category"); + List finalCertCategoryList = certCategoryList; + certCategoryNameList = sysDictItemList.stream().filter(e-> finalCertCategoryList.contains(e.getItemValue())).map(SysDictItem::getItemText).collect(Collectors.toList()); + certCategoryMap = sysDictItemList.stream().filter(e-> finalCertCategoryList.contains(e.getItemValue())).collect(Collectors.toMap(c->c.getItemText(),c->c.getItemValue())); + } + //导出数据 + List> sheetsList = new ArrayList<>(); + + // 创建参数对象（用来设定excel得sheet得内容等信息） + ExportParams bussExportParams = new ExportParams(); + // 设置sheet得名称 + bussExportParams.setSheetName("企业参数表"); + bussExportParams.setType(ExcelType.XSSF); // 解决HSSFRichTextString cannot cast XSSFRichTextString问题 + bussExportParams.setStyle(CommonExcelExportStyler.class); + // 创建sheet1使用得map + Map bussExportMap = new HashMap<>(); + // title的参数为ExportParams类型，目前仅仅在ExportParams中设置了sheetName + bussExportMap.put("title", bussExportParams); + // 模版导出对应得实体类型 + bussExportMap.put("entity", ParamsInfoEnExport.class); + // sheet中要填充得数据 + bussExportMap.put("data", paramsInfoEnExportList); + sheetsList.add(bussExportMap); + + // 导出认证类别参数项 + if (CollectionUtil.isNotEmpty(certCategoryNameList)) { + // 所有数据 + List certCategoryParamsInfoListExport = new ArrayList<>(); + for (ParamsInfoEnExport paramsInfoEnExport : paramsInfoEnExportList) { + List certCategoryParamsInfoEnExports = paramsInfoEnExport.getCertCategoryParamsInfoEnExportList(); + certCategoryParamsInfoListExport.addAll(certCategoryParamsInfoEnExports); + } + if (CollectionUtil.isNotEmpty(certCategoryParamsInfoListExport)) { + for (String certCategoryName : certCategoryNameList) { + // 当前认证类别数据 + Map finalCertCategoryMap = certCategoryMap; + List certCategoryParamsInfoExport = certCategoryParamsInfoListExport.stream() + .filter(e -> finalCertCategoryMap.get(certCategoryName).equals(e.getCertCategory())) + .collect(Collectors.toList()); + if (CollectionUtil.isNotEmpty(certCategoryParamsInfoExport)) { + ExportParams certExportParams = new ExportParams(); + certExportParams.setSheetName(certCategoryName); + certExportParams.setType(ExcelType.XSSF); // 解决HSSFRichTextString cannot cast XSSFRichTextString问题 + certExportParams.setStyle(CommonExcelExportStyler.class); + Map certExportMap = new HashMap<>(); + certExportMap.put("title", certExportParams); + certExportMap.put("entity", CertCategoryParamsInfoEnExport.class); + certExportMap.put("data", certCategoryParamsInfoExport); + sheetsList.add(certExportMap); + } + } + } + } + //下载附件模板对应文件 + if (fileTemplateList != null && !fileTemplateList.isEmpty()) { + fileTemplateList = fileTemplateList.stream().distinct().collect(Collectors.toList()); + downLoadFileList(fileTemplateList,fileNowPath); + } + + return sheetsList; + } + private void downLoadFileList(List fileTemplateList,String fileNowPath) throws IOException { for(OSSFile fileExportDto : fileTemplateList){ String oldPath = fileExportDto.getUrl(); @@ -449,7 +557,6 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl paramsInfoEOList, String cut) { + //树形数据字典 + List categoryList = sysCategoryService.list(); + + for (ParamsInfoEO paramsInfoEO : paramsInfoEOList){ + String value = paramsInfoEO.getTechnologyTerritory(); + if (StringUtils.isNotBlank(value)) { + List idList = Arrays.asList(value.split(",")); + List sysCategoryList = categoryList.stream().filter(e -> idList.contains(e.getId())).collect(Collectors.toList()); + if (CutEnum.CN.getValue().equals(cut)) { + List nameList = sysCategoryList.stream().map(SysCategory::getName).collect(Collectors.toList()); + paramsInfoEO.setTechnologyTerritory(StringUtils.join(nameList, ",")); + } else { + List nameEnList = sysCategoryList.stream().map(SysCategory::getEnName).collect(Collectors.toList()); + paramsInfoEO.setTechnologyTerritory(StringUtils.join(nameEnList, ",")); + } + } + } + } + + public void getTreeDictItemTextForEnExport(List paramsInfoEnExportList) { + //树形数据字典 + List categoryList = sysCategoryService.list(); + + for (ParamsInfoEnExport paramsInfoEnExport : paramsInfoEnExportList){ + String value = paramsInfoEnExport.getTechnologyTerritory(); + if (StringUtils.isNotBlank(value)) { + List idList = Arrays.asList(value.split(",")); + List sysCategoryList = categoryList.stream().filter(e -> idList.contains(e.getId())).collect(Collectors.toList()); + List nameEnList = sysCategoryList.stream().map(SysCategory::getEnName).collect(Collectors.toList()); + paramsInfoEnExport.setTechnologyTerritory(StringUtils.join(nameEnList, ",")); + } + } + } } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnExport.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnExport.java index 83f432fb8..6a56cafdf 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnExport.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnExport.java @@ -8,6 +8,8 @@ import lombok.Data; import org.jeecgframework.poi.excel.annotation.Excel; import org.springframework.format.annotation.DateTimeFormat; +import java.util.List; + /** * @Author: liyawei * @Description: @@ -59,19 +61,19 @@ public class ParamsInfoEnExport { private String paramsName; /**技术领域*/ - @Excel(name = "*technology territory", width = 15, dicCode = "technology_territory") - @Dict(dicCode = "technology_territory") + @Excel(name = "*technology territory", width = 15) +// @Dict(dicCode = "technology_territory") @ApiModelProperty(value = "技术领域") private String technologyTerritory; /**参数批次*/ - @Excel(name = "*params batch", width = 15, dicCode = "params_batch") + @Excel(name = "*params batch", width = 15, dicCode = "params_batch_en") @Dict(dicCode = "params_batch") @ApiModelProperty(value = "参数批次") private String paramsBatch; /**责任领域*/ - @Excel(name = "*duty territory", width = 15, dicCode = "duty_territory") + @Excel(name = "*duty territory", width = 15, dicCode = "duty_territory_en") @Dict(dicCode = "duty_territory") @ApiModelProperty(value = "责任领域") private String dutyTerritory; @@ -82,7 +84,7 @@ public class ParamsInfoEnExport { private String description; /**认证类别*/ - @Excel(name = "cert category", width = 15, dicCode = "cert_category") + @Excel(name = "cert category", width = 15, dicCode = "cert_category_en") @Dict(dicCode = "cert_category") @ApiModelProperty(value = "认证类别") private String certCategory; @@ -110,4 +112,12 @@ public class ParamsInfoEnExport { @TableField(exist = false) private String fileTemplateName; //附件模板文件名 + /**参数模板id*/ + @ApiModelProperty(value = "参数模板id") + private String paramsTemplateId; + + @TableField(exist = false) + private List certCategoryParamsInfoEnExportList; // 认证类别参数列表 + + } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDictMapper.xml b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDictMapper.xml index 56133cad0..7d9a4f9e2 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDictMapper.xml +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDictMapper.xml @@ -4,7 +4,7 @@ diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java index a06768d9a..a36600081 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java @@ -546,6 +546,8 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl