WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_20230912_Platform' into fix_20230911_UAT

Browse Source
This commit is contained in:
高嵩
2023-09-28 16:00:48 +08:00
parent 0793f28305 d4e9fcd6dd
commit fcfaa52184
8 changed files with 34 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/db/蔚来标准sql/dev_third_record.sql
+7
View File
@@ -1241,3 +1241,10 @@ CREATE TABLE `laws_inventory_platform` (
`platform_laws_inventory_id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '平台件项目库法规清单id',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
--车修改字段长度2023-09-28
ALTER TABLE `project_certification_directory`
MODIFY COLUMN `directory_name` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '目录名称' AFTER `project_library_id`,
MODIFY COLUMN `lot` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '批次' AFTER `directory_name`,
MODIFY COLUMN `detection_report_location` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '检测报告位置' AFTER `experiment_file`,
MODIFY COLUMN `explain_info` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '说明' AFTER `detection_report_location`;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
+5
View File
@@ -4991,6 +4991,11 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
value = pullMore(dictItemList, projectCertificationInventoryEO, errorMsg, dutyTerritory,msgList,"责任领域","Responsible Field","duty_territory");
if(StringUtils.isNotBlank(value)){
projectCertificationInventoryEO.setDutyTerritory(value);
List<String> list = Arrays.asList(value.split(","));
List<SysDictItem> ddList = dictItemList.stream().filter(e -> "duty_territory".equals(e.getDictCode()) && list.contains(e.getItemValue())).collect(Collectors.toList());
List<String> valueList = ddList.stream().map(SysDictItem::getStatNode).collect(Collectors.toList());
projectCertificationInventoryEO.setDutyDepart(StringUtils.join(valueList,","));
}
}
//工程接口人(责任领域下的工程接口人)
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
+9
View File
@@ -5592,6 +5592,15 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
flag = must(projectLawsInventoryEO, errorMsg, msgList, dutyTerritory, "责任领域", "Responsible Field");
if (flag) {
value = pullMore(dictItemList, projectLawsInventoryEO, errorMsg, dutyTerritory, msgList, "责任领域", "Responsible Field", DicCodeEnum.DUTY_TERRITORY.getCode());
if(StringUtils.isNotBlank(value)){
projectLawsInventoryEO.setDutyTerritory(value);
List<String> list = Arrays.asList(value.split(","));
List<SysDictItem> ddList = dictItemList.stream().filter(e -> "duty_territory".equals(e.getDictCode()) && list.contains(e.getItemValue())).collect(Collectors.toList());
List<String> valueList = ddList.stream().map(SysDictItem::getStatNode).collect(Collectors.toList());
projectLawsInventoryEO.setDutyDepart(StringUtils.join(valueList,","));
}
if (StringUtils.isNotBlank(value)) {
//工程接口人(责任领域下的工程接口人)
Map<String, Object> objectMap = iProjectRelatedPersonnelService.queryPersonByProjectId(projectLawsInventoryEOTemp.getProjectLibraryId(), value);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
+4
View File
@@ -4880,6 +4880,10 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
value = pullMore(dictItemList, projectCertificationInventoryEO, errorMsg, dutyTerritory,msgList,"责任领域","Responsible Field","duty_territory");
if(StringUtils.isNotBlank(value)){
projectCertificationInventoryEO.setDutyTerritory(value);
List<String> list = Arrays.asList(value.split(","));
List<SysDictItem> ddList = dictItemList.stream().filter(e -> "duty_territory".equals(e.getDictCode()) && list.contains(e.getItemValue())).collect(Collectors.toList());
List<String> valueList = ddList.stream().map(SysDictItem::getStatNode).collect(Collectors.toList());
projectCertificationInventoryEO.setDutyDepart(StringUtils.join(valueList,","));
}
}
//工程接口人(责任领域下的工程接口人)
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+5
View File
@@ -5522,6 +5522,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
if (flag) {
value = pullMore(dictItemList, projectLawsInventoryEO, errorMsg, dutyTerritory, msgList, "责任领域", "Responsible Field", DicCodeEnum.DUTY_TERRITORY.getCode());
if (StringUtils.isNotBlank(value)) {
List<String> list = Arrays.asList(value.split(","));
List<SysDictItem> ddList = dictItemList.stream().filter(e -> "duty_territory".equals(e.getDictCode()) && list.contains(e.getItemValue())).collect(Collectors.toList());
List<String> valueList = ddList.stream().map(SysDictItem::getStatNode).collect(Collectors.toList());
projectLawsInventoryEO.setDutyDepart(StringUtils.join(valueList,","));
//工程接口人(责任领域下的工程接口人)
Map<String, Object> objectMap = iProjectRelatedPersonnelService.queryPersonByProjectId(projectLawsInventoryEOTemp.getProjectLibraryId(), value);