From 16e6af6a1e2f2a0d42b0d08e08b54ee6642a080d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Wed, 18 Oct 2023 09:23:15 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E4=BB=B6=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85=E7=9A=84=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectStatusBoard/components/statistics.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jero-web/src/views/projectManagement/projectStatusBoard/components/statistics.vue b/jero-web/src/views/projectManagement/projectStatusBoard/components/statistics.vue index a3dc17b00..0a1fa65a6 100644 --- a/jero-web/src/views/projectManagement/projectStatusBoard/components/statistics.vue +++ b/jero-web/src/views/projectManagement/projectStatusBoard/components/statistics.vue @@ -775,7 +775,8 @@ }, getoptions() { - getAction('project/projectLibraryBase/getProjectDetailsStatisticsCollectManifestLabel', { id: this.projectQuery.projectId }).then((res) => { + getAction('project/projectLibraryBase/getProjectDetailsStatisticsCollectManifestLabel', + { id: this.projectInfo.parentId ,projectVersion:this.projectInfo.projectVersion}).then((res) => { if (res.success) { this.options = res.result this.queryParam.ctype = this.options[0].value From ebea60e23adbcd30ba44ac24bb5d013840fd87a7 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 18 Oct 2023 11:23:00 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95-?= =?UTF-8?q?=E5=85=B3=E8=81=94=E5=B9=B3=E5=8F=B0=E4=BB=B6=EF=BC=88=E5=A4=84?= =?UTF-8?q?=E7=90=86=E9=A1=B9=E7=9B=AE=E5=90=8D=E7=A7=B0=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/system/util/DictItemUtil.java | 43 +++++++++++++++++++ .../ProjectLawsInventoryEOServiceImpl.java | 7 ++- 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/DictItemUtil.java diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/DictItemUtil.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/DictItemUtil.java new file mode 100644 index 000000000..f8f599022 --- /dev/null +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/DictItemUtil.java @@ -0,0 +1,43 @@ +package com.jero.modules.system.util; + +import com.jero.common.constant.enums.CutEnum; +import com.jero.common.system.vo.DictModel; +import org.apache.commons.lang3.StringUtils; + +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + +/** + * @description + * @date 2023/10/18 10:59 + * @auth zhn + */ +public class DictItemUtil { + public static String getDictItemText(String cut, String value, List dictModelAll) { + if (StringUtils.isBlank(value)) { + return ""; + } + List dictModelList = new ArrayList<>(); + for (String s : value.split(",")) { + List dictModelListTemp = dictModelAll.stream() + .filter(e -> s.equals(e.getValue())).collect(Collectors.toList()); + dictModelList.addAll(dictModelListTemp); + } + String targetMarket = ""; + 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)) { + targetMarket = sb.substring(0, sb.length() - 1); + } + } + return targetMarket; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 1c1c5d16e..71b59f1d9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -129,6 +129,7 @@ import com.jero.modules.system.service.ISysDictService; import com.jero.modules.system.service.ISysUserService; import com.jero.modules.system.service.impl.SysCategoryServiceImpl; import com.jero.modules.system.service.impl.SysDictItemServiceImpl; +import com.jero.modules.system.util.DictItemUtil; import com.jero.modules.system.util.PDFUtils; import com.jero.modules.todoCenter.entity.ProcessInfoDetailEO; import com.jero.modules.todoCenter.entity.ProcessInfoEO; @@ -12391,6 +12392,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode()); if(!projectLawsInventoryEOList.isEmpty()){ List projectLibraryIdList = projectLawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getProjectLibraryId).distinct().collect(Collectors.toList()); LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); @@ -12402,7 +12404,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl collect = libraryBaseList.stream().filter(e -> inventoryEO.getProjectLibraryId().equals(e.getId())).collect(Collectors.toList()); if(!collect.isEmpty()){ - inventoryEO.setProjectName(collect.get(0).getProjectNameId()); + //目标市场 + String targetMarket = DictItemUtil.getDictItemText(cut,collect.get(0).getTargetMarket(),targetMarketList); + String projectName = collect.get(0).getPower()+collect.get(0).getProducer() + targetMarket; + inventoryEO.setProjectName(projectName); } } } From 56fee24a95c8791aea8c0f97d7d8f968450a7fb2 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 18 Oct 2023 13:42:14 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E5=BC=95=E7=94=A8=E5=B9=B3=E5=8F=B0=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ctCertificationInventoryEOServiceImpl.java | 22 +++++++++++++++---- .../ProjectLawsInventoryEOServiceImpl.java | 2 +- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index b51d8e4c3..eec94df0b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -16,6 +16,7 @@ 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.common.system.vo.DictModel; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.DateUtils; import com.jero.common.util.oss.CosBootUtil; @@ -69,6 +70,7 @@ import com.jero.modules.system.entity.SysCategory; import com.jero.modules.system.entity.SysDictItem; import com.jero.modules.system.entity.SysRole; import com.jero.modules.system.entity.SysUser; +import com.jero.modules.system.enums.DicCodeEnum; import com.jero.modules.system.enums.ProjectRoleEnum; import com.jero.modules.system.enums.SysCategoryValueTypeEnum; import com.jero.modules.system.mapper.SysCategoryMapper; @@ -78,8 +80,10 @@ import com.jero.modules.system.mapper.SysUserMapper; import com.jero.modules.system.service.IProjectUserDutyTerritoryService; import com.jero.modules.system.service.ISysCategoryService; import com.jero.modules.system.service.ISysDictItemService; +import com.jero.modules.system.service.ISysDictService; import com.jero.modules.system.service.ISysUserService; import com.jero.modules.system.service.impl.SysDictItemServiceImpl; +import com.jero.modules.system.util.DictItemUtil; import com.jero.modules.todoCenter.entity.ProcessInfoDetailEO; import com.jero.modules.todoCenter.entity.ProcessInfoEO; import com.jero.modules.todoCenter.service.IProcessInfoDetailEOService; @@ -203,6 +207,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl pageList = this.page(page, queryWrapper); //平台件数据处理 - platformDispose(projectCertificationInventoryEO, pageList.getRecords()); + platformDispose(cut,projectCertificationInventoryEO, pageList.getRecords()); @@ -1937,9 +1943,10 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl result) { + private void platformDispose(String cut,ProjectCertificationInventoryEO projectCertificationInventoryEO, List result) { List lawsInventoryPlatformEOList = new ArrayList<>(); List projectCertificationInventoryEOS = new ArrayList<>(); + List targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode()); if(!result.isEmpty()){ //认证清单ID @@ -1989,7 +1996,11 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl libraryBaseList = projectLibraryBaseList.stream() .filter(e -> certificationInventoryEOS.get(0).getProjectLibraryId().equals(e.getId())).collect(Collectors.toList()); if(ObjectUtils.isNotEmpty(libraryBaseList)){ - certificationInventoryEO.setConfigItem(libraryBaseList.get(0).getProjectNameId()); + String dictItemText = DictItemUtil.getDictItemText(cut, libraryBaseList.get(0).getTargetMarket(), targetMarketList); + String configItem = libraryBaseList.get(0).getPower()+"-"+libraryBaseList.get(0).getProducer()+"-"+dictItemText; + + certificationInventoryEO.setConfigItem(configItem); +// certificationInventoryEO.setConfigItem(libraryBaseList.get(0).getProjectNameId()); } if(!certificationInventoryEOS.isEmpty()){ @@ -7156,6 +7167,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode()); //认证清单数据 LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); @@ -7204,7 +7216,9 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl Date: Wed, 18 Oct 2023 14:30:34 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E5=BA=93=E5=85=B3?= =?UTF-8?q?=E8=81=94=E5=B9=B3=E5=8F=B0=E4=BB=B6=E5=90=8E-=E8=AE=BE?= =?UTF-8?q?=E8=AE=A1=E7=AC=A6=E5=90=88=E6=80=A7=E7=A1=AE=E8=AE=A4=E8=B4=A3?= =?UTF-8?q?=E4=BB=BB=E4=BA=BA=E5=9B=9E=E6=98=BE=E5=B9=B3=E5=8F=B0=E4=BB=B6?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/service/impl/ProjectLawsInventoryEOServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 67d3b0058..fcca7ee61 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -12353,7 +12353,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl Date: Wed, 18 Oct 2023 14:43:43 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E5=BA=93=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E8=AF=A6=E6=83=85-=E8=AE=A4=E8=AF=81=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E7=AE=A1=E7=90=86-=E8=AE=A4=E8=AF=81=E8=BF=9B?= =?UTF-8?q?=E5=BA=A6-=E7=82=B9=E5=87=BB=E6=9F=A5=E7=9C=8B=E9=A2=86?= =?UTF-8?q?=E5=9F=9F=EF=BC=88=E8=BF=87=E6=BB=A4=E6=8E=89=E4=B8=8D=E6=B6=89?= =?UTF-8?q?=E5=8F=8A=E7=9A=84=E6=95=B0=E6=8D=AE=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_third_record.sql | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index a02c7e021..aa51beb57 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -1301,3 +1301,11 @@ INSERT INTO `platform_task_planning`(`id`, `create_by`, `create_time`, `update_b INSERT INTO `platform_task_planning`(`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `node_name`, `node_time`, `project_id`, `flag`) VALUES ('e76e63a251aa6d64cac96125315805e1', NULL, NULL, NULL, NULL, NULL, 'CAMDS提交（CDF前）', NULL, NULL, 'down'); INSERT INTO `platform_task_planning`(`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `node_name`, `node_time`, `project_id`, `flag`) VALUES ('ee85c1b1964586e512ef0b2b401b16b5', NULL, NULL, NULL, NULL, NULL, '验证检查（ESO）', NULL, NULL, 'down'); +--平台件合规认证计划初始化数据->合规管理阀点相关字段初始化值修改 2023-10-18 +UPDATE `platform_task_planning` SET `create_by` = NULL, `create_time` = NULL, `update_by` = NULL, `update_time` = NULL, `sys_org_code` = NULL, `node_name` = '法规清单', `node_time` = NULL, `project_id` = NULL, `flag` = 'down' WHERE `id` = '85fa6eb0b58d93d4cc76b8fb1d5248ca'; +UPDATE `platform_task_planning` SET `create_by` = NULL, `create_time` = NULL, `update_by` = NULL, `update_time` = NULL, `sys_org_code` = NULL, `node_name` = '责任确认', `node_time` = NULL, `project_id` = NULL, `flag` = 'down' WHERE `id` = '97aaf07d156b6a4278e0ac3627566c8b'; +UPDATE `platform_task_planning` SET `create_by` = NULL, `create_time` = NULL, `update_by` = NULL, `update_time` = NULL, `sys_org_code` = NULL, `node_name` = '设计核查', `node_time` = NULL, `project_id` = NULL, `flag` = 'down' WHERE `id` = 'a533416284ab81c7f6ee95b5e9e06d38'; +UPDATE `platform_task_planning` SET `create_by` = NULL, `create_time` = NULL, `update_by` = NULL, `update_time` = NULL, `sys_org_code` = NULL, `node_name` = '强检报告', `node_time` = NULL, `project_id` = NULL, `flag` = 'down' WHERE `id` = 'cd7d6332a42dd3855f0117ffb188f5b1'; +UPDATE `platform_task_planning` SET `create_by` = NULL, `create_time` = NULL, `update_by` = NULL, `update_time` = NULL, `sys_org_code` = NULL, `node_name` = 'E-mark', `node_time` = NULL, `project_id` = NULL, `flag` = 'down' WHERE `id` = 'e611b793756bf9caeb4a1c09526ceb76'; +UPDATE `platform_task_planning` SET `create_by` = NULL, `create_time` = NULL, `update_by` = NULL, `update_time` = NULL, `sys_org_code` = NULL, `node_name` = 'CAMDS提交', `node_time` = NULL, `project_id` = NULL, `flag` = 'down' WHERE `id` = 'e76e63a251aa6d64cac96125315805e1'; +UPDATE `platform_task_planning` SET `create_by` = NULL, `create_time` = NULL, `update_by` = NULL, `update_time` = NULL, `sys_org_code` = NULL, `node_name` = '验证检查', `node_time` = NULL, `project_id` = NULL, `flag` = 'down' WHERE `id` = 'ee85c1b1964586e512ef0b2b401b16b5';