From 84cc6a3d809174d602a05a2f9c55fd42518453f2 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Tue, 12 Jul 2022 15:31:02 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=A1=B9=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E9=A1=B5=E4=BF=AE=E6=94=B9=20=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E5=BA=93-=E8=87=AA=E5=AE=9A=E4=B9=89=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=8E=A5=E5=8F=A3=20=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86=E5=8E=BB=E6=8E=89=E6=8A=80?= =?UTF-8?q?=E6=9C=AF=E9=A2=86=E5=9F=9F=20=E5=8F=82=E6=95=B0=E8=AF=B4?= =?UTF-8?q?=E6=98=8E=E5=AD=97=E7=AC=A6=E9=99=90=E5=88=B6=E4=BF=AE=E6=94=B9?= 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 + .../src/components/tableCollection/index1.vue | 8 ++- .../commponts/customexportmodle.vue | 59 +++++++++++----- .../parameter/managementdetails/index.vue | 2 + .../parameterlist/components/addModel.vue | 70 ++++++++++--------- 6 files changed, 86 insertions(+), 55 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 05586dcd0..b43170a80 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -389,6 +389,7 @@ module.exports = { whole: 'Whole', DocumentLibrary: 'Document Library', GeneralExportInformation:'General export information', + CustomizeExportInformation:'Customize export information', DocumentComparisonLibrary: 'Document comparison Library', weekly: 'Weekly', SyncLibrary: 'Sync to doc. library', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 700a6135c..c0a728c48 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -394,6 +394,7 @@ module.exports = { whole: '全部', DocumentLibrary: '文档库', GeneralExportInformation:'常规导出信息', + CustomizeExportInformation:'自定义导出信息', DocumentComparisonLibrary: '文档对比库', weekly: '周报', SyncLibrary: '同步至文档库', diff --git a/jero-web/src/components/tableCollection/index1.vue b/jero-web/src/components/tableCollection/index1.vue index 0dc4b2e8e..2faa372e5 100644 --- a/jero-web/src/components/tableCollection/index1.vue +++ b/jero-web/src/components/tableCollection/index1.vue @@ -96,7 +96,7 @@ - +
{{$t('configurationName')}}: @@ -290,12 +290,16 @@ this.$emit('handlePreservation') this.getTableList() }, + hideModal(){ + this.areaVisibleView = false + }, // 查看配置详细信息 onClickSee(val) { + console.log(val) let _this = this this.areaVisibleView = true axios({ - url: `/jero-boot/params/config/getById?id=${val.db_field_name}`, + url: `/jero-boot/report/detail/getConfig?id=${val.db_field_name}`, method: 'get', transformRequest: [function(data) { let ret = '' diff --git a/jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue b/jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue index 550f1e191..c413fbf9e 100644 --- a/jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue +++ b/jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue @@ -17,6 +17,7 @@
+ * {{$t('configure')}}
@@ -41,14 +42,23 @@
+ * {{$t('CustomTemplateName')}}
- - + + + + {{ mode.label }} + + + + + + +
@@ -87,6 +97,7 @@ export default { confirmLoading: false, description:false, dictOptions:[], + exportTemplatetOptions:[], visible: false, required:false, disabled:false, @@ -110,8 +121,8 @@ export default { description:[ { min:1, max: 200, message: this.$t('cantExeed')+'200'+this.$t('characters'), trigger: 'blur' }, ], - status: [ - { required: true, message: this.$t('PleaseSelect')+this.$t('status'), trigger: 'change' }, + exportTemplateId: [ + { required: true, message: this.$t('PleaseSelect')+this.$t('CustomTemplateName'), trigger: 'change' }, ], fileConnectId: [ { required: true, message: this.$t('PleaseSelect')+this.$t('attachmentTemplate'), trigger: 'change' }, @@ -160,9 +171,9 @@ export default { this.visible = true this.title = this.$t('CustomExport') this.formInline = {} - this.formInline.separator = ',' this.formInline = {...this.formInline} this.getConfigure() + this.getexportTemplateId() this.$nextTick(() => { this.$refs['ruleForm'].clearValidate() @@ -172,7 +183,7 @@ export default { let pram = { paramsManifestId: this.$route.query.id } - getAction('report/detail/getConfigLabelList', pram).then((res) => { + getAction('report/detail/getConfigLabelListCustom', pram).then((res) => { if (res.success) { console.log(res.result) this.dictOptions = res.result @@ -181,6 +192,16 @@ export default { } }) }, + getexportTemplateId(){ + getAction('report/detail/getTemplateLabelList', {}).then((res) => { + if (res.success) { + console.log(res.result) + this.exportTemplatetOptions = res.result + } else { + // this.$refs.uploadFile.perentHandleFunc() + } + }) + }, editModel(value) { this.visible = true this.title = '编辑' @@ -213,17 +234,17 @@ export default { let url = this.url.ConventionalExport let Action = getAction let query = JSON.parse(JSON.stringify(this.formInline)) - Object.keys(query).forEach(res => { - if (query[res] && query[res] instanceof Array) { - query[res] = query[res].join(',') - } - }) - if(this.contentListStart){ - query.certCategoryName = this.contentListStart - } + // Object.keys(query).forEach(res => { + // if (query[res] && query[res] instanceof Array) { + // query[res] = query[res].join(',') + // } + // }) + // if(this.contentListStart){ + // query.certCategoryName = this.contentListStart + // } query.paramsManifestId = this.$route.query.id this.confirmLoading = true - downloadFile('report/detail/exportNormal', this.$t('GeneralExportInformation')+'.zip', query) + downloadFile('report/detail/exportCustom', this.$t('CustomizeExportInformation')+'.zip', query) this.confirmLoading = false } }) diff --git a/jero-web/src/views/parameter/managementdetails/index.vue b/jero-web/src/views/parameter/managementdetails/index.vue index 6dc973175..3dc497d98 100644 --- a/jero-web/src/views/parameter/managementdetails/index.vue +++ b/jero-web/src/views/parameter/managementdetails/index.vue @@ -1,4 +1,5 @@ \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue index d51f228f7..29abc1c70 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue @@ -155,7 +155,7 @@ - + Date: Tue, 12 Jul 2022 17:29:05 +0800 Subject: [PATCH 07/14] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=B8=85=E5=8D=95-=E5=8E=86=E5=8F=B2=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/xml/ParamsCollectManifestHistoryEOMapper.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 6857bebfa..d59367314 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 @@ -48,7 +48,9 @@ AND params_manifest_id = #{paramsCollectManifestEO.paramsManifestId} - + + AND state = #{paramsCollectManifestEO.state} + From 4b6b1005ed955fd33e73498c4c3255b26b29de2c Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Tue, 12 Jul 2022 17:44:33 +0800 Subject: [PATCH 08/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=B2=E7=9F=A5?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/tableCollection/index.vue | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index ab50d9fd6..758291e89 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -294,8 +294,15 @@ onClickSee(val) { let _this = this this.areaVisibleView = true + let url = '' + if (this.$route.query.it === undefined) { + url = `/jero-boot/params/config/getById?id=${val.db_field_name}` + } else { + // 历史版本 + url = `/jero-boot/params/collectManifestHistory/getConfigById?id=${val.db_field_name}` + } axios({ - url: `/jero-boot/params/config/getById?id=${val.db_field_name}`, + url: url, method: 'get', transformRequest: [function(data) { let ret = '' @@ -312,8 +319,9 @@ .then((res) => { console.log(res) if (res.data.success) { - this.configDetail = res.data.result + this.configDetail = res.data.result || {} } else { + this.configDetail = {} _this.$message.warning(res.data.result) } }) From 71f659b5f92c1a36e5020bb04e3dfc44205316b9 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Tue, 12 Jul 2022 17:45:36 +0800 Subject: [PATCH 09/14] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=EF=BC=8C=E5=B1=95=E7=A4=BA=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=A4=84=E7=90=86=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LawsTechnologyEvaluationEOController.java | 2 + .../entity/LawsTechnologyEvaluationEO.java | 7 +++ .../ILawsTechnologyEvaluationEOService.java | 7 +++ ...LawsTechnologyEvaluationEOServiceImpl.java | 54 ++++++++++++++++++- 4 files changed, 68 insertions(+), 2 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 f62943826..ada4ac7cb 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 @@ -53,10 +53,12 @@ public class LawsTechnologyEvaluationEOController extends JeroController queryPageList(LawsTechnologyEvaluationEO lawsTechnologyEvaluationEO, @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(lawsTechnologyEvaluationEO, req.getParameterMap()); Page page = new Page(pageNo, pageSize); IPage pageList = lawsTechnologyEvaluationEOService.page(page, queryWrapper); + this.lawsTechnologyEvaluationEOService.disposeData(pageList.getRecords(),cut); return Result.OK(pageList); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationEO.java index bb3718991..37a7d210f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationEO.java @@ -6,6 +6,7 @@ import java.math.BigDecimal; import java.util.Date; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -82,16 +83,22 @@ public class LawsTechnologyEvaluationEO implements Serializable { @Excel(name = "技术领域", width = 15) @ApiModelProperty(value = "技术领域") private String technologyTerritory; + @TableField(exist = false) + private String technologyTerritoryName; /**评估方式*/ @Excel(name = "评估方式", width = 15) @ApiModelProperty(value = "评估方式") private String evaluationMethods; + @TableField(exist = false) + private String evaluationMethodsName; /**流程状态*/ @Excel(name = "流程状态", width = 15) @ApiModelProperty(value = "流程状态") private String flowStatus; + @TableField(exist = false) + private String flowStatusName; /**发起日期*/ @Excel(name = "发起日期", width = 15, format = "yyyy-MM-dd") 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 ba0402ba0..fd70dcc12 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 @@ -67,4 +67,11 @@ public interface ILawsTechnologyEvaluationEOService extends IService processCall(JSONObject jsonObject); + + /** + * 处理数据 + * @param records + * @param cut + */ + void disposeData(List records, String cut); } 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 ef74f3786..2dc019550 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 @@ -3,20 +3,26 @@ package com.jero.modules.lawsTechnologyEvaluation.service.impl; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.jero.common.api.vo.Result; +import com.jero.common.constant.enums.CutEnum; import com.jero.common.exception.JeroBootException; +import com.jero.modules.lawsOpinionGather.enums.GatherResultEnum; import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationEO; -import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationFlowDetailEO; 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.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; /** @@ -28,6 +34,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @Service public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl implements ILawsTechnologyEvaluationEOService { + @Autowired + private SysCategoryServiceImpl sysCategoryService; + /** * 保存 * @@ -122,4 +131,45 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl().success("调用成功！"); } + + @Override + public void disposeData(List datas, String cut) { + if(CollectionUtils.isNotEmpty(datas)){ + List categoryList = sysCategoryService.list(); + for (LawsTechnologyEvaluationEO data : datas) { + if(StringUtils.isNotEmpty(data.getEvaluationMethods())){ + List evaluationMethodsList = Arrays.asList(data.getEvaluationMethods().split(",")); + String name = getTreeName(cut, categoryList, evaluationMethodsList); + data.setEvaluationMethodsName(name); + } + if(StringUtils.isNotEmpty(data.getFlowStatus())){ + data.setFlowStatusName(GatherResultEnum.getTextByValue(data.getFlowStatus(),cut)); + } + if(StringUtils.isNotEmpty(data.getTechnologyTerritory())){ + List technologyTerritory = Arrays.asList(data.getTechnologyTerritory().split(",")); + String name = getTreeName(cut, categoryList, technologyTerritory); + data.setTechnologyTerritoryName(name); + } + } + } + } + + private String getTreeName(String cut, List categoryList, List technologyTerritoryList) { + StringBuilder sb = new StringBuilder(); + for (String technologyTerritory : technologyTerritoryList) { + List collect = categoryList.stream().filter(e -> technologyTerritory.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 technologyTerritoryName = ""; + if (StringUtils.isNotBlank(sb)) { + technologyTerritoryName = sb.substring(0, sb.length() - 1); + } + return technologyTerritoryName; + } } From ae1412cdd2cbfba752fa427be9198830e46c5423 Mon Sep 17 00:00:00 2001 From: liyawei Date: Tue, 12 Jul 2022 17:47:53 +0800 Subject: [PATCH 10/14] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=B8=85=E5=8D=95-=E5=8E=86=E5=8F=B2=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E6=B8=85=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/tableCollection/index.vue | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index 758291e89..1399e3518 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -509,12 +509,25 @@ getTableListReset() { let params = { paramsManifestId: this.$route.query.id, - userTypes: this.currentPersonRole + pageNo: this.pageNo, + pageSize: this.pageSize, + // userTypes: this.currentPersonRole } + let url this.loading = true this.$emit('listReset', '') // todo - getAction(this.url.tableList, params).then((res) => { + if (this.$route.query.it === undefined) { + // 页面跳转 + url = this.url.tableList + params.paramsManifestId = this.$route.query.id + params.userTypes = this.currentPersonRole + } else { + // 历史版本 + url = 'params/collectManifestHistory/list' + params.paramsManifestId = this.$route.query.it + } + getAction(url, params).then((res) => { if (res.success) { let tt = [] if (this.currentPersonRole !== 'dre') { From 371d784ae1d97f5da881b2b9ade659de745e2503 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Tue, 12 Jul 2022 18:04:34 +0800 Subject: [PATCH 11/14] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E5=BA=93=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=8A=80=E6=9C=AF=E9=A2=86?= =?UTF-8?q?=E5=9F=9Fid=E5=AD=97=E6=AE=B5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../document/service/impl/BussDocumentLibraryEOServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index 85a5e52d1..655b5e6f3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -5722,11 +5722,13 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl record1 = (Map) record; + String technology_territory = (String)record1.get("technology_territory"); for (Map.Entry entry : record1.entrySet()) { //下拉选处理数据字典 dictItem(sysDictItems, entry, cut, fieldList,null); treeDictItem(categoryList, entry, treeFieldList, cut,null); } + record1.put("technology_territory_id",technology_territory); } return infoPage; } From 9eb9fe4e4fd3f653c9d2f403bf5150ff8450ff20 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Tue, 12 Jul 2022 18:08:37 +0800 Subject: [PATCH 12/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=B2=E7=9F=A5?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../technologyAssessment/components/initiatingProcess.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue index 29abc1c70..c7156aeaf 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue @@ -348,7 +348,7 @@ standId: content[0].id, serialNumber: content[0].serial_number, title: content[0].title, - technologyTerritory: content[0].technology_territory + technologyTerritory: content[0].technology_territory_id }) } }, From d6519656c19a79e8a7f592b171111c7150687d64 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Tue, 12 Jul 2022 18:23:03 +0800 Subject: [PATCH 13/14] update --- .../modules/lawsOpinionGather/entity/LawsOpinionGatherEO.java | 2 +- .../service/impl/LawsOpinionGatherEOServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsOpinionGatherEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsOpinionGatherEO.java index 35461f2e7..5e5a18fcf 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsOpinionGatherEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsOpinionGatherEO.java @@ -77,7 +77,7 @@ public class LawsOpinionGatherEO implements Serializable { private String technologyTerritory; @TableField(exist = false) /**技术领域展示字段*/ - private String technologyTerritoryShow; + private String technologyTerritoryName; /**收集结果*/ @Excel(name = "收集结果", width = 15) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java index ef6aa374f..3107550fb 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java @@ -151,7 +151,7 @@ public class LawsOpinionGatherEOServiceImpl extends ServiceImpl opinionArchiveFileList = iOSSFileService.getFileInfosByConnectId(StringUtils.join(lawsOpinionGather.getOpinionArchiveId(), ",")); From 195a581f948193262ec865524a85bf177c673ba1 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Tue, 12 Jul 2022 18:53:33 +0800 Subject: [PATCH 14/14] update --- .../LawsOpinionAssessmentResultEOServiceImpl.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java index 23fc954b6..3679cf031 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java @@ -156,8 +156,8 @@ public class LawsOpinionAssessmentResultEOServiceImpl extends ServiceImpl params) { - Integer pageNo = (Integer) params.get("pageNo"); - Integer pageSize = (Integer) params.get("pageSize"); + Integer pageNo = Integer.parseInt(params.get("pageNo").toString()); + Integer pageSize = Integer.parseInt(params.get("pageSize").toString()); String exportAll = (String)params.get("exportAll"); String ids = (String)params.get("ids"); String cut = (String)params.get("cut"); @@ -191,6 +191,8 @@ public class LawsOpinionAssessmentResultEOServiceImpl extends ServiceImpl