From 849f382be5bd1a05daef6328bec2befb61b29bba Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 29 Dec 2022 16:08:53 +0800 Subject: [PATCH 1/5] =?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--=E6=A0=87=E9=A2=98=E5=9B=9E?= =?UTF-8?q?=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParamsManifestEOController.java | 2 +- .../mapper/xml/ParamsManifestEOMapper.xml | 3 +- .../service/IParamsManifestEOService.java | 2 +- .../ParamsCollectManifestEOServiceImpl.java | 14 +++-- .../impl/ParamsManifestEOServiceImpl.java | 57 +++++++++++++++++-- 5 files changed, 65 insertions(+), 13 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java index 15f45239e..211aaeb69 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java @@ -83,7 +83,7 @@ public class ParamsManifestEOController extends JeroController stateMap = ManifestStateEnum.toMap(cut); rows.forEach(manifestEO -> { - manifestEO.setProjectName(paramsManifestEOService.getProjectById(manifestEO.getProjectId(), manifestEO.getProjectVersion()).getProjectName()); + manifestEO.setProjectName(paramsManifestEOService.getProjectById(manifestEO.getProjectId(), manifestEO.getProjectVersion(),paramsManifestEO.getCut()).getProjectName()); manifestEO.setState(stateMap.get(manifestEO.getState())); }); return Result.OK(cut, pageList); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml index 223479319..55d306b2a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml @@ -203,7 +203,8 @@ select tmp_tb.* from( select plb.id as project_id, - concat(pni.project_name,'-',pyni.year_name,'-',target_market) as project_name + target_market as targetMarket, + concat(pni.project_name,'-',pyni.year_name) as project_name from project_library_base plb left join project_name_info as pni on plb.project_name_id = pni.id left join project_year_name_info as pyni on plb.year_name_id = pyni.id diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java index bbfaf178d..613f739ae 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java @@ -89,7 +89,7 @@ public interface IParamsManifestEOService extends IService { ParamsManifestEO copy(ParamsManifestEO paramsManifestEO, String sourceManifestId); - ParamsManifestVO getProjectById(String projectId, String projectVersion); + ParamsManifestVO getProjectById(String projectId, String projectVersion,String cut); List> labelListForProjectDetails(String projectId); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index af66d076a..a2d5830ce 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -1836,7 +1836,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl manifestEOS = paramsManifestEOService.list(queryWrapper); for (ParamsManifestEO manifestEO : manifestEOS) { //项目名称 - ParamsManifestVO projectInfo = paramsManifestEOService.getProjectById(manifestEO.getProjectId(), manifestEO.getProjectVersion()); + ParamsManifestVO projectInfo = paramsManifestEOService.getProjectById(manifestEO.getProjectId(), manifestEO.getProjectVersion(),null); if (ObjectUtils.isNotEmpty(projectInfo)) { //url String urlParamsStr = parseUrlParams(manifestEO); @@ -5707,7 +5709,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl regionList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode()); + targetMarket = getTargetMarket(cut, regionList, targetMarket); + } + paramsManifestVO.setProjectName(paramsManifestVO.getProjectName()+"-"+ targetMarket + "-" + projectVersion); // 项目名称加上 相关项目版本 return paramsManifestVO; } + private String getTargetMarket(String cut, List regionList, String targetMarket) { + //适用地区 + List dictModelList = new ArrayList<>(); + String region = ""; + if(com.jero.modules.system.util.StringUtils.isNotBlank(targetMarket)){ + for (String s : targetMarket.split(",")) { + List dictModelListTemp = regionList.stream() + .filter(e -> s.equals(e.getValue())).collect(Collectors.toList()); + dictModelList.addAll(dictModelListTemp); + } + + if(dictModelList.size() != 0){ + StringBuilder sb = new StringBuilder(); + for (DictModel dictModel : dictModelList) { + if(CutEnum.CN.getValue().equals(cut)){ + sb.append(dictModel.getText()+","); + }else{ + sb.append(dictModel.getTextEn()+","); + } + } + if(com.jero.modules.system.util.StringUtils.isNotBlank(sb)){ + region = sb.substring(0,sb.length()-1); + } + } + } + return region; + } + @Override public List> labelListForProjectDetails(String projectId) { return paramsManifestEOMapper.labelListForProjectDetails(projectId); From 479d17b03a12c2921e43417fbefd5c089c339848 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Thu, 29 Dec 2022 16:09:31 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E5=8E=86=E5=8F=B2-=E5=A2=9E=E5=8A=A0=E5=8F=82=E8=80=83?= =?UTF-8?q?=E5=88=97=E9=85=8D=E7=BD=AEid=E5=AD=97=E6=AE=B5sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_2nd_period.sql | 3 +++ 1 file changed, 3 insertions(+) diff --git a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql index a5aee169b..b7f74da69 100644 --- a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql +++ b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql @@ -150,6 +150,9 @@ CREATE TABLE `laws_weilai`.`params_collect_manifest_log` ( -- 参数清单-增加参考列配置id 2022-12-29 未同步生产环境 ALTER TABLE `laws_weilai`.`params_manifest` ADD COLUMN `references_col_id` varchar(255) NULL COMMENT '参数项清单的参考列配置id(对应上报库参数配置表中的id)' AFTER `references_col_name`; +-- 参数清单历史-增加参考列配置id 2022-12-29 未同步生产环境 +ALTER TABLE `laws_weilai`.`params_manifest_history` + ADD COLUMN `references_col_id` varchar(255) NULL COMMENT '参数项清单的参考列配置id(对应上报库参数配置表中的id)' AFTER `references_col_name`; -- 上报库备注列字段长度修改 2022-12-29 未同步生产环境 ALTER TABLE `laws_weilai`.`params_report_detail` MODIFY COLUMN `remarks` varchar(4000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注' AFTER `title_default_value`; From 7cd46586a7b0d4c07a7a06e63eeb0c7d6f40e957 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Thu, 29 Dec 2022 17:02:25 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=B8=85=E5=8D=95-?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=A4=84=E7=90=86=E8=B4=A3=E4=BB=BB=E9=A2=86?= =?UTF-8?q?=E5=9F=9F=E7=A9=BA=E6=8C=87=E9=92=88=E5=A4=84=E7=90=86=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectTaskInventoryEOServiceImpl.java | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java index b722bc011..8b1839adf 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java @@ -1605,10 +1605,12 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl collect = dictItemList.stream() .filter(dict -> StringUtils.equals(dict.getItemValue(), projectTaskInventoryEO.getDutyTerritory())).collect(Collectors.toList()); - if(StringUtils.equals(cut,CutEnum.CN.getValue())){ - projectTaskInventoryEO.setDutyTerritoryName(collect.get(0).getItemText()); - }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ - projectTaskInventoryEO.setDutyTerritoryName(collect.get(0).getEnName()); + if(CollectionUtils.isNotEmpty(collect)){ + if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + projectTaskInventoryEO.setDutyTerritoryName(collect.get(0).getItemText()); + }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ + projectTaskInventoryEO.setDutyTerritoryName(collect.get(0).getEnName()); + } } }else{ projectTaskInventoryEO.setDutyTerritoryName(""); @@ -1617,10 +1619,12 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl collect = certificationProgress.stream() .filter(dict -> StringUtils.equals(dict.getItemValue(), projectTaskInventoryEO.getCertificationProgress())).collect(Collectors.toList()); - if(StringUtils.equals(cut,CutEnum.CN.getValue())){ - projectTaskInventoryEO.setCertificationProgressName(collect.get(0).getItemText()); - }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ - projectTaskInventoryEO.setCertificationProgressName(collect.get(0).getEnName()); + if(CollectionUtils.isNotEmpty(collect)){ + if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + projectTaskInventoryEO.setCertificationProgressName(collect.get(0).getItemText()); + }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ + projectTaskInventoryEO.setCertificationProgressName(collect.get(0).getEnName()); + } } }else{ projectTaskInventoryEO.setCertificationProgressName(""); From a9fc1cf3e1d6fa1cef9a0cc9d088002143c7b847 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 29 Dec 2022 17:04:04 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E8=A1=A8=E5=A4=B4=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/document/enums/LawsStateEnum.java | 2 +- .../impl/DummyInventoryInfoEOServiceImpl.java | 54 +++++++------------ 2 files changed, 20 insertions(+), 36 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/enums/LawsStateEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/enums/LawsStateEnum.java index 9d580bac4..c4bfd70ef 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/enums/LawsStateEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/enums/LawsStateEnum.java @@ -11,7 +11,7 @@ public enum LawsStateEnum { ABOLISH("废止","2"), THE_UPCOMING("即将实施","3"), DRAFT("草稿","4"), - BE_REPLACED("被代替","5"); + BE_REPLACED("被替代","5"); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java index 369928b37..25e9a0748 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java @@ -466,7 +466,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl attestationRankSort(String orderBy, String orderByField, List dummyInventoryInfoEOList, List list) { + private List attestationRankSort(String orderBy, String orderByField, List dummyInventoryInfoEOList) { + List list = new LinkedList<>(); if(ObjectUtils.isNotEmpty(orderByField) && "attestationRank".equals(orderByField)){ List wvta = dummyInventoryInfoEOList.stream() .filter(e -> e.getAttestationRankStr().startsWith(AttestationRankEnum.WVTA.getValue())).collect(Collectors.toList()); @@ -496,10 +497,13 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl e.getAttestationRankStr().startsWith(AttestationRankEnum.REGU.getValue())).collect(Collectors.toList()); List na = dummyInventoryInfoEOList.stream() .filter(e -> e.getAttestationRankStr().startsWith(AttestationRankEnum.NA.getValue())).collect(Collectors.toList()); + List valueNull = dummyInventoryInfoEOList.stream() + .filter(e -> StringUtils.isBlank(e.getAttestationRankStr())).collect(Collectors.toList()); if (OrderEnum.POSITIVE.getValue().equals(orderBy)) { //正序 + list.addAll(valueNull); list.addAll(wvta); list.addAll(vta); list.addAll(market); @@ -513,6 +517,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl categoryList = sysCategoryService.list(); for (DummyInventoryInfoEO record : dummyInventoryInfoEOList) { - String shi4Yong4Fan4Wei2 = record.getShi4Yong4Fan4Wei2(); - String state = record.getState(); - String attestationRank = record.getAttestationRank(); - String dutyTerritory = record.getDutyTerritory(); if(StringUtils.isBlank(record.getWvtaId())){ record.setWvtaId(""); } - - //适用范围 apply_scope - if(StringUtils.isNotBlank(shi4Yong4Fan4Wei2)){ - String applyScope = getItemText(dummyInventoryInfoEO.getCut(), sysDictItems, shi4Yong4Fan4Wei2, "apply_scope"); - record.setShi4Yong4Fan4Wei2Str(applyScope); - }else{ - record.setShi4Yong4Fan4Wei2Str(""); - } - //状态 state - if(StringUtils.isNotBlank(state)){ - String stateTemp = getItemText(dummyInventoryInfoEO.getCut(), sysDictItems, state, "state"); - record.setStateStr(stateTemp); - }else{ - record.setStateStr(""); - } - //认证级别 attestation_rank - if(StringUtils.isNotBlank(attestationRank)){ - String attestationRankTemp = getItemText(dummyInventoryInfoEO.getCut(), sysDictItems, attestationRank, "attestation_rank"); - record.setAttestationRankStr(attestationRankTemp); - }else{ - record.setAttestationRankStr(""); - } - //责任领域 duty_territory - if(StringUtils.isNotBlank(dutyTerritory)){ - String dutyTerritoryTemp = getItemText(dummyInventoryInfoEO.getCut(), sysDictItems, dutyTerritory, "duty_territory"); - record.setDutyTerritoryStr(dutyTerritoryTemp); - }else{ - record.setDutyTerritoryStr(""); - } //技术领域 if (categoryList.size() != 0 && StringUtils.isNotBlank(record.getTechnologyTerritory())) { List technologyTerritoryList = Arrays.asList(record.getTechnologyTerritory().split(",")); From e291acc6d296860bf242696ed903dd596a7c8116 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 29 Dec 2022 17:09:21 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E5=BA=93=E8=A1=A8?= =?UTF-8?q?=E5=A4=B4=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cert/report/controller/ParamsReportEOController.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java index 251f4c09e..7187296a0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java @@ -113,6 +113,8 @@ public class ParamsReportEOController extends JeroController