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 13:46:45 +08:00
parent 79a6ac3b4c
commit 9e0aad737c
1 changed files with 21 additions and 17 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
+21 -17
View File
@@ -62,7 +62,7 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
public String add(AddDetailedDto addDetailedDto) {
//判断页面的国家地区是否和数据库里的字段长度相等
QueryWrapper<SarLawsDetailedList> wrapper = new QueryWrapper<>();
wrapper.select("DISTINCT country_area");
wrapper.select("DISTINCT country_area,car_type");
List<SarLawsDetailedList> sarLawsDetailedLists = sarLawsDetailedListDao.selectList(wrapper);
//多选是否可以添加的标识，true表示可以添加，false表示不许添加
boolean multiAddFlag = true;
@@ -71,8 +71,8 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
// System.out.println("数据库的值"+sarLawsDetailedLists);
// System.out.println("数据库里有多少条数据"+sarLawsDetailedLists.size());
// System.out.println("数据库里第一条"+sarLawsDetailedLists.get(1));
//如果页面字段国家为空，则为其他清单新增
if (addDetailedDto.getCountryArea() == null) {
//如果页面字段国家为空且页面字段车型类别为空，则为其他清单新增
if (addDetailedDto.getCountryArea() == null && addDetailedDto.getCarType() == null) {
//下面放添加的具体方法
try {
SarLawsDetailedList sarLawsDetailedList = SarLawsDetailedList.builder()
@@ -95,7 +95,7 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
break;
case "2":
sarLawsDetailedList.setProjectName(addDetailedDto.getProjectName());
sarLawsDetailedList.setCarType(addDetailedDto.getCarType());
break;
@@ -154,7 +154,7 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
e.printStackTrace();
}
//0表示添加成功，1表示添加失败
return "0";
return "其他清单添加成功";
//添加方法结束
}
@@ -168,7 +168,7 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
// System.out.println("页面字段"+addDetailedDto.getCountryArea());
// System.out.println("页面字段长度"+addDetailedDto.getCountryArea().length());
System.out.println(sarLawsDetailedLists.get(i));
if (null == 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) + "条的国家地区字段长度和页面的国家地区字段长度不一样，不重复，目前可以添加");
@@ -257,7 +257,7 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
break;
case "2":
sarLawsDetailedList.setProjectName(addDetailedDto.getProjectName());
sarLawsDetailedList.setCarType(addDetailedDto.getCarType());
break;
@@ -315,8 +315,12 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
} catch (Exception e) {
e.printStackTrace();
}
//0表示添加成功，1表示添加失败
return "0";
//如果页面字段国家不为空，则是国家地区清单新增;如果为空，则是其他清单新增
if (addDetailedDto.getCountryArea() != null){
return "国家/地区清单添加成功";
}else {
return "清单添加成功";
}
//添加方法结束
}
}
@@ -345,7 +349,7 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
break;
case "2":
sarLawsDetailedList.setProjectName(addDetailedDto.getProjectName());
sarLawsDetailedList.setCarType(addDetailedDto.getCarType());
break;
@@ -404,25 +408,25 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
e.printStackTrace();
}
//0表示添加成功，1表示添加失败
return "0";
return "国家/地区清单添加成功";
//添加方法结束
} else {
//0表示添加成功，1表示添加失败
return "1";
return "国家/地区清单添加失败";
}
}
@Override
public IPage<SarLawsDetailedList> AllSelectD(Integer page, Integer pageSize, String sortKey,
String countryArea, String projectName,
String countryArea, String carType,
String detailedList, String detailedListName) {
QueryWrapper<SarLawsDetailedList> wrapper = new QueryWrapper<>();
if ("1".equals(sortKey)) {
wrapper.like(StringUtils.isNotEmpty(countryArea), "country_area", countryArea).
like(StringUtils.isNotEmpty(detailedListName), "detailed_list_name", detailedListName);
} 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);
} else if ("3".equals(sortKey)) {
@@ -475,9 +479,9 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
else if ("null".equals(detailedUpDto.getCountryArea())) ;
else list.setCountryArea(detailedUpDto.getCountryArea());
//项目名称
if (StringUtils.isBlank(detailedUpDto.getProjectName())) list.setProjectName(null);
else if ("null".equals(detailedUpDto.getProjectName())) ;
else list.setProjectName(detailedUpDto.getProjectName());
if (StringUtils.isBlank(detailedUpDto.getCarType())) list.setCarType(null);
else if ("null".equals(detailedUpDto.getCarType())) ;
else list.setCarType(detailedUpDto.getCarType());
//清单类别
if (StringUtils.isBlank(detailedUpDto.getDetailedList())) list.setDetailedList(null);
else if ("null".equals(detailedUpDto.getDetailedList())) ;