|
|
@@ -97,7 +97,7 @@ public class KwfTruckReportService {
|
|
|
countList.add(allCount);
|
|
|
|
|
|
/**数据处理**/
|
|
|
- Map<String, Integer> authStatusMap = new HashMap(){{put("正常", 1); put("临时", 2); put("异常", 3);}};
|
|
|
+ Map<String, Integer> authStatusMap = new HashMap<>(Global.NUMERICAL_SIXTEEN){{put("正常", 1); put("临时", 2); put("异常", 3);}};
|
|
|
for(Map.Entry<String, Integer> entry:authStatusMap.entrySet()){
|
|
|
System.out.println(entry.getKey()+"--->"+entry.getValue());
|
|
|
KwfTableTopCount count = new KwfTableTopCount();
|
|
|
@@ -112,7 +112,7 @@ public class KwfTruckReportService {
|
|
|
}
|
|
|
|
|
|
/**数据组装**/
|
|
|
- Map tableCount = new HashMap();
|
|
|
+ Map<String, Object> tableCount = new HashMap<>(Global.NUMERICAL_SIXTEEN);
|
|
|
tableCount.put("tableTop", countList);
|
|
|
tableCount.put("tableBottom", tatol);
|
|
|
return tableCount;
|
|
|
@@ -234,7 +234,7 @@ public class KwfTruckReportService {
|
|
|
|
|
|
/**车辆信息**/
|
|
|
//校验车辆档案是否存在
|
|
|
- List<KwfTruck> trucks = truckDao.findTruck(new HashMap() {{ put("truckNo", truckReportExcel.getTruckNo());}});
|
|
|
+ List<KwfTruck> trucks = truckDao.findTruck(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{ put("truckNo", truckReportExcel.getTruckNo());}});
|
|
|
if (CollectionUtils.isEmpty(trucks)) {
|
|
|
//车辆信息
|
|
|
KwfTruck truckParams = new KwfTruck();
|
|
|
@@ -251,7 +251,7 @@ public class KwfTruckReportService {
|
|
|
} else {
|
|
|
//校验车辆是否已上报
|
|
|
KwfTruck truck = trucks.get(Global.NUMERICAL_ZERO);
|
|
|
- List<Map<String, Object>> reports = truckReportDao.findList(new HashMap() {{
|
|
|
+ List<Map<String, Object>> reports = truckReportDao.findList(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
|
|
|
put("truckId", truck.getId());
|
|
|
put("entId", LoginUserHolder.getEntId());
|
|
|
}});
|
|
|
@@ -264,7 +264,7 @@ public class KwfTruckReportService {
|
|
|
|
|
|
/**档案信息**/
|
|
|
//校验司机档案是否存在
|
|
|
- List<KwfDriver> drivers = driverDao.findDriver(new HashMap() {{put("phone", truckReportExcel.getPhone());}});
|
|
|
+ List<KwfDriver> drivers = driverDao.findDriver(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{put("phone", truckReportExcel.getPhone());}});
|
|
|
if (CollectionUtils.isEmpty(drivers)) {
|
|
|
KwfDriver driverParams = new KwfDriver();
|
|
|
driverParams.setName(truckReportExcel.getName());
|
|
|
@@ -281,7 +281,7 @@ public class KwfTruckReportService {
|
|
|
} else {
|
|
|
//校验司机是否已上报
|
|
|
KwfDriver driver = drivers.get(0);
|
|
|
- List<Map<String, Object>> reports = truckReportDao.findList(new HashMap() {{
|
|
|
+ List<Map<String, Object>> reports = truckReportDao.findList(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
|
|
|
put("driverId", driver.getId());
|
|
|
put("entId", LoginUserHolder.getEntId());
|
|
|
}});
|
|
|
@@ -324,7 +324,7 @@ public class KwfTruckReportService {
|
|
|
|
|
|
/**车辆信息**/
|
|
|
//校验车辆档案是否存在
|
|
|
- List<KwfTruck> trucks = truckDao.findTruck(new HashMap() {{ put("truckNo", reportDto.getTruckNo());}});
|
|
|
+ List<KwfTruck> trucks = truckDao.findTruck(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{ put("truckNo", reportDto.getTruckNo());}});
|
|
|
if (CollectionUtils.isEmpty(trucks)) {
|
|
|
//车辆信息
|
|
|
KwfTruck truckParams = new KwfTruck();
|
|
|
@@ -341,7 +341,7 @@ public class KwfTruckReportService {
|
|
|
} else {
|
|
|
//校验车辆是否已上报
|
|
|
KwfTruck truck = trucks.get(Global.NUMERICAL_ZERO);
|
|
|
- List<Map<String, Object>> reports = truckReportDao.findList(new HashMap() {{
|
|
|
+ List<Map<String, Object>> reports = truckReportDao.findList(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
|
|
|
put("truckId", truck.getId());
|
|
|
put("entId", LoginUserHolder.getEntId());
|
|
|
}});
|
|
|
@@ -359,7 +359,7 @@ public class KwfTruckReportService {
|
|
|
|
|
|
/**档案信息**/
|
|
|
//校验司机档案是否存在
|
|
|
- List<KwfDriver> drivers = driverDao.findDriver(new HashMap() {{put("phone", reportDto.getPhone());}});
|
|
|
+ List<KwfDriver> drivers = driverDao.findDriver(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{put("phone", reportDto.getPhone());}});
|
|
|
if (CollectionUtils.isEmpty(drivers)) {
|
|
|
KwfDriver driverParams = new KwfDriver();
|
|
|
driverParams.setName(reportDto.getName());
|
|
|
@@ -376,7 +376,7 @@ public class KwfTruckReportService {
|
|
|
} else {
|
|
|
//校验司机是否已上报
|
|
|
KwfDriver driver = drivers.get(0);
|
|
|
- List<Map<String, Object>> reports = truckReportDao.findList(new HashMap() {{
|
|
|
+ List<Map<String, Object>> reports = truckReportDao.findList(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
|
|
|
put("driverId", driver.getId());
|
|
|
put("entId", LoginUserHolder.getEntId());
|
|
|
}});
|
|
|
@@ -415,7 +415,7 @@ public class KwfTruckReportService {
|
|
|
}
|
|
|
|
|
|
/**更新**/
|
|
|
- List<Map<String, Object>> reports = truckReportDao.findList(new HashMap() {{
|
|
|
+ List<Map<String, Object>> reports = truckReportDao.findList(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
|
|
|
put("driverId", params.getDriverId());
|
|
|
put("entId", LoginUserHolder.getEntId());
|
|
|
}});
|
|
|
@@ -532,11 +532,11 @@ public class KwfTruckReportService {
|
|
|
|
|
|
/**车辆信息**/
|
|
|
//校验车辆档案是否存在
|
|
|
- List<KwfTruck> trucks = truckDao.findTruck(new HashMap() {{put("truckNo", reportDto.getTruckNo());}});
|
|
|
+ List<KwfTruck> trucks = truckDao.findTruck(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{put("truckNo", reportDto.getTruckNo());}});
|
|
|
if (!CollectionUtils.isEmpty(trucks)) {
|
|
|
//校验车辆是否已上报
|
|
|
KwfTruck truck = trucks.get(Global.NUMERICAL_ZERO);
|
|
|
- List<Map<String, Object>> reports = truckReportDao.findList(new HashMap() {{
|
|
|
+ List<Map<String, Object>> reports = truckReportDao.findList(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
|
|
|
put("truckId", truck.getId());
|
|
|
put("entId", LoginUserHolder.getEntId());
|
|
|
}});
|
|
|
@@ -548,11 +548,11 @@ public class KwfTruckReportService {
|
|
|
|
|
|
/**档案信息**/
|
|
|
//校验司机档案是否存在
|
|
|
- List<KwfDriver> drivers = driverDao.findDriver(new HashMap() {{ put("phone", reportDto.getPhone()); }});
|
|
|
+ List<KwfDriver> drivers = driverDao.findDriver(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{ put("phone", reportDto.getPhone()); }});
|
|
|
if (!CollectionUtils.isEmpty(drivers)) {
|
|
|
//校验司机是否已上报
|
|
|
KwfDriver driver = drivers.get(Global.NUMERICAL_ZERO);
|
|
|
- List<Map<String, Object>> reports = truckReportDao.findList(new HashMap() {{
|
|
|
+ List<Map<String, Object>> reports = truckReportDao.findList(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
|
|
|
put("driverId", driver.getId());
|
|
|
put("entId", LoginUserHolder.getEntId());
|
|
|
}});
|
|
|
@@ -566,7 +566,7 @@ public class KwfTruckReportService {
|
|
|
}
|
|
|
|
|
|
/**返回数据**/
|
|
|
- Map<String, Object> resultMap = new HashMap<>();
|
|
|
+ Map<String, Object> resultMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
|
|
|
resultMap.put("haveCount", haveCount);
|
|
|
resultMap.put("errorCount", errorCount);
|
|
|
resultMap.put("fail", haveCount + errorCount);
|
|
|
@@ -585,11 +585,11 @@ public class KwfTruckReportService {
|
|
|
public boolean checkReport(KwfTruckReportDto reportDto) {
|
|
|
/**车辆信息**/
|
|
|
//校验车辆档案是否存在
|
|
|
- List<KwfTruck> trucks = truckDao.findTruck(new HashMap() {{ put("truckNo", reportDto.getTruckNo());}});
|
|
|
+ List<KwfTruck> trucks = truckDao.findTruck(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{ put("truckNo", reportDto.getTruckNo());}});
|
|
|
if (!CollectionUtils.isEmpty(trucks)) {
|
|
|
//校验车辆是否已上报
|
|
|
KwfTruck truck = trucks.get(Global.NUMERICAL_ZERO);
|
|
|
- List<Map<String, Object>> reports = truckReportDao.findList(new HashMap() {{
|
|
|
+ List<Map<String, Object>> reports = truckReportDao.findList(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
|
|
|
put("truckId", truck.getId());
|
|
|
put("entId", LoginUserHolder.getEntId());
|
|
|
}});
|
|
|
@@ -600,11 +600,11 @@ public class KwfTruckReportService {
|
|
|
|
|
|
/**档案信息**/
|
|
|
//校验司机档案是否存在
|
|
|
- List<KwfDriver> drivers = driverDao.findDriver(new HashMap() {{ put("phone", reportDto.getPhone()); }});
|
|
|
+ List<KwfDriver> drivers = driverDao.findDriver(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{ put("phone", reportDto.getPhone()); }});
|
|
|
if (!CollectionUtils.isEmpty(drivers)) {
|
|
|
//校验司机是否已上报
|
|
|
KwfDriver driver = drivers.get(Global.NUMERICAL_ZERO);
|
|
|
- List<Map<String, Object>> reports = truckReportDao.findList(new HashMap() {{
|
|
|
+ List<Map<String, Object>> reports = truckReportDao.findList(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
|
|
|
put("driverId", driver.getId());
|
|
|
put("entId", LoginUserHolder.getEntId());
|
|
|
}});
|
|
|
@@ -728,11 +728,11 @@ public class KwfTruckReportService {
|
|
|
|
|
|
/**车辆信息**/
|
|
|
//校验车辆档案是否存在
|
|
|
- List<KwfTruck> trucks = truckDao.findTruck(new HashMap() {{ put("truckNo", truckReportExcel.getTruckNo());}});
|
|
|
+ List<KwfTruck> trucks = truckDao.findTruck(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{ put("truckNo", truckReportExcel.getTruckNo());}});
|
|
|
if (!CollectionUtils.isEmpty(trucks)) {
|
|
|
//校验车辆是否已上报
|
|
|
KwfTruck truck = trucks.get(Global.NUMERICAL_ZERO);
|
|
|
- List<Map<String, Object>> reports = truckReportDao.findList(new HashMap() {{
|
|
|
+ List<Map<String, Object>> reports = truckReportDao.findList(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
|
|
|
put("truckId", truck.getId());
|
|
|
put("entId", LoginUserHolder.getEntId());
|
|
|
}});
|
|
|
@@ -743,11 +743,11 @@ public class KwfTruckReportService {
|
|
|
|
|
|
/**档案信息**/
|
|
|
//校验司机档案是否存在
|
|
|
- List<KwfDriver> drivers = driverDao.findDriver(new HashMap() {{ put("phone", truckReportExcel.getPhone()); }});
|
|
|
+ List<KwfDriver> drivers = driverDao.findDriver(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{ put("phone", truckReportExcel.getPhone()); }});
|
|
|
if (!CollectionUtils.isEmpty(drivers)) {
|
|
|
//校验司机是否已上报
|
|
|
KwfDriver driver = drivers.get(Global.NUMERICAL_ZERO);
|
|
|
- List<Map<String, Object>> reports = truckReportDao.findList(new HashMap() {{
|
|
|
+ List<Map<String, Object>> reports = truckReportDao.findList(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
|
|
|
put("driverId", driver.getId());
|
|
|
put("entId", LoginUserHolder.getEntId());
|
|
|
}});
|