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

jero-boot/db/蔚来标准sql/dev_third_record.sql

@@ -1309,3 +1309,36 @@ UPDATE `platform_task_planning` SET `create_by` = NULL, `create_time` = NULL, `u
 UPDATE `platform_task_planning` SET `create_by` = NULL, `create_time` = NULL, `update_by` = NULL, `update_time` = NULL, `sys_org_code` = NULL, `node_name` = 'E-mark', `node_time` = NULL, `project_id` = NULL, `flag` = 'down' WHERE `id` = 'e611b793756bf9caeb4a1c09526ceb76';
 UPDATE `platform_task_planning` SET `create_by` = NULL, `create_time` = NULL, `update_by` = NULL, `update_time` = NULL, `sys_org_code` = NULL, `node_name` = 'CAMDS提交', `node_time` = NULL, `project_id` = NULL, `flag` = 'down' WHERE `id` = 'e76e63a251aa6d64cac96125315805e1';
 UPDATE `platform_task_planning` SET `create_by` = NULL, `create_time` = NULL, `update_by` = NULL, `update_time` = NULL, `sys_org_code` = NULL, `node_name` = '验证检查', `node_time` = NULL, `project_id` = NULL, `flag` = 'down' WHERE `id` = 'ee85c1b1964586e512ef0b2b401b16b5';
+
+--项目库添加平台件类型字段  2023-10-18
+ALTER TABLE `project_library_base` ADD COLUMN `platform_type` varchar(255) NULL COMMENT '平台件类型' AFTER `remark`;
+
+--ota_manage_receive_nsdp添加数量字段  2023-10-18
+ALTER TABLE `ota_manage_receive_nsdp`
+ADD COLUMN `extension_item_count` int(10) NULL COMMENT '扩展任务数量' AFTER `created_at`;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageApplyEO.java

@@ -229,5 +229,9 @@ public class OtaManageApplyEO implements Serializable {
     @ApiModelProperty(value = "中英文切换")
     private String cut;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "扩展任务数量")
+    private Integer extensionItemCount;
+
 
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageReceiveNsdp.java

@@ -1,22 +1,19 @@
 package com.jero.modules.ota.entity;
 
-import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import com.jero.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
 
 
 /**
@@ -113,4 +110,7 @@ public class OtaManageReceiveNsdp implements Serializable {
     @ApiModelProperty(value = "排序")
     private java.lang.String orderBy;
 
+    @ApiModelProperty(value = "扩展任务数量")
+    private java.lang.Integer extensionItemCount;
+
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/job/OtaDataUpdate.java

@@ -2,10 +2,12 @@ package com.jero.modules.ota.job;
 
 import com.jero.modules.ota.entity.OtaManageReceive;
 import com.jero.modules.ota.entity.OtaManageReceiveNsdp;
+import com.jero.modules.ota.enums.OtaHomoImpactEnum;
 import com.jero.modules.ota.service.IOtaManageReceiveNsdpService;
 import com.jero.modules.ota.service.IOtaManageReceiveService;
 import com.jero.modules.system.util.StringUtils;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.ObjectUtils;
 import org.quartz.Job;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
@@ -247,6 +249,26 @@ public class OtaDataUpdate implements Job {
         if (CollectionUtils.isNotEmpty(dateUpdateList)) {
             otaManageReceiveService.updateBatchById(dateUpdateList);
         }
+        //扩展任务数量的值为Homo Extension - Paperwork和Homo Extension - Retest的数量和
+        List<OtaManageReceive> otaManageReceiveList = otaManageReceiveService.queryList();
+        List<OtaManageReceiveNsdp> otaManageReceiveNsdpList = otaManageReceiveNsdpService.queryList();
+        for (OtaManageReceiveNsdp otaManageReceiveNsdp : otaManageReceiveNsdpList) {
+            List<OtaManageReceive> collect = otaManageReceiveList.stream()
+                    .filter(e -> StringUtils.isNotBlank(e.getPlannedBpLaunchBatch())
+                            && e.getPlannedBpLaunchBatch().equals(otaManageReceiveNsdp.getReleaseName())).collect(Collectors.toList());
+            List<OtaManageReceive> collect1 = collect.stream()
+                    .filter(e -> OtaHomoImpactEnum.HOMOEX_PAPERWORK.getValue().equals(e.getHomologationImpact())
+                            || OtaHomoImpactEnum.HOMOEX_RETEST.getValue().equals(e.getHomologationImpact())).collect(Collectors.toList());
+            if(ObjectUtils.isNotEmpty(collect1)){
+                otaManageReceiveNsdp.setExtensionItemCount(collect1.size());
+            }else{
+                otaManageReceiveNsdp.setExtensionItemCount(0);
+            }
+        }
+        otaManageReceiveNsdpService.updateBatchById(otaManageReceiveNsdpList);
+
+
+
         System.out.println("===============================OtaDataUpdate定时任务结束===============================");
     }
 

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java

@@ -11,12 +11,20 @@ import com.jero.common.util.oConvertUtils;
 import com.jero.modules.dummy.enums.OrderEnum;
 import com.jero.modules.feishu.enums.TemplateInfoEnum2;
 import com.jero.modules.feishu.service.IFeishuService;
-import com.jero.modules.ota.entity.*;
+import com.jero.modules.ota.entity.OtaManageApplyEO;
+import com.jero.modules.ota.entity.OtaManageHistory;
+import com.jero.modules.ota.entity.OtaManagePermission;
+import com.jero.modules.ota.entity.OtaManageReceive;
+import com.jero.modules.ota.entity.OtaManageReceiveNsdp;
 import com.jero.modules.ota.enums.OtaCarEnum;
 import com.jero.modules.ota.enums.OtaHomoImpactEnum;
 import com.jero.modules.ota.enums.OtaStatusEnum;
 import com.jero.modules.ota.mapper.OtaManageApplyEOMapper;
-import com.jero.modules.ota.service.*;
+import com.jero.modules.ota.service.IOtaManageApplyEOService;
+import com.jero.modules.ota.service.IOtaManageHistoryService;
+import com.jero.modules.ota.service.IOtaManagePermissionService;
+import com.jero.modules.ota.service.IOtaManageReceiveNsdpService;
+import com.jero.modules.ota.service.IOtaManageReceiveService;
 import com.jero.modules.ota.vo.AllCarExportCnVO;
 import com.jero.modules.ota.vo.AllCarExportEnVO;
 import com.jero.modules.ota.vo.OneCarExportCnVO;
@@ -57,7 +65,6 @@ import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
 import java.text.Collator;
-import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -119,8 +126,6 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
     @Value(value = "${jero.backUrlPhone}")
     private String backUrlPhone;
 
-    private static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-    private static SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
 
     /**
      * 保存
@@ -197,6 +202,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
 
 
     public List<OtaManageApplyEO> getNsdpList(OtaManageApplyEO otaManageApplyEO) {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         Date today = new Date();
         List<OtaManageApplyEO> resList = new ArrayList<>();
         List<OtaManageReceiveNsdp> dataList = otaManageReceiveNsdpService.queryList();
@@ -213,7 +219,13 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
                 Set<String> marketSet = new HashSet<>();
                 //车型
                 Set<String> vehicleSet = new HashSet<>();
+                int extensionItemCount = 0;
                 for (OtaManageReceiveNsdp omrn : valList) {
+                    if(ObjectUtils.isEmpty(omrn.getExtensionItemCount())){
+                        extensionItemCount = 0;
+                    }else{
+                        extensionItemCount = omrn.getExtensionItemCount();
+                    }
                     //找到最快来临的发布时间
                     try {
                         if(StringUtils.isNotBlank(omrn.getReleaseDate())){
@@ -226,7 +238,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
                                 }
                             }
                         }
-                    } catch (ParseException e) {
+                    } catch (Exception e) {
                         e.printStackTrace();
                     }
                     String appliedVehicleProject = omrn.getVehicle();
@@ -269,6 +281,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
                 }
                 oma.setCreatedAt(omrn.getCreatedAt());
                 oma.setReleaseType(omrn.getReleaseType());
+                oma.setExtensionItemCount(extensionItemCount);
                 resList.add(oma);
             }
         }
@@ -300,76 +313,6 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
                 dataList = collect;
             }
         }
-
-//        List<OtaManageApplyEO> result = new ArrayList<>();
-//        if (!dataList.isEmpty()) {
-//            List<String> otaNameList = OtaCarEnum.getOtaNameList();
-//            List<String> plannedBpLaunchBatchList = dataList.stream()
-//                    .filter(e -> StringUtils.isNotBlank(e.getPlannedBpLaunchBatch()))
-//                    .map(OtaManageApplyEO::getPlannedBpLaunchBatch).distinct().collect(Collectors.toList());
-//            if (!plannedBpLaunchBatchList.isEmpty()) {
-//                for (String plannedBpLaunchBatch : plannedBpLaunchBatchList) {
-//                    OtaManageApplyEO manageApplyEO = new OtaManageApplyEO();
-//                    manageApplyEO.setPlannedBpLaunchBatch(plannedBpLaunchBatch);
-//                    manageApplyEO.setId(plannedBpLaunchBatch);
-//
-//                    List<OtaManageApplyEO> otaManageApplyEOS = dataList.stream()
-//                            .filter(e -> plannedBpLaunchBatch.equals(e.getPlannedBpLaunchBatch())).collect(Collectors.toList());
-//                    if (!otaManageApplyEOS.isEmpty()) {
-//                        //发布时间
-//                        manageApplyEO.setReleaseDate(otaManageApplyEOS.get(0).getReleaseDate());
-//
-//                        List<String> appliedVehicleProjectList = otaManageApplyEOS.stream()
-//                                .filter(e -> StringUtils.isNotBlank(e.getAppliedVehicleProject()))
-//                                .map(OtaManageApplyEO::getAppliedVehicleProject).collect(Collectors.toList());
-//                        List<String> carList = new ArrayList<>();
-//                        for (String appliedVehicleProject : appliedVehicleProjectList) {
-//                            carList.addAll(Arrays.asList(appliedVehicleProject.split(",")));
-//                        }
-//                        if (!carList.isEmpty()) {
-//                            //适用车型
-//                            carList = carList.stream().distinct().collect(Collectors.toList());
-//                            manageApplyEO.setAppliedVehicleProject(StringUtils.join(carList, ","));
-//                            //市场
-//                            Set<String> marketSet = new HashSet<>();
-//                            for (String appliedVehicleProject : carList) {
-//                                if(otaNameList.contains(appliedVehicleProject)){
-//                                    marketSet.add(appliedVehicleProject);
-//                                }else{
-//                                    for (String s : appliedVehicleProject.split(",")) {
-//                                        String[] split = s.split(" ");
-//                                        if (split.length == 2) {
-//                                            if (!otaNameList.contains(s)) {
-//                                                marketSet.add(split[1]);
-//                                            }
-//                                        } else if (split.length == 3) {
-//                                            if (!otaNameList.contains(s)) {
-//                                                marketSet.add(split[2]);
-//                                            }
-//                                        }
-//                                    }
-//                                }
-//                            }
-//                            if (!marketSet.isEmpty()) {
-//                                manageApplyEO.setMarket(StringUtils.join(marketSet, ","));
-//                            }
-//                        }
-//                    }
-//                    result.add(manageApplyEO);
-//                }
-//            }
-//        }
-//        if (ObjectUtils.isNotEmpty(otaManageApplyEO.getSoftwareIssueTimeStart())) {
-//            result = result.stream()
-//                    .filter(e -> StringUtils.isNotBlank(e.getReleaseDate())
-//                            && (e.getReleaseNameDate().after(otaManageApplyEO.getSoftwareIssueTimeStart())
-//                            || e.getReleaseNameDate().equals(otaManageApplyEO.getSoftwareIssueTimeStart()))).collect(Collectors.toList());
-//        }
-//        if (ObjectUtils.isNotEmpty(otaManageApplyEO.getSoftwareIssueTimeEnd())) {
-//            result = result.stream().filter(e -> StringUtils.isNotBlank(e.getReleaseDate())
-//                    && (e.getReleaseNameDate().before(otaManageApplyEO.getSoftwareIssueTimeEnd())
-//                    || e.getReleaseNameDate().equals(otaManageApplyEO.getSoftwareIssueTimeEnd()))).collect(Collectors.toList());
-//        }
         if (!dataList.isEmpty()) {
             //表头排序
             heartSort(otaManageApplyEO, dataList);

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/xml/PlatformProjectLibraryBaseMapper.xml

@@ -80,6 +80,7 @@
             plb.cooling_method,
             plb.filing_completion_time,
             plb.remark,
+            plb.platform_type,
             sdi.item_text brandText,
             sdi.en_name brandTextEn
         from project_library_base as plb

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java

@@ -365,6 +365,8 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 		LambdaQueryWrapper<ProjectLawsInventoryEO> wrapperTemp = new LambdaQueryWrapper<>();
 		wrapperTemp.in(ProjectLawsInventoryEO::getProjectLibraryId, projectLawsInventoryEO.getProjectLibraryId());
 		List<ProjectLawsInventoryEO> projectLawsInventoryEOList = this.list(wrapperTemp);
+		//项目信息
+		ProjectLibraryBase projectLibraryBase = projectLibraryBaseService.getById(projectLawsInventoryEO.getProjectLibraryId());
 		//调取
 		String dummyInventoryBaseId = projectLawsInventoryEO.getDummyInventoryBaseId();
 		if (StringUtils.isNotBlank(projectLawsInventoryEO.getDummyids())) {
@@ -403,6 +405,8 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 						projectLawsInventoryEOTemp.setVerifyFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue());
 						projectLawsInventoryEOTemp.setCreateTime(new Date());
 						projectLawsInventoryEOTemp.setUpdateTime(new Date());
+						projectLawsInventoryEOTemp.setRegulationOwnerId(projectLibraryBase.getRegulationOwnerId());
+						projectLawsInventoryEOTemp.setEngineeringInterfacePerson(projectLibraryBase.getEngineeringInterfacePerson());
 						projectLawsInventoryEOS.add(projectLawsInventoryEOTemp);
 					}
 				} else {
@@ -414,7 +418,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 						if (collect.size() != 0) {
 							for (ProjectLawsInventoryEO lawsInventoryEO : collect) {
 								//数据对比
-								ProjectLawsInventoryEO projectLawsInventoryEOTemp = dataCompare(lawsInventoryEO, dummyInventoryInfoEO);
+								ProjectLawsInventoryEO projectLawsInventoryEOTemp = dataCompare(lawsInventoryEO, dummyInventoryInfoEO,projectLibraryBase);
 								projectLawsInventoryEOListTemp.add(projectLawsInventoryEOTemp);
 							}
 						} else {
@@ -429,6 +433,8 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 							projectLawsInventoryEOTemp.setVerifyFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue());
 							projectLawsInventoryEOTemp.setCreateTime(new Date());
 							projectLawsInventoryEOTemp.setUpdateTime(new Date());
+							projectLawsInventoryEOTemp.setRegulationOwnerId(projectLibraryBase.getRegulationOwnerId());
+							projectLawsInventoryEOTemp.setEngineeringInterfacePerson(projectLibraryBase.getEngineeringInterfacePerson());
 							projectLawsInventoryEOS.add(projectLawsInventoryEOTemp);
 						}
 					}
@@ -3685,10 +3691,12 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 	}
 
 
-	private ProjectLawsInventoryEO dataCompare(ProjectLawsInventoryEO projectLawsInventoryEO, DummyInventoryInfoEO dummyInventoryInfoEO) {
+	private ProjectLawsInventoryEO dataCompare(ProjectLawsInventoryEO projectLawsInventoryEO,
+											   DummyInventoryInfoEO dummyInventoryInfoEO,
+											   ProjectLibraryBase projectLibraryBase) {
 		//编号
 		if (StringUtils.isBlank(projectLawsInventoryEO.getSerialNumber())) {
-			projectLawsInventoryEO.setSendMsgFlag(dummyInventoryInfoEO.getSerialNumber());
+			projectLawsInventoryEO.setSerialNumber(dummyInventoryInfoEO.getSerialNumber());
 		}
 		//标题
 		if (StringUtils.isBlank(projectLawsInventoryEO.getTitle())) {
@@ -3788,6 +3796,14 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 		if (StringUtils.isBlank(projectLawsInventoryEO.getVerifyDuty())) {
 			projectLawsInventoryEO.setVerifyDuty(dummyInventoryInfoEO.getVerifyDuty());
 		}
+		//法规工程师
+		if(StringUtils.isBlank(projectLawsInventoryEO.getRegulationOwnerId())){
+			projectLawsInventoryEO.setRegulationOwnerId(projectLibraryBase.getRegulationOwnerId());
+		}
+		//工程接口人
+		if(StringUtils.isBlank(projectLawsInventoryEO.getEngineeringInterfacePerson())){
+			projectLawsInventoryEO.setEngineeringInterfacePerson(projectLibraryBase.getEngineeringInterfacePerson());
+		}
 		return projectLawsInventoryEO;
 	}
 

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java

@@ -266,6 +266,9 @@ public class ProjectLibraryBase implements Comparable<ProjectLibraryBase> {
     @TableField(exist = false)
     private List<String> urlList;
 
+    @ApiModelProperty(value = "平台件类型")
+    private String platformType;
+
 
     @Override
     public int compareTo(ProjectLibraryBase o) {