From 7e4620f25c4a191521f225444bbd286dc889f895 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Wed, 13 Jul 2022 11:24:51 +0800 Subject: [PATCH 01/50] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF?= =?UTF-8?q?=E8=AF=84=E4=BC=B0-=E6=9D=A1=E6=AC=BE=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=20=20=E6=9F=A5=E8=AF=A2=E6=96=87?= =?UTF-8?q?=E6=A1=A3=E5=BA=93=E5=88=97=E8=A1=A8=E8=B0=83=E7=94=A8=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=BC=80=E5=8F=91=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LawsTechnologyEvaluationEOController.java | 10 ++ .../ILawsTechnologyEvaluationEOService.java | 4 + ...LawsTechnologyEvaluationEOServiceImpl.java | 121 +++++++++++++++++- 3 files changed, 132 insertions(+), 3 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java index ada4ac7cb..8d18a4a05 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java @@ -2,6 +2,7 @@ package com.jero.modules.lawsTechnologyEvaluation.controller; import java.util.Arrays; import java.util.List; +import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -183,4 +184,13 @@ public class LawsTechnologyEvaluationEOController extends JeroController parameter) { + IPage infoPage = this.lawsTechnologyEvaluationEOService.getPageDummy(parameter); + Result ok = Result.OK(infoPage); + net.sf.json.JSONObject jsonResult = net.sf.json.JSONObject.fromObject(ok); + return jsonResult; + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java index fd70dcc12..ad017a213 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java @@ -1,10 +1,12 @@ package com.jero.modules.lawsTechnologyEvaluation.service; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.common.api.vo.Result; import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationEO; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; +import java.util.Map; /** * @Description: 法规技术评估 @@ -74,4 +76,6 @@ public interface ILawsTechnologyEvaluationEOService extends IService records, String cut); + + IPage getPageDummy(Map parameter); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java index 2dc019550..31822ae7a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java @@ -2,25 +2,36 @@ package com.jero.modules.lawsTechnologyEvaluation.service.impl; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +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.api.vo.Result; import com.jero.common.constant.enums.CutEnum; +import com.jero.common.constant.enums.ModuleEnum; import com.jero.common.exception.JeroBootException; +import com.jero.generater.modules.online.cgform.entity.OnlCgformField; +import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl; +import com.jero.modules.document.enums.FieldTypeEnum; +import com.jero.modules.document.mapper.BussDocumentLibraryEOMapper; +import com.jero.modules.document.service.impl.BussDocumentLibraryEOServiceImpl; import com.jero.modules.lawsOpinionGather.enums.GatherResultEnum; import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationEO; import com.jero.modules.lawsTechnologyEvaluation.mapper.LawsTechnologyEvaluationEOMapper; import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationEOService; import com.jero.modules.project.enums.OperatorTypeEnum; import com.jero.modules.project.enums.RequestSourceEnum; +import com.jero.modules.split.entity.SarFileSplitInfoEO; +import com.jero.modules.split.service.ISarFileSplitInfoService; import com.jero.modules.system.entity.SysCategory; +import com.jero.modules.system.entity.SysDictItem; import com.jero.modules.system.service.impl.SysCategoryServiceImpl; +import com.jero.modules.system.service.impl.SysDictItemServiceImpl; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.Arrays; -import java.util.List; -import java.util.Date; +import java.util.*; import java.util.stream.Collectors; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -36,6 +47,16 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl parameter) { + String cut = (String) parameter.get("cut");//中英文切换标识 + //文档库字段 + List fieldList = onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue()); + + //需要查询的字段 + List fieldListQuery = new ArrayList<>(); + fieldListQuery.add("serial_number"); + fieldListQuery.add("title"); + fieldListQuery.add("title_en"); + fieldListQuery.add("state"); + fieldListQuery.add("region"); + fieldListQuery.add("technology_territory"); + fieldListQuery.add("xin1_che1_xing2_shi2_shi1_ri4_qi1"); + fieldListQuery.add("implement_time"); + fieldListQuery.add("corresponding_standard"); + + List fieldListNew = new ArrayList<>(); + fieldListNew.add("id"); + + //转时间格式 + for (String field : fieldListQuery) { + String fieldTemp = null; + if ("xin1_che1_xing2_shi2_shi1_ri4_qi1".equals(field) || "implement_time".equals(field)) { + String fieldNew = "date_format(" + field + ", '%Y-%m-%d')"; + fieldTemp = "case when " + fieldNew + " is null then \"\" else " + fieldNew + " end " + field; + fieldListNew.add(fieldTemp); + } else { + fieldTemp = "case when " + field + " is null then \"\" else " + field + " end " + field; + fieldListNew.add(fieldTemp); + } + } + //过滤出文件字段 + List fileFieldList = fieldList.stream() + .filter(e -> FieldTypeEnum.FILE.getValue().equals(e.getFieldShowType())) + .collect(Collectors.toList()); + for (OnlCgformField onlCgformField : fileFieldList) { + fieldListNew.add(onlCgformField.getDbFieldName()); + } + + //封装查询条件 + String condition = this.bussDocumentLibraryEOService.getConditionStr(parameter); + int pageNo = Integer.parseInt(parameter.get("pageNo").toString()); + int pageSize = Integer.parseInt(parameter.get("pageSize").toString()); + IPage page = new Page(pageNo, pageSize); + + IPage infoPage = this.bussDocumentLibraryEOMapper.getInfoPage(page, " " + com.jero.modules.system.util.StringUtils.join(fieldListNew, ","), condition); + + //树形数据字典 + List categoryList = this.sysCategoryService.list(); + //过滤出树形字段 + List treeFieldList = fieldList.stream() + .filter(e -> FieldTypeEnum.TREE.getValue().equals(e.getFieldShowType())) + .collect(Collectors.toList()); + + + List records = infoPage.getRecords(); + //数据字典 + List sysDictItems = this.sysDictItemServiceImpl.selectItemsAll(); + //下拉选处理数据字典 + for (Map record : records) { + Map record1 = (Map) record; + String technology_territory = (String)record1.get("technology_territory"); + for (Map.Entry entry : record1.entrySet()) { + //下拉选处理数据字典 + this.bussDocumentLibraryEOService.dictItem(sysDictItems, entry, cut, fieldList,null); + this.bussDocumentLibraryEOService.treeDictItem(categoryList, entry, treeFieldList, cut,null); + } + record1.put("technology_territory_id",technology_territory); + String id = (String) record.get("id"); + //根据id查询当前文档库数据是否有拆分数据。 + QueryWrapper splitInfoEOQueryWrapper = new QueryWrapper<>(); + splitInfoEOQueryWrapper.lambda().eq(SarFileSplitInfoEO::getDocumentId,id); + List sarFileSplitInfoListTemp = sarFileSplitInfoService.list(splitInfoEOQueryWrapper); + List sarFileSplitInfoList = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(sarFileSplitInfoListTemp)){ + sarFileSplitInfoListTemp.forEach(splitInfo -> { + //查询出已回传的数据 + String flag = ""; // 1 已回传 0未回传。 + if(StringUtils.isNotEmpty(splitInfo.getFileId())){ + flag = "1"; + sarFileSplitInfoList.add(splitInfo); + }else { + flag = "0"; + } + splitInfo.setFlag(flag); + }); + } + record1.put("sarFileSplitInfoList",sarFileSplitInfoList); + } + return infoPage; + } + private String getTreeName(String cut, List categoryList, List technologyTerritoryList) { StringBuilder sb = new StringBuilder(); for (String technologyTerritory : technologyTerritoryList) { From cfd49b795e50386ece3988b20cac77a3bc8595a1 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Wed, 13 Jul 2022 11:31:02 +0800 Subject: [PATCH 02/50] =?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 | 1 + jero-web/src/common/lang/zh-cn.js | 1 + .../views/businessSupport/technologyAssessment/index.vue | 6 +++--- jero-web/src/views/dashboard/components/myList.vue | 6 ++++++ .../processCenter/processForm/processDetails/index.vue | 2 +- .../processList/tabComponents/alreadyProcess/index.vue | 3 ++- .../processList/tabComponents/alreadySend/index.vue | 3 ++- .../processList/tabComponents/monitorProcess/index.vue | 3 ++- .../processList/tabComponents/processCenter/index.vue | 9 ++++++++- 9 files changed, 26 insertions(+), 8 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index d6a2427e1..1540cd94c 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1124,4 +1124,5 @@ module.exports = { engineerFeedbackResults:'Engineer feedback results', fileExport:'File export', feedbackTime:'Feedback time', + regulatoryTechnologyAssessmentProcess:'Regulatory technology assessment process', } \ 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 182b67d00..77280c96f 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1128,4 +1128,5 @@ module.exports = { engineerFeedbackResults:'工程师反馈结果', fileExport:'文件导出', feedbackTime:'反馈时间', + regulatoryTechnologyAssessmentProcess:'法规技术评估流程', } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/technologyAssessment/index.vue b/jero-web/src/views/businessSupport/technologyAssessment/index.vue index 936c45306..eb9627cd0 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/index.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/index.vue @@ -92,10 +92,10 @@ :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :columns="columns" > - - + + {{$t('viewProcess')}} - {{$t('evaluationResults')}} diff --git a/jero-web/src/views/dashboard/components/myList.vue b/jero-web/src/views/dashboard/components/myList.vue index 3f1f4e533..637435a0d 100644 --- a/jero-web/src/views/dashboard/components/myList.vue +++ b/jero-web/src/views/dashboard/components/myList.vue @@ -100,6 +100,12 @@ query: row }) window.open(newUrl.href, '_blank') + }else if (row.prcType == '6') { + let newUrl = this.$router.resolve({ + path: '/evaluationProcess', + query: row + }) + window.open(newUrl.href, '_blank') } } } diff --git a/jero-web/src/views/processCenter/processForm/processDetails/index.vue b/jero-web/src/views/processCenter/processForm/processDetails/index.vue index a013952f1..b249d372e 100644 --- a/jero-web/src/views/processCenter/processForm/processDetails/index.vue +++ b/jero-web/src/views/processCenter/processForm/processDetails/index.vue @@ -13,7 +13,7 @@
- + 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 cacd6f524..00d243eb9 100644 --- a/jero-web/src/views/processCenter/processList/tabComponents/alreadyProcess/index.vue +++ b/jero-web/src/views/processCenter/processList/tabComponents/alreadyProcess/index.vue @@ -51,7 +51,8 @@ selectedRowKeys: [], prcTypeName: { 1: this.$t('taskConfirmationProcess'), - 5:this.$t('collectionOfRegulatoryOpinionsProcess') + 5:this.$t('collectionOfRegulatoryOpinionsProcess'), + 6:this.$t('regulatoryTechnologyAssessmentProcess') }, 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 a9f08e126..de39cef91 100644 --- a/jero-web/src/views/processCenter/processList/tabComponents/alreadySend/index.vue +++ b/jero-web/src/views/processCenter/processList/tabComponents/alreadySend/index.vue @@ -52,7 +52,8 @@ selectedRowKeys: [], prcTypeName: { 1: this.$t('taskConfirmationProcess'), - 5:this.$t('collectionOfRegulatoryOpinionsProcess') + 5:this.$t('collectionOfRegulatoryOpinionsProcess'), + 6:this.$t('regulatoryTechnologyAssessmentProcess') }, 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 848dcfc44..5df28512c 100644 --- a/jero-web/src/views/processCenter/processList/tabComponents/monitorProcess/index.vue +++ b/jero-web/src/views/processCenter/processList/tabComponents/monitorProcess/index.vue @@ -52,7 +52,8 @@ selectedRowKeys: [], prcTypeName: { 1: this.$t('taskConfirmationProcess'), - 5:this.$t('collectionOfRegulatoryOpinionsProcess') + 5:this.$t('collectionOfRegulatoryOpinionsProcess'), + 6:this.$t('regulatoryTechnologyAssessmentProcess') }, 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 ce1eaeec0..8e318e4f8 100644 --- a/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue +++ b/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue @@ -50,7 +50,8 @@ selectedRowKeys: [], prcTypeName: { 1: this.$t('taskConfirmationProcess'), - 5:this.$t('collectionOfRegulatoryOpinionsProcess') + 5:this.$t('collectionOfRegulatoryOpinionsProcess'), + 6:this.$t('regulatoryTechnologyAssessmentProcess') }, columns: [ { @@ -168,6 +169,12 @@ query: row }) window.open(newUrl.href, '_blank') + } else if (row.prcType == '6') { + let newUrl = this.$router.resolve({ + path: '/evaluationProcess', + query: row + }) + window.open(newUrl.href, '_blank') } }, onChange(page, pageSize) { From 2680d820d94096c4abd9ec57c4ab0e80e22d5533 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Wed, 13 Jul 2022 11:37:11 +0800 Subject: [PATCH 03/50] =?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 --- .../components/initiatingProcess.vue | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue index c7156aeaf..e7cd9c853 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue @@ -199,7 +199,8 @@ //url传参严格按照当前命名 url: { seachList: 'document/bussDocumentLibraryEO/queryCondition', //搜索字段 - addModelList: '/dummy/dummyInventoryInfoEO/queryPageDummy' + addModelList: '/dummy/dummyInventoryInfoEO/queryPageDummy', + addModelListOne: '/lawsTechnologyEvaluation/lawsTechnologyEvaluationEO/queryPageDummy' }, loading: false, JLoading: false, @@ -322,7 +323,13 @@ ...this.searchParmes } this.loading = true - postAction(this.url.addModelList, query).then((res) => { + let url = '' + if (this.$route.query.whetherTobring == '1') { + url = this.url.addModelListOne + } else { + url = this.url.addModelList + } + postAction(url, query).then((res) => { if (res.success) { this.dataSource = res.result.records || [] this.total = res.result.total From 44460051d7f69646c219e0addc5109112b96dd71 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Wed, 13 Jul 2022 14:22:15 +0800 Subject: [PATCH 04/50] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF?= =?UTF-8?q?=E8=AF=84=E4=BC=B0-=E6=9F=A5=E8=AF=A2=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E5=BA=93=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=8F=A3=E5=AE=8C=E5=96=84?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...LawsTechnologyEvaluationEOServiceImpl.java | 66 ++++++++++++------- 1 file changed, 41 insertions(+), 25 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java index 31822ae7a..9c1ca000b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java @@ -196,6 +196,14 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl fieldListNew = new ArrayList<>(); fieldListNew.add("id"); + //过滤出文件字段 + List fileFieldList = fieldList.stream() + .filter(e -> FieldTypeEnum.FILE.getValue().equals(e.getFieldShowType())) + .collect(Collectors.toList()); + for (OnlCgformField onlCgformField : fileFieldList) { + fieldListQuery.add(onlCgformField.getDbFieldName()); + } + //转时间格式 for (String field : fieldListQuery) { String fieldTemp = null; @@ -208,13 +216,10 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl fileFieldList = fieldList.stream() - .filter(e -> FieldTypeEnum.FILE.getValue().equals(e.getFieldShowType())) + + List fileFieldStrList = fieldList.stream() + .filter(e -> FieldTypeEnum.FILE.getValue().equals(e.getFieldShowType())).map(OnlCgformField::getDbFieldName) .collect(Collectors.toList()); - for (OnlCgformField onlCgformField : fileFieldList) { - fieldListNew.add(onlCgformField.getDbFieldName()); - } //封装查询条件 String condition = this.bussDocumentLibraryEOService.getConditionStr(parameter); @@ -239,32 +244,43 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl record1 = (Map) record; String technology_territory = (String)record1.get("technology_territory"); + + List connectIdList = new ArrayList<>(); + for (Map.Entry entry : record1.entrySet()) { //下拉选处理数据字典 this.bussDocumentLibraryEOService.dictItem(sysDictItems, entry, cut, fieldList,null); this.bussDocumentLibraryEOService.treeDictItem(categoryList, entry, treeFieldList, cut,null); + if(fileFieldStrList.contains(entry.getKey())){ + if(entry.getValue()!=null){ + connectIdList.add(entry.getValue().toString()); + } + } } record1.put("technology_territory_id",technology_territory); - String id = (String) record.get("id"); - //根据id查询当前文档库数据是否有拆分数据。 - QueryWrapper splitInfoEOQueryWrapper = new QueryWrapper<>(); - splitInfoEOQueryWrapper.lambda().eq(SarFileSplitInfoEO::getDocumentId,id); - List sarFileSplitInfoListTemp = sarFileSplitInfoService.list(splitInfoEOQueryWrapper); - List sarFileSplitInfoList = new ArrayList<>(); - if (CollectionUtils.isNotEmpty(sarFileSplitInfoListTemp)){ - sarFileSplitInfoListTemp.forEach(splitInfo -> { - //查询出已回传的数据 - String flag = ""; // 1 已回传 0未回传。 - if(StringUtils.isNotEmpty(splitInfo.getFileId())){ - flag = "1"; - sarFileSplitInfoList.add(splitInfo); - }else { - flag = "0"; - } - splitInfo.setFlag(flag); - }); + + if(CollectionUtils.isNotEmpty(connectIdList)){ + //根据id查询当前文档库数据是否有拆分数据。 + QueryWrapper splitInfoEOQueryWrapper = new QueryWrapper<>(); + splitInfoEOQueryWrapper.lambda().in(SarFileSplitInfoEO::getConnectId,connectIdList); + List sarFileSplitInfoList = new ArrayList<>(); + + List sarFileSplitInfoListTemp = sarFileSplitInfoService.list(splitInfoEOQueryWrapper); + if (CollectionUtils.isNotEmpty(sarFileSplitInfoListTemp)){ + sarFileSplitInfoListTemp.forEach(splitInfo -> { + //查询出已回传的数据 + String flag = ""; // 1 已回传 0未回传。 + if(StringUtils.isNotEmpty(splitInfo.getFileId())){ + flag = "1"; + sarFileSplitInfoList.add(splitInfo); + }else { + flag = "0"; + } + splitInfo.setFlag(flag); + }); + record1.put("sarFileSplitInfoList",sarFileSplitInfoList); + } } - record1.put("sarFileSplitInfoList",sarFileSplitInfoList); } return infoPage; } From 002908252c311176a3a0fda351f841bcffeb03b2 Mon Sep 17 00:00:00 2001 From: liyawei Date: Wed, 13 Jul 2022 14:51:11 +0800 Subject: [PATCH 05/50] =?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=EF=BC=9A=E6=B7=BB=E5=8A=A0"?= =?UTF-8?q?=E6=A0=87=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 --- jero-boot/db/蔚来标准sql/dev_third_record.sql | 18 ++++- .../entity/ParamsCollectManifestBaseEO.java | 5 ++ .../mapper/ParamsCollectManifestEOMapper.java | 13 ++-- .../xml/ParamsCollectManifestEOMapper.xml | 10 +++ .../ParamsCollectManifestHistoryEOMapper.xml | 2 + .../ParamsCollectManifestEOServiceImpl.java | 16 ++++ .../mapper/xml/ParamsReportDetailEOMapper.xml | 1 + .../cert/template/entity/ParamsInfoEO.java | 9 ++- .../cert/template/enums/ControlTypeEnum.java | 3 +- .../mapper/xml/ParamsInfoEOMapper.xml | 4 + .../mapper/xml/ParamsInfoPublishEOMapper.xml | 1 + .../service/impl/ParamsInfoEOServiceImpl.java | 76 +++++++++++++------ .../cert/template/vo/ParamsInfoCnImport.java | 5 ++ .../cert/template/vo/ParamsInfoEnExport.java | 7 +- .../cert/template/vo/ParamsInfoEnImport.java | 5 ++ jero-web/src/common/lang/en-us.js | 2 + jero-web/src/common/lang/zh-cn.js | 2 + .../parameterlist/components/addModel.vue | 23 ++++++ 18 files changed, 170 insertions(+), 32 deletions(-) diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index d1f370f85..f93c831d4 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -359,4 +359,20 @@ ALTER TABLE `laws_weilai`.`params_report_detail` 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日 已同步正式环境 \ No newline at end of file +--以上SQL 2022年7月12日 已同步正式环境 + +-- 参数项清单表 添加字段 标题默认值 2022-07-13 +ALTER TABLE `laws_weilai`.`params_info` + ADD COLUMN `title_default_value` varchar(100) NULL COMMENT '标题默认值' AFTER `params_template_id`; + +ALTER TABLE `laws_weilai`.`params_info_publish` + ADD COLUMN `title_default_value` varchar(100) NULL COMMENT '标题默认值' AFTER `version`; + +ALTER TABLE `laws_weilai`.`params_collect_manifest` + ADD COLUMN `title_default_value` varchar(100) NULL COMMENT '标题默认值' AFTER `add_flag`; + +ALTER TABLE `laws_weilai`.`params_collect_manifest_history` + ADD COLUMN `title_default_value` varchar(100) NULL COMMENT '标题默认值' AFTER `params_manifest_id`; + +ALTER TABLE `laws_weilai`.`params_report_detail` + ADD COLUMN `title_default_value` varchar(100) NULL COMMENT '标题默认值' AFTER `sync_time`; \ No newline at end of file diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestBaseEO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestBaseEO.java index 5346caf15..8e42caf35 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestBaseEO.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestBaseEO.java @@ -137,4 +137,9 @@ public class ParamsCollectManifestBaseEO implements Serializable { @Excel(name = "参数清单id", width = 15) @ApiModelProperty(value = "参数清单id") private String paramsManifestId; + + /**标题默认值*/ + @Excel(name = "默认值", width = 15) + @ApiModelProperty(value = "标题默认值") + private String titleDefaultValue; } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java index 9c04eeaa3..1e8304570 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java @@ -1,11 +1,11 @@ package com.jero.modules.cert.collect.mapper; -import java.util.List; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import org.apache.ibatis.annotations.Param; -import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * @Description: 参数收集清单 @@ -17,5 +17,8 @@ public interface ParamsCollectManifestEOMapper extends BaseMapper listInfo(@Param("paramsCollectManifestEO") ParamsCollectManifestEO paramsCollectManifestEO); + // 查询控件类型为 标题的 参数项 + List listInfoOfTitle(@Param("paramsManifestId") String paramsManifestId); + IPage pageInfo(@Param("page") IPage page, @Param("paramsCollectManifestEO") ParamsCollectManifestEO paramsCollectManifestEO); } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml index 5709b8d47..98d02ed0d 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml @@ -29,6 +29,7 @@ + @@ -79,10 +80,19 @@ order by del_flag desc, add_flag desc, change_flag desc, nio_number asc + + diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestHistoryEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestHistoryEOMapper.xml index d59367314..07a93e805 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestHistoryEOMapper.xml +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestHistoryEOMapper.xml @@ -26,6 +26,7 @@ + @@ -66,6 +67,7 @@ select * from params_collect_manifest_history + and control_type != '11' order by nio_number asc \ No newline at end of file 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 a11e3fb76..112e02295 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 @@ -1545,6 +1545,22 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl paramsCollectManifestEOListOfTitle = paramsCollectManifestEOMapper.listInfoOfTitle(paramsManifestId); + if(CollectionUtil.isNotEmpty(paramsCollectManifestEOListOfTitle)) { + for(ParamsCollectManifestEO item : paramsCollectManifestEOListOfTitle) { + ParamsReportDetailEO addReportDetailEO = new ParamsReportDetailEO(); + BeanUtils.copyProperties(item, addReportDetailEO); + String reportDetailId = UUID.randomUUID().toString().replace("-",""); + addReportDetailEO.setId(reportDetailId); + addReportDetailEO.setParamsManifestId(reportId); + addReportDetailEO.setSyncTime(syncTime); + addReportDetailEOList.add(addReportDetailEO); + } + } + } + // 复制认证类别参数 List nioNumberList = paramsCollectManifestEOList.stream().map(ParamsCollectManifestEO::getNioNumber).collect(Collectors.toList()); List certCategoryParamsInfoPublishEOS = certCategoryParamsInfoPublishEOService.queryListByVersionAndNio(paramsManifestEO.getParamsTemplateId(), paramsManifestEO.getParamsTemplatePublishVersion(), nioNumberList); 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 819e1af14..e73cb2970 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 @@ -27,6 +27,7 @@ + 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 548885b9d..1df1f9a2e 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 @@ -106,7 +106,7 @@ public class ParamsInfoEO implements Serializable { private String certCategory; /**控件类型*/ - @Excel(name = "*控件类型", width = 15, replace = {"文本_1","下拉单选_2","下拉多选_3","附件_4","文本+下拉单选_5","文本+下拉多选_6","文本+附件_7","下拉单选+附件_8","下拉多选+附件_9","文本+下拉单选+附件_10"}) + @Excel(name = "*控件类型", width = 15, replace = {"文本_1","下拉单选_2","下拉多选_3","附件_4","文本+下拉单选_5","文本+下拉多选_6","文本+附件_7","下拉单选+附件_8","下拉多选+附件_9","文本+下拉单选+附件_10","标题_11"}) @ApiModelProperty(value = "控件类型") private String controlType; @@ -120,7 +120,12 @@ public class ParamsInfoEO implements Serializable { @ApiModelProperty(value = "控件备选值") private String controlValues; - /**附件模板*/ + /**标题默认值*/ + @Excel(name = "默认值", width = 15) + @ApiModelProperty(value = "标题默认值") + private String titleDefaultValue; + + /**附件模板*/ @ApiModelProperty(value = "附件模板") private String fileTemplateConnectId; diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/enums/ControlTypeEnum.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/enums/ControlTypeEnum.java index 3beeb783d..9304ce180 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/enums/ControlTypeEnum.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/enums/ControlTypeEnum.java @@ -20,7 +20,8 @@ public enum ControlTypeEnum { TEXT_FILE("文本+附件","Text+File","7"), PULL_SINGLE_FILE("下拉单选+附件","Pull single+File","8"), PULL_MORE_FILE("下拉多选+附件","Pull more+File","9"), - TEXT_PULL_SINGLE_FILE("文本+下拉单选+附件","Text+Pull single+File","10"); + TEXT_PULL_SINGLE_FILE("文本+下拉单选+附件","Text+Pull single+File","10"), + Title("标题","Title","11"); String name; String enName; 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 9b653f43e..7416091d5 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 @@ -21,6 +21,7 @@ + @@ -43,6 +44,7 @@ + @@ -74,6 +76,7 @@ + @@ -105,6 +108,7 @@ pi.control_verify as control_verify, pi.file_template_connect_id as file_template_connect_id, pi.params_template_id as params_template_id, + pi.title_default_value as title_default_value, ccpi.id as ccpi_id, ccpi.params_number as ccpi_params_number, ccpi.params_name as ccpi_params_name, diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsInfoPublishEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsInfoPublishEOMapper.xml index a41f24b12..4b3361698 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsInfoPublishEOMapper.xml +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsInfoPublishEOMapper.xml @@ -22,6 +22,7 @@ + select * from params_collect_manifest - - and control_type = '11' + where params_manifest_id = #{paramsManifestId} and control_type = '11' order by del_flag desc, add_flag desc, change_flag desc, nio_number asc From a813e55f098571db79d7a00658c4484c29d2b714 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Wed, 13 Jul 2022 15:43:48 +0800 Subject: [PATCH 09/50] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF?= =?UTF-8?q?=E8=AF=84=E4=BC=B0-=E6=B5=81=E7=A8=8B=E5=AF=B9=E6=8E=A5?= =?UTF-8?q?=E3=80=82=E3=80=82=20=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF?= =?UTF-8?q?=E8=AF=84=E4=BC=B0-=E5=AF=BC=E5=85=A5=E6=9D=A1=E6=AC=BE?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LawsTechnologyEvaluationEOController.java | 9 +++ ...echnologyEvaluationResultEOController.java | 5 +- .../LawsTechnologyEvaluationResultEO.java | 5 -- .../ILawsTechnologyEvaluationEOService.java | 3 + ...wsTechnologyEvaluationResultEOService.java | 5 +- ...LawsTechnologyEvaluationEOServiceImpl.java | 68 +++++++++++++------ ...chnologyEvaluationResultEOServiceImpl.java | 13 +++- 7 files changed, 76 insertions(+), 32 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java index bf0a2bf79..747a2c2f5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java @@ -20,6 +20,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.ModelAndView; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -201,4 +202,12 @@ public class LawsTechnologyEvaluationEOController extends JeroController> importItemExcel(MultipartFile file, @RequestParam(name = "cut") String cut, HttpServletRequest request) throws Exception { + List> result = this.lawsTechnologyEvaluationEOService.importItemExcel(file,cut,request); + return result; + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationResultEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationResultEOController.java index 7dc83916c..3b91ded39 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationResultEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationResultEOController.java @@ -68,8 +68,9 @@ public class LawsTechnologyEvaluationResultEOController extends JeroController> queryList() { - List list = lawsTechnologyEvaluationResultEOService.queryList(); + public Result> queryList(LawsTechnologyEvaluationResultEO lawsTechnologyEvaluationResultEO, + HttpServletRequest req) { + List list = lawsTechnologyEvaluationResultEOService.queryList(lawsTechnologyEvaluationResultEO,req); return Result.OK(list); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationResultEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationResultEO.java index 1777b8396..15b4a7998 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationResultEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationResultEO.java @@ -1,8 +1,6 @@ package com.jero.modules.lawsTechnologyEvaluation.entity; import java.io.Serializable; -import java.io.UnsupportedEncodingException; -import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -10,13 +8,10 @@ import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; -import com.jero.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; - /** * @Description: 法规技术评估-评估结果表 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java index 6692885a1..5c4cd6ce8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.common.api.vo.Result; import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationEO; import com.baomidou.mybatisplus.extension.service.IService; +import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -83,4 +84,6 @@ public interface ILawsTechnologyEvaluationEOService extends IService parameter); void exportItemTemplate(String cut, HttpServletResponse response, HttpServletRequest request); + + List> importItemExcel(MultipartFile file, String cut, HttpServletRequest request)throws Exception; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationResultEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationResultEOService.java index a1ab5e08c..e7f842c8c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationResultEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationResultEOService.java @@ -3,6 +3,8 @@ package com.jero.modules.lawsTechnologyEvaluation.service; import com.alibaba.fastjson.JSONObject; import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationResultEO; import com.baomidou.mybatisplus.extension.service.IService; + +import javax.servlet.http.HttpServletRequest; import java.util.List; /** @@ -58,7 +60,8 @@ public interface ILawsTechnologyEvaluationResultEOService extends IService queryList(); + List queryList(LawsTechnologyEvaluationResultEO lawsTechnologyEvaluationResultEO, + HttpServletRequest req); /** * 评估人保存/提交 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java index c55596370..e530159eb 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java @@ -1,17 +1,13 @@ package com.jero.modules.lawsTechnologyEvaluation.service.impl; -import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; 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.api.vo.Result; -import com.jero.common.constant.CommonConstant; import com.jero.common.constant.enums.CutEnum; import com.jero.common.constant.enums.ModuleEnum; -import com.jero.common.constant.enums.YesOrNoEnum; import com.jero.common.exception.JeroBootException; -import com.jero.common.util.TokenUtils; import com.jero.generater.modules.online.cgform.entity.OnlCgformField; import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl; import com.jero.modules.document.enums.FieldTypeEnum; @@ -22,12 +18,10 @@ import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluation import com.jero.modules.lawsTechnologyEvaluation.mapper.LawsTechnologyEvaluationEOMapper; import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationEOService; import com.jero.modules.project.enums.OperatorTypeEnum; -import com.jero.modules.project.enums.ProjectInventoryFieldEnum; import com.jero.modules.project.enums.RequestSourceEnum; import com.jero.modules.split.entity.SarFileSplitInfoEO; import com.jero.modules.split.service.ISarFileSplitInfoService; import com.jero.modules.system.entity.SysCategory; -import com.jero.modules.system.entity.SysCategoryTreeVO; import com.jero.modules.system.entity.SysDictItem; import com.jero.modules.system.service.impl.SysCategoryServiceImpl; import com.jero.modules.system.service.impl.SysDictItemServiceImpl; @@ -38,15 +32,8 @@ import org.apache.poi.hssf.usermodel.HSSFCellStyle; import org.apache.poi.hssf.usermodel.HSSFRichTextString; import org.apache.poi.hssf.usermodel.HSSFSheet; import org.apache.poi.hssf.usermodel.HSSFWorkbook; -import org.apache.poi.ss.usermodel.Cell; -import org.apache.poi.ss.usermodel.HorizontalAlignment; -import org.apache.poi.ss.usermodel.Row; -import org.apache.poi.ss.usermodel.VerticalAlignment; +import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.util.CellRangeAddress; -import org.apache.poi.xssf.usermodel.XSSFCellStyle; -import org.apache.poi.xssf.usermodel.XSSFRichTextString; -import org.apache.poi.xssf.usermodel.XSSFSheet; -import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -57,6 +44,7 @@ import java.util.*; import java.util.stream.Collectors; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -314,21 +302,17 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl> importItemExcel(MultipartFile file, String cut, HttpServletRequest request)throws Exception { + //校验文件格式 + int pos = file.getOriginalFilename().lastIndexOf("."); + String fileSuffixStr = file.getOriginalFilename().substring(pos+1).toLowerCase(); + if(!StringUtils.equals(fileSuffixStr,"xls")){ + if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + throw new JeroBootException("请上传xls文件"); + }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ + throw new JeroBootException("Please upload a xls file"); + } + } + String fileName = file.getOriginalFilename(); + + List> result = new ArrayList<>(); + + File excelFile = File.createTempFile(fileName, fileSuffixStr); + file.transferTo(excelFile); + Workbook workbook = WorkbookFactory.create(excelFile); + if (workbook != null) { + Sheet sheet = workbook.getSheetAt(0); + if (sheet != null) { + int rowNos = sheet.getPhysicalNumberOfRows();// 得到excel的总记录条数 + for (int i = 0; i < rowNos ; i++) { + Row row = sheet.getRow(i + 1); + + String itemNum = row.getCell(0, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK).toString(); + String itemName = row.getCell(1, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK).toString(); + String itemContents = row.getCell(2, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK).toString(); + Map itemInfoMap = new HashMap<>(); + itemInfoMap.put("itemNum",itemNum); + itemInfoMap.put("itemName",itemName); + itemInfoMap.put("itemContent",itemContents); + result.add(itemInfoMap); + } + } + } + return result; + } + private String getTreeName(String cut, List categoryList, List technologyTerritoryList) { StringBuilder sb = new StringBuilder(); for (String technologyTerritory : technologyTerritoryList) { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationResultEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationResultEOServiceImpl.java index 21a4f9974..0a8d9dd7f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationResultEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationResultEOServiceImpl.java @@ -3,6 +3,7 @@ package com.jero.modules.lawsTechnologyEvaluation.service.impl; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.jero.common.system.query.QueryGenerator; import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationComplianceResultEO; import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationResultEO; import com.jero.modules.lawsTechnologyEvaluation.mapper.LawsTechnologyEvaluationResultEOMapper; @@ -17,6 +18,8 @@ import java.util.List; import java.util.Date; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import javax.servlet.http.HttpServletRequest; + /** * @Description: 法规技术评估-评估结果表 * @Author: jero-boot @@ -95,8 +98,11 @@ public class LawsTechnologyEvaluationResultEOServiceImpl extends ServiceImpl queryList() { - return list(); + public List queryList(LawsTechnologyEvaluationResultEO lawsTechnologyEvaluationResultEO, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(lawsTechnologyEvaluationResultEO, req.getParameterMap()); + List evaluationResultEOList = this.baseMapper.selectList(queryWrapper); + return evaluationResultEOList; } @Override @@ -129,6 +135,9 @@ public class LawsTechnologyEvaluationResultEOServiceImpl extends ServiceImpl Date: Wed, 13 Jul 2022 15:45:35 +0800 Subject: [PATCH 10/50] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF?= =?UTF-8?q?=E8=AF=84=E4=BC=B0-=E6=9D=A1=E6=AC=BE=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0itemId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/LawsTechnologyEvaluationEOServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java index e530159eb..b2c091f39 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java @@ -403,6 +403,8 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl itemInfoMap = new HashMap<>(); + String itemId = UUID.randomUUID().toString().replace("-", ""); + itemInfoMap.put("itemId",itemId); itemInfoMap.put("itemNum",itemNum); itemInfoMap.put("itemName",itemName); itemInfoMap.put("itemContent",itemContents); From 1bff3449b78a7504e8085110453f9ec1f5789ab1 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Wed, 13 Jul 2022 15:59:04 +0800 Subject: [PATCH 11/50] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF?= =?UTF-8?q?=E8=AF=84=E4=BC=B0-=E6=B5=81=E7=A8=8B=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E5=A4=84=E7=90=86=E8=AF=84=E4=BC=B0=E4=BA=BA=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ologyEvaluationFlowDetailEOController.java | 2 + .../LawsTechnologyEvaluationFlowDetailEO.java | 4 ++ ...chnologyEvaluationFlowDetailEOService.java | 7 ++++ ...logyEvaluationFlowDetailEOServiceImpl.java | 42 +++++++++++++++++++ 4 files changed, 55 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationFlowDetailEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationFlowDetailEOController.java index 499b50d43..3605e81cc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationFlowDetailEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationFlowDetailEOController.java @@ -53,10 +53,12 @@ public class LawsTechnologyEvaluationFlowDetailEOController extends JeroControll public Result queryPageList(LawsTechnologyEvaluationFlowDetailEO lawsTechnologyEvaluationFlowDetailEO, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + @RequestParam(name="cut", defaultValue="cn") String cut, HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(lawsTechnologyEvaluationFlowDetailEO, req.getParameterMap()); Page page = new Page(pageNo, pageSize); IPage pageList = lawsTechnologyEvaluationFlowDetailEOService.page(page, queryWrapper); + this.lawsTechnologyEvaluationFlowDetailEOService.disposeData(pageList.getRecords(),cut); return Result.OK(pageList); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationFlowDetailEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationFlowDetailEO.java index 8178c3dfb..954586eaa 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationFlowDetailEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationFlowDetailEO.java @@ -4,6 +4,7 @@ import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.math.BigDecimal; 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; @@ -86,4 +87,7 @@ public class LawsTechnologyEvaluationFlowDetailEO implements Serializable { @ApiModelProperty(value = "评估人id") private java.lang.String evaluatorId; + @TableField(exist = false) + private String evaluatorName; + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationFlowDetailEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationFlowDetailEOService.java index 89af12bd5..f190d574d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationFlowDetailEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationFlowDetailEOService.java @@ -67,4 +67,11 @@ public interface ILawsTechnologyEvaluationFlowDetailEOService extends IService processCall(JSONObject jsonObject); + + /** + * 处理数据 + * @param datas + * @param cut + */ + void disposeData(List datas, String cut); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationFlowDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationFlowDetailEOServiceImpl.java index dbf699f42..fa247a532 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationFlowDetailEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationFlowDetailEOServiceImpl.java @@ -9,13 +9,18 @@ import com.jero.modules.lawsTechnologyEvaluation.mapper.LawsTechnologyEvaluation import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationFlowDetailEOService; import com.jero.modules.project.enums.OperatorTypeEnum; import com.jero.modules.project.enums.RequestSourceEnum; +import com.jero.modules.system.entity.SysUser; +import com.jero.modules.system.service.ISysUserService; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; import java.util.Date; +import java.util.stream.Collectors; + import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** @@ -27,6 +32,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @Service public class LawsTechnologyEvaluationFlowDetailEOServiceImpl extends ServiceImpl implements ILawsTechnologyEvaluationFlowDetailEOService { + @Autowired + private ISysUserService sysUserService; + /** * 保存 * @@ -126,4 +134,38 @@ public class LawsTechnologyEvaluationFlowDetailEOServiceImpl extends ServiceImpl return new Result<>().success("调用成功！"); } + + @Override + public void disposeData(List datas, String cut) { + if(CollectionUtils.isNotEmpty(datas)){ + List userIdList = new ArrayList<>(); + for (LawsTechnologyEvaluationFlowDetailEO data : datas) { + String evaluatorId = data.getEvaluatorId(); + if(StringUtils.isNotEmpty(evaluatorId)){ + userIdList.add(evaluatorId); + } + } + List sysUserList = new ArrayList<>(); + if(CollectionUtils.isNotEmpty(userIdList)){ + sysUserList = sysUserService.querySysUserListByIdList(userIdList); + } + + for (LawsTechnologyEvaluationFlowDetailEO data : datas) { + if(CollectionUtils.isNotEmpty(sysUserList)){ + String evaluatorId = data.getEvaluatorId(); + if(StringUtils.isNotEmpty(evaluatorId)){ + String evaluatorName = sysUserList.stream().filter(sysUser -> { + boolean flag = false; + if (StringUtils.equals(sysUser.getId(), data.getEvaluatorId())) { + flag = true; + } + return flag; + }).map(SysUser::getUsername).distinct().collect(Collectors.joining(",")); + data.setEvaluatorName(evaluatorName); + } + } + } + + } + } } From e8c88e0de32f8708eb83677e32a75dc3297d51ac Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Wed, 13 Jul 2022 16:04:07 +0800 Subject: [PATCH 12/50] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E3=80=81=E6=84=8F=E8=A7=81=E6=94=B6=E9=9B=86?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=B8=9A=E5=8A=A1=E5=B1=82=E5=8A=A0=E4=BA=8B?= =?UTF-8?q?=E5=8A=A1=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LawsTechnologyEvaluationComplianceResultEOServiceImpl.java | 3 +++ .../service/impl/LawsTechnologyEvaluationEOServiceImpl.java | 3 +++ .../impl/LawsTechnologyEvaluationFlowDetailEOServiceImpl.java | 3 +++ .../impl/LawsTechnologyEvaluationItemResultEOServiceImpl.java | 3 +++ .../impl/LawsTechnologyEvaluationResultEOServiceImpl.java | 3 +++ 5 files changed, 15 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationComplianceResultEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationComplianceResultEOServiceImpl.java index 8f8397d0c..16849cd96 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationComplianceResultEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationComplianceResultEOServiceImpl.java @@ -7,6 +7,8 @@ import org.springframework.stereotype.Service; import java.util.List; import java.util.Date; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; /** * @Description: 法规技术评估-评估人反馈-符合性结果表 @@ -15,6 +17,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; * @Version: V1.0 */ @Service +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) public class LawsTechnologyEvaluationComplianceResultEOServiceImpl extends ServiceImpl implements ILawsTechnologyEvaluationComplianceResultEOService { /** diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java index b2c091f39..08d0b962b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java @@ -44,6 +44,8 @@ import java.util.*; import java.util.stream.Collectors; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; @@ -56,6 +58,7 @@ import javax.servlet.http.HttpServletResponse; * @Version: V1.0 */ @Service +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl implements ILawsTechnologyEvaluationEOService { @Autowired diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationFlowDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationFlowDetailEOServiceImpl.java index fa247a532..fb5429b62 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationFlowDetailEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationFlowDetailEOServiceImpl.java @@ -22,6 +22,8 @@ import java.util.Date; import java.util.stream.Collectors; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; /** * @Description: 法规技术评估表-流程明细 @@ -30,6 +32,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; * @Version: V1.0 */ @Service +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) public class LawsTechnologyEvaluationFlowDetailEOServiceImpl extends ServiceImpl implements ILawsTechnologyEvaluationFlowDetailEOService { @Autowired diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationItemResultEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationItemResultEOServiceImpl.java index 9f2fdc9f1..9980664e8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationItemResultEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationItemResultEOServiceImpl.java @@ -18,6 +18,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Date; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; /** * @Description: 法规技术评估-条款信息评估结果表 @@ -26,6 +28,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; * @Version: V1.0 */ @Service +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) public class LawsTechnologyEvaluationItemResultEOServiceImpl extends ServiceImpl implements ILawsTechnologyEvaluationItemResultEOService { /** diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationResultEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationResultEOServiceImpl.java index 0a8d9dd7f..221725daa 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationResultEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationResultEOServiceImpl.java @@ -17,6 +17,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Date; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletRequest; @@ -27,6 +29,7 @@ import javax.servlet.http.HttpServletRequest; * @Version: V1.0 */ @Service +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) public class LawsTechnologyEvaluationResultEOServiceImpl extends ServiceImpl implements ILawsTechnologyEvaluationResultEOService { @Autowired From 8dac0ed7f9c1026ddfaf2410100758051044748c Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Wed, 13 Jul 2022 16:16:06 +0800 Subject: [PATCH 13/50] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF?= =?UTF-8?q?=E8=AF=84=E4=BC=B0-=E5=A2=9E=E5=8A=A0=E7=AC=A6=E5=90=88?= =?UTF-8?q?=E6=80=A7=E7=BB=93=E6=9E=9C=E6=9E=9A=E4=B8=BE=E7=B1=BB=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../enums/ComplianceResultEnum.java | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/enums/ComplianceResultEnum.java diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/enums/ComplianceResultEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/enums/ComplianceResultEnum.java new file mode 100644 index 000000000..4eb017186 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/enums/ComplianceResultEnum.java @@ -0,0 +1,51 @@ +package com.jero.modules.lawsTechnologyEvaluation.enums; + +import com.alibaba.druid.util.StringUtils; +import com.jero.common.constant.enums.CutEnum; + +/** + * 符合性结果枚举类 + */ +public enum ComplianceResultEnum { + CONFORMITY("符合","Compliance"), + INCONFORMITY("不符合","Non-Compliance"), + ; + + String name; + String value; + + private ComplianceResultEnum(String name, String value) { + this.name = name; + this.value = value; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public static String getTextByValue(String value,String cut) { + ComplianceResultEnum[] values = values(); + for (ComplianceResultEnum complianceResultEnum : values) { + if (complianceResultEnum.value.equals(value)) { + if(StringUtils.equals(cut, CutEnum.CN.getValue())){ + return complianceResultEnum.name; + }else { + return complianceResultEnum.value; + } + } + } + return null; + } +} From 22f0ed57c55725f6a113daf196502c6cadb44708 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Wed, 13 Jul 2022 16:17:21 +0800 Subject: [PATCH 14/50] update --- .../enums/ComplianceResultEnum.java | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/enums/ComplianceResultEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/enums/ComplianceResultEnum.java index 4eb017186..04942f12b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/enums/ComplianceResultEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/enums/ComplianceResultEnum.java @@ -7,15 +7,17 @@ import com.jero.common.constant.enums.CutEnum; * 符合性结果枚举类 */ public enum ComplianceResultEnum { - CONFORMITY("符合","Compliance"), - INCONFORMITY("不符合","Non-Compliance"), + CONFORMITY("符合","Compliance","Compliance"), + INCONFORMITY("不符合","Non-Compliance","Non-Compliance"), ; String name; + String enName; String value; - private ComplianceResultEnum(String name, String value) { + private ComplianceResultEnum(String name,String enName, String value) { this.name = name; + this.enName = enName; this.value = value; } @@ -35,14 +37,22 @@ public enum ComplianceResultEnum { this.value = value; } - public static String getTextByValue(String value,String cut) { + public String getEnName() { + return enName; + } + + public void setEnName(String enName) { + this.enName = enName; + } + + public static String getTextByValue(String value, String cut) { ComplianceResultEnum[] values = values(); for (ComplianceResultEnum complianceResultEnum : values) { if (complianceResultEnum.value.equals(value)) { if(StringUtils.equals(cut, CutEnum.CN.getValue())){ return complianceResultEnum.name; }else { - return complianceResultEnum.value; + return complianceResultEnum.enName; } } } From b3dd749d8eee5e0973373debb07b0006f9187fe4 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Wed, 13 Jul 2022 16:22:43 +0800 Subject: [PATCH 15/50] =?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 | 4 + jero-web/src/common/lang/zh-cn.js | 4 + .../components/TermInformation.vue | 115 ++++++++++++--- .../components/initiatingProcess.vue | 93 +++++++++---- .../components/standardDecompositionSheet.vue | 131 +++++++++++++----- .../processForm/evaluationProcess/index.vue | 13 +- 6 files changed, 277 insertions(+), 83 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 7d5120366..d05cdc046 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1127,4 +1127,8 @@ module.exports = { fileExport:'File export', feedbackTime:'Feedback time', regulatoryTechnologyAssessmentProcess:'Regulatory technology assessment process', + feedbackEvaluation:'Feedback evaluation', + clauseEvaluation:'Clause evaluation', + standardDocuments:'Standard documents', + pleaseCompleteTheEvaluationMethodorEvaluator:'Please complete the evaluation method or evaluator in the list', } \ 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 5e8ef43d5..94de35b3b 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1131,4 +1131,8 @@ module.exports = { fileExport:'文件导出', feedbackTime:'反馈时间', regulatoryTechnologyAssessmentProcess:'法规技术评估流程', + feedbackEvaluation:'反馈评估', + clauseEvaluation:'条款评估', + standardDocuments:'标准文件', + pleaseCompleteTheEvaluationMethodorEvaluator:'Please complete the evaluation method or evaluator in the list', } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue index b44281a68..89f862ffc 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue @@ -1,11 +1,30 @@ @@ -283,6 +321,17 @@ margin-bottom: 12px; } + .title-text-right { + display: inline-block; + width: calc(100% - 130px); + padding-top: 15px; + font-size: 14px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + color: #000F16; + } + .Required { color: red; margin-right: 4px; diff --git a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue index 3f3f20893..69ff81f3d 100644 --- a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue @@ -13,13 +13,14 @@ :standardContentQuery="queryProject" /> @@ -47,6 +48,7 @@ import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage' import moment from 'moment' import { mapGetters } from 'vuex' + export default { name: 'evaluationProcess', components: { @@ -62,12 +64,14 @@ title: this.$t('collectionOfRegulatoryOpinions'), url: { queryTaskDetailByTaskIds: '/task/queryTaskDetailByTaskIds', - list: '/lawsOpinionGather/lawsOpinionAssessmentResultEO/list' + list: '/lawsTechnologyEvaluation/lawsTechnologyEvaluationResultEO/queryEvaluationResultAndComplianceResult' }, loading: false, isDisplay: true, feedbackDataList: [], queryProject: {}, + complianceResult:{}, + isTrue: false, standardContentList: [ { title: this.$t('standard'), @@ -79,7 +83,7 @@ }, { title: this.$t('regulatoryEngineer'), - value: 'currentUserName' + value: 'regulationOwnerName' }, { title: this.$t('closingDate'), @@ -87,7 +91,7 @@ }, { title: this.$t('evaluationMethod'), - value: 'evaluationMethod', + value: 'evaluationMethodsName' }, { title: this.$t('RelevantMaterials'), @@ -98,44 +102,46 @@ title: this.$t('processBackground'), value: 'processBackground' } - // { - // title: this.$t('remarks'), - // value: 'remark' - // } ] } }, mounted() { this.isDisplay = false - this.queryTaskDetailByTask(() => { - this.lawsOpinionAssessmentResult() - }) + this.queryTaskDetailByTask() }, methods: { ...mapGetters(['userInfo']), - queryTaskDetailByTask(callback) { + queryTaskDetailByTask() { this.loading = true getAction(this.url.queryTaskDetailByTaskIds, { taskIds: this.$route.query.taskIds }).then((res) => { if (res instanceof String) { this.queryProject = JSON.parse(res) || {} - callback && callback() } else { this.queryProject = res || {} - callback && callback() } - this.queryProject.evaluationTypeName = this.queryProject.evaluationType == 'Feedback evaluation' ? this.$t('feedbackEvaluation') :this.$t('clauseEvaluation') + this.isTrue = this.queryProject.evaluationType == 'Feedback evaluation' ? false : true + if (this.isTrue) { + this.standardContentList = this.standardContentList.filter(res => { + return res.title != this.$t('evaluationMethod') + }) + } else { + this.lawsOpinionAssessmentResult() + } }) }, lawsOpinionAssessmentResult() { getAction(this.url.list, { - lawsOpinionGatherId: this.queryProject.id, - actiProcInstId: this.$route.query.prcId + lawsTechnologyEvaluationId: this.queryProject.lawsTechnologyEvaluationId, + actiProcInstId: this.$route.query.prcId, + createBy: this.userInfo().username }).then((res) => { if (res.success) { - this.feedbackDataList = res.result || [] + this.complianceResult = res.result.complianceResult || {} + this.feedbackDataList = res.result.evaluationResultEOList || [] this.loading = false } else { this.feedbackDataList = [] + this.complianceResult = {} this.loading = false } this.isDisplay = true @@ -143,21 +149,21 @@ }, preservation() { this.loading = true - let dataList = this.$refs.feedbackInformationRef.dataList - this.insertBatch(dataList, 1) - }, - insertBatch(list, num) { - list.forEach(res => { - res.lawsOpinionGatherId = this.queryProject.id - res.actiProcInstId = this.$route.query.prcId + this.$refs.evaluatorFeedbackRef.preservationData((res) => { + this.insertBatch(res, 1) }) - postAction('/lawsOpinionGather/lawsOpinionAssessmentResultEO/insertBatch', { dataList:list }).then((res) => { + }, + insertBatch(val, num) { + let query = { + actiProcInstId: this.$route.query.prcId, + lawsTechnologyEvaluationId: this.queryProject.lawsTechnologyEvaluationId, + complianceResult: val.complianceResult, + evaluationResultList: val.dataList + } + postAction('/lawsTechnologyEvaluation/lawsTechnologyEvaluationResultEO/evaluatorSaveResult', query).then((res) => { if (res.success) { if (num == 1) { this.$message.success(this.$t('OperationSuccessful')) - this.$router.push({ - path: '/collectionOfRegulatoryOpinions' - }) this.loading = false } else { this.completeTask() @@ -171,9 +177,9 @@ }) }, submit() { - this.$refs.evaluatorFeedbackRef.submitData() - // let dataList = this.$refs.feedbackInformationRef.dataList - // this.insertBatch(dataList, 2) + this.$refs.evaluatorFeedbackRef.submitData((res) => { + this.insertBatch(res, 2) + }) }, completeTask() { let query = { @@ -183,13 +189,10 @@ } postAction('/workFlow/completeTask', query).then((res) => { if (res.success) { - // setTimeout(() => { - // window.close() - // }, 1000) this.$message.success(this.$t('OperationSuccessful')) this.loading = false this.$router.push({ - path: '/collectionOfRegulatoryOpinions' + path: '/technologyAssessment' }) } else { this.loading = false From 66f618dd5135001f150f99802b7ca6e0ff699bf4 Mon Sep 17 00:00:00 2001 From: liyawei Date: Wed, 13 Jul 2022 17:45:40 +0800 Subject: [PATCH 21/50] =?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 22/50] =?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 23/50] =?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, From 2373bcdef528710e7cb794be6aed2cfe4f40a149 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Wed, 13 Jul 2022 18:37:10 +0800 Subject: [PATCH 24/50] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF?= =?UTF-8?q?=E8=AF=84=E4=BC=B0-=E6=9D=A1=E6=AC=BE=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...wsTechnologyEvaluationItemResultEOController.java | 6 ++++-- ...ILawsTechnologyEvaluationItemResultEOService.java | 6 +++++- ...sTechnologyEvaluationFlowDetailEOServiceImpl.java | 10 ++++++++++ ...sTechnologyEvaluationItemResultEOServiceImpl.java | 12 ++++++++++-- 4 files changed, 29 insertions(+), 5 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationItemResultEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationItemResultEOController.java index ccf5dcd61..2375580d2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationItemResultEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationItemResultEOController.java @@ -68,8 +68,10 @@ public class LawsTechnologyEvaluationItemResultEOController extends JeroControll @AutoLog(value = "法规技术评估-条款信息评估结果表-列表查询") @ApiOperation(value="法规技术评估-条款信息评估结果表-列表查询", notes="法规技术评估-条款信息评估结果表-列表查询") @GetMapping(value = "/list") - public Result> queryList() { - List list = lawsTechnologyEvaluationItemResultEOService.queryList(); + public Result> queryList(LawsTechnologyEvaluationItemResultEO lawsTechnologyEvaluationItemResultEO, + HttpServletRequest req, + String cut) { + List list = lawsTechnologyEvaluationItemResultEOService.queryList(lawsTechnologyEvaluationItemResultEO,req,cut); return Result.OK(list); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationItemResultEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationItemResultEOService.java index bdc60abf2..8ab7d2844 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationItemResultEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationItemResultEOService.java @@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSONObject; import com.jero.common.api.vo.Result; import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationItemResultEO; import com.baomidou.mybatisplus.extension.service.IService; + +import javax.servlet.http.HttpServletRequest; import java.util.List; /** @@ -59,7 +61,9 @@ public interface ILawsTechnologyEvaluationItemResultEOService extends IService queryList(); + List queryList(LawsTechnologyEvaluationItemResultEO lawsTechnologyEvaluationItemResultEO, + HttpServletRequest req, + String cut); /** * 流程调用 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationFlowDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationFlowDetailEOServiceImpl.java index fb5429b62..beb0f70de 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationFlowDetailEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationFlowDetailEOServiceImpl.java @@ -2,6 +2,7 @@ package com.jero.modules.lawsTechnologyEvaluation.service.impl; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.jero.common.api.vo.Result; import com.jero.common.exception.JeroBootException; import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationFlowDetailEO; @@ -133,6 +134,15 @@ public class LawsTechnologyEvaluationFlowDetailEOServiceImpl extends ServiceImpl if(CollectionUtils.isNotEmpty(detailList)){ this.saveBatch(detailList); } + }else if(StringUtils.equals(operatorType, OperatorTypeEnum.QUERY.getValue())){ + String lawsTechnologyEvaluationId = jsonObject.getString("lawsTechnologyEvaluationId"); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(LawsTechnologyEvaluationFlowDetailEO::getLawsTechnologyEvaluationId,lawsTechnologyEvaluationId); + List lawsTechnologyEvaluationFlowDetailEOS = this.baseMapper.selectList(queryWrapper); + Result> objectResult = new Result<>(); + objectResult.setResult(lawsTechnologyEvaluationFlowDetailEOS); + objectResult.setSuccess(true); + return objectResult; } return new Result<>().success("调用成功！"); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationItemResultEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationItemResultEOServiceImpl.java index 9980664e8..03c4f4053 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationItemResultEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationItemResultEOServiceImpl.java @@ -2,8 +2,10 @@ package com.jero.modules.lawsTechnologyEvaluation.service.impl; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.jero.common.api.vo.Result; import com.jero.common.exception.JeroBootException; +import com.jero.common.system.query.QueryGenerator; import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationFlowDetailEO; import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationItemResultEO; import com.jero.modules.lawsTechnologyEvaluation.mapper.LawsTechnologyEvaluationItemResultEOMapper; @@ -21,6 +23,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +import javax.servlet.http.HttpServletRequest; + /** * @Description: 法规技术评估-条款信息评估结果表 * @Author: jero-boot @@ -97,8 +101,12 @@ public class LawsTechnologyEvaluationItemResultEOServiceImpl extends ServiceImpl * @return */ @Override - public List queryList() { - return list(); + public List queryList(LawsTechnologyEvaluationItemResultEO lawsTechnologyEvaluationItemResultEO, + HttpServletRequest req, + String cut) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(lawsTechnologyEvaluationItemResultEO, req.getParameterMap()); + List itemResultEOList = this.baseMapper.selectList(queryWrapper); + return itemResultEOList; } /** From 0cca632e440be798fc28cd4ab86f705ee4fd6681 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Wed, 13 Jul 2022 18:48:19 +0800 Subject: [PATCH 25/50] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF?= =?UTF-8?q?=E8=AF=84=E4=BC=B0-=E6=9D=A1=E6=AC=BE=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E7=BB=93=E6=9E=9C=E8=A1=A8-=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2=E5=AE=8C=E5=96=84=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ologyEvaluationItemResultEOController.java | 1 + .../LawsTechnologyEvaluationItemResultEO.java | 3 ++ ...chnologyEvaluationItemResultEOService.java | 2 + ...logyEvaluationItemResultEOServiceImpl.java | 42 +++++++++++++++++++ .../processForm/evaluationProcess/index.vue | 1 - 5 files changed, 48 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationItemResultEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationItemResultEOController.java index 2375580d2..eb34fe50e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationItemResultEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationItemResultEOController.java @@ -72,6 +72,7 @@ public class LawsTechnologyEvaluationItemResultEOController extends JeroControll HttpServletRequest req, String cut) { List list = lawsTechnologyEvaluationItemResultEOService.queryList(lawsTechnologyEvaluationItemResultEO,req,cut); + this.lawsTechnologyEvaluationItemResultEOService.disposeData(list,cut); return Result.OK(list); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationItemResultEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationItemResultEO.java index 0ef568162..86ef20c82 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationItemResultEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationItemResultEO.java @@ -4,6 +4,7 @@ import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.math.BigDecimal; 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; @@ -85,6 +86,8 @@ public class LawsTechnologyEvaluationItemResultEO implements Serializable { @Excel(name = "评估方式", width = 15) @ApiModelProperty(value = "评估方式") private java.lang.String evaluationMethods; + @TableField(exist = false) + private java.lang.String evaluationMethodsName; /**技术文件名称*/ @Excel(name = "技术文件名称", width = 15) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationItemResultEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationItemResultEOService.java index 8ab7d2844..e0eaf3b76 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationItemResultEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationItemResultEOService.java @@ -77,4 +77,6 @@ public interface ILawsTechnologyEvaluationItemResultEOService extends IService datas, String cut); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationItemResultEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationItemResultEOServiceImpl.java index 03c4f4053..c7ab70d02 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationItemResultEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationItemResultEOServiceImpl.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.jero.common.api.vo.Result; +import com.jero.common.constant.enums.CutEnum; import com.jero.common.exception.JeroBootException; import com.jero.common.system.query.QueryGenerator; import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationFlowDetailEO; @@ -12,13 +13,19 @@ import com.jero.modules.lawsTechnologyEvaluation.mapper.LawsTechnologyEvaluation import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationItemResultEOService; import com.jero.modules.project.enums.OperatorTypeEnum; import com.jero.modules.project.enums.RequestSourceEnum; +import com.jero.modules.system.entity.SysCategory; +import com.jero.modules.system.service.impl.SysCategoryServiceImpl; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.Date; +import java.util.stream.Collectors; + import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @@ -35,6 +42,9 @@ import javax.servlet.http.HttpServletRequest; @Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) public class LawsTechnologyEvaluationItemResultEOServiceImpl extends ServiceImpl implements ILawsTechnologyEvaluationItemResultEOService { + @Autowired + private SysCategoryServiceImpl sysCategoryService; + /** * 保存 * @@ -158,4 +168,36 @@ public class LawsTechnologyEvaluationItemResultEOServiceImpl extends ServiceImpl this.updateBatchById(itemResultEOList); } } + + @Override + public void disposeData(List datas, String cut) { + if(CollectionUtils.isNotEmpty(datas)){ + List categoryList = sysCategoryService.list(); + for (LawsTechnologyEvaluationItemResultEO data : datas) { + String evaluationMethods = data.getEvaluationMethods(); + List evaluationMethodsList = Arrays.asList(evaluationMethods.split(",")); + String name = getTreeName(cut, categoryList, evaluationMethodsList); + data.setEvaluationMethodsName(name); + } + } + } + + private String getTreeName(String cut, List categoryList, List evaluationMethodsList) { + StringBuilder sb = new StringBuilder(); + for (String evaluationMethods : evaluationMethodsList) { + List collect = categoryList.stream().filter(e -> evaluationMethods.equals(e.getId())).collect(Collectors.toList()); + if(collect.size() != 0){ + if (CutEnum.CN.getValue().equals(cut)) { + sb.append(collect.get(0).getName() + ","); + } else { + sb.append(collect.get(0).getEnName()+ ","); + } + } + } + String evaluationMethodsName = ""; + if (StringUtils.isNotBlank(sb)) { + evaluationMethodsName = sb.substring(0, sb.length() - 1); + } + return evaluationMethodsName; + } } diff --git a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue index c7e7b5d10..b7769855b 100644 --- a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue @@ -175,7 +175,6 @@ 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 || [] From 333eb6d0f72479689a1fefd7db1d40314422db5c Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 14 Jul 2022 09:22:24 +0800 Subject: [PATCH 26/50] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/parameter/parameterlist/components/addModel.vue | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue index 705be6cec..345a424a1 100644 --- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue +++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue @@ -163,7 +163,9 @@ :title="$t('NcontrolType')">{{$t('NcontrolType')}} - + {{ item.label }} @@ -466,6 +468,9 @@ export default { } }) }, + controlTypeChange(value){ + this.$refs.ruleForm.clearValidate(['controlVerify','titleDefaultValue','controlValues']) + }, uploadSuccess(data) { let attIdList = [] if (data && data.length > 0) { From da3f684f9ee5a3bc6dd0e7e0e3ee86103ce0852f Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Thu, 14 Jul 2022 10:08:40 +0800 Subject: [PATCH 27/50] =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=A1=B9=E6=94=B6?= =?UTF-8?q?=E9=9B=86=E6=B8=85=E5=8D=95=E5=A2=9E=E5=8A=A0=E9=AB=98=E7=BA=A7?= =?UTF-8?q?=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/tableCollection/index.vue | 7 +- .../ParameterItemCollectionList.vue | 129 ++++++++++++------ 2 files changed, 93 insertions(+), 43 deletions(-) diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index 1399e3518..fb66f9bdc 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -161,6 +161,10 @@ type: Object, default: true }, + queryParamQuery: { + type: Object, + default: true + }, currentPersonRole: { type: String, default: true @@ -591,7 +595,8 @@ pageSize: this.pageSize, userTypes: this.currentPersonRole || currentPersonRole, paramsManifestId: paramsManifestid, - ...this.formInline + ...this.formInline, + ...currentPersonRole } this.loading = true getAction(url, params).then((res) => { diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index a81744a55..99c19a08b 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -33,17 +33,17 @@ v-model="formInline.paramsName"> - -
-
- {{$t('certificationCategory')}} -
- -
- + + + + + + + + + + +
@@ -64,29 +64,32 @@ v-model="formInline.dre">
- -
-
- {{$t('status')}} -
- - - - {{ item.name}} - - - -
- + + + + + + + + + + + + + + + + + + + + + {{$t('query')}} {{$t('reset')}} @@ -187,7 +190,7 @@
Date: Thu, 14 Jul 2022 10:20:18 +0800 Subject: [PATCH 28/50] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=A1=B9=E6=94=B6=E9=9B=86-=E5=8F=98=E6=9B=B4=EF=BC=9A?= =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E9=A2=86=E5=9F=9F=E5=8F=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParamsCollectManifestEOController.java | 22 ++++++++++++-- .../IParamsCollectManifestEOService.java | 4 ++- .../ParamsCollectManifestEOServiceImpl.java | 30 +++++++++++++++++++ 3 files changed, 52 insertions(+), 4 deletions(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java index aed81c064..3020e8abf 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java @@ -5,20 +5,17 @@ import com.baomidou.mybatisplus.core.metadata.IPage; 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.aspect.annotation.PermissionData; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO; import com.jero.modules.cert.collect.service.IParamsCollectManifestEOService; import com.jero.modules.cert.collect.vo.ParamsCollectManifestVO; -import com.jero.modules.cert.template.entity.ParamsInfoPublishEO; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysUserService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; -import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -279,6 +276,25 @@ public class ParamsCollectManifestEOController extends JeroController updateDutyTerritory(ParamsCollectManifestVO paramsCollectManifestVO) { + boolean isSuccess = paramsCollectManifestEOService.updateDutyTerritory(paramsCollectManifestVO); + if (isSuccess) { + return Result.OK("修改责任领域成功！"); + } else { + return Result.error("修改责任领域失败！"); + } + } + /** * 分配工程接口人 * diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java index fce085305..d41c37cf2 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO; import com.jero.modules.cert.collect.vo.ParamsCollectManifestVO; -import com.jero.modules.cert.template.entity.ParamsInfoPublishEO; import java.util.List; import java.util.Map; @@ -116,6 +115,9 @@ public interface IParamsCollectManifestEOService extends IService Date: Thu, 14 Jul 2022 10:36:27 +0800 Subject: [PATCH 29/50] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=A1=B9=E6=94=B6=E9=9B=86-=E5=8F=98=E6=9B=B4=EF=BC=9A?= =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E9=A2=86=E5=9F=9F=E5=8F=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ParamsCollectManifestEOServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) 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 f44f6b9f1..651291499 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 @@ -641,6 +641,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl Date: Thu, 14 Jul 2022 10:49:31 +0800 Subject: [PATCH 30/50] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=A1=B9=E6=94=B6=E9=9B=86-=E5=8F=98=E6=9B=B4=EF=BC=9A?= =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E9=A2=86=E5=9F=9F=E5=8F=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ParamsCollectManifestEOServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 651291499..ffaca6260 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 @@ -642,7 +642,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl Date: Thu, 14 Jul 2022 11:02:04 +0800 Subject: [PATCH 31/50] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=A1=B9=E6=94=B6=E9=9B=86-=E5=8F=98=E6=9B=B4=EF=BC=9A?= =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E9=A2=86=E5=9F=9F=E5=8F=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ParamsCollectManifestEOServiceImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 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 ffaca6260..5f77dae15 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 @@ -1184,13 +1184,14 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl Date: Thu, 14 Jul 2022 11:05:33 +0800 Subject: [PATCH 32/50] =?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 | 2 + jero-web/src/common/lang/zh-cn.js | 2 + .../components/TermInformation.vue | 1 - .../components/standardDecompositionSheet.vue | 1 - .../components/evaluatorFeedbackList.vue | 223 ++++++++++++++++-- .../processForm/evaluationProcess/index.vue | 60 ++++- 6 files changed, 265 insertions(+), 24 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 1dc0d3d5c..ff30c7a53 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1132,4 +1132,6 @@ module.exports = { standardDocuments:'Standard documents', pleaseCompleteTheEvaluationMethodorEvaluator:'Please complete the evaluation method or evaluator in the list', reviewComments:'Review comments', + PleaseCompleteList:'Please complete the compliance results in the list', + sponsorFeedback:'Sponsor 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 4c6a71b22..6325d941d 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1136,4 +1136,6 @@ module.exports = { standardDocuments:'标准文件', pleaseCompleteTheEvaluationMethodorEvaluator:'请补全列表中评估方式或评估人', reviewComments:'审核意见', + PleaseCompleteList:'请补全列表中符合性结果', + sponsorFeedback:'发起人反馈', } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue index 620a72018..8233a6a36 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue @@ -87,7 +87,6 @@ title: this.$t('clauseContent'), dataIndex: 'itemContent', align: 'center', - ellipsis: true, scopedSlots: { customRender: 'clauseContent' } }, { diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue index d7d0a0c65..0496bf0a7 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue @@ -123,7 +123,6 @@ title: this.$t('clauseContent'), dataIndex: 'iterms_conditions', align: 'center', - ellipsis: true, scopedSlots: { customRender: 'clauseContent' } }, { diff --git a/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue b/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue index bd94d2b08..c8365ad06 100644 --- a/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue +++ b/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue @@ -22,21 +22,81 @@
+ + + + + + + + + + + + + {{ (result.accessoryFile === 'null' || result.accessoryFile === '' || + result.accessoryFile == null) ? $t('clickUpload') : $t('viewUploadedFiles') + }} + + + + + + + {{ item.name }} + + + + + + + {{ $t('viewFile') }} + + -- + + + {{text == 'Compliance' ? $t('accord'):$t('nonConformity')}} + + + +
+ + + \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/technologyAssessment/index.vue b/jero-web/src/views/businessSupport/technologyAssessment/index.vue index eb9627cd0..52e936410 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/index.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/index.vue @@ -149,14 +149,18 @@ + @@ -228,6 +299,7 @@ display: flex; justify-content: space-between; border-bottom: 2px #eff1f3 solid; + z-index: 1000; background: #fff; .doc-detail-title { @@ -326,9 +398,30 @@ margin-top: 2px; } + .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/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue index f645cc16e..cde7e8ce8 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue @@ -6,7 +6,7 @@ - {{$t('regulatoryTechnicalEvaluationResults')}} + {{$route.query.serialNumber +' '+$t('regulatoryTechnicalEvaluationResults')}}
@@ -19,18 +19,18 @@
- dskf' ;sdfl';s sd稍等景点风光大家分工法规地方官给，。不买；两个客人坦克；量大幅高开的管理骨科大夫给的快感的法律公开大家赶快来的风格 + {{$route.query.processBackground}}
- +
-
- {{$t('engineerFeedbackResults')}} +
+ {{$t('engineer')+item.createBy+$t('feedbackResults')}}
-
- +
+ {{$t('fileExport')}}
@@ -40,77 +40,77 @@ size="middle" :loading="loading" :pagination="false" - :scroll="{x: '100%'}" - :data-source="item.dataList" + :scroll="{x: '100%',y:350}" + :data-source="item.lawsTechnologyEvaluationResultEOList" :columns="columns" > + + + {{ $t('viewFile') }} + + -- +
+
+ {{$t('complianceResults')}}：{{item.complianceResultName}} +
+