From e4e3508b54cd612e55ae0f0c887ea9aeadf65862 Mon Sep 17 00:00:00 2001 From: zer0Black Date: Mon, 4 Jul 2022 10:09:54 +0800 Subject: [PATCH 01/21] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E8=AE=B0?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/first_bug_fix_record.sql | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql b/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql index 8cd569344..7ced5c156 100644 --- a/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql +++ b/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql @@ -10,3 +10,11 @@ ADD COLUMN `prehomo_remark` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_ ADD COLUMN `design_remark` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '设计备注' AFTER `prehomo_remark`; -- 2022年7月2日部署到正式环境 + +-- 加大备注的长度 +ALTER TABLE `buss_document_library` +MODIFY COLUMN `description` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '描述' AFTER `replaced_standard`; + +UPDATE `laws_weilai`.`onl_cgform_field` SET `id`='e4fe526794af4477321227f69b764b0d', `cgform_head_id`='48308196e7b04761b533dc31bc899707', `db_field_name`='description', `db_field_en_name`='Description', `db_field_txt`='描述', `order_num`='9', `db_field_name_old`=NULL, `db_is_key`='0', `db_is_null`='1', `db_type`='string', `db_length`='1000', `db_point_length`='0', `db_default_val`='', `dict_field`='', `dict_table`='', `dict_text`='', `field_show_type`='8', `field_href`='', `field_length`='120', `field_valid_type`=NULL, `field_must_input`='0', `field_extend_json`='', `field_default_value`='', `is_query`='0', `is_show_form`='1', `is_show_list`='0', `is_read_only`='0', `query_mode`='single', `main_table`='', `main_field`='', `update_by`='admin', `update_time`='2022-06-06 16:05:28', `create_time`='2022-01-21 14:41:40', `create_by`='admin', `converter`='', `query_def_val`='', `query_dict_text`='', `query_dict_field`='', `query_dict_table`='', `query_show_type`='text', `query_config_flag`='0', `query_valid_type`=NULL, `query_must_input`=NULL, `sort_flag`='0', `show_area`='1499657602378825729', `is_show_laws_list`='0', `is_show_search`='0', `is_delete`='0', `is_model`='1', `dict_id`=NULL WHERE (`id`='e4fe526794af4477321227f69b764b0d'); + +-- 2022年7月4日部署到正式环境 \ No newline at end of file From d440219c454e7ef1724e9bb8554b76e6c3b0f483 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 4 Jul 2022 14:44:48 +0800 Subject: [PATCH 02/21] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95--?= =?UTF-8?q?=E5=B8=A6=E5=85=A5=E7=9B=B8=E5=85=B3=E4=BA=BA=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectLawsInventoryEOServiceImpl.java | 300 +++++++++++------- 1 file changed, 188 insertions(+), 112 deletions(-) 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 dca30e633..54f454305 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 @@ -1694,31 +1694,103 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl projectRelatedPersonnelList = projectRelatedPersonnels.stream() + .filter(e -> dutyTerritory.contains(e.getDutyTerritory())).collect(Collectors.toList()); + + List lawEngineerList = projectRelatedPersonnelList.stream().map(ProjectRelatedPersonnel::getLawEngineer).distinct().collect(Collectors.toList()).stream().filter(e->StringUtils.isNotBlank(e)).collect(Collectors.toList()); + List engineeringInterfacePersonList = projectRelatedPersonnelList.stream().map(ProjectRelatedPersonnel::getEngineeringInterfacePerson).distinct().collect(Collectors.toList()).stream().filter(e->StringUtils.isNotBlank(e)).collect(Collectors.toList()); + List certificationEngineerList = projectRelatedPersonnelList.stream().map(ProjectRelatedPersonnel::getCertificationEngineer).distinct().collect(Collectors.toList()).stream().filter(e->StringUtils.isNotBlank(e)).collect(Collectors.toList()); + List lawEngineerListTemp = new ArrayList<>(); + List engineeringInterfacePersonListTemp = new ArrayList<>(); + List certificationEngineerListTemp = new ArrayList<>(); + + if(lawEngineerList.size() != 0){ + for (String s : lawEngineerList) { + lawEngineerListTemp.addAll(Arrays.asList(s.split(","))); + } + lawEngineerListTemp = lawEngineerListTemp.stream().distinct().collect(Collectors.toList()); + } + if(engineeringInterfacePersonList.size() != 0){ + for (String s : engineeringInterfacePersonList) { + engineeringInterfacePersonListTemp.addAll(Arrays.asList(s.split(","))); + } + engineeringInterfacePersonListTemp = engineeringInterfacePersonListTemp.stream().distinct().collect(Collectors.toList()); + } + if(certificationEngineerList.size() != 0){ + for (String s : certificationEngineerList) { + certificationEngineerListTemp.addAll(Arrays.asList(s.split(","))); + } + certificationEngineerListTemp = certificationEngineerListTemp.stream().distinct().collect(Collectors.toList()); + } + + //法规工程师 + if (StringUtils.isEmpty(projectLawsInventoryEO.getRegulationOwnerId()) && lawEngineerListTemp.size() == 1) { + List finalLawEngineerList = lawEngineerListTemp; + List collect = projectRelatedPersonnels.stream() + .filter(e -> finalLawEngineerList.contains(e.getLawEngineer())).collect(Collectors.toList()); + if(collect.size() != 0){ + String userId = ToGetAUserId(ProjectRoleEnum.REGULATI_ENGINEER.getValue(), collect.get(0),studioEngineer); if(StringUtils.isNotEmpty(userId)){ projectLawsInventoryEO.setRegulationOwnerId(userId); } } + } - //认证工程师 - if (StringUtils.isEmpty(projectLawsInventoryEO.getHomologationEngineerId())) { - String userId = ToGetAUserId(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue(), projectRelatedPersonnel,studioEngineer); + //认证工程师 + if (StringUtils.isEmpty(projectLawsInventoryEO.getHomologationEngineerId()) && certificationEngineerListTemp.size() == 1) { + List finalCertificationEngineerList = certificationEngineerListTemp; + List collect = projectRelatedPersonnels.stream() + .filter(e -> finalCertificationEngineerList.contains(e.getCertificationEngineer())).collect(Collectors.toList()); + if(collect.size() != 0){ + String userId = ToGetAUserId(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue(), collect.get(0),studioEngineer); if(StringUtils.isNotEmpty(userId)){ projectLawsInventoryEO.setHomologationEngineerId(userId); } } + } - //项目接口人 - if (StringUtils.isEmpty(projectLawsInventoryEO.getEngineeringInterfacePerson())) { - String userId = ToGetAUserId(ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue(), projectRelatedPersonnel,studioEngineer); + //项目接口人 + if (StringUtils.isEmpty(projectLawsInventoryEO.getEngineeringInterfacePerson()) && engineeringInterfacePersonListTemp.size() == 1) { + List finalEngineeringInterfacePersonList = engineeringInterfacePersonListTemp; + List collect = projectRelatedPersonnels.stream() + .filter(e -> finalEngineeringInterfacePersonList.contains(e.getEngineeringInterfacePerson())).collect(Collectors.toList()); + if(collect.size() != 0){ + String userId = ToGetAUserId(ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue(), collect.get(0),studioEngineer); if(StringUtils.isNotEmpty(userId)){ projectLawsInventoryEO.setEngineeringInterfacePerson(userId); } } + } + } + + for (ProjectRelatedPersonnel projectRelatedPersonnel : projectRelatedPersonnels) { + if(StringUtils.equals(projectRelatedPersonnel.getDutyTerritory(),projectLawsInventoryEO.getDutyTerritory())){ +// //法规工程师 +// if (StringUtils.isEmpty(projectLawsInventoryEO.getRegulationOwnerId())) { +// String userId = ToGetAUserId(ProjectRoleEnum.REGULATI_ENGINEER.getValue(), projectRelatedPersonnel,studioEngineer); +// if(StringUtils.isNotEmpty(userId)){ +// projectLawsInventoryEO.setRegulationOwnerId(userId); +// } +// } +// +// //认证工程师 +// if (StringUtils.isEmpty(projectLawsInventoryEO.getHomologationEngineerId())) { +// String userId = ToGetAUserId(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue(), projectRelatedPersonnel,studioEngineer); +// if(StringUtils.isNotEmpty(userId)){ +// projectLawsInventoryEO.setHomologationEngineerId(userId); +// } +// } +// +// //项目接口人 +// if (StringUtils.isEmpty(projectLawsInventoryEO.getEngineeringInterfacePerson())) { +// String userId = ToGetAUserId(ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue(), projectRelatedPersonnel,studioEngineer); +// if(StringUtils.isNotEmpty(userId)){ +// projectLawsInventoryEO.setEngineeringInterfacePerson(userId); +// } +// } //设计符合性确认 //发起人角色 @@ -2171,121 +2243,125 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl id.equals(e.getId())).collect(Collectors.toList()).get(0); - ProjectLawsInventoryEO infoCopy = infoListCopy.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList()).get(0); - StringBuilder contentLogBuilder = new StringBuilder(); - StringBuilder enContentLogBuilder = new StringBuilder(); - contentLogBuilder.append(info.getSerialNumber() + ":"); - enContentLogBuilder.append(infoCopy.getSerialNumber() + ":"); - ProjectLawsInventoryEO projectLawsInventoryEOTemp = new ProjectLawsInventoryEO(); - projectLawsInventoryEOTemp.setId(id); - //实施类别 implementType - if(StringUtils.isNotBlank(projectLawsInventoryEO.getImplementType())){ - if (!info.getImplementType().equals(inputInfoEO.getImplementType()) && !inputInfoEO.getImplementType().equals("空")){ - setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.IMPLEMENT_TYPE.getName(), info.getImplementType(), inputInfoEO.getImplementType()); - setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.IMPLEMENT_TYPE.getEnName(), infoCopy.getImplementType(), inputInfoEO.getImplementType()); - } - } - //认证类型 attestationType - if(StringUtils.isNotBlank(projectLawsInventoryEO.getAttestationType())){ - if (!info.getAttestationType().equals(inputInfoEO.getAttestationType()) && !inputInfoEO.getAttestationType().equals("空")){ - setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.ATTESTATION_TYPE.getName(), info.getAttestationType(), inputInfoEO.getAttestationType()); - setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.ATTESTATION_TYPE.getEnName(), infoCopy.getAttestationType(), inputInfoEO.getAttestationType()); - } - } - //认证级别 attestationRank - if(StringUtils.isNotBlank(projectLawsInventoryEO.getAttestationRank())){ - if (!info.getAttestationRank().equals(inputInfoEO.getAttestationRank()) && !inputInfoEO.getAttestationRank().equals("空")){ - setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.ATTESTATION_RANK.getName(), info.getAttestationRank(), inputInfoEO.getAttestationRank()); - setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.ATTESTATION_RANK.getEnName(), infoCopy.getAttestationRank(), inputInfoEO.getAttestationRank()); - } - } - //责任领域 dutyTerritory - if(StringUtils.isNotBlank(projectLawsInventoryEO.getDutyTerritory())){ - if (!info.getDutyTerritory().equals(inputInfoEO.getDutyTerritory())){ - setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.DUTY_TERRITORY.getName(), info.getDutyTerritory(), inputInfoEO.getDutyTerritory()); - setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.DUTY_TERRITORY.getEnName(), infoCopy.getDutyTerritory(), inputInfoEO.getDutyTerritory()); - } - } - //在产车实施日期implementTime - if(ObjectUtils.isNotEmpty(projectLawsInventoryEO.getImplementTime())){ - if (info.getImplementTime() == null){ - setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.IMPLEMENT_TIME.getName(),"空",inputInfoEO.getImplementTimeString()); - setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.IMPLEMENT_TIME.getEnName(),"null",inputInfoEO.getImplementTimeString()); - }else { - if (!info.getImplementTimeString().equals(inputInfoEO.getImplementTimeString())) { - setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.IMPLEMENT_TIME.getName(), info.getImplementTimeString(), inputInfoEO.getImplementTimeString()); - setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.IMPLEMENT_TIME.getEnName(), infoCopy.getImplementTimeString(), inputInfoEO.getImplementTimeString()); + List collect = infoList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList()); + if(collect.size() != 0){ + ProjectLawsInventoryEO info = collect.get(0); + ProjectLawsInventoryEO infoCopy = infoListCopy.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList()).get(0); + StringBuilder contentLogBuilder = new StringBuilder(); + StringBuilder enContentLogBuilder = new StringBuilder(); + contentLogBuilder.append(info.getSerialNumber() + ":"); + enContentLogBuilder.append(infoCopy.getSerialNumber() + ":"); + ProjectLawsInventoryEO projectLawsInventoryEOTemp = new ProjectLawsInventoryEO(); + projectLawsInventoryEOTemp.setId(id); + //实施类别 implementType + if(StringUtils.isNotBlank(projectLawsInventoryEO.getImplementType())){ + if (!info.getImplementType().equals(inputInfoEO.getImplementType()) && !inputInfoEO.getImplementType().equals("空")){ + setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.IMPLEMENT_TYPE.getName(), info.getImplementType(), inputInfoEO.getImplementType()); + setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.IMPLEMENT_TYPE.getEnName(), infoCopy.getImplementType(), inputInfoEO.getImplementType()); } } - } - //新车型实施日期xin1Che1Xing2Shi2Shi1Ri4Qi1 - if(ObjectUtils.isNotEmpty(projectLawsInventoryEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1())){ - if (info.getXin1Che1Xing2Shi2Shi1Ri4Qi1() == null){ - setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getName(),"空",inputInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1String()); - setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getEnName(),"null",inputInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1String()); - }else { - if (!info.getXin1Che1Xing2Shi2Shi1Ri4Qi1String().equals(inputInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1String())) { - setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getName(), info.getXin1Che1Xing2Shi2Shi1Ri4Qi1String(), inputInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1String()); - setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getEnName(), infoCopy.getXin1Che1Xing2Shi2Shi1Ri4Qi1String(), inputInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1String()); + //认证类型 attestationType + if(StringUtils.isNotBlank(projectLawsInventoryEO.getAttestationType())){ + if (!info.getAttestationType().equals(inputInfoEO.getAttestationType()) && !inputInfoEO.getAttestationType().equals("空")){ + setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.ATTESTATION_TYPE.getName(), info.getAttestationType(), inputInfoEO.getAttestationType()); + setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.ATTESTATION_TYPE.getEnName(), infoCopy.getAttestationType(), inputInfoEO.getAttestationType()); } } - } - //适用地区region - if(ObjectUtils.isNotEmpty(projectLawsInventoryEO.getRegion())){ - if (!info.getRegion().equals(inputInfoEO.getRegion())) { - setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.REGION.getName(),info.getRegion(),inputInfoEO.getRegion()); - setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.REGION.getEnName(), infoCopy.getRegion(),inputInfoEO.getRegion()); + //认证级别 attestationRank + if(StringUtils.isNotBlank(projectLawsInventoryEO.getAttestationRank())){ + if (!info.getAttestationRank().equals(inputInfoEO.getAttestationRank()) && !inputInfoEO.getAttestationRank().equals("空")){ + setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.ATTESTATION_RANK.getName(), info.getAttestationRank(), inputInfoEO.getAttestationRank()); + setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.ATTESTATION_RANK.getEnName(), infoCopy.getAttestationRank(), inputInfoEO.getAttestationRank()); + } + } + //责任领域 dutyTerritory + if(StringUtils.isNotBlank(projectLawsInventoryEO.getDutyTerritory())){ + if (!info.getDutyTerritory().equals(inputInfoEO.getDutyTerritory())){ + setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.DUTY_TERRITORY.getName(), info.getDutyTerritory(), inputInfoEO.getDutyTerritory()); + setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.DUTY_TERRITORY.getEnName(), infoCopy.getDutyTerritory(), inputInfoEO.getDutyTerritory()); + } + } + //在产车实施日期implementTime + if(ObjectUtils.isNotEmpty(projectLawsInventoryEO.getImplementTime())){ + if (info.getImplementTime() == null){ + setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.IMPLEMENT_TIME.getName(),"空",inputInfoEO.getImplementTimeString()); + setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.IMPLEMENT_TIME.getEnName(),"null",inputInfoEO.getImplementTimeString()); + }else { + if (!info.getImplementTimeString().equals(inputInfoEO.getImplementTimeString())) { + setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.IMPLEMENT_TIME.getName(), info.getImplementTimeString(), inputInfoEO.getImplementTimeString()); + setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.IMPLEMENT_TIME.getEnName(), infoCopy.getImplementTimeString(), inputInfoEO.getImplementTimeString()); + } + } + } + //新车型实施日期xin1Che1Xing2Shi2Shi1Ri4Qi1 + if(ObjectUtils.isNotEmpty(projectLawsInventoryEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1())){ + if (info.getXin1Che1Xing2Shi2Shi1Ri4Qi1() == null){ + setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getName(),"空",inputInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1String()); + setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getEnName(),"null",inputInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1String()); + }else { + if (!info.getXin1Che1Xing2Shi2Shi1Ri4Qi1String().equals(inputInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1String())) { + setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getName(), info.getXin1Che1Xing2Shi2Shi1Ri4Qi1String(), inputInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1String()); + setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getEnName(), infoCopy.getXin1Che1Xing2Shi2Shi1Ri4Qi1String(), inputInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1String()); + } + } + } + //适用地区region + if(ObjectUtils.isNotEmpty(projectLawsInventoryEO.getRegion())){ + if (!info.getRegion().equals(inputInfoEO.getRegion())) { + setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.REGION.getName(),info.getRegion(),inputInfoEO.getRegion()); + setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.REGION.getEnName(), infoCopy.getRegion(),inputInfoEO.getRegion()); - } - } - //设计符合性确认截止时间 - if(ObjectUtils.isNotEmpty(projectLawsInventoryEO.getDesignDueDate())){ - if (info.getDesignDueDate() == null){ - setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getName(),"空",inputInfoEO.getDesignDueDateString()); - setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getEnName(),"null",inputInfoEO.getDesignDueDateString()); - }else { - if (!info.getDesignDueDateString().equals(inputInfoEO.getDesignDueDateString())) { - setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getName(), info.getDesignDueDateString(), inputInfoEO.getDesignDueDateString()); - setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getEnName(), infoCopy.getDesignDueDateString(), inputInfoEO.getDesignDueDateString()); } } - } - //preHomo确认截止时间 - if(ObjectUtils.isNotEmpty(projectLawsInventoryEO.getPrehomoDueDate())){ - if (info.getVerifyDueDate() == null){ - setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.PREHOMO_DUE_DATE.getName(),"空",inputInfoEO.getPrehomoDueDateString()); - setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.PREHOMO_DUE_DATE.getEnName(),"null",inputInfoEO.getPrehomoDueDateString()); - }else { - if (!info.getPrehomoDueDateString().equals(inputInfoEO.getPrehomoDueDateString())) { - setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.PREHOMO_DUE_DATE.getName(), info.getPrehomoDueDateString(), inputInfoEO.getPrehomoDueDateString()); - setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.PREHOMO_DUE_DATE.getEnName(), infoCopy.getPrehomoDueDateString(), inputInfoEO.getPrehomoDueDateString()); + //设计符合性确认截止时间 + if(ObjectUtils.isNotEmpty(projectLawsInventoryEO.getDesignDueDate())){ + if (info.getDesignDueDate() == null){ + setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getName(),"空",inputInfoEO.getDesignDueDateString()); + setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getEnName(),"null",inputInfoEO.getDesignDueDateString()); + }else { + if (!info.getDesignDueDateString().equals(inputInfoEO.getDesignDueDateString())) { + setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getName(), info.getDesignDueDateString(), inputInfoEO.getDesignDueDateString()); + setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getEnName(), infoCopy.getDesignDueDateString(), inputInfoEO.getDesignDueDateString()); + } } } - } - //验证符合性确认截止时间 - if(ObjectUtils.isNotEmpty(projectLawsInventoryEO.getVerifyDueDate())){ - if (info.getVerifyDueDate() == null){ - setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.VERIFY_DUE_DATE.getName(),"空",inputInfoEO.getVerifyDueDateString()); - setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.VERIFY_DUE_DATE.getEnName(),"null",inputInfoEO.getVerifyDueDateString()); - }else { - if (!info.getVerifyDueDateString().equals(inputInfoEO.getVerifyDueDateString())) { - setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.VERIFY_DUE_DATE.getName(), info.getVerifyDueDateString(), inputInfoEO.getVerifyDueDateString()); - setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.VERIFY_DUE_DATE.getEnName(), infoCopy.getVerifyDueDateString(), inputInfoEO.getVerifyDueDateString()); + //preHomo确认截止时间 + if(ObjectUtils.isNotEmpty(projectLawsInventoryEO.getPrehomoDueDate())){ + if (info.getVerifyDueDate() == null){ + setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.PREHOMO_DUE_DATE.getName(),"空",inputInfoEO.getPrehomoDueDateString()); + setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.PREHOMO_DUE_DATE.getEnName(),"null",inputInfoEO.getPrehomoDueDateString()); + }else { + if (!info.getPrehomoDueDateString().equals(inputInfoEO.getPrehomoDueDateString())) { + setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.PREHOMO_DUE_DATE.getName(), info.getPrehomoDueDateString(), inputInfoEO.getPrehomoDueDateString()); + setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.PREHOMO_DUE_DATE.getEnName(), infoCopy.getPrehomoDueDateString(), inputInfoEO.getPrehomoDueDateString()); + } } } - } - //处理具体变动消息为空的contentLog - String contentInfoIndexStart = contentLogBuilder.substring(0,contentLogBuilder.lastIndexOf(":")); - String contentInfo= contentLogBuilder.substring(contentInfoIndexStart.length()+1,contentLogBuilder.length()); + //验证符合性确认截止时间 + if(ObjectUtils.isNotEmpty(projectLawsInventoryEO.getVerifyDueDate())){ + if (info.getVerifyDueDate() == null){ + setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.VERIFY_DUE_DATE.getName(),"空",inputInfoEO.getVerifyDueDateString()); + setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.VERIFY_DUE_DATE.getEnName(),"null",inputInfoEO.getVerifyDueDateString()); + }else { + if (!info.getVerifyDueDateString().equals(inputInfoEO.getVerifyDueDateString())) { + setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.VERIFY_DUE_DATE.getName(), info.getVerifyDueDateString(), inputInfoEO.getVerifyDueDateString()); + setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.VERIFY_DUE_DATE.getEnName(), infoCopy.getVerifyDueDateString(), inputInfoEO.getVerifyDueDateString()); + } + } + } + //处理具体变动消息为空的contentLog + String contentInfoIndexStart = contentLogBuilder.substring(0,contentLogBuilder.lastIndexOf(":")); + String contentInfo= contentLogBuilder.substring(contentInfoIndexStart.length()+1,contentLogBuilder.length()); - String enContentInfoIndexStart = enContentLogBuilder.substring(0,enContentLogBuilder.lastIndexOf(":")); - String enContentInfo= enContentLogBuilder.substring(enContentInfoIndexStart.length()+1,enContentLogBuilder.length()); + String enContentInfoIndexStart = enContentLogBuilder.substring(0,enContentLogBuilder.lastIndexOf(":")); + String enContentInfo= enContentLogBuilder.substring(enContentInfoIndexStart.length()+1,enContentLogBuilder.length()); - if(StringUtils.isNotBlank(contentInfo) && StringUtils.isNotBlank(enContentInfo)){ - contentLog += contentLogBuilder; - enContentLog += enContentLogBuilder ; + if(StringUtils.isNotBlank(contentInfo) && StringUtils.isNotBlank(enContentInfo)){ + contentLog += contentLogBuilder; + enContentLog += enContentLogBuilder ; + } } + } String contentIndexStart = contentLog.substring(0,contentLog.indexOf("“")); String content= contentLog.substring(contentIndexStart.length()+1,contentLog.length()); From 031536a17d81a1a98d72e77f0baa347b95186648 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 4 Jul 2022 15:01:00 +0800 Subject: [PATCH 03/21] =?UTF-8?q?=E9=A3=9E=E4=B9=A6=E8=B7=B3=E8=BD=AC?= =?UTF-8?q?=E9=93=BE=E6=8E=A5=E6=94=B9=E4=B8=BAView?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/modules/feishu/service/impl/FeishuServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java index bca8cb8c2..f5aa0fc96 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java @@ -85,7 +85,7 @@ public class FeishuServiceImpl implements IFeishuService { // 第二行 JSONObject contentTwo = new JSONObject(); contentTwo.put("tag", "a"); - contentTwo.put("text", "跳转链接"); + contentTwo.put("text", "View"); contentTwo.put("href", backUrl); List contentList = new ArrayList<>(); contentList.add(contentOne); From 2a4f848d7e95b811696372ed8d10076f54f12c6f Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Mon, 4 Jul 2022 15:06:15 +0800 Subject: [PATCH 04/21] =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E3=80=81prehomo?= =?UTF-8?q?=E3=80=81=E9=AA=8C=E8=AF=81=E7=AC=A6=E5=90=88=E6=80=A7=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=EF=BC=8C=E5=8F=91=E8=B5=B7=E4=BA=BA=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E9=80=80=E5=9B=9E=EF=BC=8C=E7=BB=99=E8=B4=A3=E4=BB=BB=E4=BA=BA?= =?UTF-8?q?=E5=8F=91=E6=B6=88=E6=81=AF=EF=BC=88=E6=A8=A1=E6=9D=BF=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E6=8F=90=E4=BE=9B=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/project/enums/MsgTypeEnum.java | 4 ++ .../ProjectTaskInventoryEOServiceImpl.java | 44 ++++++++++++++++--- 2 files changed, 43 insertions(+), 5 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/MsgTypeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/MsgTypeEnum.java index d602fd513..7adee9350 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/MsgTypeEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/MsgTypeEnum.java @@ -15,6 +15,10 @@ public enum MsgTypeEnum { PREHOMO_REMIND_MSG("prehomo提醒办理","prehomoRemindMsg"), VERIFY_ISSUE_DRE_MSG("验证符合性确认分配dre消息","verifyIssueDreMsg"), VERIFY_REMIND_MSG("验证符合性确认提醒办理","verifyRemindMsg"), + + DESIGN_RETURN_MSG("设计符合性发起人退回","designReturnMsg"), + PREHOMO_RETURN_MSG("prehomo发起人退回","prehomoReturnMsg"), + VERIFY_RETURN_MSG("验证符合性发起人退回","verifyReturnMsg"), ; String name; 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 54a89a29c..8165dbfad 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 @@ -278,6 +278,8 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl().success("调用成功！"); @@ -644,17 +646,49 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl userIdList = new ArrayList<>(); String dreUserIds = jsonObject.getString("dreUserIds"); //dre用户id - userIdList.addAll(Arrays.asList(dreUserIds.split(","))); + if(StringUtils.isNotEmpty(dreUserIds)){ + userIdList.addAll(Arrays.asList(dreUserIds.split(","))); + } + FeishuMsgVo feishuMsgVo = new FeishuMsgVo(); if (StringUtils.equals(msgType, MsgTypeEnum.DESIGN_ISSUE_DRE_MSG.getValue())) { msgContentEN = sysUser.getUsername() + "has assigned the design compliance confirmation process of " + serialNumber + " in " + projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket() + " to you. Please check and handle it in time."; - } - FeishuMsgVo feishuMsgVo = new FeishuMsgVo(); - feishuMsgVo.setContent("Hello! " + sysUser.getUsername() + " has assigned the task to you. Please check and handle it in time."); - feishuMsgVo.setTaskType("Design Compliance Confirmation"); + feishuMsgVo.setContent("Hello! " + sysUser.getUsername() + " has assigned the task to you. Please check and handle it in time."); + feishuMsgVo.setTaskType("Design Compliance Confirmation"); + }else if(StringUtils.equals(msgType, MsgTypeEnum.DESIGN_RETURN_MSG.getValue())){ + String designDutyId = jsonObject.getString("designDutyId");//设计符合性流程责任人id + userIdList.add(designDutyId); + + msgContentEN = sysUser.getUsername() + " 将设计符合性流程退回，编号： " + serialNumber + " in " + + projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket() + + " to you. Please check and handle it in time."; + + feishuMsgVo.setContent("Hello! " + sysUser.getUsername() + " has assigned the task to you. Please check and handle it in time."); + feishuMsgVo.setTaskType("XXX"); + }else if(StringUtils.equals(msgType, MsgTypeEnum.PREHOMO_RETURN_MSG.getValue())){ + String prehomoDutyId = jsonObject.getString("prehomoDutyId");//prehomo流程责任人id + userIdList.add(prehomoDutyId); + + msgContentEN = sysUser.getUsername() + " 将prehomo流程退回，编号： " + serialNumber + " in " + + projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket() + + " to you. Please check and handle it in time."; + + feishuMsgVo.setContent("Hello! " + sysUser.getUsername() + " has assigned the task to you. Please check and handle it in time."); + feishuMsgVo.setTaskType("XXX"); + }else if(StringUtils.equals(msgType, MsgTypeEnum.VERIFY_RETURN_MSG.getValue())){ + String verifyDutyId = jsonObject.getString("verifyDutyId");//验证符合性流程责任人id + userIdList.add(verifyDutyId); + + msgContentEN = sysUser.getUsername() + " 将验证符合性流程退回，编号： " + serialNumber + " in " + + projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket() + + " to you. Please check and handle it in time."; + + feishuMsgVo.setContent("Hello! " + sysUser.getUsername() + " has assigned the task to you. Please check and handle it in time."); + feishuMsgVo.setTaskType("XXX"); + } feishuMsgVo.setRegulationNo(serialNumber); feishuMsgVo.setProject(projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()); From 8c17bd9b94e8c737ba4a7dafd699dde71387f7f7 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 4 Jul 2022 15:20:33 +0800 Subject: [PATCH 05/21] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E5=8F=91=E5=B8=83--=E5=8F=91=E6=B6=88=E6=81=AF=E5=88=A4?= =?UTF-8?q?=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DummyInventoryBaseEOServiceImpl.java | 390 ++++++++++-------- 1 file changed, 209 insertions(+), 181 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java index 83ed551b2..cbccf59d0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java @@ -1213,324 +1213,352 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl list = Arrays.asList(infoDiff.get("title").split(",")); - String infoDiffOld = list.get(0); - String infoDiffNew = list.get(1); - if (StringUtils.isBlank(contentLog)) { - contentInfo += "'"+DummyInventoryBaseFieldEnum.TITLE.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "
"; - - }else{ - contentLog += "'"+DummyInventoryBaseFieldEnum.TITLE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + if(list.size() > 1){ + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1); + if (StringUtils.isBlank(contentLog)) { + contentInfo += "'"+DummyInventoryBaseFieldEnum.TITLE.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "
"; + }else{ + contentLog += "'"+DummyInventoryBaseFieldEnum.TITLE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + } } } //子标题 if (StringUtils.isNotBlank(infoDiff.get("subtitle"))) { List list = Arrays.asList(infoDiff.get("subtitle").split(",")); - String infoDiffOld = list.get(0); - String infoDiffNew = list.get(1); - if (StringUtils.isBlank(contentLog)) { - contentInfo += "'"+DummyInventoryBaseFieldEnum.SUBTITLE.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "
"; - - }else{ - contentLog += "'"+DummyInventoryBaseFieldEnum.SUBTITLE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + if(list.size() > 1){ + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1); + if (StringUtils.isBlank(contentLog)) { + contentInfo += "'"+DummyInventoryBaseFieldEnum.SUBTITLE.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "
"; + }else{ + contentLog += "'"+DummyInventoryBaseFieldEnum.SUBTITLE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + } } } //WVTA ID if (StringUtils.isNotBlank(infoDiff.get("wvtaId"))) { List list = Arrays.asList(infoDiff.get("wvtaId").split(",")); - String infoDiffOld = list.get(0); - String infoDiffNew = list.get(1); - if (StringUtils.isBlank(contentLog)) { - contentInfo += "'"+DummyInventoryBaseFieldEnum.WVTA_ID.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "
"; - - } else{ - contentLog += "'"+DummyInventoryBaseFieldEnum.WVTA_ID.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + if(list.size() > 1){ + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1); + if (StringUtils.isBlank(contentLog)) { + contentInfo += "'"+DummyInventoryBaseFieldEnum.WVTA_ID.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "
"; + } else{ + contentLog += "'"+DummyInventoryBaseFieldEnum.WVTA_ID.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + } } } //适用范围applyScope 多选 if (StringUtils.isNotBlank(infoDiff.get("applyScope"))) { List list = Arrays.asList(infoDiff.get("applyScope").split("\\|")); - String infoDiffOld = list.get(0); - String infoDiffNew = list.get(1); - if (StringUtils.isBlank(contentLog)) { - contentInfo += "'"+DummyInventoryBaseFieldEnum.SHI4_YONG4_FAN4_WEI2.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "
"; - - } else{ - contentLog += "'"+DummyInventoryBaseFieldEnum.SHI4_YONG4_FAN4_WEI2.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + if(list.size() > 1){ + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1); + if (StringUtils.isBlank(contentLog)) { + contentInfo += "'"+DummyInventoryBaseFieldEnum.SHI4_YONG4_FAN4_WEI2.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "
"; + } else{ + contentLog += "'"+DummyInventoryBaseFieldEnum.SHI4_YONG4_FAN4_WEI2.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + } } } //新车型实施日期 if (StringUtils.isNotBlank(infoDiff.get("xin1Che1Xing2Shi2Shi1Ri4Qi1String"))) { List list = Arrays.asList(infoDiff.get("xin1Che1Xing2Shi2Shi1Ri4Qi1String").split(",")); - String infoDiffOld = list.get(0); - String infoDiffNew = list.get(1); - if (StringUtils.isBlank(contentLog)) { - contentInfo += "'"+DummyInventoryBaseFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "
"; - - }else{ - contentLog += "'"+DummyInventoryBaseFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + if(list.size() > 1){ + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1); + if (StringUtils.isBlank(contentLog)) { + contentInfo += "'"+DummyInventoryBaseFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "
"; + }else{ + contentLog += "'"+DummyInventoryBaseFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + } } } //在产车实施日期 if (StringUtils.isNotBlank(infoDiff.get("implementTimeString"))) { List list = Arrays.asList(infoDiff.get("implementTimeString").split(",")); - String infoDiffOld = list.get(0); - String infoDiffNew = list.get(1); - if (StringUtils.isBlank(contentLog)) { - contentInfo += "'"+DummyInventoryBaseFieldEnum.IMPLEMENT_TIME.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "
"; - - }else{ - contentLog += "'"+DummyInventoryBaseFieldEnum.IMPLEMENT_TIME.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + if(list.size() > 1){ + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1); + if (StringUtils.isBlank(contentLog)) { + contentInfo += "'"+DummyInventoryBaseFieldEnum.IMPLEMENT_TIME.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "
"; + }else{ + contentLog += "'"+DummyInventoryBaseFieldEnum.IMPLEMENT_TIME.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + } } } //认证类型 if (StringUtils.isNotBlank(infoDiff.get("attestationType"))) { List list = Arrays.asList(infoDiff.get("attestationType").split("\\|")); - String infoDiffOld = list.get(0); - String infoDiffNew = list.get(1); - if (StringUtils.isBlank(contentLog)) { - contentInfo += "'"+DummyInventoryBaseFieldEnum.ATTESTATION_TYPE.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "
"; - - } else{ - contentLog += "'"+DummyInventoryBaseFieldEnum.ATTESTATION_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + if(list.size() > 1){ + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1); + if (StringUtils.isBlank(contentLog)) { + contentInfo += "'"+DummyInventoryBaseFieldEnum.ATTESTATION_TYPE.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "
"; + } else{ + contentLog += "'"+DummyInventoryBaseFieldEnum.ATTESTATION_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + } } } //技术领域 if (StringUtils.isNotBlank(infoDiff.get("technologyTerritoryName"))) { List list = Arrays.asList(infoDiff.get("technologyTerritoryName").split("\\|")); - String infoDiffOld = list.get(0); - String infoDiffNew = list.get(1); - if (StringUtils.isBlank(contentLog)) { - contentInfo += "'"+DummyInventoryBaseFieldEnum.TECHNOLOGY_TERRITORY.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "
"; - }else{ - contentLog += "'"+DummyInventoryBaseFieldEnum.TECHNOLOGY_TERRITORY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + if(list.size() > 1){ + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1); + if (StringUtils.isBlank(contentLog)) { + contentInfo += "'"+DummyInventoryBaseFieldEnum.TECHNOLOGY_TERRITORY.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "
"; + }else{ + contentLog += "'"+DummyInventoryBaseFieldEnum.TECHNOLOGY_TERRITORY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + } } } //责任领域 if (StringUtils.isNotBlank(infoDiff.get("dutyTerritory"))) { List list = Arrays.asList(infoDiff.get("dutyTerritory").split("\\|")); - String infoDiffOld = list.get(0); - String infoDiffNew = list.get(1); - if (StringUtils.isBlank(contentLog)) { - contentInfo += "'"+DummyInventoryBaseFieldEnum.DUTY_TERRITORY.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "
"; - - } else{ - contentLog += "'"+DummyInventoryBaseFieldEnum.DUTY_TERRITORY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + if(list.size() > 1){ + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1); + if (StringUtils.isBlank(contentLog)) { + contentInfo += "'"+DummyInventoryBaseFieldEnum.DUTY_TERRITORY.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "
"; + } else{ + contentLog += "'"+DummyInventoryBaseFieldEnum.DUTY_TERRITORY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + } } } //认证级别 if (StringUtils.isNotBlank(infoDiff.get("attestationRank"))) { List list = Arrays.asList(infoDiff.get("attestationRank").split(",")); - String infoDiffOld = list.get(0); - String infoDiffNew = list.get(1); - if (StringUtils.isBlank(contentLog)) { - contentInfo += "'"+DummyInventoryBaseFieldEnum.ATTESTATION_RANK.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "
"; - - } else{ - contentLog += "'"+DummyInventoryBaseFieldEnum.ATTESTATION_RANK.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + if(list.size() > 1){ + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1); + if (StringUtils.isBlank(contentLog)) { + contentInfo += "'"+DummyInventoryBaseFieldEnum.ATTESTATION_RANK.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "
"; + } else{ + contentLog += "'"+DummyInventoryBaseFieldEnum.ATTESTATION_RANK.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + } } } //实施类别 if (StringUtils.isNotBlank(infoDiff.get("implementType"))) { List list = Arrays.asList(infoDiff.get("implementType").split(",")); - String infoDiffOld = list.get(0); - String infoDiffNew = list.get(1); - if (StringUtils.isBlank(contentLog)) { - contentInfo += "'"+DummyInventoryBaseFieldEnum.IMPLEMENT_TYPE.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "
"; - - }else{ - contentLog += "'"+DummyInventoryBaseFieldEnum.IMPLEMENT_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + if(list.size() > 1){ + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1); + if (StringUtils.isBlank(contentLog)) { + contentInfo += "'"+DummyInventoryBaseFieldEnum.IMPLEMENT_TYPE.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "
"; + }else{ + contentLog += "'"+DummyInventoryBaseFieldEnum.IMPLEMENT_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + } } } //适用地区region 多选 if (StringUtils.isNotBlank(infoDiff.get("region"))) { List list = Arrays.asList(infoDiff.get("region").split("\\|")); - String infoDiffOld = list.get(0); - String infoDiffNew = list.get(1); - if (StringUtils.isBlank(contentLog)) { - contentInfo += "'"+DummyInventoryBaseFieldEnum.REGION.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "
"; - - } else{ - contentLog += "'"+DummyInventoryBaseFieldEnum.REGION.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + if(list.size() > 1){ + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1); + if (StringUtils.isBlank(contentLog)) { + contentInfo += "'"+DummyInventoryBaseFieldEnum.REGION.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "
"; + } else{ + contentLog += "'"+DummyInventoryBaseFieldEnum.REGION.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + } } } //适用增补件applicableSupplement if (StringUtils.isNotBlank(infoDiff.get("applicableSupplement"))) { List list = Arrays.asList(infoDiff.get("applicableSupplement").split(",")); - String infoDiffOld = list.get(0); - String infoDiffNew = list.get(1); - if (StringUtils.isBlank(contentLog)) { - contentInfo += "'"+DummyInventoryBaseFieldEnum.APPLICABLE_SUPPLEMENT.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "
"; - - } else{ - contentLog += "'"+DummyInventoryBaseFieldEnum.APPLICABLE_SUPPLEMENT.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + if(list.size() > 1){ + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1); + if (StringUtils.isBlank(contentLog)) { + contentInfo += "'"+DummyInventoryBaseFieldEnum.APPLICABLE_SUPPLEMENT.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "
"; + } else{ + contentLog += "'"+DummyInventoryBaseFieldEnum.APPLICABLE_SUPPLEMENT.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + } } } //备注 if (StringUtils.isNotBlank(infoDiff.get("remark"))) { List list = Arrays.asList(infoDiff.get("remark").split(",")); - String infoDiffOld = list.get(0); - String infoDiffNew = list.get(1); - if (StringUtils.isBlank(contentLog)) { - contentInfo += "'"+DummyInventoryBaseFieldEnum.REMARK.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "
"; - - } else{ - contentLog += "'"+DummyInventoryBaseFieldEnum.REMARK.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + if(list.size() > 1){ + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1); + if (StringUtils.isBlank(contentLog)) { + contentInfo += "'"+DummyInventoryBaseFieldEnum.REMARK.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "
"; + } else{ + contentLog += "'"+DummyInventoryBaseFieldEnum.REMARK.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + } } + } //设计符合性确认-交付物类型 if (StringUtils.isNotBlank(infoDiff.get("designDeliverableTypeName"))) { List list = Arrays.asList(infoDiff.get("designDeliverableTypeName").split("\\|")); - String infoDiffOld = list.get(0); - String infoDiffNew = list.get(1); - if (StringUtils.isBlank(contentLog)) { - contentInfo += "'"+DummyInventoryBaseFieldEnum.DESIGN_DELIVERABLE_TYPE.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "
"; - - } else{ - contentLog += "'"+DummyInventoryBaseFieldEnum.DESIGN_DELIVERABLE_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + if(list.size() > 1){ + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1); + if (StringUtils.isBlank(contentLog)) { + contentInfo += "'"+DummyInventoryBaseFieldEnum.DESIGN_DELIVERABLE_TYPE.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "
"; + } else{ + contentLog += "'"+DummyInventoryBaseFieldEnum.DESIGN_DELIVERABLE_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + } } } //设计符合性确认-交付物模板 if (StringUtils.isNotBlank(infoDiff.get("designDeliverableTemplateName"))) { List list = Arrays.asList(infoDiff.get("designDeliverableTemplateName").split("\\|")); - String infoDiffOld = list.get(0); - String infoDiffNew = list.get(1); - if (StringUtils.isBlank(contentLog)) { - contentInfo += "'"+DummyInventoryBaseFieldEnum.DESIGN_DELIVERABLE_TEMPLATE.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "
"; - - } else{ - contentLog += "'"+DummyInventoryBaseFieldEnum.DESIGN_DELIVERABLE_TEMPLATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + if(list.size() > 1){ + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1); + if (StringUtils.isBlank(contentLog)) { + contentInfo += "'"+DummyInventoryBaseFieldEnum.DESIGN_DELIVERABLE_TEMPLATE.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "
"; + } else{ + contentLog += "'"+DummyInventoryBaseFieldEnum.DESIGN_DELIVERABLE_TEMPLATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + } } } //设计符合性确认-发起人 if (StringUtils.isNotBlank(infoDiff.get("designInitiator"))) { List list = Arrays.asList(infoDiff.get("designInitiator").split(",")); - String infoDiffOld = list.get(0); - String infoDiffNew = list.get(1); - if (StringUtils.isBlank(contentLog)) { - contentInfo += "'"+DummyInventoryBaseFieldEnum.DESIGN_INITIATOR.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "
"; - - } else{ - contentLog += "'"+DummyInventoryBaseFieldEnum.DESIGN_INITIATOR.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + if(list.size() > 1){ + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1); + if (StringUtils.isBlank(contentLog)) { + contentInfo += "'"+DummyInventoryBaseFieldEnum.DESIGN_INITIATOR.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "
"; + } else{ + contentLog += "'"+DummyInventoryBaseFieldEnum.DESIGN_INITIATOR.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + } } } //设计符合性确认-责任人 if (StringUtils.isNotBlank(infoDiff.get("designDuty"))) { List list = Arrays.asList(infoDiff.get("designDuty").split(",")); - String infoDiffOld = list.get(0); - String infoDiffNew = list.get(1); - if (StringUtils.isBlank(contentLog)) { - contentInfo += "'"+DummyInventoryBaseFieldEnum.DESIGN_DUTY.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "
"; - - } else{ - contentLog += "'"+DummyInventoryBaseFieldEnum.DESIGN_DUTY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + if(list.size() > 1){ + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1); + if (StringUtils.isBlank(contentLog)) { + contentInfo += "'"+DummyInventoryBaseFieldEnum.DESIGN_DUTY.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "
"; + } else{ + contentLog += "'"+DummyInventoryBaseFieldEnum.DESIGN_DUTY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + } } } //prehomo确认-交付物类型 if (StringUtils.isNotBlank(infoDiff.get("prehomoDeliverableTypeName"))) { List list = Arrays.asList(infoDiff.get("prehomoDeliverableTypeName").split("\\|")); - String infoDiffOld = list.get(0); - String infoDiffNew = list.get(1); - if (StringUtils.isBlank(contentLog)) { - contentInfo += "'"+DummyInventoryBaseFieldEnum.PREHOMO_DELIVERABLE_TYPE.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "
"; - - }else{ - contentLog += "'"+DummyInventoryBaseFieldEnum.PREHOMO_DELIVERABLE_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + if(list.size() > 1){ + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1); + if (StringUtils.isBlank(contentLog)) { + contentInfo += "'"+DummyInventoryBaseFieldEnum.PREHOMO_DELIVERABLE_TYPE.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "
"; + }else{ + contentLog += "'"+DummyInventoryBaseFieldEnum.PREHOMO_DELIVERABLE_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + } } } //prehomo确认-交付物模板 if (StringUtils.isNotBlank(infoDiff.get("prehomoDeliverableTemplateName"))) { List list = Arrays.asList(infoDiff.get("prehomoDeliverableTemplateName").split("\\|")); - String infoDiffOld = list.get(0); - String infoDiffNew = list.get(1); - if (StringUtils.isBlank(contentLog)) { - contentInfo += "'"+DummyInventoryBaseFieldEnum.PREHOMO_DELIVERABLE_TEMPLATE.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "
"; - - }else{ - contentLog += "'"+DummyInventoryBaseFieldEnum.PREHOMO_DELIVERABLE_TEMPLATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + if(list.size() > 1){ + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1); + if (StringUtils.isBlank(contentLog)) { + contentInfo += "'"+DummyInventoryBaseFieldEnum.PREHOMO_DELIVERABLE_TEMPLATE.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "
"; + }else{ + contentLog += "'"+DummyInventoryBaseFieldEnum.PREHOMO_DELIVERABLE_TEMPLATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + } } } //prehomo确认-发起人 if (StringUtils.isNotBlank(infoDiff.get("prehomoInitiator"))) { List list = Arrays.asList(infoDiff.get("prehomoInitiator").split(",")); - String infoDiffOld = list.get(0); - String infoDiffNew = list.get(1); - if (StringUtils.isBlank(contentLog)) { - contentInfo += "'"+DummyInventoryBaseFieldEnum.PREHOMO_INITIATOR.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "
"; - - } else{ - contentLog += "'"+DummyInventoryBaseFieldEnum.PREHOMO_INITIATOR.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + if(list.size() > 1){ + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1); + if (StringUtils.isBlank(contentLog)) { + contentInfo += "'"+DummyInventoryBaseFieldEnum.PREHOMO_INITIATOR.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "
"; + } else{ + contentLog += "'"+DummyInventoryBaseFieldEnum.PREHOMO_INITIATOR.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + } } } //prehomo确认-责任人 if (StringUtils.isNotBlank(infoDiff.get("prehomoDuty"))) { List list = Arrays.asList(infoDiff.get("prehomoDuty").split(",")); - String infoDiffOld = list.get(0); - String infoDiffNew = list.get(1); - if (StringUtils.isBlank(contentLog)) { - contentInfo += "'"+DummyInventoryBaseFieldEnum.PREHOMO_DUTY.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "
"; - - } else{ - contentLog += "'"+DummyInventoryBaseFieldEnum.PREHOMO_DUTY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + if(list.size() > 1){ + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1); + if (StringUtils.isBlank(contentLog)) { + contentInfo += "'"+DummyInventoryBaseFieldEnum.PREHOMO_DUTY.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "
"; + } else{ + contentLog += "'"+DummyInventoryBaseFieldEnum.PREHOMO_DUTY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + } } } //验证符合性确认-交付物类型 if (StringUtils.isNotBlank(infoDiff.get("verifyDeliverableTypeName"))) { List list = Arrays.asList(infoDiff.get("verifyDeliverableTypeName").split("\\|")); - String infoDiffOld = list.get(0); - String infoDiffNew = list.get(1); - if (StringUtils.isBlank(contentLog)) { - contentInfo += "'"+DummyInventoryBaseFieldEnum.VERIFY_DELIVERABLE_TYPE.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "
"; - - }else{ - contentLog += "'"+DummyInventoryBaseFieldEnum.VERIFY_DELIVERABLE_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + if(list.size() > 1){ + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1); + if (StringUtils.isBlank(contentLog)) { + contentInfo += "'"+DummyInventoryBaseFieldEnum.VERIFY_DELIVERABLE_TYPE.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "
"; + }else{ + contentLog += "'"+DummyInventoryBaseFieldEnum.VERIFY_DELIVERABLE_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + } } } //验证符合性确认-交付物模板 if (StringUtils.isNotBlank(infoDiff.get("verifyDeliverableTemplateName"))) { List list = Arrays.asList(infoDiff.get("verifyDeliverableTemplateName").split("\\|")); - String infoDiffOld = list.get(0); - String infoDiffNew = list.get(1); - if (StringUtils.isBlank(contentLog)) { - contentInfo += "'"+DummyInventoryBaseFieldEnum.VERIFY_DELIVERABLE_TEMPLATE.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "
"; - - }else{ - contentLog += "'"+DummyInventoryBaseFieldEnum.VERIFY_DELIVERABLE_TEMPLATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + if(list.size() > 1){ + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1); + if (StringUtils.isBlank(contentLog)) { + contentInfo += "'"+DummyInventoryBaseFieldEnum.VERIFY_DELIVERABLE_TEMPLATE.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "
"; + }else{ + contentLog += "'"+DummyInventoryBaseFieldEnum.VERIFY_DELIVERABLE_TEMPLATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + } } } //验证符合性确认-发起人 if (StringUtils.isNotBlank(infoDiff.get("verifyInitiator"))) { List list = Arrays.asList(infoDiff.get("verifyInitiator").split(",")); - String infoDiffOld = list.get(0); - String infoDiffNew = list.get(1); - if (StringUtils.isBlank(contentLog)) { - contentInfo += "'"+DummyInventoryBaseFieldEnum.VERIFY_INITIATOR.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "
"; - - } else{ - contentLog += "'"+DummyInventoryBaseFieldEnum.VERIFY_INITIATOR.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + if(list.size() > 1){ + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1); + if (StringUtils.isBlank(contentLog)) { + contentInfo += "'"+DummyInventoryBaseFieldEnum.VERIFY_INITIATOR.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "
"; + } else{ + contentLog += "'"+DummyInventoryBaseFieldEnum.VERIFY_INITIATOR.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + } } } //验证符合性确认-责任人 if (StringUtils.isNotBlank(infoDiff.get("verifyDuty"))) { List list = Arrays.asList(infoDiff.get("verifyDuty").split(",")); - String infoDiffOld = list.get(0); - String infoDiffNew = list.get(1); - if (StringUtils.isBlank(contentLog)) { - contentInfo += "'"+DummyInventoryBaseFieldEnum.VERIFY_DUTY.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "
"; - - } else{ - contentLog += "'"+DummyInventoryBaseFieldEnum.VERIFY_DUTY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + if(list.size() > 1){ + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1); + if (StringUtils.isBlank(contentLog)) { + contentInfo += "'"+DummyInventoryBaseFieldEnum.VERIFY_DUTY.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "
"; + } else{ + contentLog += "'"+DummyInventoryBaseFieldEnum.VERIFY_DUTY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + } } } From 373afeff46b7372a94dfc14831400b1b625ed0c2 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Mon, 4 Jul 2022 15:47:52 +0800 Subject: [PATCH 06/21] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=9B=B8=E5=85=B3-?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=B1=BB=E5=9E=8B=E4=BF=AE=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProjectLawsInventoryEOServiceImpl.java | 6 +++--- .../com/jero/modules/project/util/SendMessageUtils.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) 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 54f454305..174dbebf2 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 @@ -1616,7 +1616,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl userIdList, String content, String contentInfo) { + private SysAnnouncement getSysAnnouncement(List userIdList, String content, String contentInfo, MessageTypeEnum messageType) { SysAnnouncement sysAnnouncement = new SysAnnouncement(); sysAnnouncement.setDelFlag("0"); sysAnnouncement.setSendStatus("0"); sysAnnouncement.setSendTime(new Date()); - sysAnnouncement.setMsgCategory(MessageTypeEnum.READ.getValue());//消息类型 + sysAnnouncement.setMsgCategory(messageType.getValue());//消息类型 sysAnnouncement.setMsgType(CommonConstant.MSG_TYPE_UESR);//指定用户 sysAnnouncement.setMsgContent(content); sysAnnouncement.setMsgContentInfo(contentInfo); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/util/SendMessageUtils.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/util/SendMessageUtils.java index 89e3181d2..863451a73 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/util/SendMessageUtils.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/util/SendMessageUtils.java @@ -69,7 +69,7 @@ public class SendMessageUtils { String contentInfo = (String) sendMessageMap.get("contentInfo"); //系统消息 - SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, msgContent, contentInfo); + SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, msgContent, contentInfo,messageType); sysAnnouncementService.saveAnnouncement(sysAnnouncement); sendWebsocket(idTemp, idTemp); @@ -89,12 +89,12 @@ public class SendMessageUtils { } @NotNull - private static SysAnnouncement getSysAnnouncement(List userIdList, String content, String contentInfo) { + private static SysAnnouncement getSysAnnouncement(List userIdList, String content, String contentInfo, MessageTypeEnum messageType) { SysAnnouncement sysAnnouncement = new SysAnnouncement(); sysAnnouncement.setDelFlag("0"); sysAnnouncement.setSendStatus("0"); sysAnnouncement.setSendTime(new Date()); - sysAnnouncement.setMsgCategory(MessageTypeEnum.READ.getValue());//消息类型 + sysAnnouncement.setMsgCategory(messageType.getValue());//消息类型 sysAnnouncement.setMsgType(CommonConstant.MSG_TYPE_UESR);//指定用户 sysAnnouncement.setMsgContent(content); sysAnnouncement.setMsgContentInfo(contentInfo); From fefa233f8749b82a09cbdddcaef69115470c8117 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Mon, 4 Jul 2022 15:57:33 +0800 Subject: [PATCH 07/21] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../virtualList/components/batSetting.vue | 22 +- .../virtualList/components/editModel.vue | 204 ++++++------ .../components/listEditModel.vue | 294 +++++++++--------- 3 files changed, 262 insertions(+), 258 deletions(-) diff --git a/jero-web/src/views/documentTools/virtualList/components/batSetting.vue b/jero-web/src/views/documentTools/virtualList/components/batSetting.vue index 58c5fe4fb..261da3322 100644 --- a/jero-web/src/views/documentTools/virtualList/components/batSetting.vue +++ b/jero-web/src/views/documentTools/virtualList/components/batSetting.vue @@ -30,7 +30,7 @@
{{$t('certificationType')}}
- + {{$t('certificationLevel')}} - + {{$t('areaOfResponsibility')}} - - + + + + + + + @@ -116,7 +120,7 @@ {{$t('technicalField')}} - +  {{$t('confirmationOfDesignConformity')}} + + +
+
+ {{$t('Sponsor')}} +
+ + + +
+ + +
+
+ {{$t('personLiable')}} +
+ + + +
+ +
@@ -337,40 +371,6 @@
- - -
-
- {{$t('Sponsor')}} -
- - - -
- - -
-
- {{$t('personLiable')}} -
- - - -
- -
@@ -390,6 +390,40 @@
 {{$t('PrehomoConfirmation')}}
+ + +
+
+ {{$t('Sponsor')}} +
+ + + +
+ + +
+
+ {{$t('personLiable')}} +
+ + + +
+ +
@@ -436,40 +470,6 @@
- - -
-
- {{$t('Sponsor')}} -
- - - -
- - -
-
- {{$t('personLiable')}} -
- - - -
- -
@@ -489,6 +489,40 @@
 {{$t('verificationAndConformityconfirmation')}}
+ + +
+
+ {{$t('Sponsor')}} +
+ + + +
+ + +
+
+ {{$t('personLiable')}} +
+ + + +
+ +
@@ -534,40 +568,6 @@
- - -
-
- {{$t('Sponsor')}} -
- - - -
- - -
-
- {{$t('personLiable')}} -
- - - -
- -
diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue index 3eed26d00..8f8c57cc6 100644 --- a/jero-web/src/views/projectManagement/components/listEditModel.vue +++ b/jero-web/src/views/projectManagement/components/listEditModel.vue @@ -323,54 +323,6 @@ (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.homologationEngineerId && formInline.homologationEngineerId == userInfoQuery.id) || (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.regulationOwnerId && - formInline.regulationOwnerId == userInfoQuery.id)"> - -
-
- {{$t('typeOfDeliverables')}} -
- - - - - - - - -
- - -
-
- {{$t('deliverableTemplate')}} -
- - - {{ (formInline.designDeliverableTemplate === 'null' || formInline.designDeliverableTemplate === '' || - formInline.designDeliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles') - }} - - -
- - -
@@ -459,6 +411,54 @@ (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.homologationEngineerId && formInline.homologationEngineerId == userInfoQuery.id) || (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.regulationOwnerId && + formInline.regulationOwnerId == userInfoQuery.id)"> + +
+
+ {{$t('typeOfDeliverables')}} +
+ + + + + + + + +
+ + +
+
+ {{$t('deliverableTemplate')}} +
+ + + {{ (formInline.designDeliverableTemplate === 'null' || formInline.designDeliverableTemplate === '' || + formInline.designDeliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles') + }} + + +
+ + +
@@ -486,56 +486,6 @@ (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.homologationEngineerId && formInline.homologationEngineerId == userInfoQuery.id) || (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.regulationOwnerId && - formInline.regulationOwnerId == userInfoQuery.id)"> - -
-
- {{$t('typeOfDeliverables')}} -
- - - - - - - - - -
- - -
-
- {{$t('deliverableTemplate')}} -
- - - {{ (formInline.prehomoDeliverableTemplate === 'null' || formInline.prehomoDeliverableTemplate === '' - || - formInline.prehomoDeliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles') - }} - - -
- - -
@@ -624,6 +574,56 @@ (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.homologationEngineerId && formInline.homologationEngineerId == userInfoQuery.id) || (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.regulationOwnerId && + formInline.regulationOwnerId == userInfoQuery.id)"> + +
+
+ {{$t('typeOfDeliverables')}} +
+ + + + + + + + + +
+ + +
+
+ {{$t('deliverableTemplate')}} +
+ + + {{ (formInline.prehomoDeliverableTemplate === 'null' || formInline.prehomoDeliverableTemplate === '' + || + formInline.prehomoDeliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles') + }} + + +
+ + +
@@ -648,55 +648,6 @@  {{$t('verificationAndConformityconfirmation')}}
- -
-
- {{$t('typeOfDeliverables')}} -
- - - - - - - - - -
- - -
-
- {{$t('deliverableTemplate')}} -
- - - {{ (formInline.verifyDeliverableTemplate === 'null' || formInline.verifyDeliverableTemplate === '' || - formInline.verifyDeliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles') - }} - - -
- - - + +
+
+ {{$t('typeOfDeliverables')}} +
+ + + + + + + + + +
+ + +
+
+ {{$t('deliverableTemplate')}} +
+ + + {{ (formInline.verifyDeliverableTemplate === 'null' || formInline.verifyDeliverableTemplate === '' || + formInline.verifyDeliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles') + }} + + +
+ + +
From b63d720da062c0077efabd70a7ec2e43c11c8e3c Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Mon, 4 Jul 2022 16:00:09 +0800 Subject: [PATCH 08/21] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=A1=AE=E8=AE=A4?= =?UTF-8?q?=E6=B5=81=E7=A8=8B-=E5=88=86=E9=85=8Ddre=E7=BB=99dre=E5=8F=91?= =?UTF-8?q?=E6=B6=88=E6=81=AF=EF=BC=8C=E5=86=85=E5=AE=B9=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E3=80=82?= 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 174dbebf2..ba43ecc25 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 @@ -2072,7 +2072,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl Date: Mon, 4 Jul 2022 16:32:41 +0800 Subject: [PATCH 09/21] =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/BussDocumentLibraryEOServiceImpl.java | 16 ++++++++-------- .../impl/DummyInventoryBaseEOServiceImpl.java | 4 ++-- .../modules/warn/service/LawsWarnService.java | 2 +- .../jero/modules/warn/service/TimedTaskWarn.java | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) 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 bef96f215..13cfba0fb 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 @@ -315,7 +315,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl userIdList, String content, String contentInfo) { + public SysAnnouncement getSysAnnouncement(List userIdList, String content, String contentInfo,String messageType) { SysAnnouncement sysAnnouncement = new SysAnnouncement(); sysAnnouncement.setDelFlag("0"); sysAnnouncement.setSendStatus("0"); sysAnnouncement.setSendTime(new Date()); // sysAnnouncement.setDocumentId((String) dataList.get(0).get("id")); - sysAnnouncement.setMsgCategory(MessageTypeEnum.READ.getValue());//消息类型 + sysAnnouncement.setMsgCategory(messageType);//消息类型 sysAnnouncement.setMsgType(CommonConstant.MSG_TYPE_UESR);//指定用户 sysAnnouncement.setMsgContent(content); sysAnnouncement.setMsgContentInfo(contentInfo); @@ -4740,7 +4740,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl"," "); //封装消息的实体类 - SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, content, contentInfo); + SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, content, contentInfo,MessageTypeEnum.READ.getValue()); sysAnnouncementService.saveAnnouncement(sysAnnouncement); bussDocumentLibraryEOService.sendWebsocket(idTemp, contentInfo); //飞书 @@ -1161,7 +1161,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl userIdList, List thirdIdList) { //站内消息 //封装消息的实体类 - SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, content, contentInfo); + SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, content, contentInfo,MessageTypeEnum.WARN.getValue()); sysAnnouncementService.saveAnnouncement(sysAnnouncement); bussDocumentLibraryEOService.sendWebsocket(StringUtils.join(userIdList, ","), content); From 293781a685154d5c24bbbd8d62de366c2a5d080a Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Mon, 4 Jul 2022 17:00:13 +0800 Subject: [PATCH 10/21] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/standardContentList.vue | 66 +++++++------ .../components/listOfRegulations.vue | 95 ++++++++++++------- 2 files changed, 97 insertions(+), 64 deletions(-) diff --git a/jero-web/src/views/processCenter/components/standardContentList.vue b/jero-web/src/views/processCenter/components/standardContentList.vue index a84e2aae7..6408371cf 100644 --- a/jero-web/src/views/processCenter/components/standardContentList.vue +++ b/jero-web/src/views/processCenter/components/standardContentList.vue @@ -137,36 +137,42 @@ }, mounted() { this.dataSource = [] - this.dataSource.push({ - ProcessType: this.$t('designComplianceReview'), - InitiatorName: this.standardContentListQuery.designInitiatorName, - DutyName: this.standardContentListQuery.designDutyName, - DueDate: this.standardContentListQuery.designDueDate, - DeliverableType: this.standardContentListQuery.designDeliverableTypeName, - DeliverableTemplate: this.standardContentListQuery.designDeliverableTemplate, - DeliverableTemplateName: this.standardContentListQuery.designDeliverableTemplateName, - remark: this.standardContentListQuery.designRemark - }) - this.dataSource.push({ - ProcessType: this.$t('preHomeConfirmation'), - InitiatorName: this.standardContentListQuery.prehomoInitiatorName, - DutyName: this.standardContentListQuery.prehomoDutyName, - DueDate: this.standardContentListQuery.prehomoDueDate, - DeliverableType: this.standardContentListQuery.prehomoDeliverableTypeName, - DeliverableTemplate: this.standardContentListQuery.prehomoDeliverableTemplate, - DeliverableTemplateName: this.standardContentListQuery.prehomoDeliverableTemplateName, - remark: this.standardContentListQuery.prehomoRemark - }) - this.dataSource.push({ - ProcessType: this.$t('verificationComplianceReview'), - InitiatorName: this.standardContentListQuery.verifyInitiatorName, - DutyName: this.standardContentListQuery.verifyDutyName, - DueDate: this.standardContentListQuery.verifyDueDate, - DeliverableType: this.standardContentListQuery.verifyDeliverableTypeName, - DeliverableTemplate: this.standardContentListQuery.verifyDeliverableTemplate, - DeliverableTemplateName: this.standardContentListQuery.verifyDeliverableTemplateName, - remark: this.standardContentListQuery.verifyRemark - }) + if (this.standardContentListQuery.designDeliverableTypeName){ + this.dataSource.push({ + ProcessType: this.$t('designComplianceReview'), + InitiatorName: this.standardContentListQuery.designInitiatorName, + DutyName: this.standardContentListQuery.designDutyName, + DueDate: this.standardContentListQuery.designDueDate, + DeliverableType: this.standardContentListQuery.designDeliverableTypeName, + DeliverableTemplate: this.standardContentListQuery.designDeliverableTemplate, + DeliverableTemplateName: this.standardContentListQuery.designDeliverableTemplateName, + remark: this.standardContentListQuery.designRemark + }) + } + if (this.standardContentListQuery.prehomoDeliverableTypeName){ + this.dataSource.push({ + ProcessType: this.$t('preHomeConfirmation'), + InitiatorName: this.standardContentListQuery.prehomoInitiatorName, + DutyName: this.standardContentListQuery.prehomoDutyName, + DueDate: this.standardContentListQuery.prehomoDueDate, + DeliverableType: this.standardContentListQuery.prehomoDeliverableTypeName, + DeliverableTemplate: this.standardContentListQuery.prehomoDeliverableTemplate, + DeliverableTemplateName: this.standardContentListQuery.prehomoDeliverableTemplateName, + remark: this.standardContentListQuery.prehomoRemark + }) + } + if (this.standardContentListQuery.verifyDeliverableTypeName){ + this.dataSource.push({ + ProcessType: this.$t('verificationComplianceReview'), + InitiatorName: this.standardContentListQuery.verifyInitiatorName, + DutyName: this.standardContentListQuery.verifyDutyName, + DueDate: this.standardContentListQuery.verifyDueDate, + DeliverableType: this.standardContentListQuery.verifyDeliverableTypeName, + DeliverableTemplate: this.standardContentListQuery.verifyDeliverableTemplate, + DeliverableTemplateName: this.standardContentListQuery.verifyDeliverableTemplateName, + remark: this.standardContentListQuery.verifyRemark + }) + } }, methods: { ...mapGetters(['userInfo']), diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 8d548556f..32c90b786 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -1355,27 +1355,50 @@ let isTrue = true this.detailedSuccessList = [] this.detailedWarningList = [] + let dataSource = [] for (let i = 0; i < this.dataSource.length; i++) { for (let j = 0; j < selectedRowKeys.length; j++) { if (this.dataSource[i].id == selectedRowKeys[j]) { - if (this.dataSource[i].inventoryAffirmStatus == 'Not started' || this.dataSource[i].inventoryAffirmStatus == 'Rejected') { - if (this.dataSource[i].homologationEngineerId && this.dataSource[i].regulationOwnerId) { - this.detailedSuccessList.push(this.dataSource[i]) - } else { - this.detailedWarningList.push( < div > { this.dataSource[i].serialNumber + this.$t('TheEngineerAndCertification') } < /div>) - // this.$message.warning(this.dataSource[i].serialNumber + this.$t('TheEngineerAndCertification')) - // isTrue = false - // return - } - } else { - this.detailedWarningList.push( < div > {this.dataSource[i].serialNumber + ',' + this.$t('pleaseSelectinitiatedOrRejected')} < /div>) - // this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseSelectinitiatedOrRejected')) - // isTrue = false - // return - } + dataSource.push(this.dataSource[i]) } } } + for (let i = 0; i < dataSource.length; i++) { + if (dataSource[i].inventoryAffirmStatus == 'Not started' || dataSource[i].inventoryAffirmStatus == 'Rejected') { + if (dataSource[i].homologationEngineerId && dataSource[i].regulationOwnerId) { + if (dataSource[i].designDeliverableType){ + if (!dataSource[i].designInitiatorId){ + this.detailedWarningList.push( < div > { dataSource[i].serialNumber + ','+this.$t('designComplianceReview')+ this.$t('Sponsor')+this.$t('cannotEmpty') } < /div>) + continue + } + } + if (dataSource[i].prehomoDeliverableType){ + if (!dataSource[i].prehomoInitiatorId){ + this.detailedWarningList.push( < div > { dataSource[i].serialNumber + ','+this.$t('preHomeConfirmation')+ this.$t('Sponsor')+this.$t('cannotEmpty') } < /div>) + continue + } + } + if (dataSource[i].verifyDeliverableType){ + if (!dataSource[i].verifyInitiatorId){ + this.detailedWarningList.push( < div > { dataSource[i].serialNumber + ','+this.$t('verificationComplianceReview')+ this.$t('Sponsor')+this.$t('cannotEmpty') } < /div>) + continue + } + } + this.detailedSuccessList.push(dataSource[i]) + + } else { + this.detailedWarningList.push( < div > { dataSource[i].serialNumber + this.$t('TheEngineerAndCertification') } < /div>) + // this.$message.warning(this.dataSource[i].serialNumber + this.$t('TheEngineerAndCertification')) + // isTrue = false + // return + } + } else { + this.detailedWarningList.push( < div > {dataSource[i].serialNumber + ',' + this.$t('pleaseSelectinitiatedOrRejected')} < /div>) + // this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseSelectinitiatedOrRejected')) + // isTrue = false + // return + } + } if (this.detailedSuccessList && this.detailedSuccessList.length > 0) { this.visible = true this.formInline = {} @@ -1592,31 +1615,35 @@ getRowKeys(value, callBack) { let isTrue = true + let dataSource = [] for (let i = 0; i < this.dataSource.length; i++) { for (let j = 0; j < value.length; j++) { if (this.dataSource[i].id == value[j]) { - if (this.dataSource[i].inventoryAffirmStatus == 'List to confirm') { - if (this.dataSource[i].roleCode == 1 && this.dataSource[i].regulationOwnerSubmitStatus) { - isTrue = false - this.$message.warning(this.$t('The') + (i + 1) + this.$t('submitted')) - return - } else if (this.dataSource[i].roleCode == 2 && this.dataSource[i].homologationEngineerSubmitStatus) { - isTrue = false - this.$message.warning(this.$t('The') + (i + 1) + this.$t('submitted')) - return - } else if (this.dataSource[i].roleCode == 4 && (this.dataSource[i].homologationEngineerSubmitStatus && this.dataSource[i].regulationOwnerSubmitStatus)) { - isTrue = false - this.$message.warning(this.$t('The') + (i + 1) + this.$t('submitted')) - return - } - } else { - isTrue = false - this.$message.warning(this.$t('The') + (i + 1) + this.$t('incorrectsubmitted')) - return - } + dataSource.push(this.dataSource[i]) } } } + for (let i = 0; i < dataSource.length; i++) { + if (dataSource[i].inventoryAffirmStatus == 'List to confirm') { + if (dataSource[i].roleCode == 1 && dataSource[i].regulationOwnerSubmitStatus) { + isTrue = false + this.$message.warning(this.$t('The') + (i + 1) + this.$t('submitted')) + return + } else if (dataSource[i].roleCode == 2 && dataSource[i].homologationEngineerSubmitStatus) { + isTrue = false + this.$message.warning(this.$t('The') + (i + 1) + this.$t('submitted')) + return + } else if (dataSource[i].roleCode == 4 && (dataSource[i].homologationEngineerSubmitStatus && dataSource[i].regulationOwnerSubmitStatus)) { + isTrue = false + this.$message.warning(this.$t('The') + (i + 1) + this.$t('submitted')) + return + } + } else { + isTrue = false + this.$message.warning(this.$t('The') + (i + 1) + this.$t('incorrectsubmitted')) + return + } + } if (isTrue) { callBack() } From 0185003adb90d1f8f02169c1c12a70907826a0f5 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Mon, 4 Jul 2022 17:20:02 +0800 Subject: [PATCH 11/21] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?= =?UTF-8?q?=EF=BC=8C=E5=B1=95=E7=A4=BA=E6=B8=85=E5=8D=95=E7=A1=AE=E8=AE=A4?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=BF=AE=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/project/enums/InventoryAffirmStatusEnum.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/InventoryAffirmStatusEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/InventoryAffirmStatusEnum.java index 3978f6c87..9954add24 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/InventoryAffirmStatusEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/InventoryAffirmStatusEnum.java @@ -17,10 +17,10 @@ public enum InventoryAffirmStatusEnum { ACCEPTED("接受","Accepted"), REJECTED("拒绝","Rejected"), - REG_ENG_TO_CONFIRM("法规工程师待确认","To be confirmed by Reg Eng."), - HOMO_ENG_TO_CONFIRM("认证工程师待确认","To be confirmed by Homo Eng."), - REG_ENG_REJECTED("法规工程师拒绝 ","Reg Eng. rejected"), - HOMO_ENG_REJECTED("认证工程师拒绝 ","Homo Eng. rejected"), + REG_ENG_TO_CONFIRM("法规待确认","To be confirmed by Reg Eng."), + HOMO_ENG_TO_CONFIRM("认证待确认","To be confirmed by Homo Eng."), + REG_ENG_REJECTED("法规拒绝 ","Reg Eng. rejected"), + HOMO_ENG_REJECTED("认证拒绝 ","Homo Eng. rejected"), ; From d6e8963e1d87e72b811798f90040454c6e6da3c0 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 4 Jul 2022 17:22:55 +0800 Subject: [PATCH 12/21] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85--?= =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/service/impl/ProjectLibraryBaseServiceImpl.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/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java index e6d75e87c..c445270a2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java @@ -641,7 +641,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl Date: Mon, 4 Jul 2022 17:39:56 +0800 Subject: [PATCH 13/21] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E5=90=8D=E5=8D=95--=E6=B7=BB=E5=8A=A0=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectRelatedPersonnelController.java | 6 ++- .../mapper/ProjectRelatedPersonnelMapper.java | 7 +++- .../xml/ProjectRelatedPersonnelMapper.xml | 14 ++++++- .../IProjectRelatedPersonnelService.java | 2 +- .../ProjectLawsInventoryEOServiceImpl.java | 2 +- .../ProjectRelatedPersonnelServiceImpl.java | 41 ++++++++++++++----- 6 files changed, 56 insertions(+), 16 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java index cc44c5694..718595b26 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java @@ -46,7 +46,11 @@ public class ProjectRelatedPersonnelController extends JeroController queryPageList(@RequestBody Map map) { - List pageList= projectRelatedPersonnelService.queryPageList((String) map.get("projectId")); + List pageList= projectRelatedPersonnelService.queryPageList((String) map.get("projectId"), + (String) map.get("dutyTerritory"), + (String) map.get("lawEngineer"), + (String) map.get("engineeringInterfacePerson"), + (String) map.get("certificationEngineer")); return Result.OK((String)map.get("cut"),pageList); } /** diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectRelatedPersonnelMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectRelatedPersonnelMapper.java index 86d629061..fb4d2d269 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectRelatedPersonnelMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectRelatedPersonnelMapper.java @@ -14,7 +14,12 @@ import java.util.List; */ public interface ProjectRelatedPersonnelMapper extends BaseMapper { - List queryPageList(@Param("projectId") String projectId,String dictCode); + List queryPageList(@Param("projectId") String projectId, + String dictCode, + @Param("dutyTerritory") String dutyTerritory, + @Param("lawEngineer") String lawEngineer, + @Param("engineeringInterfacePerson") String engineeringInterfacePerson, + @Param("certificationEngineer") String certificationEngineer); List queryById(@Param("id")String id); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRelatedPersonnelMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRelatedPersonnelMapper.xml index 7bfe89213..8c097fef3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRelatedPersonnelMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRelatedPersonnelMapper.xml @@ -42,6 +42,18 @@ prp.project_id=#{projectId} + + AND prp.duty_territory=#{dutyTerritory} + + + AND prp.law_engineer like concat(concat('%',#{lawEngineer}),'%') + + + AND prp.engineering_interface_person like concat(concat('%',#{engineeringInterfacePerson}),'%') + + + AND prp.certification_engineer like concat(concat('%',#{certificationEngineer}),'%') + AND sd.dict_code = #{dictCode} ORDER BY sdi.item_text ASC @@ -57,4 +69,4 @@ order by prp.create_time desc - \ No newline at end of file + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java index 482e383ca..ae78929e4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java @@ -67,7 +67,7 @@ public interface IProjectRelatedPersonnelService extends IService queryList(); - List queryPageList(String projectId); + List queryPageList(String projectId,String dutyTerritory,String lawEngineer,String engineeringInterfacePerson,String certificationEngineer); Map queryPersonByProjectId(String projectId, String dutyTerritory); 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 ba43ecc25..84697d47d 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 @@ -6400,7 +6400,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl projectRelatedPersonnels = projectRelatedPersonnelService.queryPageList(projectLibraryId); + List projectRelatedPersonnels = projectRelatedPersonnelService.queryPageList(projectLibraryId,null,null,null,null); List lawEngineerNameList = new ArrayList<>(); if(projectRelatedPersonnels.size() != 0){ for (ProjectRelatedPersonnel projectRelatedPersonnel : projectRelatedPersonnels) { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java index 455dd593e..466967e62 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java @@ -183,26 +183,45 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl queryPageList(String projectId) { + public List queryPageList(String projectId, + String dutyTerritoryTemp, + String lawEngineer, + String engineeringInterfacePerson, + String certificationEngineer) { //查询数据 - List result = projectRelatedPersonnelMapper.queryPageList(projectId,DictCodeEnum.DUTY_TERRITORY.getValue()); + List result = projectRelatedPersonnelMapper.queryPageList(projectId, + DictCodeEnum.DUTY_TERRITORY.getValue(), + dutyTerritoryTemp, + lawEngineer, + engineeringInterfacePerson, + certificationEngineer); //查询数据里的责任领域 List dutyTerritory = result.stream().map(e -> e.getDutyTerritory()).collect(Collectors.toList()); //查标签内容里的责任领域数据 List sysDictItemValueList = sysDictItemMapper.selectItemValueByDictCode(DictCodeEnum.DUTY_TERRITORY.getValue()); //没有数据->新增所有责任领域,查询 - if(result.size() != sysDictItemValueList.size()){ + if(StringUtils.isBlank(dutyTerritoryTemp) + && StringUtils.isBlank(lawEngineer) + && StringUtils.isBlank(engineeringInterfacePerson) + && StringUtils.isBlank(certificationEngineer)){ + if(result.size() != sysDictItemValueList.size()){ - //更新相关人员表里的责任领域数据 - if (CollectionUtils.isNotEmpty(sysDictItemValueList)) { - for (String sysDictItemValue : sysDictItemValueList) { - if(!dutyTerritory.contains(sysDictItemValue)) { - setDutyTerritoryValue(sysDictItemValue, projectId); + //更新相关人员表里的责任领域数据 + if (CollectionUtils.isNotEmpty(sysDictItemValueList)) { + for (String sysDictItemValue : sysDictItemValueList) { + if(!dutyTerritory.contains(sysDictItemValue)) { + setDutyTerritoryValue(sysDictItemValue, projectId); + } } } + //重新查询列表 + result = projectRelatedPersonnelMapper.queryPageList(projectId, + DictCodeEnum.DUTY_TERRITORY.getValue(), + dutyTerritoryTemp, + lawEngineer, + engineeringInterfacePerson, + certificationEngineer); } - //重新查询列表 - result = projectRelatedPersonnelMapper.queryPageList(projectId,DictCodeEnum.DUTY_TERRITORY.getValue()); } disposeData(result); return result; @@ -456,7 +475,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl Date: Mon, 4 Jul 2022 18:15:52 +0800 Subject: [PATCH 14/21] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E5=90=8D=E5=8D=95--=E6=89=B9=E9=87=8F=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectRelatedPersonnelController.java | 38 +++++++++++++++++- .../entity/ProjectRelatedPersonnel.java | 6 ++- .../IProjectRelatedPersonnelService.java | 2 + .../ProjectRelatedPersonnelServiceImpl.java | 39 ++++++++++++++++++- 4 files changed, 81 insertions(+), 4 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java index 718595b26..2574ed923 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java @@ -2,6 +2,7 @@ package com.jero.modules.project.controller; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.constant.enums.CutEnum; import com.jero.common.system.base.controller.JeroController; import com.jero.modules.project.entity.ProjectRelatedPersonnel; import com.jero.modules.project.service.IProjectRelatedPersonnelService; @@ -13,7 +14,15 @@ import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; @@ -209,4 +218,31 @@ public class ProjectRelatedPersonnelController extends JeroController certificationEngineerList = projectRelatedPersonnelService.queryCertificationEngineer(projectId); return Result.OK(certificationEngineerList); } + + /** + * 批量设置 + * @param projectRelatedPersonnel + * @return + */ + @AutoLog(value = "批量设置") + @ApiOperation(value="批量设置", notes="批量设置") + @PostMapping(value = "/setBatch") + public Result setBatch(@RequestBody ProjectRelatedPersonnel projectRelatedPersonnel) { + String cut = projectRelatedPersonnel.getCut(); + try { + projectRelatedPersonnelService.setBatch(projectRelatedPersonnel); + } catch (Exception e) { + if(CutEnum.CN.getValue().equals(cut)){ + return Result.error("批量设置失败！"); + }else{ + return Result.error("Batch set success"); + } + } + if(CutEnum.CN.getValue().equals(cut)){ + return Result.OK("批量设置成功"); + }else{ + return Result.OK("Batch set success"); + } + + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRelatedPersonnel.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRelatedPersonnel.java index 4b6f6c130..e94f363f6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRelatedPersonnel.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRelatedPersonnel.java @@ -90,4 +90,8 @@ public class ProjectRelatedPersonnel implements Serializable { /**中英切换标志*/ @TableField(exist = false) private String cut; -} \ No newline at end of file + + //批量设置传参ids + @TableField(exist = false) + private String ids; +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java index ae78929e4..fe8cc762c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java @@ -88,4 +88,6 @@ public interface IProjectRelatedPersonnelService extends IService queryCertificationEngineer(String projectId); + + void setBatch(ProjectRelatedPersonnel projectRelatedPersonnel); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java index 466967e62..a22bc0d69 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java @@ -34,7 +34,14 @@ 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.openxml4j.exceptions.InvalidFormatException; -import org.apache.poi.ss.usermodel.*; +import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.CellType; +import org.apache.poi.ss.usermodel.HorizontalAlignment; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.apache.poi.ss.usermodel.VerticalAlignment; +import org.apache.poi.ss.usermodel.Workbook; +import org.apache.poi.ss.usermodel.WorkbookFactory; import org.apache.poi.ss.util.CellRangeAddress; import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -48,7 +55,14 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.IOException; import java.io.OutputStream; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Comparator; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.TreeSet; import java.util.stream.Collectors; /** @@ -1199,4 +1213,25 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl projectRelatedPersonnelList = new ArrayList<>(); + for (String id : projectRelatedPersonnel.getIds().split(",")) { + ProjectRelatedPersonnel projectRelatedPersonnelTemp = new ProjectRelatedPersonnel(); + projectRelatedPersonnelTemp.setId(id); + projectRelatedPersonnelTemp.setUpdateTime(new Date()); + if(org.apache.commons.lang3.StringUtils.isNotBlank(projectRelatedPersonnel.getLawEngineer())){ + projectRelatedPersonnelTemp.setLawEngineer(projectRelatedPersonnel.getLawEngineer()); + } + if(org.apache.commons.lang3.StringUtils.isNotBlank(projectRelatedPersonnel.getEngineeringInterfacePerson())){ + projectRelatedPersonnelTemp.setEngineeringInterfacePerson(projectRelatedPersonnel.getEngineeringInterfacePerson()); + } + if(org.apache.commons.lang3.StringUtils.isNotBlank(projectRelatedPersonnel.getCertificationEngineer())){ + projectRelatedPersonnelTemp.setCertificationEngineer(projectRelatedPersonnel.getCertificationEngineer()); + } + projectRelatedPersonnelList.add(projectRelatedPersonnelTemp); + } + this.updateBatchById(projectRelatedPersonnelList); + } + } From c4b250439b3df7d5f6b6267408f48eb00b7bfec8 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Tue, 5 Jul 2022 10:47:00 +0800 Subject: [PATCH 15/21] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93bug?= 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 | 3 +- .../projectManagement/components/TaskList.vue | 29 ++++- .../components/listOfRegulations.vue | 111 ++++++++++++++---- 4 files changed, 114 insertions(+), 30 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 420faa5b6..6f9f38f9a 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1072,4 +1072,5 @@ module.exports = { theProjectContactEmpty:'The project contact person of cannot be empty', pleaseSelectinitiatedOrRejected:'Please select the data whose list confirmation status is not initiated or rejected', TheEngineerAndCertification:'The regulatory engineer and Certification Engineer of cannot be empty', + theResponsiblePersonAndDeadlineClank:'The responsible person and deadline of cannot be blank', } \ 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 451c6f549..43e10d21e 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -693,7 +693,7 @@ module.exports = { confirmOverrule: '确认驳回？', The: '第', submitted: '条数据已提交不能重复提交', - incorrectsubmitted: '条数据状态有误；只能提交状态为待确认的数据', + incorrectsubmitted: '状态有误；只能提交状态为待确认的数据', basicInformationOfParameters: '项目基本信息', regulatoryCertificationTaskPlan: '法规/认证任务计划', bringInRelevantPersonnel: '带入相关人员', @@ -1076,4 +1076,5 @@ module.exports = { newNiONumber: 'NIO编号', English:'英文', requiredParametersEmpty:'必填参数不能为空', + theResponsiblePersonAndDeadlineClank:'的责任人、截止时间不能为空', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/TaskList.vue b/jero-web/src/views/projectManagement/components/TaskList.vue index e1f9c7be6..785f780ab 100644 --- a/jero-web/src/views/projectManagement/components/TaskList.vue +++ b/jero-web/src/views/projectManagement/components/TaskList.vue @@ -55,8 +55,8 @@ >
- {{result.serialNumber}}
- {{result.title}} + {{result.serialNumber}} + {{result.title}}
@@ -512,10 +512,20 @@ } .box-content-a { - margin-bottom: 8px; display: inline-block; text-align: left; + margin-bottom: 8px; font-weight: 400; + display: -webkit-box; + width: 100%; + overflow: hidden; + text-overflow: ellipsis; + /*! autoprefixer: off */ + -webkit-box-orient: vertical; + -webkit-line-clamp: 1; + /*! autoprefixer: on;*/ + text-justify: inter-ideograph; + word-break: break-all } .box-content-index { @@ -597,7 +607,18 @@ .box-content-cou { cursor: pointer; } - + .box-content-buttom{ + 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/projectManagement/components/personBatting.vue b/jero-web/src/views/projectManagement/components/personBatting.vue new file mode 100644 index 000000000..bfbc8f9a6 --- /dev/null +++ b/jero-web/src/views/projectManagement/components/personBatting.vue @@ -0,0 +1,180 @@ + + + + + \ No newline at end of file From 14b1a684281ef8e14c2307d54b55e48a146bd9b5 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Tue, 5 Jul 2022 14:17:13 +0800 Subject: [PATCH 18/21] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/PersonnelSelection/index.vue | 302 ++++++++++++++++++ .../components/engineeringConfirmation.vue | 29 +- 2 files changed, 321 insertions(+), 10 deletions(-) create mode 100644 jero-web/src/views/processCenter/components/PersonnelSelection/index.vue diff --git a/jero-web/src/views/processCenter/components/PersonnelSelection/index.vue b/jero-web/src/views/processCenter/components/PersonnelSelection/index.vue new file mode 100644 index 000000000..fb8bcc291 --- /dev/null +++ b/jero-web/src/views/processCenter/components/PersonnelSelection/index.vue @@ -0,0 +1,302 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue index 5082b874a..bf0f9b333 100644 --- a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue +++ b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue @@ -99,6 +99,7 @@ @@ -307,7 +308,7 @@