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

update：解决冲突

Browse Source
This commit is contained in:
zzy
2021-07-23 15:56:56 +08:00
parent 33c71b10e8
commit 1f57316d3e
1 changed files with 56 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java
+56 -43
View File
@@ -79,68 +79,82 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
switch (addDetailedDto.getSortKey()) { switch (addDetailedDto.getSortKey()) {
case "1": case "1":
sarLawsDetailedList.setCountryArea(addDetailedDto.getCountryArea()); sarLawsDetailedList.setCountryArea(addDetailedDto.getCountryArea());
if (addDetailedDto.getInforlist().contains(",")){ if (addDetailedDto.getInforlist()!=null){
String[] id = addDetailedDto.getInforlist().split(","); if (addDetailedDto.getInforlist().contains(",")){
String[] putTime = addDetailedDto.getInforlist1().split(","); String[] id = addDetailedDto.getInforlist().split(",");
String[] zcc = addDetailedDto.getInforlist2().split(","); String[] putTime = addDetailedDto.getInforlist1().split(",");
String[] xcx = addDetailedDto.getInforlist3().split(","); String[] zcc = addDetailedDto.getInforlist2().split(",");
for (int a =0;a< id.length;a++){ String[] xcx = addDetailedDto.getInforlist3().split(",");
for (int a =0;a< id.length;a++){
TimeDto dto = new TimeDto();
dto.setStandId(id[a]);
if ("\"".equals(putTime[a])){
dto.setPutTime(null);
}else {
dto.setPutTime(putTime[a]);
}
if ("\"".equals(putTime[a])){
dto.setXcxssrqgj(null);
}else {
dto.setXcxssrqgj(xcx[a]);
}
if ("\"".equals(putTime[a])){
dto.setZccssrqgj(null);
}else {
dto.setZccssrqgj(zcc[a]);
}
timeDto.add(dto);
}
}else {
TimeDto dto = new TimeDto(); TimeDto dto = new TimeDto();
dto.setStandId(id[a]); dto.setStandId(addDetailedDto.getInforlist());
if ("\"".equals(putTime[a])){ dto.setPutTime(addDetailedDto.getInforlist1());
dto.setPutTime(null); dto.setXcxssrqgj(addDetailedDto.getInforlist2());
}else { dto.setZccssrqgj(addDetailedDto.getInforlist3());
dto.setPutTime(putTime[a]);
}
if ("\"".equals(putTime[a])){
dto.setXcxssrqgj(null);
}else {
dto.setXcxssrqgj(xcx[a]);
}
if ("\"".equals(putTime[a])){
dto.setZccssrqgj(null);
}else {
dto.setZccssrqgj(zcc[a]);
}
timeDto.add(dto); timeDto.add(dto);
} }
}else { }else {
TimeDto dto = new TimeDto(); timeDto=null;
dto.setStandId(addDetailedDto.getInforlist());
dto.setPutTime(addDetailedDto.getInforlist1());
dto.setXcxssrqgj(addDetailedDto.getInforlist2());
dto.setZccssrqgj(addDetailedDto.getInforlist3());
timeDto.add(dto);
} }
break; break;
case "2": case "2":
sarLawsDetailedList.setProjectName(addDetailedDto.getProjectName()); sarLawsDetailedList.setProjectName(addDetailedDto.getProjectName());
if (addDetailedDto.getInforlist().contains(",")){ if (addDetailedDto.getInforlist() != null){
String[] id = addDetailedDto.getInforlist().split(","); if (addDetailedDto.getInforlist().contains(",")){
for (String standId:id){ String[] id = addDetailedDto.getInforlist().split(",");
for (String standId:id){
TimeDto dto = new TimeDto();
dto.setStandId(standId);
timeDto.add(dto);
}
}else {
TimeDto dto = new TimeDto(); TimeDto dto = new TimeDto();
dto.setStandId(standId); dto.setStandId(addDetailedDto.getInforlist());
timeDto.add(dto); timeDto.add(dto);
} }
}else { }else {
TimeDto dto = new TimeDto(); timeDto=null;
dto.setStandId(addDetailedDto.getInforlist());
timeDto.add(dto);
} }
break; break;
case "3": case "3":
sarLawsDetailedList.setDetailedList(addDetailedDto.getDetailedList()); sarLawsDetailedList.setDetailedList(addDetailedDto.getDetailedList());
if (addDetailedDto.getInforlist().contains(",")){ if (addDetailedDto.getInforlist() != null){
String[] id = addDetailedDto.getInforlist().split(","); if (addDetailedDto.getInforlist().contains(",")){
for (String standId:id){ String[] id = addDetailedDto.getInforlist().split(",");
for (String standId:id){
TimeDto dto = new TimeDto();
dto.setStandId(standId);
timeDto.add(dto);
}
}else {
TimeDto dto = new TimeDto(); TimeDto dto = new TimeDto();
dto.setStandId(standId); dto.setStandId(addDetailedDto.getInforlist());
timeDto.add(dto); timeDto.add(dto);
} }
}else { }else {
TimeDto dto = new TimeDto(); timeDto=null;
dto.setStandId(addDetailedDto.getInforlist());
timeDto.add(dto);
} }
break; break;
default: default:
@@ -149,7 +163,6 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
if ("admin".equals(getUserName()))sarLawsDetailedList.setUpdatePeople("管理员"); if ("admin".equals(getUserName()))sarLawsDetailedList.setUpdatePeople("管理员");
else {sarLawsDetailedList.setUpdatePeople(getUserName());} else {sarLawsDetailedList.setUpdatePeople(getUserName());}
sarLawsDetailedListDao.insert(sarLawsDetailedList); sarLawsDetailedListDao.insert(sarLawsDetailedList);
addDetailedDto.setInforlist(addDetailedDto.getInforlist().substring(1,addDetailedDto.getInforlist().length()-1));
service.insertDetailedList(sarLawsDetailedList.getId(),timeDto); service.insertDetailedList(sarLawsDetailedList.getId(),timeDto);
} catch (Exception e) { } catch (Exception e) {