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

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java

@@ -106,7 +106,9 @@ public class OtaBaCxListController extends JeroController<OtaBaCxList, IOtaBaCxL
     @ApiOperation(value = "车型及功能备案列表-列表查询", notes = "车型及功能备案列表-列表查询")
     @GetMapping(value = "/list")
     public Result<List<OtaBaCxList>> queryList() {
-        List<OtaBaCxList> list = otaBaCxListService.queryList();
+        LambdaQueryWrapper<OtaBaCxList> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.orderByDesc(OtaBaCxList::getCreateTime);
+        List<OtaBaCxList> list = otaBaCxListService.list(queryWrapper);
         return Result.OK(list);
     }
 

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java

@@ -102,7 +102,9 @@ public class OtaBaSjListController extends JeroController<OtaBaSjList, IOtaBaSjL
     @ApiOperation(value = "升级备案-升级活动备案列表-列表查询", notes = "升级备案-升级活动备案列表-列表查询")
     @GetMapping(value = "/list")
     public Result<List<OtaBaSjList>> queryList() {
-        List<OtaBaSjList> list = otaBaSjListService.queryList();
+        LambdaQueryWrapper<OtaBaSjList> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.orderByDesc(OtaBaSjList::getCreateTime);
+        List<OtaBaSjList> list = otaBaSjListService.list(queryWrapper);
         return Result.OK(list);
     }
 

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java

@@ -14,7 +14,7 @@ public enum OtaTitleEnum {
     BZ("bz", "备注", "0"),
 
     CXMB("cxmb", "车型模板", "0"),
-    QYMC("qymc", "企业名称", "0"),
+//    QYMC("qymc", "企业名称", "0"),
     DJBH("djbh", "产品登记编号", "0"),
     CPLB("cplb", "产品类别", "product_category"),
     DLLX1("dllx1", "车辆动力类型", "0"),

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

@@ -93,9 +93,6 @@ public class OtaBaSjSjmbcxServiceImpl extends ServiceImpl<OtaBaSjSjmbcxMapper, O
         otaBaSjSjmbcx.setUpdateTime(now);
         ComparisonUtil cu = new ComparisonUtil();
         List<OtaBaCxTxjl> reList = cu.comparisonRecord(otaBaSjSjmbcx.getOtaId(), OtaModuleEnum.SJ_SJMBCX, otaBaSjSjmbcxOld, otaBaSjSjmbcx, sysDictService);
-        if (StringUtils.isEmpty(otaBaSjSjmbcx.getQymc())) {
-            otaBaSjSjmbcx.setQymc("安徽江淮汽车集团股份有限公司");
-        }
         saveOrUpdate(otaBaSjSjmbcx);
         otaBaCxTxjlService.saveBatch(reList);
         return otaBaSjSjmbcx;

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java

@@ -2859,6 +2859,49 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 								}
 							}
 						}
+						if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
+							for(int k = 0 ;k<rowList.size();k++){
+								if("".equals(rowList.get("category")) ||
+										"".equals(rowList.get("inspectionItem")) ||
+										"".equals(rowList.get("configItem")) ||
+										"".equals(rowList.get("wvtaId")) ||
+										"".equals(rowList.get("serialNumber")) ||
+										"".equals(rowList.get("dutyTerritoryName")) ||
+										"".equals(rowList.get("sdtName")) ||
+										"".equals(rowList.get("dutyPersonName")) ||
+										"".equals(rowList.get("deliverableTypeName")) ||
+										"".equals(rowList.get("endTimeStr")) ){
+									//删除原上传文件
+									FileUnZip.deleteDir(saveDirectory);
+									if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
+										throw new JeroBootException("请填写必填字段内容,带*的为必填");
+									}else{
+										throw new JeroBootException("Please fill in the required fields marked with *");
+									}
+								}
+							}
+						}else {
+							for(int k = 0 ;k<rowList.size();k++){
+								if("".equals(rowList.get("category")) ||
+										"".equals(rowList.get("inspectionItem")) ||
+										"".equals(rowList.get("configItem")) ||
+										"".equals(rowList.get("wvtaId")) ||
+										"".equals(rowList.get("serialNumber")) ||
+										"".equals(rowList.get("dutyTerritoryName")) ||
+										"".equals(rowList.get("sdtName")) ||
+										"".equals(rowList.get("dutyPersonName")) ||
+										"".equals(rowList.get("deliverableTypeNameEn")) ||
+										"".equals(rowList.get("endTimeStr")) ){
+									//删除原上传文件
+									FileUnZip.deleteDir(saveDirectory);
+									if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
+										throw new JeroBootException("请填写必填字段内容,带*的为必填");
+									}else{
+										throw new JeroBootException("Please fill in the required fields marked with *");
+									}
+								}
+							}
+						}
 						if (i > 1) {
 							dataList.add(rowList);
 						}
@@ -3518,8 +3561,10 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 	//编号验证
 	private void verifySerialNumber(List<ProjectCertificationInventoryEO> datas,
 									ProjectCertificationInventoryEO projectCertificationInventoryEOTemp) {
-		//1. 验证标准号在文档库中是否存在
+
+
 		List<String> serialNumberList = datas.stream().map(ProjectCertificationInventoryEO::getSerialNumber).collect(Collectors.toList());
+		//1. 验证标准号在文档库中是否存在
 		LambdaQueryWrapper<BussDocumentLibraryEO> wrapper = new LambdaQueryWrapper<>();
 		wrapper.in(BussDocumentLibraryEO::getSerialNumber,serialNumberList);
 		List<BussDocumentLibraryEO> bussDocumentLibraryEOList = iBussDocumentLibraryEOService.list(wrapper);
@@ -3536,6 +3581,23 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 					throw new JeroBootException(StringUtils.join(serialNumbers,",")+" does not exist in the document library and cannot be added");
 				}
 			}
+		}else{
+			//验证编号在法规清单中是否存在
+			LambdaQueryWrapper<ProjectLawsInventoryEO> lwrapper = new LambdaQueryWrapper<>();
+			lwrapper.in(ProjectLawsInventoryEO::getSerialNumber,serialNumberList);
+			List<ProjectLawsInventoryEO> projectLawsInventoryEOList = projectLawsInventoryEOService.list(lwrapper);
+			List<String> LawSerialNumberListTemp = projectLawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getSerialNumber).distinct().collect(Collectors.toList());
+			if(serialNumberList.size() != LawSerialNumberListTemp.size()){
+				//存在法规清单中没有的数据
+				List<String> collect = projectLawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getSerialNumber).collect(Collectors.toList());
+				List<String> serialNumbers = serialNumberList.stream().filter(e -> !collect.contains(e)).collect(Collectors.toList());
+				if(serialNumbers.size() > 0){
+					if(CutEnum.CN.getValue().equals(datas.get(0).getCut())){
+						throw new JeroBootException(StringUtils.join(serialNumbers,",")+"法规清单中不存在,不能添加");
+					}else{
+						throw new JeroBootException(StringUtils.join(serialNumbers,",")+" does not exist in the project laws and cannot be added");
+					}
+				}
 			}else{
 				for (ProjectCertificationInventoryEO projectCertificationInventoryEO : datas) {
 					List<BussDocumentLibraryEO> collect = bussDocumentLibraryEOList.stream()
@@ -3543,18 +3605,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 					projectCertificationInventoryEO.setBussDocumentLibraryId(collect.get(0).getId());
 				}
 			}
-//		//2. 验证标准号在法规清单中是否添加过
+		}
-//		LambdaQueryWrapper<ProjectCertificationInventoryEO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+
-//		lambdaQueryWrapper.in(ProjectCertificationInventoryEO::getSerialNumber,serialNumberList).in(ProjectCertificationInventoryEO::getProjectLibraryId,projectCertificationInventoryEOTemp.getProjectLibraryId());
-//		List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList = this.list(lambdaQueryWrapper);
-//		List<String> serialNumberTempList = projectCertificationInventoryEOList.stream().map(ProjectCertificationInventoryEO::getSerialNumber).collect(Collectors.toList());
-//		if(projectCertificationInventoryEOList.size() > 0){
-//			if(CutEnum.CN.getValue().equals(datas.get(0).getCut())){
-//				throw new JeroBootException(StringUtils.join(serialNumberTempList,",")+"已存在,不能重复添加");
-//			}else{
-//				throw new JeroBootException(StringUtils.join(serialNumberTempList,",")+" already exists and cannot be added again");
-//			}
-//		}
 	}
 
 	/**