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

国家地区新增限制

Browse Source
This commit is contained in:
yanyizhou
2021-08-18 16:55:20 +08:00
parent abbf9c257f
commit 89a136ee60
4 changed files with 394 additions and 115 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 -2
View File
@@ -16,6 +16,8 @@ public class AddDetailedDto {
private String countryArea; private String countryArea;
@ApiModelProperty(value = "项目名称") @ApiModelProperty(value = "项目名称")
private String projectName; private String projectName;
@ApiModelProperty(value = "车型类别")
private String carType;
@ApiModelProperty(value = "清单类别") @ApiModelProperty(value = "清单类别")
private String detailedList; private String detailedList;
@ApiModelProperty(value = "区分，国家地区为1，项目名称为2，清单类别为3") @ApiModelProperty(value = "区分，国家地区为1，项目名称为2，清单类别为3")
@@ -40,6 +42,4 @@ public class AddDetailedDto {
private String inforlist2; private String inforlist2;
@ApiModelProperty(value = "新车型实施时间") @ApiModelProperty(value = "新车型实施时间")
private String inforlist3; private String inforlist3;
@ApiModelProperty(value = "车辆类别")
private String carType;
} }
adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/DetailedUpDto.java
+3
View File
@@ -23,6 +23,9 @@ public class DetailedUpDto {
@ApiModelProperty(value = "项目名称") @ApiModelProperty(value = "项目名称")
private String projectName; private String projectName;
@ApiModelProperty(value = "车型类别")
private String carType;
@ApiModelProperty(value = "清单类别") @ApiModelProperty(value = "清单类别")
private String detailedList; private String detailedList;
adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/SarLawsDetailedList.java
+5 -4
View File
@@ -12,7 +12,7 @@ import lombok.experimental.Accessors;
/** /**
* <p> * <p>
* *
* </p> * </p>
* *
* @author szc * @author szc
@@ -41,6 +41,10 @@ public class SarLawsDetailedList extends BaseEntity {
@TableField("project_name") @TableField("project_name")
private String projectName; private String projectName;
@ApiModelProperty(value = "车型类别")
@TableField("car_type")
private String carType;
@ApiModelProperty(value = "清单类别") @ApiModelProperty(value = "清单类别")
@TableField("detailed_list") @TableField("detailed_list")
private String detailedList; private String detailedList;
@@ -81,8 +85,5 @@ public class SarLawsDetailedList extends BaseEntity {
@TableField("file_id") @TableField("file_id")
private String fileIds; private String fileIds;
@ApiModelProperty(value = "附件id")
@TableField("car_type")
private String carType;
} }
adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java
+384 -109
View File
@@ -60,99 +60,374 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
@Override @Override
public String add(AddDetailedDto addDetailedDto) { public String add(AddDetailedDto addDetailedDto) {
try { //判断页面的国家地区是否和数据库里的字段长度相等
SarLawsDetailedList sarLawsDetailedList = SarLawsDetailedList.builder() QueryWrapper<SarLawsDetailedList> wrapper = new QueryWrapper<>();
.id(UUIDUtils.randomUUID20()) wrapper.select("DISTINCT country_area,car_type");
.sortKey(addDetailedDto.getSortKey()) List<SarLawsDetailedList> sarLawsDetailedLists = sarLawsDetailedListDao.selectList(wrapper);
.detailedListName(addDetailedDto.getDetailedListName()) //多选是否可以添加的标识，true表示可以添加，false表示不许添加
.detailedListState("0") boolean multiAddFlag = true;
.applicationScope(addDetailedDto.getApplicationScope()) //单选是否可以添加的标识，true表示可以添加，false表示不许添加
.updateTime(new Date()) boolean singleAddFlag = true;
.updatePeople(addDetailedDto.getUpdatePeople()) // System.out.println("数据库的值"+sarLawsDetailedLists);
.remark(addDetailedDto.getRemark()) // System.out.println("数据库里有多少条数据"+sarLawsDetailedLists.size());
.updatePeople(getUserName()) // System.out.println("数据库里第一条"+sarLawsDetailedLists.get(1));
.fileIds(addDetailedDto.getFileIds()) //如果页面字段国家为空且页面字段车型类别为空，则为其他清单新增
.carType(addDetailedDto.getCarType()) if (addDetailedDto.getCountryArea() == null && addDetailedDto.getCarType() == null) {
.build(); //下面放添加的具体方法
List<TimeDto> timeDto = new ArrayList<>(); try {
switch (addDetailedDto.getSortKey()) { SarLawsDetailedList sarLawsDetailedList = SarLawsDetailedList.builder()
case "1": .id(UUIDUtils.randomUUID20())
sarLawsDetailedList.setCountryArea(addDetailedDto.getCountryArea()); .sortKey(addDetailedDto.getSortKey())
.detailedListName(addDetailedDto.getDetailedListName())
.detailedListState("0")
.detailedListVision("v0")
.applicationScope(addDetailedDto.getApplicationScope())
.updateTime(new Date())
.updatePeople(addDetailedDto.getUpdatePeople())
.remark(addDetailedDto.getRemark())
.updatePeople(getUserName())
.fileIds(addDetailedDto.getFileIds())
.build();
List<TimeDto> timeDto = new ArrayList<>();
switch (addDetailedDto.getSortKey()) {
case "1":
sarLawsDetailedList.setCountryArea(addDetailedDto.getCountryArea());
break; break;
case "2": case "2":
sarLawsDetailedList.setProjectName(addDetailedDto.getProjectName()); sarLawsDetailedList.setCarType(addDetailedDto.getCarType());
break; break;
case "3": case "3":
sarLawsDetailedList.setDetailedList(addDetailedDto.getDetailedList()); sarLawsDetailedList.setDetailedList(addDetailedDto.getDetailedList());
break; break;
default: default:
break; break;
} }
if ("admin".equals(getUserName()))sarLawsDetailedList.setUpdatePeople("管理员"); if ("admin".equals(getUserName())) sarLawsDetailedList.setUpdatePeople("管理员");
else {sarLawsDetailedList.setUpdatePeople(getUserName());} else {
sarLawsDetailedListDao.insert(sarLawsDetailedList); sarLawsDetailedList.setUpdatePeople(getUserName());
if (addDetailedDto.getInforlist()!=null){ }
if (addDetailedDto.getInforlist().contains(",")){ sarLawsDetailedListDao.insert(sarLawsDetailedList);
String[] id = addDetailedDto.getInforlist().split(","); if (addDetailedDto.getInforlist() != null) {
String[] ssrq = addDetailedDto.getInforlist1().split(","); if (addDetailedDto.getInforlist().contains(",")) {
String[] zcc = addDetailedDto.getInforlist2().split(","); String[] id = addDetailedDto.getInforlist().split(",");
String[] xcx = addDetailedDto.getInforlist3().split(","); String[] putTime = addDetailedDto.getInforlist1().split(",");
for (int a =0;a< id.length;a++){ String[] zcc = addDetailedDto.getInforlist2().split(",");
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]) || null == putTime[a]) {
dto.setSsrq(null);
} else {
dto.setSsrq(putTime[a]);
}
if ("-".equals(putTime[a]) || null == xcx[a]) {
dto.setXcxssrqgj(null);
} else {
dto.setXcxssrqgj(xcx[a]);
}
if ("-".equals(putTime[a]) || null == zcc[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(ssrq[a]) || null==ssrq[a] ){ dto.setSsrq(addDetailedDto.getInforlist1());
dto.setSsrq(null); dto.setXcxssrqgj(addDetailedDto.getInforlist2());
}else { dto.setZccssrqgj(addDetailedDto.getInforlist3());
dto.setSsrq(ssrq[a]);
}
if ("-".equals(ssrq[a]) || null == xcx[a]){
dto.setXcxssrqgj(null);
}else {
dto.setXcxssrqgj(xcx[a]);
}
if ("-".equals(ssrq[a]) || null == zcc[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.setSsrq(addDetailedDto.getInforlist1());
dto.setXcxssrqgj(addDetailedDto.getInforlist2());
dto.setZccssrqgj(addDetailedDto.getInforlist3());
timeDto.add(dto);
} }
}else { service.insertDetailedList(sarLawsDetailedList.getId(), timeDto);
timeDto=null;
}
service.insertDetailedList(sarLawsDetailedList.getId(),timeDto);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
}
//0表示添加成功，1表示添加失败
return "其他清单添加成功";
//添加方法结束
}
//如果页面字段国家不为空，则是国家地区清单新增
if (addDetailedDto.getCountryArea() != null) {
//如果数据库里有数据，则判断，如果没有，则直接新增成功
if (sarLawsDetailedLists.size() > 0) {
for (int i = 0; i < sarLawsDetailedLists.size(); i++) {
// System.out.println("数据库里的第"+(i+1)+"条数据为"+sarLawsDetailedLists.get(i).getCountryArea());
// System.out.println("数据库里的第"+(i+1)+"条数据的长度为"+sarLawsDetailedLists.get(i).getCountryArea().length());
// System.out.println("页面字段"+addDetailedDto.getCountryArea());
// System.out.println("页面字段长度"+addDetailedDto.getCountryArea().length());
System.out.println(sarLawsDetailedLists.get(i));
if (null == sarLawsDetailedLists.get(i) || null == sarLawsDetailedLists.get(i).getCountryArea()) {
System.out.println("数据库里第" + (i + 1) + "条的国家地区字段长度为空，不重复，目前可以添加");
} else if (addDetailedDto.getCountryArea().length() != sarLawsDetailedLists.get(i).getCountryArea().length()) {
System.out.println("数据库里第" + (i + 1) + "条的国家地区字段长度和页面的国家地区字段长度不一样，不重复，目前可以添加");
} else {
System.out.println("数据库里第" + (i + 1) + "条的国家地区字段长度和页面的国家地区字段长度一样，可能重复");
//判断页面的国家地区是单选还是多选（判断能不能拆）
if (addDetailedDto.getCountryArea().contains(",")) {
System.out.println("页面是多选");
//如果数据库里的国家地区字段存在",",说明是多选，如果不存在说明是单选
if (sarLawsDetailedLists.get(i).getCountryArea().contains(",")) {
System.out.println("数据库是多选，如果页面字段拆分之后都包含于数据库字段拆分之后，则说明重复，目前不许添加");
System.out.println("页面字段为" + addDetailedDto.getCountryArea());
// System.out.println("页面字段以“，”为分隔符拆分后为"+ Arrays.toString(addDetailedDto.getCountryArea().split(",")));
String[] frontCountryArea = addDetailedDto.getCountryArea().split(",");
// System.out.println("页面字段以“，”为分隔符拆分后为"+ frontCountryArea[0]+"然后"+frontCountryArea[1]+"然后"+frontCountryArea[2]);
String[] databaseCountryArea = sarLawsDetailedLists.get(i).getCountryArea().split(",");
// System.out.println("数据库字段以“，”为分隔符拆分后为"+ databaseCountryArea[0]+"然后"+databaseCountryArea[1]+"然后"+databaseCountryArea[2]);
//如果页面字段拆分之后都包含于数据库字段拆分之后，则说明重复，不许添加
for (int j = 0; j < frontCountryArea.length; j++) {
//如果数据库包含了页面字段的所有值，说明这俩完全相同，重复，不许添加
List<String> databaseCountryAreaList = Arrays.asList(databaseCountryArea);
if (databaseCountryAreaList.contains(frontCountryArea[j])) {
System.out.println("数据库" + databaseCountryAreaList);
System.out.println("页面" + frontCountryArea[j]);
System.out.println("数据库里的字段包含页面里的字段，可能重复，目前不许添加");
multiAddFlag = false;
} else {
System.out.println("数据库" + databaseCountryAreaList);
System.out.println("页面" + frontCountryArea[j]);
System.out.println("数据库里的字段和页面字段虽然长度相同，但是里面有不一样的元素，可以添加");
multiAddFlag = true;
}
// System.out.println("页面字段以“，”为分隔符拆分后分别为"+ frontCountryArea[j]);
// System.out.println("数据库字段以“，”为分隔符拆分后分别为"+ databaseCountryArea[j]);
}
if (multiAddFlag == true) {
System.out.println("长度相同，只要有一个不重复，就可以添加");
} else {
System.out.println("长度相同，整个循环下来都重复，说明两个字段重复，不许添加");
break;
}
}
} else {
System.out.println("页面是单选");
//如果数据库里的国家地区字段存在",",说明是多选，如果不存在说明是单选
if (sarLawsDetailedLists.get(i).getCountryArea().contains(",")) {
System.out.println("数据库是多选，肯定不重复，目前可以添加");
} else {
System.out.println("数据库是单选，如果数据库里的字段和页面的字段相等，重复，不许添加");
//如果数据库里的字段和页面的字段相等，重复，不许添加
if (Objects.equals(sarLawsDetailedLists.get(i).getCountryArea(), addDetailedDto.getCountryArea())) {
System.out.println("数据库里的字段和页面的字段相等，重复，不许添加");
singleAddFlag = false;
break;
} else {
System.out.println("数据库里的字段和页面的字段不相等，不重复，允许添加");
}
}
}
}
}
} else {
//数据库为空，直接添加
//下面放添加的具体方法
try {
SarLawsDetailedList sarLawsDetailedList = SarLawsDetailedList.builder()
.id(UUIDUtils.randomUUID20())
.sortKey(addDetailedDto.getSortKey())
.detailedListName(addDetailedDto.getDetailedListName())
.detailedListState("0")
.detailedListVision("v0")
.applicationScope(addDetailedDto.getApplicationScope())
.updateTime(new Date())
.updatePeople(addDetailedDto.getUpdatePeople())
.remark(addDetailedDto.getRemark())
.updatePeople(getUserName())
.fileIds(addDetailedDto.getFileIds())
.build();
List<TimeDto> timeDto = new ArrayList<>();
switch (addDetailedDto.getSortKey()) {
case "1":
sarLawsDetailedList.setCountryArea(addDetailedDto.getCountryArea());
break;
case "2":
sarLawsDetailedList.setCarType(addDetailedDto.getCarType());
break;
case "3":
sarLawsDetailedList.setDetailedList(addDetailedDto.getDetailedList());
break;
default:
break;
}
if ("admin".equals(getUserName())) sarLawsDetailedList.setUpdatePeople("管理员");
else {
sarLawsDetailedList.setUpdatePeople(getUserName());
}
sarLawsDetailedListDao.insert(sarLawsDetailedList);
if (addDetailedDto.getInforlist() != null) {
if (addDetailedDto.getInforlist().contains(",")) {
String[] id = addDetailedDto.getInforlist().split(",");
String[] putTime = addDetailedDto.getInforlist1().split(",");
String[] zcc = addDetailedDto.getInforlist2().split(",");
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]) || null == putTime[a]) {
dto.setSsrq(null);
} else {
dto.setSsrq(putTime[a]);
}
if ("-".equals(putTime[a]) || null == xcx[a]) {
dto.setXcxssrqgj(null);
} else {
dto.setXcxssrqgj(xcx[a]);
}
if ("-".equals(putTime[a]) || null == zcc[a]) {
dto.setZccssrqgj(null);
} else {
dto.setZccssrqgj(zcc[a]);
}
timeDto.add(dto);
}
} else {
TimeDto dto = new TimeDto();
dto.setStandId(addDetailedDto.getInforlist());
dto.setSsrq(addDetailedDto.getInforlist1());
dto.setXcxssrqgj(addDetailedDto.getInforlist2());
dto.setZccssrqgj(addDetailedDto.getInforlist3());
timeDto.add(dto);
}
} else {
timeDto = null;
}
service.insertDetailedList(sarLawsDetailedList.getId(), timeDto);
} catch (Exception e) {
e.printStackTrace();
}
//如果页面字段国家不为空，则是国家地区清单新增;如果为空，则是其他清单新增
if (addDetailedDto.getCountryArea() != null){
return "国家/地区清单添加成功";
}else {
return "清单添加成功";
}
//添加方法结束
}
}
//如果循环完整个数据库，都没有重复使当前数据无法添加，则添加
if (multiAddFlag == true && singleAddFlag == true) {
//下面放添加的具体方法
try {
SarLawsDetailedList sarLawsDetailedList = SarLawsDetailedList.builder()
.id(UUIDUtils.randomUUID20())
.sortKey(addDetailedDto.getSortKey())
.detailedListName(addDetailedDto.getDetailedListName())
.detailedListState("0")
.detailedListVision("v0")
.applicationScope(addDetailedDto.getApplicationScope())
.updateTime(new Date())
.updatePeople(addDetailedDto.getUpdatePeople())
.remark(addDetailedDto.getRemark())
.updatePeople(getUserName())
.fileIds(addDetailedDto.getFileIds())
.build();
List<TimeDto> timeDto = new ArrayList<>();
switch (addDetailedDto.getSortKey()) {
case "1":
sarLawsDetailedList.setCountryArea(addDetailedDto.getCountryArea());
break;
case "2":
sarLawsDetailedList.setCarType(addDetailedDto.getCarType());
break;
case "3":
sarLawsDetailedList.setDetailedList(addDetailedDto.getDetailedList());
break;
default:
break;
}
if ("admin".equals(getUserName())) sarLawsDetailedList.setUpdatePeople("管理员");
else {
sarLawsDetailedList.setUpdatePeople(getUserName());
}
sarLawsDetailedListDao.insert(sarLawsDetailedList);
if (addDetailedDto.getInforlist() != null) {
if (addDetailedDto.getInforlist().contains(",")) {
String[] id = addDetailedDto.getInforlist().split(",");
String[] putTime = addDetailedDto.getInforlist1().split(",");
String[] zcc = addDetailedDto.getInforlist2().split(",");
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]) || null == putTime[a]) {
dto.setSsrq(null);
} else {
dto.setSsrq(putTime[a]);
}
if ("-".equals(putTime[a]) || null == xcx[a]) {
dto.setXcxssrqgj(null);
} else {
dto.setXcxssrqgj(xcx[a]);
}
if ("-".equals(putTime[a]) || null == zcc[a]) {
dto.setZccssrqgj(null);
} else {
dto.setZccssrqgj(zcc[a]);
}
timeDto.add(dto);
}
} else {
TimeDto dto = new TimeDto();
dto.setStandId(addDetailedDto.getInforlist());
dto.setSsrq(addDetailedDto.getInforlist1());
dto.setXcxssrqgj(addDetailedDto.getInforlist2());
dto.setZccssrqgj(addDetailedDto.getInforlist3());
timeDto.add(dto);
}
} else {
timeDto = null;
}
service.insertDetailedList(sarLawsDetailedList.getId(), timeDto);
} catch (Exception e) {
e.printStackTrace();
}
//0表示添加成功，1表示添加失败
return "国家/地区清单添加成功";
//添加方法结束
} else {
//0表示添加成功，1表示添加失败
return "国家/地区清单添加失败";
} }
return "添加成功";
} }
@Override @Override
public IPage<SarLawsDetailedList> AllSelectD(Integer page, Integer pageSize, String sortKey, public IPage<SarLawsDetailedList> AllSelectD(Integer page, Integer pageSize, String sortKey,
String countryArea, String projectName, String countryArea, String projectName, String carType,
String detailedList, String detailedListName,String carType) { String detailedList, String detailedListName) {
QueryWrapper<SarLawsDetailedList> wrapper = new QueryWrapper<>(); QueryWrapper<SarLawsDetailedList> wrapper = new QueryWrapper<>();
if ("1".equals(sortKey)) { if ("1".equals(sortKey)) {
wrapper.like(StringUtils.isNotEmpty(countryArea), "country_area", countryArea). wrapper.like(StringUtils.isNotEmpty(countryArea), "country_area", countryArea).
like(StringUtils.isNotEmpty(detailedListName), "detailed_list_name", detailedListName); like(StringUtils.isNotEmpty(detailedListName), "detailed_list_name", detailedListName);
} else if ("2".equals(sortKey)) { } else if ("2".equals(sortKey)) {
wrapper.like(StringUtils.isNotEmpty(projectName), "project_name", projectName). wrapper.like(StringUtils.isNotEmpty(carType), "car_type", carType).
like(StringUtils.isNotEmpty(detailedListName), "detailed_list_name", detailedListName). like(StringUtils.isNotEmpty(detailedListName), "detailed_list_name", detailedListName);
like(StringUtils.isNotEmpty(carType), "car_type", carType);
} else if ("3".equals(sortKey)) { } else if ("3".equals(sortKey)) {
wrapper.like(StringUtils.isNotEmpty(detailedList), "detailed_list", detailedList). wrapper.like(StringUtils.isNotEmpty(detailedList), "detailed_list", detailedList).
@@ -180,9 +455,9 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
} }
String completedString = builder.delete(builder.length() - 1, builder.length()).toString(); String completedString = builder.delete(builder.length() - 1, builder.length()).toString();
list1.setCountryArea(completedString); list1.setCountryArea(completedString);
}else { } else {
for (Map<String,String> map1:arr) { for (Map<String, String> map1 : arr) {
if (map1.get("value").equals(list1.getCountryArea())){ if (map1.get("value").equals(list1.getCountryArea())) {
list1.setCountryArea(map1.get("label")); list1.setCountryArea(map1.get("label"));
break; break;
} }
@@ -201,46 +476,46 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
SarLawsDetailedList list = sarLawsDetailedListDao.selectById(detailedUpDto.getId()); SarLawsDetailedList list = sarLawsDetailedListDao.selectById(detailedUpDto.getId());
//国家或地区 //国家或地区
if (StringUtils.isBlank(detailedUpDto.getCountryArea())) list.setCountryArea(null); if (StringUtils.isBlank(detailedUpDto.getCountryArea())) list.setCountryArea(null);
else if ("null".equals(detailedUpDto.getCountryArea())); else if ("null".equals(detailedUpDto.getCountryArea())) ;
else list.setCountryArea(detailedUpDto.getCountryArea()); else list.setCountryArea(detailedUpDto.getCountryArea());
//项目名称 //项目名称
if (StringUtils.isBlank(detailedUpDto.getProjectName())) list.setProjectName(null); if (StringUtils.isBlank(detailedUpDto.getCarType())) list.setCarType(null);
else if ("null".equals(detailedUpDto.getProjectName())); else if ("null".equals(detailedUpDto.getCarType())) ;
else list.setProjectName(detailedUpDto.getProjectName()); else list.setCarType(detailedUpDto.getCarType());
//清单类别 //清单类别
if (StringUtils.isBlank(detailedUpDto.getDetailedList())) list.setDetailedList(null); if (StringUtils.isBlank(detailedUpDto.getDetailedList())) list.setDetailedList(null);
else if ("null".equals(detailedUpDto.getDetailedList())); else if ("null".equals(detailedUpDto.getDetailedList())) ;
else list.setDetailedList(detailedUpDto.getDetailedList()); else list.setDetailedList(detailedUpDto.getDetailedList());
//清单名称 //清单名称
if (StringUtils.isBlank(detailedUpDto.getDetailedListName())) list.setDetailedListName(null); if (StringUtils.isBlank(detailedUpDto.getDetailedListName())) list.setDetailedListName(null);
else if ("null".equals(detailedUpDto.getDetailedListName())); else if ("null".equals(detailedUpDto.getDetailedListName())) ;
else list.setDetailedListName(detailedUpDto.getDetailedListName()); else list.setDetailedListName(detailedUpDto.getDetailedListName());
//适用领域 //适用领域
if (StringUtils.isBlank(detailedUpDto.getApplicationScope())) list.setApplicationScope(null); if (StringUtils.isBlank(detailedUpDto.getApplicationScope())) list.setApplicationScope(null);
else if ("null".equals(detailedUpDto.getApplicationScope())); else if ("null".equals(detailedUpDto.getApplicationScope())) ;
else list.setApplicationScope(detailedUpDto.getApplicationScope()); else list.setApplicationScope(detailedUpDto.getApplicationScope());
//清单详情 //清单详情
if (StringUtils.isBlank(detailedUpDto.getRemark())) list.setRemark(null); if (StringUtils.isBlank(detailedUpDto.getRemark())) list.setRemark(null);
else if ("null".equals(detailedUpDto.getRemark())); else if ("null".equals(detailedUpDto.getRemark())) ;
list.setRemark(detailedUpDto.getRemark()); list.setRemark(detailedUpDto.getRemark());
//版本号 //版本号
if (StringUtils.isBlank(detailedUpDto.getDetailedListVision())) list.setDetailedListVision(null); if (StringUtils.isBlank(detailedUpDto.getDetailedListVision())) list.setDetailedListVision(null);
else if ("null".equals(detailedUpDto.getDetailedListVision())); else if ("null".equals(detailedUpDto.getDetailedListVision())) ;
list.setDetailedListVision(detailedUpDto.getDetailedListVision()); list.setDetailedListVision(detailedUpDto.getDetailedListVision());
//更新时间 //更新时间
list.setUpdateTime(new Date()); list.setUpdateTime(new Date());
//更新人 //更新人
if (StringUtils.isBlank(detailedUpDto.getReNewPeople())) list.setUpdatePeople(null); if (StringUtils.isBlank(detailedUpDto.getReNewPeople())) list.setUpdatePeople(null);
else if ("null".equals(detailedUpDto.getReNewPeople())); else if ("null".equals(detailedUpDto.getReNewPeople())) ;
else list.setUpdatePeople(detailedUpDto.getReNewPeople()); else list.setUpdatePeople(detailedUpDto.getReNewPeople());
//更新人 //更新人
if (StringUtils.isBlank(detailedUpDto.getDetailedListState())) list.setDetailedListState(null); if (StringUtils.isBlank(detailedUpDto.getDetailedListState())) list.setDetailedListState(null);
else if ("null".equals(detailedUpDto.getDetailedListState())); else if ("null".equals(detailedUpDto.getDetailedListState())) ;
else list.setDetailedListState(detailedUpDto.getDetailedListState()); else list.setDetailedListState(detailedUpDto.getDetailedListState());
//文件 //文件
if (StringUtils.isBlank(detailedUpDto.getFileIds())) list.setFileIds(null); if (StringUtils.isBlank(detailedUpDto.getFileIds())) list.setFileIds(null);
else if ("null".equals(detailedUpDto.getFileIds())); else if ("null".equals(detailedUpDto.getFileIds())) ;
else list.setFileIds(detailedUpDto.getFileIds()); else list.setFileIds(detailedUpDto.getFileIds());
sarLawsDetailedListDao.updateById(list); sarLawsDetailedListDao.updateById(list);
@@ -248,31 +523,31 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
if (src.equals(detailedUpDto.getInforlist()) || null != detailedUpDto.getInforlist()) { if (src.equals(detailedUpDto.getInforlist()) || null != detailedUpDto.getInforlist()) {
List<TimeDto> timeDto = new ArrayList<>(); List<TimeDto> timeDto = new ArrayList<>();
if ( detailedUpDto.getInforlist().contains(",")) { if (detailedUpDto.getInforlist().contains(",")) {
String[] id = detailedUpDto.getInforlist().split(","); String[] id = detailedUpDto.getInforlist().split(",");
String[] ssrq = detailedUpDto.getInforlist1().split(","); String[] putTime = detailedUpDto.getInforlist1().split(",");
String[] zcc = detailedUpDto.getInforlist2().split(","); String[] zcc = detailedUpDto.getInforlist2().split(",");
String[] xcx = detailedUpDto.getInforlist3().split(","); String[] xcx = detailedUpDto.getInforlist3().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]);
if (ssrq.length<=a) { if (putTime.length <= a) {
dto.setSsrq(null); dto.setSsrq(null);
} else { } else {
dto.setSsrq(ssrq[a]); dto.setSsrq(putTime[a]);
}
if (ssrq.length<=a) {
dto.setXcxssrqgj(null);
} else {
dto.setXcxssrqgj(xcx[a]);
}
if (ssrq.length<=a) {
dto.setZccssrqgj(null);
} else {
dto.setZccssrqgj(zcc[a]);
}
timeDto.add(dto);
} }
if (putTime.length <= a) {
dto.setXcxssrqgj(null);
} else {
dto.setXcxssrqgj(xcx[a]);
}
if (putTime.length <= a) {
dto.setZccssrqgj(null);
} else {
dto.setZccssrqgj(zcc[a]);
}
timeDto.add(dto);
}
} else { } else {
TimeDto dto = new TimeDto(); TimeDto dto = new TimeDto();
dto.setStandId(detailedUpDto.getInforlist()); dto.setStandId(detailedUpDto.getInforlist());