生物安全二轮初步修改

huimv-admin/src/main/java/com/huimv/admin/controller/BillPersonnelAdmissionController.java

@@ -59,7 +59,7 @@ public class BillPersonnelAdmissionController {
                                @RequestParam(value = "imgUrl",required = false) MultipartFile imgUrl,
                                @RequestParam(value = "img",required = false) String img,
                                @RequestParam("vistitDate") String vistitDate,
-                               @RequestParam("vistitReson") String vistitReson,
+                               @RequestParam("vistitReson") Integer vistitReson,
                                @RequestParam("destId") String destId,
                                @RequestParam("destName") String destName,
                                @RequestParam(value = "carNum",required = false) String carNum,

huimv-admin/src/main/java/com/huimv/admin/controller/LoginController.java

@@ -196,7 +196,7 @@ public class LoginController {
             accessToken.setToken(token);
         }
         return new Result(ResultCode.SUCCESS,accessToken);
-  *//*      String accountName = map.get("accountName");
+  *      String accountName = map.get("accountName");
         String password = map.get("password");
         String remoteHost = req.getRemoteHost();
         Result result = iLoginService.loginMultilevel(accountName, password);
@@ -281,11 +281,11 @@ public class LoginController {
             return new Result(10001, "该手机号或身份证号已被使用！", false);
         }
         if (!PhoneNumberValidator.isValidPhoneNumber(phone)) {
-            return new Result(10001,"手机号格式错误！",false);
+            return new Result(10001, "手机号格式错误！", false);
         }
-        if (papersType.equals("0")){
-            if (!IDCardValidator.isValidIDCard(papersCode)){
-                return new Result(10001,"身份证号格式错误!",false);
+        if (papersType.equals("0")) {
+            if (!IDCardValidator.isValidIDCard(papersCode)) {
+                return new Result(10001, "身份证号格式错误!", false);
             }
         }
         SysAccountMultilevel sysAccountMultilevel = new SysAccountMultilevel();

huimv-admin/src/main/java/com/huimv/admin/entity/BillIsolate.java

@@ -122,7 +122,7 @@ public class BillIsolate implements Serializable {
     /**
      * 隔离天数
      */
-    private Integer isolateDayNum;
+    private String isolateDayNum;
 
     /**
      * 真实隔离天数

huimv-admin/src/main/java/com/huimv/admin/entity/BillPcr.java

@@ -119,4 +119,6 @@ public class BillPcr implements Serializable {
     private String phone;
 
     private String carNum;
+
+    private Date qualifiedDate;
 }

huimv-admin/src/main/java/com/huimv/admin/service/IBillPersonnelAdmissionService.java

@@ -46,7 +46,7 @@ public interface IBillPersonnelAdmissionService extends IService<BillPersonnelAd
     Result listByIdClean(HttpServletRequest httpServletRequest, Map<String,String> paramsMap);
     Result editClean(HttpServletRequest httpServletRequest, Map<String,String> paramsMap) throws ParseException;
     Result editDry(HttpServletRequest httpServletRequest, Map<String,String> paramsMap) throws ParseException;
-    Result addAdmission(HttpServletRequest httpServletRequest, String admissionType, String vistitType, String userName, String phone, String workName, String papersType, String papersCode, MultipartFile imgUrl, String img, String vistitDate, String vistitReson, String destId, String destName, String farmId, String carNum, String source, String goods) throws IOException;
+    Result addAdmission(HttpServletRequest httpServletRequest, String admissionType, String vistitType, String userName, String phone, String workName, String papersType, String papersCode, MultipartFile imgUrl, String img, String vistitDate, Integer vistitReson, String destId, String destName, String farmId, String carNum, String source, String goods) throws IOException;
 
     Result listPersonalAdmission(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 

huimv-admin/src/main/java/com/huimv/admin/service/impl/BillPersonnelAdmissionServiceImpl.java

@@ -88,7 +88,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Result addAdmission(HttpServletRequest httpServletRequest, String admissionType, String vistitType, String userName, String phone, String workName, String papersType, String papersCode, MultipartFile imgUrl, String img, String vistitDate, String vistitReson, String destId, String destName, String farmId, String carNum, String source, String goods) throws IOException {
+    public Result addAdmission(HttpServletRequest httpServletRequest, String admissionType, String vistitType, String userName, String phone, String workName, String papersType, String papersCode, MultipartFile imgUrl, String img, String vistitDate, Integer vistitReson, String destId, String destName, String farmId, String carNum, String source, String goods) throws IOException {
         Integer userId = TokenSign.getMemberIdByJwtToken(httpServletRequest);
         if (!PhoneNumberValidator.isValidPhoneNumber(phone)) {
             return new Result(10001, "手机号格式错误！", false);
@@ -128,7 +128,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         if (ObjectUtil.isNotEmpty(source)) {
             billPersonnelAdmission.setSource(source);
         }
-        billPersonnelAdmission.setVistitReson(vistitReson);
+        billPersonnelAdmission.setVistitReson(vistitReson.toString());
         billPersonnelAdmission.setFarmId(Integer.parseInt(farmId));
         BaseProcess baseProcess = new BaseProcess();
         baseProcess.setDestName(destName);
@@ -651,8 +651,8 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
     public Result commitIsolate(HttpServletRequest httpServletRequest, BillIsolate billIsolate) {
         BillIsolate isolate = isolateMapper.selectById(billIsolate.getId());
         Date startDate = billIsolate.getIsolateStartDate();
-        Integer dayNum = billIsolate.getIsolateDayNum();//隔离天数
-        Date endDate = DataUill.getNextDay(startDate, dayNum);
+        String dayNum = billIsolate.getIsolateDayNum();//隔离天数
+        Date endDate = billIsolate.getIsolateEndDate();
         isolate.setIsolateStartDate(startDate);
         isolate.setIsolateEndDate(endDate);
         isolate.setIsolateDayNum(dayNum);
@@ -816,7 +816,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                 baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId() + "," + baseLocation.getNextId());
             }
 
-            if (billIsolate.getIsolateLocationId() == 8 && baseProcess.getDestId() >= 10) {
+            if (billIsolate.getIsolateLocationId() == 3 && baseProcess.getDestId() >= 4) {
                 //通过生成洗消记录
                 BillClean billClean = new BillClean();
                 billClean.setVistitType(billIsolate.getVistitType());
@@ -831,8 +831,8 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                 billClean.setPassDate(billIsolate.getPassDate());
                 billClean.setPassUserId(billIsolate.getPassUserId());
                 billClean.setProcessId(billIsolate.getProcessId());
-                billClean.setTestLocation("场内洗澡间1");
-                billClean.setTestLocationId(10);
+                billClean.setTestLocation("场内");
+                billClean.setTestLocationId(4);
                 billClean.setPhone(billIsolate.getPhone());
                 cleanMapper.insert(billClean);
             }