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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
liyawei
2022-05-09 18:41:07 +08:00
parent 234350dc11 5b68848cc0
commit 6b85139516
1 changed files with 43 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+43 -18
View File
@@ -1833,20 +1833,15 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
}
}
workbook.close();
// //树形数据字典
List<SysCategory> categoryList = sysCategoryService.list();
//普通数据字典
List<SysDictItem> dictItemList = sysDictItemServiceImpl.selectItemsAll();
importDatas(datas, categoryList, dictItemList, zipEntryName,saveDirectory,projectLawsInventoryEO);
importDatas(datas, dictItemList, zipEntryName,saveDirectory,projectLawsInventoryEO);
//删除原上传文件
FileUnZip.deleteDir(saveDirectory);
}
private void importDatas(List<ProjectLawsInventoryEO> dataList,
List<SysCategory> categoryList,
List<SysDictItem> dictItemList,
String zipEntryName,
File saveDirectory,
@@ -1868,6 +1863,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
}
//编号
String serialNumber = projectLawsInventoryEO.getSerialNumber();
//子标题subtitle
String subtitle = projectLawsInventoryEO.getSubtitle();
//WVTA ID
String wvtaId = projectLawsInventoryEO.getWvtaId();
//备注 remark
String remark = projectLawsInventoryEO.getRemark();
//认证级别
String attestationRank = projectLawsInventoryEO.getAttestationRank();
//责任领域
@@ -1920,24 +1921,48 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
//编号(输入框必填)
flag = must(projectLawsInventoryEO, errorMsg, msgList, serialNumber, "编号", "serial number");
//子标题
if(StringUtils.isNotBlank(subtitle)){
if(subtitle.length() > 100){
String message = "";
if(CutEnum.CN.getValue().equals(projectLawsInventoryEOTemp.getCut())){
message = errorMsg + "子标题不能超过100个字符";
}else{
message = errorMsg + " Subheadings cannot be checked more than 100 characters";
}
msgList.add(message);
}
}
//WVTA ID
if(StringUtils.isNotBlank(wvtaId)){
if(wvtaId.length() > 100){
String message = "";
if(CutEnum.CN.getValue().equals(projectLawsInventoryEOTemp.getCut())){
message = errorMsg + "WVTA ID不能超过100个字符";
}else{
message = errorMsg + " The WVTA ID cannot contain more than 100 characters";
}
msgList.add(message);
}
}
//备注 remark
if(StringUtils.isNotBlank(remark)){
if(remark.length() > 300){
String message = "";
if(CutEnum.CN.getValue().equals(projectLawsInventoryEOTemp.getCut())){
message = errorMsg + "备注不能超过300个字符";
}else{
message = errorMsg + " Note The value cannot exceed 300 characters";
}
msgList.add(message);
}
}
//实施类别(单选不必填)
value = pullSingle(dictItemList, projectLawsInventoryEO, errorMsg, implementType,msgList,"实施类别","implementation category","implement_type");
if(StringUtils.isNotBlank(value)){
projectLawsInventoryEO.setImplementType(value);
}
//新车实施日期 xin1Che1Xing2Shi2Shi1Ri4Qi1
// flag = dateVerify(dummyInventoryInfoEO, errorMsg, xin1Che1Xing2Shi2Shi1Ri4Qi1,msgList,"新车实施日期","new car implementation date");
// if(flag){
// dummyInventoryInfoEO.setXin1Che1Xing2Shi2Shi1Ri4Qi1(xin1Che1Xing2Shi2Shi1Ri4Qi1);
// }
//在产车实施日期 implementTime
// flag = dateVerify(dummyInventoryInfoEO, errorMsg, implementTime,msgList,"在产车实施日期","on the production vehicle implementation date");
// if(flag){
// dummyInventoryInfoEO.setImplementTime(implementTime);
// }
//认证类型(单选不必填)
value = pullSingle(dictItemList, projectLawsInventoryEO, errorMsg, attestationType,msgList,"认证类型","certification type","attestation_type");
if(StringUtils.isNotBlank(value)){