From c5bf32bc6c9488f9d8a5ca847392aa42baee5c77 Mon Sep 17 00:00:00 2001 From: liyawei Date: Tue, 12 Jul 2022 09:36:19 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E5=BA=93-=E5=B8=B8=E8=A7=84=E5=AF=BC=E5=87=BA=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E5=8F=82=E6=95=B0=E7=BB=91=E5=AE=9A=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_third_record.sql | 4 ++++ .../service/impl/ParamsCollectManifestEOServiceImpl.java | 1 + .../cert/report/entity/ReportCertCategoryParamsInfoEO.java | 4 ++++ .../cert/report/mapper/xml/ParamsReportDetailEOMapper.xml | 3 ++- .../mapper/xml/ReportCertCategoryParamsInfoEOMapper.xml | 1 + 5 files changed, 12 insertions(+), 1 deletion(-) diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index 6f67d579a..b3ad6c4a9 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -239,6 +239,10 @@ CREATE TABLE `laws_technology_evaluation` ( PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '法规技术评估表' ROW_FORMAT = DYNAMIC; +-- 上报库认证类别参数信息 添加字段 2022-07-11 +ALTER TABLE `laws_weilai`.`report_cert_category_params_info` + ADD COLUMN `params_manifest_id` varchar(50) NULL COMMENT '上报库id' AFTER `version`; + -- 法规技术评估-流程明细表 CREATE TABLE `laws_technology_evaluation_flow_detail` ( `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index ff8f7c289..a11e3fb76 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -1552,6 +1552,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl and prd.id in diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ReportCertCategoryParamsInfoEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ReportCertCategoryParamsInfoEOMapper.xml index cc2317fb5..d73208e9f 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ReportCertCategoryParamsInfoEOMapper.xml +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ReportCertCategoryParamsInfoEOMapper.xml @@ -15,5 +15,6 @@ + \ No newline at end of file From 8a32f6f74c3fc39ae5e0fa73b721e19d6b567dc4 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Tue, 12 Jul 2022 09:41:01 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E5=B8=83=E5=B1=80=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 --- jero-web/src/common/lang/en-us.js | 2 + jero-web/src/common/lang/zh-cn.js | 2 + .../components/evaluatorFeedback.vue | 280 ++++++++++++++++++ .../components/evaluatorFeedbackList.vue | 185 ++++++++++++ .../processForm/evaluationProcess/index.vue | 29 +- 5 files changed, 485 insertions(+), 13 deletions(-) create mode 100644 jero-web/src/views/processCenter/components/evaluatorFeedback.vue create mode 100644 jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 9b08f22c0..5390bad63 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1112,4 +1112,6 @@ module.exports = { selectedStandard:'Selected standard', standardDecompositionDocument:'Standard decomposition document', pleaseSelectStandardFirst:'Please select a standard first', + RelevantMaterials:'RelevantMaterials', + evaluatorFeedback:'Evaluator feedback', } \ 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 d1d642381..e7216f749 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1112,8 +1112,10 @@ module.exports = { RegulationTaskConfirmationNotification:'任务确认通知', evaluationMethod:'评估方式', uploadRelevantMaterials:'相关资料上传', + RelevantMaterials:'相关资料', processBackground:'流程背景', selectedStandard:'所选标准', standardDecompositionDocument:'带入标准分解单', pleaseSelectStandardFirst:'请先选择标准', + evaluatorFeedback:'评估人反馈', } \ No newline at end of file diff --git a/jero-web/src/views/processCenter/components/evaluatorFeedback.vue b/jero-web/src/views/processCenter/components/evaluatorFeedback.vue new file mode 100644 index 000000000..3d5cfad06 --- /dev/null +++ b/jero-web/src/views/processCenter/components/evaluatorFeedback.vue @@ -0,0 +1,280 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue b/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue new file mode 100644 index 000000000..68383c0c4 --- /dev/null +++ b/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue @@ -0,0 +1,185 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue index 94ec268cf..810c536e3 100644 --- a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue @@ -12,11 +12,11 @@ :url="url" :standardContentQuery="queryProject" /> - { - this.lawsOpinionAssessmentResult() - }) + this.isDisplay = true + // this.queryTaskDetailByTask(() => { + // this.lawsOpinionAssessmentResult() + // }) }, methods: { ...mapGetters(['userInfo']), From 6c8bb8ba72b8169082f1a82d9d7d5593163ab82e Mon Sep 17 00:00:00 2001 From: liyawei Date: Tue, 12 Jul 2022 10:52:55 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E5=BA=93=E5=8F=82=E6=95=B0=E9=A1=B9-=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParamsReportDetailEOController.java | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportDetailEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportDetailEOController.java index 8d3e9f61e..a3cd6327c 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportDetailEOController.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportDetailEOController.java @@ -5,7 +5,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.base.controller.JeroController; +import com.jero.modules.cert.report.entity.ParamsReportConfigEO; import com.jero.modules.cert.report.entity.ParamsReportDetailEO; +import com.jero.modules.cert.report.service.IParamsReportConfigEOService; import com.jero.modules.cert.report.service.IParamsReportDetailEOService; import com.jero.modules.cert.report.vo.ParamsReportDetailVO; import io.swagger.annotations.Api; @@ -38,6 +40,9 @@ public class ParamsReportDetailEOController extends JeroController getById(@RequestParam(name = "id") String id) { + ParamsReportConfigEO paramsReportConfigEO = paramsReportConfigEOService.getById(id); + return Result.OK(paramsReportConfigEO); + } + } From 772a314b3a56ca4747b30610aa40f52b67c77a6e Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Tue, 12 Jul 2022 11:01:43 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E5=B8=83=E5=B1=80=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 --- jero-web/src/common/lang/en-us.js | 3 + jero-web/src/common/lang/zh-cn.js | 3 + .../components/modules/defaultTemplate.vue | 46 +++++--- .../components/modules/fillAdd.vue | 11 ++ .../components/evaluatorFeedback.vue | 17 +-- .../components/evaluatorFeedbackList.vue | 104 ++++++++++++------ .../processForm/evaluationProcess/index.vue | 12 +- 7 files changed, 126 insertions(+), 70 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 5390bad63..05586dcd0 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1114,4 +1114,7 @@ module.exports = { pleaseSelectStandardFirst:'Please select a standard first', RelevantMaterials:'RelevantMaterials', evaluatorFeedback:'Evaluator feedback', + nameTechnicalDocument:'Name of technical document', + chapter:'chapter', + problemDescription:'Problem description', } \ 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 e7216f749..700a6135c 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1118,4 +1118,7 @@ module.exports = { standardDecompositionDocument:'带入标准分解单', pleaseSelectStandardFirst:'请先选择标准', evaluatorFeedback:'评估人反馈', + nameTechnicalDocument:'技术文件名称', + chapter:'章节', + problemDescription:'问题说明', } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue index cdd5dd3a4..61e2611e2 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue @@ -135,20 +135,20 @@ - -
-
- {{$t('releaseDate')}} -
- - - -
- + + + + + + + + + + + + + +
@@ -163,8 +163,6 @@
- -
@@ -180,6 +178,9 @@
+ + +
@@ -391,8 +392,21 @@ methods: { ...mapGetters(['userInfo']), getStandData(value) { + console.log(value) this.formInline.titleCn = value.serial_number + ' ' + value.title this.formInline.titleEn = value.serial_number + ' ' + value.title_en + this.formInline.technologyTerritory = value.technology_territory_dict + this.formInline.applyCar = value.shi4_yong4_che1_xing2_dict + this.formInline.applyScope = value.shi4_yong4_fan4_wei2_dict + this.formInline.state = value.state_dict + this.formInline.newCarImplementTime = value.xin1_che1_xing2_shi2_shi1_ri4_qi1 + this.formInline.productionCarImplementTime = value.implement_time + var curPath = window.document.location.href + var pathname = window.document.location.pathname + var pos = curPath.indexOf(pathname) + var localhostPath = curPath.substring(0, pos) + this.formInline.link = localhostPath + '/docManage/library/detail?id=' + value.id + this.formInline = {...this.formInline} }, getSysCategoryTree() { getAction('/sys/category/getSysCategoryTree', {}).then((res) => { diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue index 22f173f08..ca2803ca7 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue @@ -50,6 +50,7 @@ v-model="formInline.memoriesChapter" :maxTagCount="1" :disabled="disabled" + @change="changeTree" :getPopupContainer="triggerNode=> triggerNode.parentNode" class="box-input" style="width: 100%" @@ -187,6 +188,9 @@ getAction('/report/lawsMonthlyReportTitleTemplateEO/list', {}).then((res) => { if (res.success) { this.chapterContentsList = res.result || [] + this.chapterContentsList.forEach(val => { + val.disabled = true + }) } else { this.chapterContentsList = [] } @@ -245,6 +249,13 @@ handleCancel() { this.visible = false }, + changeTree(value, node, extra) { + if (value.length > 1) { + value.shift() + } + this.formInline.memoriesChapter = value + this.formInline = { ...this.formInline } + }, handleSubmit() { this.$refs.ruleForm.validate(valid => { if (valid) { diff --git a/jero-web/src/views/processCenter/components/evaluatorFeedback.vue b/jero-web/src/views/processCenter/components/evaluatorFeedback.vue index 3d5cfad06..5492cf511 100644 --- a/jero-web/src/views/processCenter/components/evaluatorFeedback.vue +++ b/jero-web/src/views/processCenter/components/evaluatorFeedback.vue @@ -59,31 +59,18 @@
* {{$t('questionsSuggestions')}} + :title="$t('problemDescription')">{{$t('problemDescription')}}
+ :placeholder="$t('PleaseEnter')+$t('problemDescription')"/>
- -
-
- {{$t('reason')}} -
- - - -
-
diff --git a/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue b/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue index 68383c0c4..1711ad4fe 100644 --- a/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue +++ b/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue @@ -6,7 +6,15 @@
- + +
@@ -25,36 +33,73 @@ type: String, default: '' }, - feedbackDataList:{ - type: Array, - default: (()=>{ - return [] - }) - }, }, data() { return { - formInline: {}, disabled:false, - rules: {}, + loading:false, uploadIndex:'', - dataList: [] + dataSource:[], + columns:[ + { + title: this.$t('clauseNo'), + dataIndex: 'items_num', + align: 'center', + ellipsis: true + }, + { + title: this.$t('clauseName'), + dataIndex: 'items_name', + align: 'center', + ellipsis: true + }, + { + title: this.$t('clauseContent'), + dataIndex: 'iterms_conditions', + align: 'center', + ellipsis: true + }, + { + title: this.$t('evaluationMethod'), + dataIndex: 'evaluationMethod', + align: 'center', + ellipsis: true + }, + { + title: this.$t('nameTechnicalDocument'), + dataIndex: 'nameTechnicalDocument', + align: 'center', + ellipsis: true + }, + { + title: this.$t('chapter'), + dataIndex: 'chapter', + align: 'center', + ellipsis: true + }, + { + title: this.$t('opinion'), + dataIndex: 'opinion', + align: 'center', + ellipsis: true + }, + { + title: this.$t('enclosure'), + dataIndex: 'enclosure', + align: 'center', + ellipsis: true + }, + { + title: this.$t('complianceResults'), + dataIndex: 'complianceResults', + align: 'center', + ellipsis: true + }, + ], } }, mounted() { - if (this.feedbackDataList && this.feedbackDataList.length > 0){ - this.dataList = this.feedbackDataList - this.dataList = [...this.dataList] - }else{ - this.dataList = [ - { - relatedSection: '', - issueOrSuggest: '', - reason: '', - accessoryFile: '' - } - ] - } + }, methods: { clickButtonToUpload(item,index) { @@ -82,19 +127,6 @@ this.dataList[this.uploadIndex][this.uploadName] = attIdList.join(',') this.dataList = [...this.dataList] }, - addData() { - this.dataList.push({ - relatedSection: '', - issueOrSuggest: '', - reason: '', - accessoryFile: '' - }) - this.dataList = [...this.dataList] - }, - deleteData() { - this.dataList.pop() - this.dataList = [...this.dataList] - } } } diff --git a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue index 810c536e3..f438e9690 100644 --- a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue @@ -14,10 +14,15 @@ /> + Date: Tue, 12 Jul 2022 11:41:59 +0800 Subject: [PATCH 05/12] =?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/api/manage.js | 4 ++++ jero-web/src/views/dashboard/components/myList.vue | 4 ++-- .../processList/tabComponents/processCenter/index.vue | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/jero-web/src/api/manage.js b/jero-web/src/api/manage.js index 349700e7a..eebd43e55 100644 --- a/jero-web/src/api/manage.js +++ b/jero-web/src/api/manage.js @@ -195,6 +195,10 @@ export function downloadFile(url, fileName, parameter, callback) { } } catch (e) { if (!data || data.size === 0) { + index.showDrawer({ + loading: false, + isTrue: isTrue + }) Vue.prototype['$message'].warning('文件下载失败') return } diff --git a/jero-web/src/views/dashboard/components/myList.vue b/jero-web/src/views/dashboard/components/myList.vue index 82e3f7663..3f1f4e533 100644 --- a/jero-web/src/views/dashboard/components/myList.vue +++ b/jero-web/src/views/dashboard/components/myList.vue @@ -86,8 +86,8 @@ }) }, prcClick(row) { - let index = row.taskIds.lastIndexOf(',') - row.taskIds = row.taskIds.slice(0, index) + // let index = row.taskIds.lastIndexOf(',') + // row.taskIds = row.taskIds.slice(0, index) if (row.prcType == '1') { let newUrl = this.$router.resolve({ path: '/handshakeProcess', 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 e3981099f..ce1eaeec0 100644 --- a/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue +++ b/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue @@ -154,8 +154,8 @@ }) }, dealWith(row) { - let index = row.taskIds.lastIndexOf(',') - row.taskIds = row.taskIds.slice(0, index) + // let index = row.taskIds.lastIndexOf(',') + // row.taskIds = row.taskIds.slice(0, index) if (row.prcType == '1') { let newUrl = this.$router.resolve({ path: '/handshakeProcess', From 32dbf7486f29f0f004bf30dbc6e2745c746e8ad4 Mon Sep 17 00:00:00 2001 From: liyawei Date: Tue, 12 Jul 2022 11:57:13 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E5=BA=93-=E8=A7=A3=E5=86=B3=E5=8E=86=E5=8F=B2=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E4=B8=8B=E8=BD=BD=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/service/impl/ParamsReportDetailEOServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java index ae409e6dc..629c3eebd 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java @@ -588,7 +588,8 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl Date: Tue, 12 Jul 2022 13:44:32 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=A1=B9-=E5=8F=98=E6=9B=B4:=E5=8E=BB=E6=8E=89=E6=8A=80?= =?UTF-8?q?=E6=9C=AF=E9=A2=86=E5=9F=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cert/template/entity/ParamsInfoEO.java | 4 +-- .../service/impl/ParamsInfoEOServiceImpl.java | 32 +++++++++---------- .../cert/template/vo/ParamsInfoCnImport.java | 2 +- .../cert/template/vo/ParamsInfoEnExport.java | 4 +-- .../cert/template/vo/ParamsInfoEnImport.java | 2 +- 5 files changed, 22 insertions(+), 22 deletions(-) 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 bac0f3502..548885b9d 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,10 +77,10 @@ public class ParamsInfoEO implements Serializable { private String paramsName; /**技术领域*/ - @Excel(name = "*技术领域", width = 15) +// @Excel(name = "*技术领域", width = 15) // @Dict(dicCode = "technology_territory") @ApiModelProperty(value = "技术领域") - private String technologyTerritory; + private String technologyTerritory; // 2022-07-12 需求去掉技术领域 /**参数批次*/ @Excel(name = "*参数批次", width = 15, dicCode = "params_batch") 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 ad9bf75f1..0c2e0f47a 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 @@ -455,7 +455,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl paramsInfoEOList = paramsInfoEOMapper.selectListWithCert(paramsInfoVO); // 中文数据导出 - getTreeDictItemText(paramsInfoEOList, cut); +// getTreeDictItemText(paramsInfoEOList, cut); List> sheetsList = new ArrayList<>(); sheetsList = getCnExportSheetsList(paramsInfoEOList, fileNowPath, paramsTemplateId); workbook = ExcelExportUtil.exportExcel(sheetsList, ExcelType.XSSF); @@ -463,7 +463,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl paramsInfoEnExportList = paramsInfoEOMapper.selectListWithCertForEnExport(paramsInfoVO); // 英文数据导出 - getTreeDictItemTextForEnExport(paramsInfoEnExportList); +// getTreeDictItemTextForEnExport(paramsInfoEnExportList); List> sheetsList = new ArrayList<>(); sheetsList = getEnExportSheetsList(paramsInfoEnExportList, fileNowPath, paramsTemplateId); workbook = ExcelExportUtil.exportExcel(sheetsList, ExcelType.XSSF); @@ -839,7 +839,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl paramsInfoEOListEn = resultEn.getList(); copyParamsInfoList(paramsInfoEOListEn, paramsInfoEOList); } else { - String fields[] ={ "*NIO编号", "*是否必填", "*参数名称","*技术领域","*参数批次","*责任领域", + String fields[] ={ "*NIO编号", "*是否必填", "*参数名称","*参数批次","*责任领域", "参数说明", "*控件类型", "控件校验", "控件备选值", "附件模板"}; params.setImportFields(fields); @@ -1069,7 +1069,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl certCategoryParamsInfoEOList = new ArrayList<>(); // 树形数据字典 - List categoryList = sysCategoryService.queryByTreeDicCode("technology_territory"); +// List categoryList = sysCategoryService.queryByTreeDicCode("technology_territory"); // 普通数据字典 List dictItemList = new ArrayList<>(); List dictCodeList = new ArrayList<>(); @@ -1091,12 +1091,12 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl itemNameList = new ArrayList<>(); if (CutEnum.CN.getValue().equals(cut)) { - treeNameList = categoryList.stream().map(SysCategory::getName).collect(Collectors.toList()); +// treeNameList = categoryList.stream().map(SysCategory::getName).collect(Collectors.toList()); itemNameList = dictItemList.stream().map(SysDictItem::getItemText).collect(Collectors.toList()); certCategoryMap = dictItemList.stream().filter(e->"cert_category".equals(e.getDictCode())).collect(Collectors.toMap(c->c.getItemText(),c->c.getItemValue())); } else if(CutEnum.EN.getValue().equals(cut)){ - treeNameList = categoryList.stream().map(SysCategory::getEnName).collect(Collectors.toList()); +// treeNameList = categoryList.stream().map(SysCategory::getEnName).collect(Collectors.toList()); itemNameList = dictItemList.stream().map(SysDictItem::getEnName).collect(Collectors.toList()); certCategoryMap = dictItemList.stream().filter(e->"cert_category".equals(e.getDictCode())).collect(Collectors.toMap(c->c.getEnName(),c->c.getItemValue())); @@ -1177,15 +1177,15 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl Date: Tue, 12 Jul 2022 14:19:22 +0800 Subject: [PATCH 08/12] =?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 --- .../components/evaluationResultsList.vue | 12 +- .../components/evaluatorFeedback.vue | 115 +++++++++++++----- .../components/feedbackInformation.vue | 75 +++++++----- .../processForm/evaluationProcess/index.vue | 5 +- .../processForm/regulatoryProcess/index.vue | 4 +- 5 files changed, 138 insertions(+), 73 deletions(-) diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue index fb1d93dfa..a474a8892 100644 --- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue @@ -177,11 +177,13 @@ //导出 handleExport() { let query = { - lawsOpinionGatherId: this.lawsOpinionGatherId, - actiProcInstId: this.actiProcInstId + pageSize:this.pageSize, + pageNo:this.pageNo + // lawsOpinionGatherId: this.lawsOpinionGatherId, + // actiProcInstId: this.actiProcInstId } downloadFile('/lawsOpinionGather/lawsOpinionAssessmentResultEO/exportXls', - this.$t('evaluationResults') + '.xls', query) + this.$t('evaluationResults') + '.zip', query) }, getData(row) { this.visible = true @@ -206,7 +208,9 @@ getList() { let query = { lawsOpinionGatherId: this.lawsOpinionGatherId, - actiProcInstId: this.actiProcInstId + actiProcInstId: this.actiProcInstId, + pageSize:this.pageSize, + pageNo:this.pageNo } this.loading = true getAction('/lawsOpinionGather/lawsOpinionAssessmentResultEO/page', query).then((res) => { diff --git a/jero-web/src/views/processCenter/components/evaluatorFeedback.vue b/jero-web/src/views/processCenter/components/evaluatorFeedback.vue index 5492cf511..a9b0fcefe 100644 --- a/jero-web/src/views/processCenter/components/evaluatorFeedback.vue +++ b/jero-web/src/views/processCenter/components/evaluatorFeedback.vue @@ -27,16 +27,16 @@
-
+
{{$t('feedbackPoint')+(index+1)}}
@@ -46,7 +46,11 @@ * {{$t('relevantSections')}}
- + {{$t('problemDescription')}}
- + import { getAction, postAction } from '@/api/manage' import uploadFile from '@/components/uploadFile/file' + export default { name: 'evaluatorFeedback', components: { @@ -107,44 +115,78 @@ type: String, default: '' }, - feedbackDataList:{ + feedbackDataList: { type: Array, - default: (()=>{ + default: (() => { return [] }) - }, + } }, data() { return { formInline: {}, - disabled:false, - rules: {}, - uploadIndex:'', + disabled: false, + rules: { + flag:[ + { + required: true, + message: this.$t('complianceResults') + this.$t('cannotEmpty'), + trigger: 'change' + }, + ], + relatedSection: [ + { + required: true, + message: this.$t('relevantSections') + this.$t('cannotEmpty'), + trigger: 'blur' + }, + { + max: 300, + message: this.$t('relevantSections') + this.$t('cannotExceed') + 300 + this.$t('Characters'), + trigger: 'blur' + } + ], + issueOrSuggest: [ + { + required: true, + message: this.$t('problemDescription') + this.$t('cannotEmpty'), + trigger: 'blur' + }, + { + max: 300, + message: this.$t('problemDescription') + this.$t('cannotExceed') + 300 + this.$t('Characters'), + trigger: 'blur' + } + ] + }, + uploadIndex: '', dataList: [] } }, mounted() { - if (this.feedbackDataList && this.feedbackDataList.length > 0){ - this.dataList = this.feedbackDataList - this.dataList = [...this.dataList] - }else{ - this.dataList = [ - { - relatedSection: '', - issueOrSuggest: '', - reason: '', - accessoryFile: '' - } - ] - } + this.$nextTick(() => { + if (this.feedbackDataList && this.feedbackDataList.length > 0) { + this.formInline.dataList = this.feedbackDataList + } else { + this.formInline.dataList = [ + { + relatedSection: '', + issueOrSuggest: '', + reason: '', + accessoryFile: '' + } + ] + } + this.formInline = { ...this.formInline } + }) }, methods: { - clickButtonToUpload(item,index) { + clickButtonToUpload(item, index) { this.$refs.uploadFile.perentHandleFunc() this.$refs.uploadFile.visible = true this.uploadName = item this.uploadIndex = index - getAction('sys/common/getFileInfos', { id: this.dataList[this.uploadIndex][this.uploadName] }).then((res) => { + getAction('sys/common/getFileInfos', { id: this.formInline.dataList[this.uploadIndex][this.uploadName] }).then((res) => { if (res.success) { this.$refs.uploadFile.perentHandleFunc(res.result) } else { @@ -161,22 +203,29 @@ }) } /** 赋值给当前对应的表单文件 */ - this.dataList[this.uploadIndex][this.uploadName] = attIdList.join(',') - this.dataList = [...this.dataList] + this.formInline.dataList[this.uploadIndex][this.uploadName] = attIdList.join(',') + this.formInline = [...this.formInline] }, addData() { - this.dataList.push({ + this.formInline.dataList.push({ relatedSection: '', issueOrSuggest: '', reason: '', accessoryFile: '' }) - this.dataList = [...this.dataList] + this.formInline = [...this.formInline] }, deleteData() { - this.dataList.pop() - this.dataList = [...this.dataList] - } + this.formInline.dataList.pop() + this.formInline = [...this.formInline] + }, + submitData(callBack){ + this.$refs.ruleForm.validate(valid => { + if (valid) { + callBack && callBack(this.formInline) + } + }) + }, } } diff --git a/jero-web/src/views/processCenter/components/feedbackInformation.vue b/jero-web/src/views/processCenter/components/feedbackInformation.vue index 2eb3fd2ce..31a6c837d 100644 --- a/jero-web/src/views/processCenter/components/feedbackInformation.vue +++ b/jero-web/src/views/processCenter/components/feedbackInformation.vue @@ -7,16 +7,16 @@
-
+
{{$t('feedbackPoint')+(index+1)}}
@@ -26,7 +26,11 @@ * {{$t('relevantSections')}}
- + {{$t('questionsSuggestions')}}
- + { - return [] + default: (() => { + return [] }) - }, + } }, data() { return { formInline: {}, - disabled:false, + disabled: false, rules: {}, - uploadIndex:'', + uploadIndex: '', dataList: [] } }, mounted() { - if (this.feedbackDataList && this.feedbackDataList.length > 0){ - this.dataList = this.feedbackDataList - this.dataList = [...this.dataList] - }else{ - this.dataList = [ - { - relatedSection: '', - issueOrSuggest: '', - reason: '', - accessoryFile: '' - } - ] - } + this.$nextTick(() => { + if (this.feedbackDataList && this.feedbackDataList.length > 0) { + this.formInline.dataList = this.feedbackDataList + this.formInline = { ...this.formInline } + } else { + this.formInline.dataList = [ + { + relatedSection: '', + issueOrSuggest: '', + reason: '', + accessoryFile: '' + } + ] + } + this.formInline = { ...this.formInline } + }) + }, methods: { - clickButtonToUpload(item,index) { + clickButtonToUpload(item, index) { this.$refs.uploadFile.perentHandleFunc() this.$refs.uploadFile.visible = true this.uploadName = item this.uploadIndex = index - getAction('sys/common/getFileInfos', { id: this.dataList[this.uploadIndex][this.uploadName] }).then((res) => { + getAction('sys/common/getFileInfos', { id: this.formInline.dataList[this.uploadIndex][this.uploadName] }).then((res) => { if (res.success) { this.$refs.uploadFile.perentHandleFunc(res.result) } else { @@ -155,21 +166,21 @@ }) } /** 赋值给当前对应的表单文件 */ - this.dataList[this.uploadIndex][this.uploadName] = attIdList.join(',') - this.dataList = [...this.dataList] + this.formInline.dataList[this.uploadIndex][this.uploadName] = attIdList.join(',') + this.formInline = { ...this.formInline } }, addData() { - this.dataList.push({ + this.formInline.dataList.push({ relatedSection: '', issueOrSuggest: '', reason: '', accessoryFile: '' }) - this.dataList = [...this.dataList] + this.formInline = { ...this.formInline } }, deleteData() { - this.dataList.pop() - this.dataList = [...this.dataList] + this.formInline.dataList.pop() + this.formInline = { ...this.formInline } } } } diff --git a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue index f438e9690..bddbf9efc 100644 --- a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue @@ -170,8 +170,9 @@ }) }, submit() { - let dataList = this.$refs.feedbackInformationRef.dataList - this.insertBatch(dataList, 2) + this.$refs.evaluatorFeedbackRef.submitData() + // let dataList = this.$refs.feedbackInformationRef.dataList + // this.insertBatch(dataList, 2) }, completeTask() { let query = { diff --git a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue index 165d6d740..9d30aecbb 100644 --- a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue @@ -134,7 +134,7 @@ }, preservation() { this.loading = true - let dataList = this.$refs.feedbackInformationRef.dataList + let dataList = this.$refs.feedbackInformationRef.formInline.dataList this.insertBatch(dataList, 1) }, insertBatch(list, num) { @@ -162,7 +162,7 @@ }) }, submit() { - let dataList = this.$refs.feedbackInformationRef.dataList + let dataList = this.$refs.feedbackInformationRef.formInline.dataList this.insertBatch(dataList, 2) }, completeTask() { From ba56bc1ce316e4034190dbc69049e371d3802f2e Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Tue, 12 Jul 2022 14:19:36 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E6=94=B6=E9=9B=86-=E8=AF=84=E4=BC=B0=E7=BB=93=E6=9E=9C?= =?UTF-8?q?=E5=B8=A6=E6=96=87=E4=BB=B6=E5=AF=BC=E5=87=BA=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...wsOpinionAssessmentResultEOController.java | 19 +- .../entity/LawsOpinionAssessmentResultEO.java | 3 + ...ILawsOpinionAssessmentResultEOService.java | 4 + ...sOpinionAssessmentResultEOServiceImpl.java | 230 +++++++++++++++++- 4 files changed, 250 insertions(+), 6 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsOpinionAssessmentResultEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsOpinionAssessmentResultEOController.java index a47f57b8f..8c14f5d6c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsOpinionAssessmentResultEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsOpinionAssessmentResultEOController.java @@ -3,6 +3,7 @@ package com.jero.modules.lawsOpinionGather.controller; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -19,7 +20,6 @@ import com.jero.common.system.base.controller.JeroController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.ModelAndView; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import com.jero.common.aspect.annotation.AutoLog; @@ -153,10 +153,23 @@ public class LawsOpinionAssessmentResultEOController extends JeroController params) { + this.lawsOpinionAssessmentResultEOService.exportXls(response,request, lawsOpinionAssessmentResultEO,params); + } /** * 通过excel导入数据 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsOpinionAssessmentResultEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsOpinionAssessmentResultEO.java index a7712bfbf..446d76baa 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsOpinionAssessmentResultEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsOpinionAssessmentResultEO.java @@ -4,6 +4,7 @@ import java.io.Serializable; import java.util.Date; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -82,6 +83,8 @@ public class LawsOpinionAssessmentResultEO implements Serializable { @Excel(name = "附件", width = 15) @ApiModelProperty(value = "附件") private String accessoryFile; + @TableField(exist = false) + private String accessoryFileName; /**提出时间*/ @Excel(name = "提出时间", width = 15, format = "yyyy-MM-dd") diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsOpinionAssessmentResultEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsOpinionAssessmentResultEOService.java index f5f7a15c2..5fdc85844 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsOpinionAssessmentResultEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsOpinionAssessmentResultEOService.java @@ -5,7 +5,9 @@ import com.jero.modules.lawsOpinionGather.entity.LawsOpinionAssessmentResultEO; import com.baomidou.mybatisplus.extension.service.IService; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.util.List; +import java.util.Map; /** * @Description: 法规意见收集-评估结果表 @@ -67,4 +69,6 @@ public interface ILawsOpinionAssessmentResultEOService extends IService params); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java index bb99b46a6..ada06b7e7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java @@ -1,23 +1,44 @@ package com.jero.modules.lawsOpinionGather.service.impl; +import cn.hutool.core.util.ZipUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.aliyuncs.utils.IOUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.common.constant.enums.CutEnum; +import com.jero.common.exception.JeroBootException; import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.vo.LoginUser; +import com.jero.common.util.oss.CosBootUtil; import com.jero.modules.lawsOpinionGather.entity.LawsOpinionAssessmentResultEO; +import com.jero.modules.lawsOpinionGather.entity.LawsOpinionGatherEO; import com.jero.modules.lawsOpinionGather.mapper.LawsOpinionAssessmentResultEOMapper; import com.jero.modules.lawsOpinionGather.service.ILawsOpinionAssessmentResultEOService; +import com.jero.modules.oss.entity.OSSFile; +import com.jero.modules.oss.service.IOSSFileService; +import com.jero.modules.system.util.PDFUtils; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.poi.hssf.usermodel.HSSFSheet; +import org.apache.poi.hssf.usermodel.HSSFWorkbook; +import org.apache.poi.ss.usermodel.*; import org.apache.shiro.SecurityUtils; +import org.aspectj.util.FileUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.List; -import java.util.Date; +import java.io.*; +import java.text.SimpleDateFormat; +import java.util.*; +import java.util.stream.Collectors; + import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; /** * @Description: 法规意见收集-评估结果表 @@ -28,6 +49,12 @@ import javax.servlet.http.HttpServletRequest; @Service public class LawsOpinionAssessmentResultEOServiceImpl extends ServiceImpl implements ILawsOpinionAssessmentResultEOService { + @Value(value = "${jero.path.upload}") + private String uploadpath; + + @Autowired + private IOSSFileService iOSSFileService; + /** * 保存 * @@ -125,4 +152,201 @@ public class LawsOpinionAssessmentResultEOServiceImpl extends ServiceImpl params) { + + Integer pageNo = (Integer) params.getOrDefault("pageNo",1); + Integer pageSize = (Integer) params.getOrDefault("pageNo",10); + String exportAll = (String)params.get("exportAll"); + String ids = (String)params.get("ids"); + String cut = (String)params.get("cut"); + String exportType = (String)params.get("exportType"); + List exportData = new ArrayList<>(); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(lawsOpinionAssessmentResultEO, request.getParameterMap()); + if(StringUtils.isNotEmpty(ids)){ + List idList = Arrays.asList(ids.split(",")); + queryWrapper.lambda().in(LawsOpinionAssessmentResultEO::getId,idList); + } + if(StringUtils.equals(exportAll,"yes")){ + exportData = this.baseMapper.selectList(queryWrapper); + }else { + Page page = new Page(pageNo, pageSize); + IPage pageList = this.page(page, queryWrapper); + exportData = pageList.getRecords(); + } + + this.disposeData(exportData,cut); + + String title = ""; + String fileName = ""; + if(StringUtils.equals(cut, CutEnum.CN.getValue())){ + title = "相关章节,问题/建议,理由,附件,评估人,提出时间"; + fileName = "评估结果 " + ".xlsx"; + }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ + title = "Related section,IssueOrSuggest,Reason,Accessory,Evaluator,Submit Date"; + fileName = "Evaluation results " + ".xlsx"; + } + + OutputStream os = null; + HSSFWorkbook workbook = new HSSFWorkbook(); + + try { + response.setHeader("Content-Disposition", + "attachment; filename=" + fileName); + response.setContentType("application/force-download"); + + HSSFSheet sheet = workbook.createSheet("sheet1"); + + CellStyle titleCellStyle = workbook.createCellStyle(); + titleCellStyle.setAlignment(HorizontalAlignment.CENTER);//垂直居中 + titleCellStyle.setVerticalAlignment(VerticalAlignment.CENTER);//水平居中 + titleCellStyle.setWrapText(true);//自动换行 + + Row firstRow = sheet.createRow(0); + + //创建表头 + String[] titleArr = title.split(","); + for (int i=0; i<=5; i++){ + sheet.setColumnWidth(i,4000); + Cell cell = firstRow.createCell(i); + cell.setCellStyle(titleCellStyle); + cell.setCellValue(titleArr[i]); + } + + //设置导出数据 + if(CollectionUtils.isNotEmpty(exportData)) { + for (int dataIndex = 0; dataIndex < exportData.size(); dataIndex++) { + Row dataRow = sheet.createRow(dataIndex + 1); + dataRow.createCell(0).setCellValue(exportData.get(dataIndex).getRelatedSection()); + dataRow.createCell(1).setCellValue(exportData.get(dataIndex).getIssueOrSuggest()); + dataRow.createCell(2).setCellValue(exportData.get(dataIndex).getReason()); + dataRow.createCell(3).setCellValue(exportData.get(dataIndex).getAccessoryFileName()); + dataRow.createCell(4).setCellValue(exportData.get(dataIndex).getCreateBy()); + String submitTimeStr = disposeDate(exportData.get(dataIndex).getSubmitTime()); + dataRow.createCell(5).setCellValue(submitTimeStr); + } + } + if ("excel".equals(exportType)) { + os = response.getOutputStream(); + workbook.write(os); + os.flush(); + }else { + String path = uploadpath + "/tempZip/evaluationResults"; + File fileTemp = new File(path); + if (fileTemp.exists()) { + fileTemp.delete(); + } + fileTemp.mkdirs(); + //excel + OutputStream excelOS = new FileOutputStream(path + File.separator + fileName); + workbook.write(excelOS); + excelOS.flush(); + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + + for (LawsOpinionAssessmentResultEO data : exportData) { + String accessoryFile = data.getAccessoryFile(); + + List fileInfosList = iOSSFileService.getFileInfos(accessoryFile); + if (fileInfosList.size() != 0) { + for (OSSFile ossFile : fileInfosList) { + String url = ossFile.getUrl(); + //判断文件是否存在 + if(StringUtils.isNotBlank(url)){ + //判断文件是否存在 + boolean b = CosBootUtil.doesObjectExist(url); + if(b){ + InputStream download = CosBootUtil.download(url); + if(url.endsWith(".pdf") || url.endsWith(".PDF")){ + String currentTime = sdf.format(new Date()); + String waterContent = loginUser.getUsername() + " " + currentTime; + File newFile = PDFUtils.PDFWatermark(download,uploadpath,ossFile.getFileName(),waterContent); + download = new FileInputStream(newFile.getPath()); + } + copyFile(download, path + File.separator + ossFile.getFileName()); + } + } + } + } + } + ZipUtil.zip(path, path + ".zip"); + //文件 + FileInputStream fis = new FileInputStream(path + ".zip"); + os = response.getOutputStream(); + + int len = 0; + while ((len = fis.read()) != -1) { + os.write(len); + } + os.flush(); + fis.close(); + } + + }catch (IOException ex){ + if(CutEnum.CN.getValue().equals(cut)){ + throw new JeroBootException("下载文件失败"); + }else{ + throw new JeroBootException("Failed to download file"); + } + }finally { + IOUtils.closeQuietly(os); + File file = new File(uploadpath + "/tempZip/evaluationResults"); + FileUtil.deleteContents(file); + File fileTemp = new File(uploadpath + "/tempZip/evaluationResults.zip"); + FileUtil.deleteContents(fileTemp); + } + } + + public static void copyFile(InputStream in, String newFile) throws IOException { + File file2 = new File(newFile); + if (!file2.exists()) { + file2.createNewFile(); + } + try (FileOutputStream ou = new FileOutputStream(newFile);) { + byte[] bs = new byte[1024]; + int count = 0; + while ((count = in.read(bs, 0, bs.length)) != -1) { + ou.write(bs, 0, count); + } + ou.flush(); + } catch (IOException e) { + e.printStackTrace(); + throw new IOException("复制文件失败！"); + } finally { + in.close(); + } + } + + /** + * 处理数据 + * @param datas + * @param cut + */ + public void disposeData(List datas,String cut){ + if(CollectionUtils.isNotEmpty(datas)){ + for (LawsOpinionAssessmentResultEO data : datas) { + if(StringUtils.isNotEmpty(data.getAccessoryFile())){ + List accessoryFileList = iOSSFileService.getFileInfos(data.getAccessoryFile()); + String accessoryFileName = accessoryFileList.stream().map(OSSFile::getFileName).collect(Collectors.joining(",")); + data.setAccessoryFileName(accessoryFileName); + } + } + } + } + + public String disposeDate(Date date){ + String result = ""; + try { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + if(date != null){ + result = sdf.format(date); + } + }catch (Exception ex){ + ex.printStackTrace(); + log.error("处理日期失败：" +ex.getMessage()); + } + return result; + } } From 055b70e61a6ccc1ceacfa8f55d5486751243297f Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Tue, 12 Jul 2022 14:22:24 +0800 Subject: [PATCH 10/12] =?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 + .../components/evaluationResultsList.vue | 6 +++--- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 05586dcd0..313d0a2b1 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1117,4 +1117,5 @@ module.exports = { nameTechnicalDocument:'Name of technical document', chapter:'chapter', problemDescription:'Problem description', + filingExternalOpinions:'Filing of external opinions', } \ 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 700a6135c..d6238311a 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1121,4 +1121,5 @@ module.exports = { nameTechnicalDocument:'技术文件名称', chapter:'章节', problemDescription:'问题说明', + filingExternalOpinions:'对外意见归档', } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue index a474a8892..f4230edc3 100644 --- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue @@ -44,13 +44,13 @@ />
- 对外意见归档: -
{{$t('filingExternalOpinions')}}: +
{{$t('clickUpload')}}
-
+
{{$t('viewFile')}}
From d49a86e28bf89e92e9e8dd4828dd22f7510f4d2d Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Tue, 12 Jul 2022 14:48:59 +0800 Subject: [PATCH 11/12] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=E6=95=B0=E6=8D=AE=E5=AD=97=E5=85=B8=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E3=80=81=E6=8F=92=E5=85=A5=E8=AF=84=E4=BC=B0=E6=96=B9?= =?UTF-8?q?=E5=BC=8F=E7=9B=B8=E5=85=B3=E6=95=B0=E6=8D=AEsql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_third_record.sql | 8 ++++++++ .../modules/system/controller/SysCategoryController.java | 9 +++++++++ .../system/service/impl/SysCategoryServiceImpl.java | 2 ++ 3 files changed, 19 insertions(+) diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index b3ad6c4a9..0fe7be784 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -326,3 +326,11 @@ CREATE TABLE `laws_technology_evaluation_result` ( `acti_proc_inst_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '流程实例id', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '法规技术评估-评估结果表' ROW_FORMAT = Dynamic; + + +-- 增加评估方式树形字典。 +INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `sys_dict_id`, `has_child`, `en_name`, `description`, `is_tag_dict`, `attribute_type`, `is_read_only`, `del_flag`, `item_value`, `sort_order`) VALUES ('1546745025973256194', '0', '评1', NULL, 'admin', '2022-07-12 14:35:26', 'admin', '2022-07-12 14:36:36', 'A01', '1546744902203539458', '1', 'P1', '333', 1, NULL, NULL, 0, NULL, 1); +INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `sys_dict_id`, `has_child`, `en_name`, `description`, `is_tag_dict`, `attribute_type`, `is_read_only`, `del_flag`, `item_value`, `sort_order`) VALUES ('1546745149692641282', '0', '评2', NULL, 'admin', '2022-07-12 14:35:55', NULL, NULL, 'A01', '1546744902203539458', NULL, 'P2', NULL, 1, NULL, NULL, 0, NULL, 2); +INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `sys_dict_id`, `has_child`, `en_name`, `description`, `is_tag_dict`, `attribute_type`, `is_read_only`, `del_flag`, `item_value`, `sort_order`) VALUES ('1546745318161055745', '1546745025973256194', '评1+1', NULL, 'admin', '2022-07-12 14:36:36', NULL, NULL, 'A01', '1546744902203539458', NULL, 'P1+1', NULL, 1, NULL, NULL, 0, NULL, 1); + +INSERT INTO `sys_dict` (`id`, `dict_name`, `dict_code`, `description`, `del_flag`, `create_by`, `create_time`, `update_by`, `update_time`, `type`, `dict_en_name`, `is_tag_dict`, `is_read_only`, `attribute_type`, `order_num`) VALUES ('1546744902203539458', '评估方式', 'evaluation_method', '评估方式', 0, 'admin', '2022-07-12 14:34:56', NULL, NULL, NULL, NULL, 1, 0, '2', 1); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java index 08d457698..7536ab487 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java @@ -594,4 +594,13 @@ public class SysCategoryController { return Result.OK(sysCategoryService.getSysCategoryTree(flag)); } + /** + * 只查询评估方式的树形数据字典 + * @return + */ + @GetMapping("/getEvaluationMethodTree") + public Result getevaluationMethodTree() { + String flag = "evaluation_method"; + return Result.OK(sysCategoryService.getSysCategoryTree(flag)); + } } 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 2232b6ade..db4eeac8c 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 @@ -273,6 +273,8 @@ public class SysCategoryServiceImpl extends ServiceImpl Date: Tue, 12 Jul 2022 15:14:45 +0800 Subject: [PATCH 12/12] update --- .../impl/LawsOpinionAssessmentResultEOServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java index ada06b7e7..23fc954b6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java @@ -156,8 +156,8 @@ public class LawsOpinionAssessmentResultEOServiceImpl extends ServiceImpl params) { - Integer pageNo = (Integer) params.getOrDefault("pageNo",1); - Integer pageSize = (Integer) params.getOrDefault("pageNo",10); + Integer pageNo = (Integer) params.get("pageNo"); + Integer pageSize = (Integer) params.get("pageSize"); String exportAll = (String)params.get("exportAll"); String ids = (String)params.get("ids"); String cut = (String)params.get("cut");