|
@@ -118,6 +118,29 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
|
|
baseProcess.setSubDate(DateTime.now());
|
|
baseProcess.setSubDate(DateTime.now());
|
|
baseProcess.setUpdateDate(LocalDateTime.now().format(dateTimeFormatter));
|
|
baseProcess.setUpdateDate(LocalDateTime.now().format(dateTimeFormatter));
|
|
baseProcess.setCurrentStatus("0");
|
|
baseProcess.setCurrentStatus("0");
|
|
|
|
+
|
|
|
|
+ QueryWrapper<BaseLocation> queryWrapper = new QueryWrapper<>();
|
|
|
|
+ queryWrapper.eq("vistit_type", vistitType).eq("farm_id", farmId).orderByAsc("id");
|
|
|
|
+ List<BaseLocation> baseLocations = baseLocationMapper.selectList(queryWrapper);
|
|
|
|
+ String allLocation = "";
|
|
|
|
+ String allLocationId = "";
|
|
|
|
+ String allLocationStatus = "";
|
|
|
|
+ for (BaseLocation baseLocation : baseLocations) {
|
|
|
|
+ if (baseLocation.getId() < Integer.parseInt(destId)) {
|
|
|
|
+ allLocation = allLocation + baseLocation.getLocationName() + ",";
|
|
|
|
+ allLocationId = allLocationId + baseLocation.getId() + ",";
|
|
|
|
+ allLocationStatus = allLocationStatus + "0" + ",";
|
|
|
|
+ }
|
|
|
|
+ if (baseLocation.getId() == Integer.parseInt(destId)) {
|
|
|
|
+ allLocation = allLocation + baseLocation.getLocationName();
|
|
|
|
+ allLocationId = allLocationId + baseLocation.getId();
|
|
|
|
+ allLocationStatus = allLocationStatus + "0";
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ baseProcess.setAllLocation(allLocation);
|
|
|
|
+ baseProcess.setAllLocationId(allLocationId);
|
|
|
|
+ baseProcess.setAllLocationStatus(allLocationStatus);
|
|
|
|
+
|
|
//获取位置
|
|
//获取位置
|
|
BaseLocation baseLocation;
|
|
BaseLocation baseLocation;
|
|
if (vistitType.equals("5")) {
|
|
if (vistitType.equals("5")) {
|
|
@@ -247,6 +270,8 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
|
|
billPersonnelAdmission.setBillStatus(2);
|
|
billPersonnelAdmission.setBillStatus(2);
|
|
baseProcess.setProcessType(2);
|
|
baseProcess.setProcessType(2);
|
|
baseProcess.setCurrentStatus(String.join(",", split));
|
|
baseProcess.setCurrentStatus(String.join(",", split));
|
|
|
|
+ baseProcess.setAllLocationStatus("3");
|
|
|
|
+
|
|
// SendSMS.sendSMS(phoneList,"拒绝入场申请测试");
|
|
// SendSMS.sendSMS(phoneList,"拒绝入场申请测试");
|
|
} else {
|
|
} else {
|
|
//通过
|
|
//通过
|
|
@@ -267,6 +292,12 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
|
|
baseProcess.setCurrentStatus(result.toString());
|
|
baseProcess.setCurrentStatus(result.toString());
|
|
baseProcess.setCurrentLocation(baseProcess.getCurrentLocation() + "," + baseLocation.getLocationName());
|
|
baseProcess.setCurrentLocation(baseProcess.getCurrentLocation() + "," + baseLocation.getLocationName());
|
|
baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId() + "," + baseLocation.getId());
|
|
baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId() + "," + baseLocation.getId());
|
|
|
|
+
|
|
|
|
+ String status = baseProcess.getAllLocationStatus();
|
|
|
|
+ String[] split1 = status.split(",");
|
|
|
|
+ split1[0] = "1";
|
|
|
|
+ baseProcess.setAllLocationStatus(split1[0] + status.substring(1));
|
|
|
|
+
|
|
BillPcr billPcr = new BillPcr();
|
|
BillPcr billPcr = new BillPcr();
|
|
billPcr.setVistitType(billPersonnelAdmission.getVistitType());
|
|
billPcr.setVistitType(billPersonnelAdmission.getVistitType());
|
|
billPcr.setDestName(billPersonnelAdmission.getDestName());
|
|
billPcr.setDestName(billPersonnelAdmission.getDestName());
|
|
@@ -298,6 +329,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
|
|
return Result.SUCCESS();
|
|
return Result.SUCCESS();
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+
|
|
@Override
|
|
@Override
|
|
public Result listAll(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
|
|
public Result listAll(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
|
|
String type = paramsMap.get("type");
|
|
String type = paramsMap.get("type");
|
|
@@ -428,6 +460,19 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
|
|
for (ListAdmissionVo listAdmissionVo : admissionVo) {
|
|
for (ListAdmissionVo listAdmissionVo : admissionVo) {
|
|
JSONObject jsonObject = new JSONObject();
|
|
JSONObject jsonObject = new JSONObject();
|
|
jsonObject.put("type", listAdmissionVo.getType());
|
|
jsonObject.put("type", listAdmissionVo.getType());
|
|
|
|
+ if (listAdmissionVo.getType() == 0) {
|
|
|
|
+ jsonObject.put("name", "人员");
|
|
|
|
+ } else if (listAdmissionVo.getType() == 1) {
|
|
|
|
+ jsonObject.put("name", "环保车");
|
|
|
|
+ } else if (listAdmissionVo.getType() == 2) {
|
|
|
|
+ jsonObject.put("name", "拉猪车");
|
|
|
|
+ } else if (listAdmissionVo.getType() == 3) {
|
|
|
|
+ jsonObject.put("name", "饲料车");
|
|
|
|
+ } else if (listAdmissionVo.getType() == 4) {
|
|
|
|
+ jsonObject.put("name", "送猪车");
|
|
|
|
+ } else if (listAdmissionVo.getType() == 5) {
|
|
|
|
+ jsonObject.put("name", "物资车");
|
|
|
|
+ }
|
|
jsonObject.put("count", listAdmissionVo.getCount());
|
|
jsonObject.put("count", listAdmissionVo.getCount());
|
|
jsonArray.add(jsonObject);
|
|
jsonArray.add(jsonObject);
|
|
}
|
|
}
|
|
@@ -485,7 +530,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
|
|
endTime = LocalDateTime.now() + " 23:59:59";
|
|
endTime = LocalDateTime.now() + " 23:59:59";
|
|
}
|
|
}
|
|
QueryWrapper<BillPersonnelAdmission> queryWrapper = new QueryWrapper<>();
|
|
QueryWrapper<BillPersonnelAdmission> queryWrapper = new QueryWrapper<>();
|
|
- queryWrapper.eq("farm_id", farmId).eq(StringUtils.isNotBlank(destId),"dest_id", destId).eq(StringUtils.isNotBlank(type),"vistit_type",type);
|
|
|
|
|
|
+ queryWrapper.eq("farm_id", farmId).eq(StringUtils.isNotBlank(destId), "dest_id", destId).eq(StringUtils.isNotBlank(type), "vistit_type", type);
|
|
queryWrapper.between("sub_date", startTime, endTime);
|
|
queryWrapper.between("sub_date", startTime, endTime);
|
|
Page<BillPersonnelAdmission> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
|
|
Page<BillPersonnelAdmission> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
|
|
return new Result(ResultCode.SUCCESS, billPersonnelAdmissionMapper.selectPage(page, queryWrapper));
|
|
return new Result(ResultCode.SUCCESS, billPersonnelAdmissionMapper.selectPage(page, queryWrapper));
|
|
@@ -689,6 +734,12 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
|
|
|
|
|
|
baseProcess.setCurrentStatus(substring + "2");
|
|
baseProcess.setCurrentStatus(substring + "2");
|
|
baseProcess.setProcessType(2);
|
|
baseProcess.setProcessType(2);
|
|
|
|
+
|
|
|
|
+ String status1 = baseProcess.getAllLocationStatus();
|
|
|
|
+ String[] split1 = status1.split(",");
|
|
|
|
+ split1[0] = "3";
|
|
|
|
+ baseProcess.setAllLocationStatus(split1[0] + status1.substring(1));
|
|
|
|
+
|
|
processMapper.updateById(baseProcess);
|
|
processMapper.updateById(baseProcess);
|
|
pcrMapper.updateById(billPcr);
|
|
pcrMapper.updateById(billPcr);
|
|
return new Result(10000, "修改成功!", true);
|
|
return new Result(10000, "修改成功!", true);
|
|
@@ -711,6 +762,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
|
|
String substring = status.substring(0, status.length() - 1);
|
|
String substring = status.substring(0, status.length() - 1);
|
|
baseProcess.setCurrentStatus(substring + "1");
|
|
baseProcess.setCurrentStatus(substring + "1");
|
|
baseProcess.setProcessType(1);
|
|
baseProcess.setProcessType(1);
|
|
|
|
+
|
|
processMapper.updateById(baseProcess);
|
|
processMapper.updateById(baseProcess);
|
|
pcrMapper.updateById(billPcr);
|
|
pcrMapper.updateById(billPcr);
|
|
return new Result(10000, "修改成功!", true);
|
|
return new Result(10000, "修改成功!", true);
|
|
@@ -731,6 +783,11 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
|
|
billPcr.setPassDate(sdf.parse(sdf.format(new Date())));
|
|
billPcr.setPassDate(sdf.parse(sdf.format(new Date())));
|
|
billPcr.setCheckDate(sdf.parse(data));
|
|
billPcr.setCheckDate(sdf.parse(data));
|
|
|
|
|
|
|
|
+ String status1 = baseProcess.getAllLocationStatus();
|
|
|
|
+ String[] split1 = status.split(",");
|
|
|
|
+ split1[0] = "3";
|
|
|
|
+ baseProcess.setAllLocationStatus(split1[0] + status1.substring(1));
|
|
|
|
+
|
|
processMapper.updateById(baseProcess);
|
|
processMapper.updateById(baseProcess);
|
|
pcrMapper.updateById(billPcr);
|
|
pcrMapper.updateById(billPcr);
|
|
return new Result(10000, "修改成功!", true);
|
|
return new Result(10000, "修改成功!", true);
|
|
@@ -912,6 +969,14 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
|
|
billClean.setTestLocationId(4);
|
|
billClean.setTestLocationId(4);
|
|
billClean.setPhone(billIsolate.getPhone());
|
|
billClean.setPhone(billIsolate.getPhone());
|
|
cleanMapper.insert(billClean);
|
|
cleanMapper.insert(billClean);
|
|
|
|
+
|
|
|
|
+ String status = baseProcess.getAllLocationStatus();
|
|
|
|
+ String[] split = status.split(",");
|
|
|
|
+ split[0] = "2";
|
|
|
|
+ split[1] = "2";
|
|
|
|
+ split[2] = "2";
|
|
|
|
+ split[3] = "1";
|
|
|
|
+ baseProcess.setAllLocationStatus(split[0] + split[1] + split[2] + split[3] + status.substring(7));
|
|
}
|
|
}
|
|
|
|
|
|
billIsolate.setIsolateRealEndDate(new Date());
|
|
billIsolate.setIsolateRealEndDate(new Date());
|
|
@@ -934,6 +999,10 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
|
|
String substring = status.substring(0, status.length() - 1);
|
|
String substring = status.substring(0, status.length() - 1);
|
|
baseProcess.setCurrentStatus(substring + "1," + 0);
|
|
baseProcess.setCurrentStatus(substring + "1," + 0);
|
|
|
|
|
|
|
|
+ if (billIsolate.getIsolateLocationId() == 5) {
|
|
|
|
+ baseProcess.setAllLocationStatus("2,2,2,2,2");
|
|
|
|
+ }
|
|
|
|
+
|
|
isolateMapper.updateById(billIsolate);
|
|
isolateMapper.updateById(billIsolate);
|
|
processMapper.updateById(baseProcess);
|
|
processMapper.updateById(baseProcess);
|
|
return new Result(10000, "正常解除隔离成功!", true);
|
|
return new Result(10000, "正常解除隔离成功!", true);
|
|
@@ -969,6 +1038,14 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
|
|
billClean.setTestLocationId(4);
|
|
billClean.setTestLocationId(4);
|
|
billClean.setPhone(billIsolate.getPhone());
|
|
billClean.setPhone(billIsolate.getPhone());
|
|
cleanMapper.insert(billClean);
|
|
cleanMapper.insert(billClean);
|
|
|
|
+
|
|
|
|
+ String status = baseProcess.getAllLocationStatus();
|
|
|
|
+ String[] split = status.split(",");
|
|
|
|
+ split[0] = "2";
|
|
|
|
+ split[1] = "2";
|
|
|
|
+ split[2] = "2";
|
|
|
|
+ split[3] = "1";
|
|
|
|
+ baseProcess.setAllLocationStatus(split[0] + split[1] + split[2] + split[3] + status.substring(7));
|
|
}
|
|
}
|
|
billIsolate.setIsolateRealEndDate(new Date());
|
|
billIsolate.setIsolateRealEndDate(new Date());
|
|
SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd");
|
|
SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd");
|
|
@@ -990,6 +1067,10 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
|
|
String substring = status.substring(0, status.length() - 1);
|
|
String substring = status.substring(0, status.length() - 1);
|
|
baseProcess.setCurrentStatus(substring + "1," + 0);
|
|
baseProcess.setCurrentStatus(substring + "1," + 0);
|
|
|
|
|
|
|
|
+ if (billIsolate.getIsolateLocationId() == 5) {
|
|
|
|
+ baseProcess.setAllLocationStatus("2,2,2,2,2");
|
|
|
|
+ }
|
|
|
|
+
|
|
isolateMapper.updateById(billIsolate);
|
|
isolateMapper.updateById(billIsolate);
|
|
processMapper.updateById(baseProcess);
|
|
processMapper.updateById(baseProcess);
|
|
return new Result(10000, "提前解除隔离成功!", true);
|
|
return new Result(10000, "提前解除隔离成功!", true);
|
|
@@ -1087,6 +1168,8 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
|
|
String substring = status.substring(0, status.length() - 1);
|
|
String substring = status.substring(0, status.length() - 1);
|
|
baseProcess.setCurrentStatus(substring + "1");
|
|
baseProcess.setCurrentStatus(substring + "1");
|
|
baseProcess.setProcessType(1);
|
|
baseProcess.setProcessType(1);
|
|
|
|
+
|
|
|
|
+ baseProcess.setAllLocationStatus("2,2");
|
|
} else {
|
|
} else {
|
|
baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
|
|
baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
|
|
baseProcess.setCurrentLocation(baseProcess.getCurrentLocation() + "," + baseLocation.getNextLocation());
|
|
baseProcess.setCurrentLocation(baseProcess.getCurrentLocation() + "," + baseLocation.getNextLocation());
|
|
@@ -1185,6 +1268,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
|
|
|
|
|
|
baseProcess.setCurrentStatus(substring + "2");
|
|
baseProcess.setCurrentStatus(substring + "2");
|
|
baseProcess.setProcessType(2);
|
|
baseProcess.setProcessType(2);
|
|
|
|
+ baseProcess.setAllLocationStatus("3");
|
|
processMapper.updateById(baseProcess);
|
|
processMapper.updateById(baseProcess);
|
|
cleanMapper.updateById(billClean);
|
|
cleanMapper.updateById(billClean);
|
|
return new Result(10000, "修改成功!", true);
|
|
return new Result(10000, "修改成功!", true);
|
|
@@ -1264,7 +1348,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
|
|
billClean.setCheckDate(sdf.parse(sdf.format(new Date())));
|
|
billClean.setCheckDate(sdf.parse(sdf.format(new Date())));
|
|
|
|
|
|
//最终结束
|
|
//最终结束
|
|
- if (billClean.getTestLocationId() == 13 || billClean.getTestLocationId() == 58 || billClean.getTestLocationId() == 43) {
|
|
|
|
|
|
+ if (billClean.getTestLocationId() == 13 || billClean.getTestLocationId() == 17 || billClean.getTestLocationId() == 43) {
|
|
baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
|
|
baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
|
|
baseProcess.setCurrentLocation(baseProcess.getCurrentLocation());
|
|
baseProcess.setCurrentLocation(baseProcess.getCurrentLocation());
|
|
baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId());
|
|
baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId());
|
|
@@ -1272,6 +1356,11 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
|
|
String substring = status.substring(0, status.length() - 1);
|
|
String substring = status.substring(0, status.length() - 1);
|
|
baseProcess.setCurrentStatus(substring + "1");
|
|
baseProcess.setCurrentStatus(substring + "1");
|
|
baseProcess.setProcessType(1);
|
|
baseProcess.setProcessType(1);
|
|
|
|
+ if (billClean.getTestLocationId() == 17) {
|
|
|
|
+ baseProcess.setAllLocationStatus("2,2");
|
|
|
|
+ } else {
|
|
|
|
+ baseProcess.setAllLocationStatus("2,2,2");
|
|
|
|
+ }
|
|
} else {
|
|
} else {
|
|
baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
|
|
baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
|
|
baseProcess.setCurrentLocation(baseProcess.getCurrentLocation() + "," + baseLocation.getNextLocation());
|
|
baseProcess.setCurrentLocation(baseProcess.getCurrentLocation() + "," + baseLocation.getNextLocation());
|