FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

国内 清单bug修复

Browse Source
This commit is contained in:
yuezhihang
2022-06-23 14:35:46 +08:00
parent 6cd06641ca
commit 03b4ba0d1e
2 changed files with 74 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/AddDetailedDto.java
+2
View File
@@ -42,4 +42,6 @@ public class AddDetailedDto {
private String inforlist2; private String inforlist2;
@ApiModelProperty(value = "新车型实施时间") @ApiModelProperty(value = "新车型实施时间")
private String inforlist3; private String inforlist3;
@ApiModelProperty(value = "适用认证")
private String inforlist4;
} }
adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java
+72 -49
View File
@@ -323,30 +323,50 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
sarLawsDetailedListDao.insert(sarLawsDetailedList); sarLawsDetailedListDao.insert(sarLawsDetailedList);
if (addDetailedDto.getInforlist() != null) { if (addDetailedDto.getInforlist() != null) {
if (addDetailedDto.getInforlist().contains(",")) { if (addDetailedDto.getInforlist().contains(",")) {
String[] id = addDetailedDto.getInforlist().split(","); String[] id = new String[]{};
String[] putTime = addDetailedDto.getInforlist1().split(";"); String[] putTime = new String[]{};
String[] zcc = addDetailedDto.getInforlist2().split(";"); String[] zcc = new String[]{};
String[] xcx = addDetailedDto.getInforlist3().split(";"); String[] xcx = new String[]{};
String[] syrz = new String[]{};
if (StringUtils.isNotEmpty(addDetailedDto.getInforlist())) {
id = addDetailedDto.getInforlist().split(",");
}
if (StringUtils.isNotEmpty(addDetailedDto.getInforlist1())) {
putTime = addDetailedDto.getInforlist1().split(";");
}
if (StringUtils.isNotEmpty(addDetailedDto.getInforlist2())) {
zcc = addDetailedDto.getInforlist2().split(";");
}
if (StringUtils.isNotEmpty(addDetailedDto.getInforlist3())) {
xcx = addDetailedDto.getInforlist3().split(";");
}
if (StringUtils.isNotEmpty(addDetailedDto.getInforlist4())) {
syrz = addDetailedDto.getInforlist4().split(";");
}
for (int a = 0; a < id.length; a++) { for (int a = 0; a < id.length; a++) {
TimeDto dto = new TimeDto(); TimeDto dto = new TimeDto();
dto.setStandId(id[a]); dto.setStandId(id[a]);
//putTiem即ssrq可能为空 '' //putTiem即ssrq可能为空 ''
if (putTime.length > 0) {
if ("-".equals(putTime[a]) || null == putTime[a]) { if (putTime.length <= a) {
dto.setSsrq(null); dto.setSsrq(null);
} else { } else {
dto.setSsrq(putTime[a]); dto.setSsrq(putTime[a]);
} }
if ("-".equals(putTime[a]) || null == xcx[a]) { if (xcx.length <= a) {
dto.setXcxssrqgj(null); dto.setXcxssrqgj(null);
} else { } else {
dto.setXcxssrqgj(xcx[a]); dto.setXcxssrqgj(xcx[a]);
} }
if ("-".equals(putTime[a]) || null == zcc[a]) { if (zcc.length <= a) {
dto.setZccssrqgj(null); dto.setZccssrqgj(null);
} else { } else {
dto.setZccssrqgj(zcc[a]); dto.setZccssrqgj(zcc[a]);
} }
if (syrz.length <= a) {
dto.setSyrz(null);
} else {
dto.setSyrz(syrz[a]);
} }
timeDto.add(dto); timeDto.add(dto);
} }
@@ -356,22 +376,25 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
dto.setSsrq(addDetailedDto.getInforlist1()); dto.setSsrq(addDetailedDto.getInforlist1());
dto.setXcxssrqgj(addDetailedDto.getInforlist2()); dto.setXcxssrqgj(addDetailedDto.getInforlist2());
dto.setZccssrqgj(addDetailedDto.getInforlist3()); dto.setZccssrqgj(addDetailedDto.getInforlist3());
dto.setSyrz(addDetailedDto.getInforlist4());
timeDto.add(dto); timeDto.add(dto);
} }
} else { } else {
timeDto = null; timeDto = null;
} }
service.insertDetailedList(sarLawsDetailedList.getId(), timeDto); service.insertDetailedList(sarLawsDetailedList.getId(), timeDto);
if (null != timeDto) { List<String> list1 = new ArrayList<>();
List<SarStandardsInfo> sarStandardsInfos = new ArrayList<>(); List<String> list2 = new ArrayList<>();
timeDto.forEach(timeDto1 -> { //避免出现数据丢失 处理一下适用认证信息
SarStandardsInfo sarStandardsInfo = new SarStandardsInfo(); list1.addAll(Arrays.asList(addDetailedDto.getInforlist().split(",")));
sarStandardsInfo.setId(timeDto1.getStandId()); Hashtable<String, String> hashtable = new Hashtable<>();
sarStandardsInfo.setIsRelateAccess("1"); for (TimeDto dto:timeDto) {
sarStandardsInfos.add(sarStandardsInfo); if (StringUtils.isNotBlank(dto.getSyrz())) {
}); hashtable.put(dto.getStandId(), dto.getSyrz());
sarStandardsInfoService.updateBatchById(sarStandardsInfos); }
} }
//下面写消息队列了开始
createUpdateMQService.sendMQ(hashtable, list2, list1);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
@@ -656,16 +679,16 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
String[] zcc = new String[]{}; String[] zcc = new String[]{};
String[] xcx = new String[]{}; String[] xcx = new String[]{};
String[] syrz = new String[]{}; String[] syrz = new String[]{};
if(StringUtils.isNotEmpty(detailedUpDto.getInforlist())){ if (StringUtils.isNotEmpty(detailedUpDto.getInforlist())) {
id = detailedUpDto.getInforlist().split(","); id = detailedUpDto.getInforlist().split(",");
} }
if(StringUtils.isNotEmpty(detailedUpDto.getInforlist1())){ if (StringUtils.isNotEmpty(detailedUpDto.getInforlist1())) {
putTime = detailedUpDto.getInforlist1().split(";"); putTime = detailedUpDto.getInforlist1().split(";");
} }
if(StringUtils.isNotEmpty(detailedUpDto.getInforlist2())){ if (StringUtils.isNotEmpty(detailedUpDto.getInforlist2())) {
zcc = detailedUpDto.getInforlist2().split(";"); zcc = detailedUpDto.getInforlist2().split(";");
} }
if(StringUtils.isNotEmpty(detailedUpDto.getInforlist3())){ if (StringUtils.isNotEmpty(detailedUpDto.getInforlist3())) {
xcx = detailedUpDto.getInforlist3().split(";"); xcx = detailedUpDto.getInforlist3().split(";");
} }
if(StringUtils.isNotEmpty(detailedUpDto.getInforlist4())){ if(StringUtils.isNotEmpty(detailedUpDto.getInforlist4())){
@@ -722,7 +745,7 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
if (list1.size() > 0) { if (list1.size() > 0) {
QueryWrapper<SarLawsAttrDetailedList> wrapper1 = new QueryWrapper<>(); QueryWrapper<SarLawsAttrDetailedList> wrapper1 = new QueryWrapper<>();
wrapper1.in("stand_id", list1); wrapper1.in("stand_id", list1);
List<SarLawsAttrDetailedList> res = sarLawsAttrDetailedListDao.selectList(wrapper); List<SarLawsAttrDetailedList> res = sarLawsAttrDetailedListDao.selectList(wrapper1);
if (res.size() > 0) { if (res.size() > 0) {
res.forEach(sarLawsAttrDetailedList -> { res.forEach(sarLawsAttrDetailedList -> {
dealWithHashTableData(list1, list2, hashtable, sarLawsAttrDetailedList); dealWithHashTableData(list1, list2, hashtable, sarLawsAttrDetailedList);
@@ -869,20 +892,20 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
} }
//数据校验 先做重复交验+再做是否存在校验 //数据校验 先做重复交验+再做是否存在校验
if (null != res && "".equals(stringBuilder.toString())) { if (null != res && "".equals(stringBuilder.toString())) {
for (ExportEmptyModelDto re:res) { for (ExportEmptyModelDto re : res) {
if(!(re.getSsrq().contains(",")||re.getSsrq().contains("，"))) { if (!(re.getSsrq().contains(",") || re.getSsrq().contains("，"))) {
Date date = org.apache.poi.ss.usermodel.DateUtil Date date = org.apache.poi.ss.usermodel.DateUtil
.getJavaDate(Double.valueOf(re.getSsrq())); .getJavaDate(Double.valueOf(re.getSsrq()));
DateFormat format = new SimpleDateFormat("yyyy-MM-dd"); DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
re.setSsrq(format.format(date)); re.setSsrq(format.format(date));
} }
if(!(re.getXcxssrqgj().contains(",")||re.getXcxssrqgj().contains("，"))) { if (!(re.getXcxssrqgj().contains(",") || re.getXcxssrqgj().contains("，"))) {
Date date = org.apache.poi.ss.usermodel.DateUtil Date date = org.apache.poi.ss.usermodel.DateUtil
.getJavaDate(Double.valueOf(re.getXcxssrqgj())); .getJavaDate(Double.valueOf(re.getXcxssrqgj()));
DateFormat format = new SimpleDateFormat("yyyy-MM-dd"); DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
re.setXcxssrqgj(format.format(date)); re.setXcxssrqgj(format.format(date));
} }
if(!(re.getZccssrqgj().contains(",")||re.getZccssrqgj().contains("，"))) { if (!(re.getZccssrqgj().contains(",") || re.getZccssrqgj().contains("，"))) {
Date date = org.apache.poi.ss.usermodel.DateUtil Date date = org.apache.poi.ss.usermodel.DateUtil
.getJavaDate(Double.valueOf(re.getZccssrqgj())); .getJavaDate(Double.valueOf(re.getZccssrqgj()));
DateFormat format = new SimpleDateFormat("yyyy-MM-dd"); DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
@@ -989,10 +1012,10 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
ExportEmptyModelDto model = map.get(sarStandardsInfo.getId()); ExportEmptyModelDto model = map.get(sarStandardsInfo.getId());
model.setStandName(sarStandardsInfo.getStandName()); model.setStandName(sarStandardsInfo.getStandName());
model.setStandEnName(sarStandardsInfo.getStandEnName()); model.setStandEnName(sarStandardsInfo.getStandEnName());
model.setNylx(null!=sarStandardsInfo.getAttrInfoCaseMap().get("nylx") ?sarStandardsInfo.getAttrInfoCaseMap().get("nylx").toString():""); model.setNylx(null != sarStandardsInfo.getAttrInfoCaseMap().get("nylx") ? sarStandardsInfo.getAttrInfoCaseMap().get("nylx").toString() : "");
model.setSycpx(null!=sarStandardsInfo.getAttrInfoCaseMap().get("sycpx") ?sarStandardsInfo.getAttrInfoCaseMap().get("sycpx").toString():""); model.setSycpx(null != sarStandardsInfo.getAttrInfoCaseMap().get("sycpx") ? sarStandardsInfo.getAttrInfoCaseMap().get("sycpx").toString() : "");
model.setZrbm(null!=sarStandardsInfo.getAttrInfoCaseMap().get("zrbm") ?sarStandardsInfo.getAttrInfoCaseMap().get("zrbm").toString():""); model.setZrbm(null != sarStandardsInfo.getAttrInfoCaseMap().get("zrbm") ? sarStandardsInfo.getAttrInfoCaseMap().get("zrbm").toString() : "");
model.setSycx(null!=sarStandardsInfo.getAttrInfoCaseMap().get("cllx") ?sarStandardsInfo.getAttrInfoCaseMap().get("cllx").toString():""); model.setSycx(null != sarStandardsInfo.getAttrInfoCaseMap().get("cllx") ? sarStandardsInfo.getAttrInfoCaseMap().get("cllx").toString() : "");
result.add(model); result.add(model);
}); });
} }
@@ -1016,10 +1039,10 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
ExportEmptyModelDto model = map.get(sarStandardsInfo.getId()); ExportEmptyModelDto model = map.get(sarStandardsInfo.getId());
model.setStandName(sarStandardsInfo.getStandName()); model.setStandName(sarStandardsInfo.getStandName());
model.setStandEnName(sarStandardsInfo.getStandEnName()); model.setStandEnName(sarStandardsInfo.getStandEnName());
model.setNylx(null!=sarStandardsInfo.getAttrInfoCaseMap().get("nylx") ?sarStandardsInfo.getAttrInfoCaseMap().get("nylx").toString():""); model.setNylx(null != sarStandardsInfo.getAttrInfoCaseMap().get("nylx") ? sarStandardsInfo.getAttrInfoCaseMap().get("nylx").toString() : "");
model.setSycpx(null!=sarStandardsInfo.getAttrInfoCaseMap().get("sycpx") ?sarStandardsInfo.getAttrInfoCaseMap().get("sycpx").toString():""); model.setSycpx(null != sarStandardsInfo.getAttrInfoCaseMap().get("sycpx") ? sarStandardsInfo.getAttrInfoCaseMap().get("sycpx").toString() : "");
model.setZrbm(null!=sarStandardsInfo.getAttrInfoCaseMap().get("zrbm") ?sarStandardsInfo.getAttrInfoCaseMap().get("zrbm").toString():""); model.setZrbm(null != sarStandardsInfo.getAttrInfoCaseMap().get("zrbm") ? sarStandardsInfo.getAttrInfoCaseMap().get("zrbm").toString() : "");
model.setSycx(null!=sarStandardsInfo.getAttrInfoCaseMap().get("cllx") ?sarStandardsInfo.getAttrInfoCaseMap().get("cllx").toString():""); model.setSycx(null != sarStandardsInfo.getAttrInfoCaseMap().get("cllx") ? sarStandardsInfo.getAttrInfoCaseMap().get("cllx").toString() : "");
result.add(model); result.add(model);
}); });
} }
@@ -1042,11 +1065,11 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
ExportEmptyModelDto model = map.get(sarStandardsInfo.getId()); ExportEmptyModelDto model = map.get(sarStandardsInfo.getId());
model.setStandName(sarStandardsInfo.getLawsName()); model.setStandName(sarStandardsInfo.getLawsName());
model.setStandEnName(sarStandardsInfo.getLawsEnName()); model.setStandEnName(sarStandardsInfo.getLawsEnName());
model.setNylx(null!=sarStandardsInfo.getAttrInfoCaseMap().get("nylxlaws") ?sarStandardsInfo.getAttrInfoCaseMap().get("nylxlaws").toString():""); model.setNylx(null != sarStandardsInfo.getAttrInfoCaseMap().get("nylxlaws") ? sarStandardsInfo.getAttrInfoCaseMap().get("nylxlaws").toString() : "");
//没有使用产品线 //没有使用产品线
// model.setSycpx(null!=sarStandardsInfo.getLawsSycx() ?sarStandardsInfo.getLawsSycx():""); // model.setSycpx(null!=sarStandardsInfo.getLawsSycx() ?sarStandardsInfo.getLawsSycx():"");
model.setZrbm(null!=sarStandardsInfo.getAttrInfoCaseMap().get("zrbmlaws") ?sarStandardsInfo.getAttrInfoCaseMap().get("zrbmlaws").toString():""); model.setZrbm(null != sarStandardsInfo.getAttrInfoCaseMap().get("zrbmlaws") ? sarStandardsInfo.getAttrInfoCaseMap().get("zrbmlaws").toString() : "");
model.setSycx(null!=sarStandardsInfo.getLawsSycx() ?sarStandardsInfo.getLawsSycx():""); model.setSycx(null != sarStandardsInfo.getLawsSycx() ? sarStandardsInfo.getLawsSycx() : "");
result.add(model); result.add(model);
}); });
} }