From 8d810fe6748e6600f0cdb7450372f90f746b52d1 Mon Sep 17 00:00:00 2001 From: liyawei Date: Fri, 15 Jul 2022 09:26:17 +0800 Subject: [PATCH 1/7] =?UTF-8?q?people-=E7=94=A8=E6=88=B7=E8=A1=A8=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E9=83=A8=E5=88=86=E7=B4=A2=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_third_record.sql | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index 42b9bed98..1961473e9 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -380,3 +380,8 @@ ALTER TABLE `laws_weilai`.`params_report_detail` -- 法规技术评估 反馈评估表中，增加符合性结果表id关联 2022-07-14 ALTER TABLE `laws_technology_evaluation_result` ADD COLUMN `compliance_result_id` varchar(64) NULL COMMENT '符合性结果id' AFTER `acti_proc_inst_id`; + +-- 用户表 删除索引 2022-07-14 已同步 +ALTER TABLE `laws_weilai`.`sys_user` +DROP INDEX `uniq_sys_user_phone`, +DROP INDEX `uniq_sys_user_email`; \ No newline at end of file From a0906e88de818ffd7f98a3b8f47aa77dd1d3d2c1 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Fri, 15 Jul 2022 10:07:13 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF?= =?UTF-8?q?=E8=AF=84=E4=BC=B0-=E9=92=88=E5=AF=B9=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=8F=91=E8=B5=B7=E6=B5=81=E7=A8=8B=E6=97=B6=EF=BC=8C=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E9=80=9A=E8=BF=87id=E6=9F=A5=E8=AF=A2=E6=96=87?= =?UTF-8?q?=E6=A1=A3=E5=BA=93=E6=95=B0=E6=8D=AE=EF=BC=8C=E8=BF=87=E6=BB=A4?= =?UTF-8?q?=E5=87=BA=E6=9D=A5=E6=96=87=E6=A1=A3=E5=BA=93id=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BussDocumentLibraryEOServiceImpl.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index 655b5e6f3..6084eef24 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 @@ -450,7 +450,13 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl YesOrNoEnum.YES.getValue().equals(StringUtils.valueOf(e.getIsQuery()))).collect(Collectors.toList()); + fieldList = fieldList.stream().filter(e -> { + boolean showFlag = false; + if(YesOrNoEnum.YES.getValue().equals(StringUtils.valueOf(e.getIsQuery())) || e.getDbFieldName().equals("id")){ + showFlag = true; + } + return showFlag; + }).collect(Collectors.toList()); if(CutEnum.CN.getValue().equals(cut)){ fieldList = fieldList.stream().filter(e->!"title_en".equals(e.getDbFieldName())).collect(Collectors.toList()); }else{ From 865e5ce63b01499ca16866a811575f3255bd7f9d Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Fri, 15 Jul 2022 10:41:54 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E9=80=9A=E8=BF=87id=E6=9F=A5=E6=89=BE?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../document/service/impl/BussDocumentLibraryEOServiceImpl.java | 2 ++ 1 file changed, 2 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 6084eef24..847538ce3 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 @@ -3637,6 +3637,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl Date: Fri, 15 Jul 2022 11:05:25 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=8A=80=E6=9C=AF=E8=AF=84=E4=BC=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/TermInformation.vue | 6 ++- .../components/evaluationResultsClause.vue | 7 ++- .../components/evaluationResultsWhole.vue | 7 ++- .../components/initiatingProcess.vue | 47 +++++++++++++++++-- .../technologyAssessment/index.vue | 11 ++--- 5 files changed, 65 insertions(+), 13 deletions(-) diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue index 5c9aa7475..98f2bc425 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue @@ -165,8 +165,10 @@ submitData(callback) { let dataList = JSON.parse(JSON.stringify(this.dataList)) for (let i = 0; i < dataList.length; i++) { - dataList[i].evaluationMethods = dataList[i].evaluationMethods.join(',') - dataList[i].lawsTechnologyEvaluationId = this.getUUID + if (dataList[i].evaluationMethods && dataList[i].evaluationMethods instanceof Array) { + dataList[i].evaluationMethods = dataList[i].evaluationMethods.join(',') + } + dataList[i].lawsTechnologyEvaluationId = this.$route.query.lawsTechnologyEvaluationId || this.getUUID if (!dataList[i].evaluationMethods || !dataList[i].evaluatorIds) { this.$message.warning(this.$t('pleaseCompleteTheEvaluationMethodorEvaluator')) return diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue index 0eb59c342..b9b258dad 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue @@ -226,13 +226,18 @@ } }, mounted() { + document.title = this.$route.query.serialNumber + ' ' + this.$t('regulatoryTechnicalEvaluationResults') this.getList() }, methods: { CurrentStandard() { let query = { firstInitiation: '2', - whetherTobring: '1' + whetherTobring: '1', + processBackground: this.$route.query.processBackground || '', + remark: this.$route.query.remark || '', + standId: this.$route.query.standId, + lawsTechnologyEvaluationId:this.$route.query.lawsTechnologyEvaluationId } let newUrl = this.$router.resolve({ path: '/evaluationInitiationProcess', diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue index 8d83206c5..7c54837f7 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue @@ -110,13 +110,18 @@ } }, mounted() { + document.title = this.$route.query.serialNumber +' '+this.$t('regulatoryTechnicalEvaluationResults') this.getList() }, methods: { CurrentStandard() { let query = { firstInitiation: '2', - whetherTobring: '2' + whetherTobring: '2', + processBackground:this.$route.query.processBackground || '', + remark:this.$route.query.remark || '', + standId:this.$route.query.standId, + lawsTechnologyEvaluationId:this.$route.query.lawsTechnologyEvaluationId } let newUrl = this.$router.resolve({ path: '/evaluationInitiationProcess', diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue index b89247abf..09874fbdd 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue @@ -99,6 +99,7 @@ @@ -113,6 +114,7 @@ @@ -290,7 +292,6 @@ }, mounted() { document.title = this.$t('regulatoryEngineer') + this.$t('initiatingProcess') - this.getList() this.getEvaluationMethodTree() if (this.$route.query.whetherTobring == '1') { this.isTrue = true @@ -299,8 +300,14 @@ } if (this.$route.query.firstInitiation == '1') { this.whetherDisplay = true + this.getList() } else { this.whetherDisplay = false + this.formInline.processBackground = this.$route.query.processBackground + this.formInline.lawsTechnologyEvaluationId = this.$route.query.lawsTechnologyEvaluationId + this.formInline.remark = this.$route.query.remark + this.formInline.standId = this.$route.query.standId + this.getListOne() } eventBUs.$on('searchQuery', search => { Object.keys(search).forEach(res => { @@ -333,6 +340,36 @@ this.pageSize = pageSize this.getList() }, + getListOne() { + let query = { + pageNo: this.pageNo, + pageSize: this.pageSize, + id: this.formInline.standId + } + this.loading = true + let url = '' + if (this.isTrue) { + url = this.url.addModelListOne + } else { + url = this.url.addModelList + } + postAction(url, query).then((res) => { + if (res.success) { + let content = res.result.records || [] + this.selectedRowKeysRecord.push({ + standId: content[0].id, + serialNumber: content[0].serial_number, + title: content[0].title, + technologyTerritory: content[0].technology_territory_id + }) + this.standardDecomposition = content + this.loading = false + } else { + this.dataSource = [] + this.loading = false + } + }) + }, getList() { let query = { pageNo: this.pageNo, @@ -463,7 +500,7 @@ value.startTime = startTime value.flowStatus = 'Underway' value.taskAffirmDueDate = value.endTime - if (!value.lawsTechnologyEvaluationId){ + if (!value.lawsTechnologyEvaluationId) { value.lawsTechnologyEvaluationId = this.getUUID() } value.regulationOwnerId = this.userInfo().id @@ -532,7 +569,11 @@ } } - + + \ No newline at end of file diff --git a/jero-web/src/views/regulationsKanban/index.vue b/jero-web/src/views/regulationsKanban/index.vue new file mode 100644 index 000000000..37e7d1b14 --- /dev/null +++ b/jero-web/src/views/regulationsKanban/index.vue @@ -0,0 +1,452 @@ + + + + + From 81f79f6d1e53f82e2a838b1738d1a738f8d3b264 Mon Sep 17 00:00:00 2001 From: xiaowenyu Date: Fri, 15 Jul 2022 13:31:32 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9sql=E6=96=87=E4=BB=B6?= =?UTF-8?q?=EF=BC=8C=E6=A0=87=E6=B3=A8=E5=B7=B2=E5=90=8C=E6=AD=A5=E6=AD=A3?= =?UTF-8?q?=E5=BC=8F=E7=8E=AF=E5=A2=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_third_record.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index 1961473e9..44aae6736 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -361,7 +361,7 @@ ALTER TABLE `laws_weilai`.`report_cert_category_params_info` MODIFY COLUMN `description` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数说明' AFTER `params_name`; --以上SQL 2022年7月12日 已同步正式环境 --- 参数项清单表 添加字段 标题默认值 2022-07-13 +-- 参数项清单表 添加字段 标题默认值 2022-07-13 已同步正式环境 ALTER TABLE `laws_weilai`.`params_info` ADD COLUMN `title_default_value` varchar(100) NULL COMMENT '标题默认值' AFTER `params_template_id`; @@ -377,7 +377,7 @@ ALTER TABLE `laws_weilai`.`params_collect_manifest_history` ALTER TABLE `laws_weilai`.`params_report_detail` ADD COLUMN `title_default_value` varchar(100) NULL COMMENT '标题默认值' AFTER `sync_time`; --- 法规技术评估 反馈评估表中，增加符合性结果表id关联 2022-07-14 +-- 法规技术评估 反馈评估表中，增加符合性结果表id关联 2022-07-14 已同步正式环境 ALTER TABLE `laws_technology_evaluation_result` ADD COLUMN `compliance_result_id` varchar(64) NULL COMMENT '符合性结果id' AFTER `acti_proc_inst_id`; From dffe45c58b196aaa93fb3066f573525c8d7cd68b Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Fri, 15 Jul 2022 14:19:50 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E5=9B=9E=E6=BB=9A=E6=A0=B9=E6=8D=AEid?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=96=87=E6=A1=A3=E5=BA=93=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BussDocumentLibraryEOServiceImpl.java | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index 847538ce3..655b5e6f3 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 @@ -450,13 +450,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl { - boolean showFlag = false; - if(YesOrNoEnum.YES.getValue().equals(StringUtils.valueOf(e.getIsQuery())) || e.getDbFieldName().equals("id")){ - showFlag = true; - } - return showFlag; - }).collect(Collectors.toList()); + fieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(StringUtils.valueOf(e.getIsQuery()))).collect(Collectors.toList()); if(CutEnum.CN.getValue().equals(cut)){ fieldList = fieldList.stream().filter(e->!"title_en".equals(e.getDbFieldName())).collect(Collectors.toList()); }else{ @@ -3637,8 +3631,6 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl