From 66f618dd5135001f150f99802b7ca6e0ff699bf4 Mon Sep 17 00:00:00 2001 From: liyawei Date: Wed, 13 Jul 2022 17:45:40 +0800 Subject: [PATCH 1/3] =?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"=E6=A0=87?= =?UTF-8?q?=E9=A2=98"=E6=8E=A7=E4=BB=B6=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParamsCollectManifestEOServiceImpl.java | 5 +- .../mapper/xml/ParamsReportDetailEOMapper.xml | 1 + .../impl/ParamsReportDetailEOServiceImpl.java | 108 ++++++++++-------- 3 files changed, 64 insertions(+), 50 deletions(-) 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 116df66f3..10ea4fc41 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 @@ -1550,6 +1550,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl nioNumberList = paramsCollectManifestEOList.stream().map(ParamsCollectManifestEO::getNioNumber).collect(Collectors.toList()); // 单独添加 控件类型为标题的参数项 if (!isSync) { // 未上报 List paramsCollectManifestEOListOfTitle = paramsCollectManifestEOMapper.listInfoOfTitle(paramsManifestId); @@ -1564,10 +1565,12 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl nioNumberListOfTitle = paramsCollectManifestEOListOfTitle.stream().map(ParamsCollectManifestEO::getNioNumber).collect(Collectors.toList()); + nioNumberList.addAll(nioNumberListOfTitle); } // 复制认证类别参数 - List nioNumberList = paramsCollectManifestEOList.stream().map(ParamsCollectManifestEO::getNioNumber).collect(Collectors.toList()); List certCategoryParamsInfoPublishEOS = certCategoryParamsInfoPublishEOService.queryListByVersionAndNio(paramsManifestEO.getParamsTemplateId(), paramsManifestEO.getParamsTemplatePublishVersion(), nioNumberList); for (CertCategoryParamsInfoPublishEO ccpi : certCategoryParamsInfoPublishEOS) { ReportCertCategoryParamsInfoEO addCcpi = new ReportCertCategoryParamsInfoEO(); diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml index e73cb2970..06d76a401 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml @@ -105,6 +105,7 @@ prd.nio_number as nio_number, prd.params_name as params_name, prd.control_type as control_type, + prd.title_default_value as title_default_value, rccpi.params_number as cert_number, rccpi.params_name as cert_params_name from params_report_detail prd 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 52f87910b..1881e36a6 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 @@ -835,6 +835,8 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl record1 : dataList) { String paramsCollectManifestId = (String) record1.get("id"); + String controlType = (String) record1.get("control_type"); + String titleDefaultValue = (String) record1.get("title_default_value"); if (CollectionUtil.isNotEmpty(paramsConfigEOList)) { List fileList = new ArrayList<>(); @@ -843,70 +845,78 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImplconfigIdList.contains(e.getId())).collect(Collectors.toList()); // 过滤出要导出的配置列 paramsConfigEOList.forEach(paramsConfigEO -> { // 参数配置 - String paramsConfigId = paramsConfigEO.getId(); - ParamsReportConfigDataEO paramsConfigDataEO = paramsReportConfigDataEOService.queryByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId); // 参数配置数据 - StringBuilder configDataBuilder = new StringBuilder(); // 重新组合配置数据 - if (StringUtils.isNotEmpty(paramsConfigDataEO.getTextData())) { - configDataBuilder.append(paramsConfigDataEO.getTextData()).append("&"); - } - if (StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) { - configDataBuilder.append(paramsConfigDataEO.getPullData()).append("&"); - } - if (StringUtils.isNotEmpty(paramsConfigDataEO.getFileConnectId())) { - List ossFileList = ossFileService.getFileInfosByConnectId(paramsConfigDataEO.getFileConnectId()); - if (CollectionUtil.isNotEmpty(ossFileList)) { - configDataBuilder.append(ossFileList.get(0).getFileName()).append("&"); - - fileList.addAll(ossFileList); + if (ControlTypeEnum.Title.getValue().equals(controlType)) { + record1.put(paramsConfigEO.getId(), titleDefaultValue); + } else { + String paramsConfigId = paramsConfigEO.getId(); + ParamsReportConfigDataEO paramsConfigDataEO = paramsReportConfigDataEOService.queryByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId); // 参数配置数据 + StringBuilder configDataBuilder = new StringBuilder(); // 重新组合配置数据 + if (StringUtils.isNotEmpty(paramsConfigDataEO.getTextData())) { + configDataBuilder.append(paramsConfigDataEO.getTextData()).append("&"); } - } + if (StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) { + configDataBuilder.append(paramsConfigDataEO.getPullData()).append("&"); + } + if (StringUtils.isNotEmpty(paramsConfigDataEO.getFileConnectId())) { + List ossFileList = ossFileService.getFileInfosByConnectId(paramsConfigDataEO.getFileConnectId()); + if (CollectionUtil.isNotEmpty(ossFileList)) { + configDataBuilder.append(ossFileList.get(0).getFileName()).append("&"); - String configData = configDataBuilder.toString(); - if (configData.contains("&")) { - configData = configData.substring(0, configData.lastIndexOf("&")); - } + fileList.addAll(ossFileList); + } + } - record1.put(paramsConfigEO.getId(), configData); + String configData = configDataBuilder.toString(); + if (configData.contains("&")) { + configData = configData.substring(0, configData.lastIndexOf("&")); + } + + record1.put(paramsConfigEO.getId(), configData); + } }); } else if ("2".equals(paramsReportDetailVO.getCombineFlag())) { // 合并 String configData = ""; - List paramsReportConfigDataEOS = paramsReportConfigDataEOService.queryByConfigIdListAndCollectManifestId(configIdList, paramsCollectManifestId); + if (ControlTypeEnum.Title.getValue().equals(controlType)) { + record1.put("params_value", titleDefaultValue); + } else { + List paramsReportConfigDataEOS = paramsReportConfigDataEOService.queryByConfigIdListAndCollectManifestId(configIdList, paramsCollectManifestId); - String textDatas = paramsReportConfigDataEOS.stream().filter(e->StringUtils.isNotEmpty(e.getTextData())) - .map(ParamsReportConfigDataEO::getTextData).distinct().collect(Collectors.joining(paramsReportDetailVO.getSeparator())); + String textDatas = paramsReportConfigDataEOS.stream().filter(e -> StringUtils.isNotEmpty(e.getTextData())) + .map(ParamsReportConfigDataEO::getTextData).distinct().collect(Collectors.joining(paramsReportDetailVO.getSeparator())); - String pullDatas = paramsReportConfigDataEOS.stream().filter(e->StringUtils.isNotEmpty(e.getPullData())) - .map(ParamsReportConfigDataEO::getPullData).distinct().collect(Collectors.joining(paramsReportDetailVO.getSeparator())); + String pullDatas = paramsReportConfigDataEOS.stream().filter(e -> StringUtils.isNotEmpty(e.getPullData())) + .map(ParamsReportConfigDataEO::getPullData).distinct().collect(Collectors.joining(paramsReportDetailVO.getSeparator())); - List fileNameList = new ArrayList<>(); - paramsReportConfigDataEOS.forEach(paramsReportConfigDataEO -> { - if (StringUtils.isNotEmpty(paramsReportConfigDataEO.getFileConnectId())) { - List ossFileList = ossFileService.getFileInfosByConnectId(paramsReportConfigDataEO.getFileConnectId()); - if (CollectionUtil.isNotEmpty(ossFileList)) { - fileNameList.add(ossFileList.get(0).getFileName()); + List fileNameList = new ArrayList<>(); + paramsReportConfigDataEOS.forEach(paramsReportConfigDataEO -> { + if (StringUtils.isNotEmpty(paramsReportConfigDataEO.getFileConnectId())) { + List ossFileList = ossFileService.getFileInfosByConnectId(paramsReportConfigDataEO.getFileConnectId()); + if (CollectionUtil.isNotEmpty(ossFileList)) { + fileNameList.add(ossFileList.get(0).getFileName()); - fileList.addAll(ossFileList); + fileList.addAll(ossFileList); + } } + }); + + StringBuilder configDataBuilder = new StringBuilder(); // 重新组合配置数据 + if (StringUtils.isNotEmpty(textDatas)) { + configDataBuilder.append(textDatas).append("&"); } - }); + if (StringUtils.isNotEmpty(pullDatas)) { + configDataBuilder.append(pullDatas).append("&"); + } + if (CollectionUtil.isNotEmpty(fileNameList)) { + configDataBuilder.append(StringUtils.join(fileNameList, paramsReportDetailVO.getSeparator())).append("&"); + } + configData = configDataBuilder.toString(); + if (configData.contains("&")) { + configData = configData.substring(0, configData.lastIndexOf("&")); + } + record1.put("params_value", configData); - StringBuilder configDataBuilder = new StringBuilder(); // 重新组合配置数据 - if (StringUtils.isNotEmpty(textDatas)) { - configDataBuilder.append(textDatas).append("&"); } - if (StringUtils.isNotEmpty(pullDatas)) { - configDataBuilder.append(pullDatas).append("&"); - } - if (CollectionUtil.isNotEmpty(fileNameList)) { - configDataBuilder.append(StringUtils.join(fileNameList, ",")).append("&"); - } - configData = configDataBuilder.toString(); - if (configData.contains("&")) { - configData = configData.substring(0, configData.lastIndexOf("&")); - } - record1.put("params_value", configData); - } record1.put("fileList", fileList); } From 5d519167c1910dbf353c3432a82530149f5e1bb6 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Wed, 13 Jul 2022 18:16:56 +0800 Subject: [PATCH 2/3] =?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 --- jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 1 + .../components/evaluatorFeedback.vue | 49 ++++++++++++++++--- .../regulatoryCirculationHistory.vue | 2 +- .../processForm/evaluationProcess/index.vue | 46 +++++++++++++++-- 5 files changed, 85 insertions(+), 14 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index d05cdc046..1dc0d3d5c 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1131,4 +1131,5 @@ module.exports = { clauseEvaluation:'Clause evaluation', standardDocuments:'Standard documents', pleaseCompleteTheEvaluationMethodorEvaluator:'Please complete the evaluation method or evaluator in the list', + reviewComments:'Review comments', } \ 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 4c2a26c01..4c6a71b22 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1135,4 +1135,5 @@ module.exports = { clauseEvaluation:'条款评估', standardDocuments:'标准文件', pleaseCompleteTheEvaluationMethodorEvaluator:'请补全列表中评估方式或评估人', + reviewComments:'审核意见', } \ 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 index f69d75e3a..659f96077 100644 --- a/jero-web/src/views/processCenter/components/evaluatorFeedback.vue +++ b/jero-web/src/views/processCenter/components/evaluatorFeedback.vue @@ -50,7 +50,7 @@ * {{$t('relevantSections')}} -
+
{{item.relatedSection}}
{{$t('problemDescription')}}
-
+
{{item.issueOrSuggest}}
{{$t('enclosure')}}
- - {{$t('viewUploadedFiles')}} + + {{$t('viewFile')}} -- @@ -113,6 +114,25 @@
+
+
+ {{$t('sponsorReview')}} +
+
+ + +
+
+ * + {{$t('reviewComments')}} +
+ + + +
+ + @@ -124,6 +144,7 @@ import { getAction, postAction } from '@/api/manage' import uploadFile from '@/components/uploadFile/file' import viewFileModel from '@/components/viewFileModel/index' + export default { name: 'evaluatorFeedback', components: { @@ -157,6 +178,18 @@ trigger: 'change' } ], + approvalOpinion: [ + { + required: true, + message: this.$t('reviewComments') + this.$t('cannotEmpty'), + trigger: 'blur' + }, + { + max: 300, + message: this.$t('reviewComments') + this.$t('cannotExceed') + 300 + this.$t('Characters'), + trigger: 'blur' + } + ], relatedSection: [ { required: true, @@ -315,7 +348,7 @@ } .itemModel { - width: calc(100% - 130px); + width: calc(100% - 110px); display: inline-block; margin-top: 2px; margin-bottom: 12px; @@ -324,8 +357,8 @@ .title-text-right { display: inline-block; width: calc(100% - 130px); - padding-top: 15px; - font-size: 14px; + padding-top: 12px; + font-size: 16px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; @@ -351,7 +384,7 @@ } .feedbackPoint { - font-size: 14px; + font-size: 16px; font-weight: 400; color: #000F16; margin-bottom: 10px; diff --git a/jero-web/src/views/processCenter/components/regulatoryCirculationHistory.vue b/jero-web/src/views/processCenter/components/regulatoryCirculationHistory.vue index 542632113..6fda1fd06 100644 --- a/jero-web/src/views/processCenter/components/regulatoryCirculationHistory.vue +++ b/jero-web/src/views/processCenter/components/regulatoryCirculationHistory.vue @@ -68,7 +68,7 @@ getList() { let query = { actiProcInstId: this.$route.query.prcId, - flowType: '5' + flowType: this.$route.query.prcType } getAction('/lawsOpinionGather/lawsProcessHistoryEO/list', query).then((res) => { if (res.success) { diff --git a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue index 69ff81f3d..17fcc8177 100644 --- a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue @@ -26,10 +26,12 @@ /> @@ -70,7 +72,9 @@ isDisplay: true, feedbackDataList: [], queryProject: {}, - complianceResult:{}, + complianceResult: {}, + isPreservation: false, + isSendBack: false, isTrue: false, standardContentList: [ { @@ -107,6 +111,13 @@ }, mounted() { this.isDisplay = false + if (this.$route.query.taskDefinitionKey == 'pgrqr') { + this.isPreservation = true + this.isSendBack = false + } else { + this.isPreservation = false + this.isSendBack = true + } this.queryTaskDetailByTask() }, methods: { @@ -176,15 +187,40 @@ } }) }, + sendBack() { + if (this.isTrue) { + + } else { + this.$refs.evaluatorFeedbackRef.preservationData((res) => { + this.loading = true + this.queryProject.approvalOpinion = res.approvalOpinion + this.queryProject.flag = '2' + this.completeTask() + }) + } + }, submit() { - this.$refs.evaluatorFeedbackRef.submitData((res) => { - this.insertBatch(res, 2) - }) + if (this.isTrue) { + + } else { + this.$refs.evaluatorFeedbackRef.submitData((res) => { + if (this.$route.query.taskDefinitionKey == 'pgrqr') { + this.loading = true + this.insertBatch(res, 2) + } else { + this.loading = true + this.queryProject.approvalOpinion = res.approvalOpinion + this.queryProject.flag = '1' + this.completeTask() + } + }) + } }, completeTask() { let query = { userid: this.userInfo().id, taskId: this.$route.query.taskIds, + flag: this.queryProject.flag, json: JSON.stringify(this.queryProject).replace(/\"/g, '\'') } postAction('/workFlow/completeTask', query).then((res) => { From 6286549c8cdf297716920adeb7578fc5a11767d8 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Wed, 13 Jul 2022 18:36:45 +0800 Subject: [PATCH 3/3] =?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 | 2 +- .../components/evaluatorFeedbackList.vue | 59 ++++++++++++++----- .../processForm/evaluationProcess/index.vue | 57 ++++++++++++++++-- 3 files changed, 98 insertions(+), 20 deletions(-) diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue index 89f862ffc..620a72018 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue @@ -92,7 +92,7 @@ }, { title: this.$t('evaluationMethod'), - dataIndex: 'evaluationMethod', + dataIndex: 'evaluationMethods', align: 'center', scopedSlots: { customRender: 'evaluationMethod' } }, diff --git a/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue b/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue index 1711ad4fe..bd94d2b08 100644 --- a/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue +++ b/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue @@ -14,6 +14,14 @@ :data-source="dataSource" :columns="columns" > +
+ + +
+ +
@@ -23,8 +31,10 @@ @@ -214,4 +233,16 @@ margin-left: 8px; cursor: pointer; } + .clauseContent-text { + width: 100%; + overflow: hidden; + display: -webkit-box; + text-overflow: ellipsis; + /*! autoprefixer: off */ + -webkit-box-orient: vertical; + -webkit-line-clamp: 1; + /*! autoprefixer: on;*/ + text-justify: inter-ideograph; + word-break: break-all + } \ 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 17fcc8177..c7e7b5d10 100644 --- a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue @@ -21,6 +21,7 @@ /> @@ -72,11 +73,13 @@ isDisplay: true, feedbackDataList: [], queryProject: {}, + evaluatorFeedbackList: [], complianceResult: {}, isPreservation: false, isSendBack: false, isTrue: false, - standardContentList: [ + standardContentList:[], + standardContent: [ { title: this.$t('standard'), value: 'serialNumber' @@ -106,7 +109,35 @@ title: this.$t('processBackground'), value: 'processBackground' } - ] + ], + evaluatorFeedback:[ + { + title: this.$t('standard'), + value: 'serialNumber' + }, + { + title: this.$t('title'), + value: 'title' + }, + { + title: this.$t('regulatoryEngineer'), + value: 'regulationOwnerName' + }, + { + title: this.$t('closingDate'), + value: 'endTime' + }, + { + title: this.$t('RelevantMaterials'), + value: 'relatedDataFileId', + type: 2 + }, + {}, + { + title: this.$t('processBackground'), + value: 'processBackground' + } + ], } }, mounted() { @@ -132,14 +163,30 @@ } this.isTrue = this.queryProject.evaluationType == 'Feedback evaluation' ? false : true if (this.isTrue) { - this.standardContentList = this.standardContentList.filter(res => { - return res.title != this.$t('evaluationMethod') - }) + this.standardContentList = this.evaluatorFeedback + this.lawsTechnologyEvaluationItem() } else { + this.standardContentList = this.standardContent this.lawsOpinionAssessmentResult() } }) }, + lawsTechnologyEvaluationItem() { + getAction('/lawsTechnologyEvaluation/lawsTechnologyEvaluationItemResultEO/list', { + lawsTechnologyEvaluationId: this.queryProject.lawsTechnologyEvaluationId, + actiProcInstId: this.$route.query.prcId, + createBy: this.userInfo().username + }).then((res) => { + if (res.success) { + this.evaluatorFeedbackList = res.result || [] + this.loading = false + } else { + this.evaluatorFeedbackList = [] + this.loading = false + } + this.isDisplay = true + }) + }, lawsOpinionAssessmentResult() { getAction(this.url.list, { lawsTechnologyEvaluationId: this.queryProject.lawsTechnologyEvaluationId,