华统小程序流程修改

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

@@ -97,6 +97,7 @@ public class BillClean implements Serializable {
      */
     private Integer processId;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
     private Date checkDate;
     /**
      * 检测地点

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

@@ -132,6 +132,7 @@ public class BillIsolate implements Serializable {
     /**
      * 真实隔离结束时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
     private Date isolateRealEndDate;
 
 

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

@@ -65,6 +65,7 @@ public class BillPcr implements Serializable {
     /**
      * 来访时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
     private LocalDateTime vistitDate;
 
     /**

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

@@ -56,14 +56,23 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
         String type = paramsMap.get("type");//展示类型 0-6
         String data = paramsMap.get("data");//状态
         String farmId = paramsMap.get("farmId");
+        String pageNum = paramsMap.get("pageNum");
+        String pageSize = paramsMap.get("pageSize");
+        if ("".equals(pageNum) || null == pageNum) {
+            pageNum = "1";
+        }
+        if ("".equals(pageSize) || null == pageSize) {
+            pageSize = "20";
+        }
         if ("".equals(type) || null == type) {
             type = "1";
         }
         if ("".equals(data) || null == data) {
             data = "1";
         }
+        Page<BillClean> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         QueryWrapper<BillClean> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("farn_id", farmId).eq("vistit_type", type);
+        queryWrapper.eq("farm_id", farmId).eq("vistit_type", type);
         if ("1".equals(data)) {
             queryWrapper.in("bill_status", 0, 1, 2);
         }
@@ -73,7 +82,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
         if ("3".equals(data)) {
             queryWrapper.eq("bill_status", 1);
         }
-        return new Result(ResultCode.SUCCESS, cleanMapper.selectList(queryWrapper));
+        return new Result(ResultCode.SUCCESS, cleanMapper.selectPage(page,queryWrapper));
     }
 
     @Override
@@ -89,7 +98,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
         String farmId = paramsMap.get("farmId");
         String id = paramsMap.get("id");
         String date = paramsMap.get("date");
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
         if (StringUtils.isBlank(date)) {
             date = sdf.format(new Date());
         }

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

@@ -55,10 +55,11 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
     public Result listPersonalPcr(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String pageNo = paramsMap.get("pageNum");
         String pageSize = paramsMap.get("pageSize");
-        Page<BillPcr> page = new Page<>(Integer.parseInt(pageNo),Integer.parseInt(pageSize));
+        Page<BillPcr> page = new Page<>(Integer.parseInt(pageNo), Integer.parseInt(pageSize));
         Page<BillPcr> billPcrPage = billPcrMapper.selectPage(page, new QueryWrapper<BillPcr>().eq("admission_user_id", TokenSign.getMemberIdByJwtToken(httpServletRequest)).orderByDesc("sub_date"));
-        return new Result(ResultCode.SUCCESS,billPcrPage);
+        return new Result(ResultCode.SUCCESS, billPcrPage);
     }
+
     @Autowired
     private BillPcrMapper pcrMapper;
     @Autowired
@@ -72,17 +73,30 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
     public Result list(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String farmId = paramsMap.get("farmId");
         String type = paramsMap.get("type");//展示类型
+        String pageNum = paramsMap.get("pageNum");
+        String pageSize = paramsMap.get("pageSize");
+        if ("".equals(pageNum) || null == pageNum) {
+            pageNum = "1";
+        }
+        if ("".equals(pageSize) || null == pageSize) {
+            pageSize = "20";
+        }
+        Page<BillPcr> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         QueryWrapper<BillPcr> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("farm_id", farmId).eq("test_location_id",TokenSign.getWorkIdByJwtToken(httpServletRequest));
-        if ("".equals(type) || null == type) {
-            queryWrapper.eq("pcr_type", 0);
-        } else if (type.equals("3")) {
-            queryWrapper.eq("pcr_type", 0).in("bill_status", 2, 3);
-        } else {
-            queryWrapper.eq("pcr_type", 0).eq("bill_status", type);
+        queryWrapper.eq("farm_id", farmId).eq("test_location_id", TokenSign.getWorkIdByJwtToken(httpServletRequest));
+        if ("0".equals(type)) {
+            queryWrapper.in("bill_status", 0, 1, 2, 3);
+        }
+        if ("1".equals(type)) {
+            queryWrapper.eq("bill_status", 0);
+        }
+        if ("2".equals(type)) {
+            queryWrapper.eq("bill_status", 1);
         }
-        List<BillPcr> billPcrs = pcrMapper.selectList(queryWrapper);
-        return new Result(ResultCode.SUCCESS, billPcrs);
+        if ("3".equals(type)) {
+            queryWrapper.in("bill_status", 2, 3);
+        }
+        return new Result(ResultCode.SUCCESS, pcrMapper.selectPage(page, queryWrapper));
     }
 
     @Override
@@ -99,7 +113,7 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
         String farmId = paramsMap.get("farmId");
         String date = paramsMap.get("date");
 
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
 
         if (StringUtils.isBlank(date)) {
             date = sdf.format(new Date());
@@ -146,7 +160,7 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
                     billClean.setTestLocationId(baseLocation.getNextId());
                     cleanMapper.insert(billClean);
 
-                    baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," +sdf.format(new Date()));
+                    baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
                     baseProcess.setCurrentLocation(baseProcess.getCurrentLocation() + "," + baseLocation.getNextLocation());
                     baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId() + "," + baseLocation.getNextId());
                     String status = baseProcess.getCurrentStatus();
@@ -166,7 +180,7 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
                         }
                     };
                     // 设定延迟时间（两小时后执行，单位为秒）
-                    long delay = 60*60*2;
+                    long delay = 60 * 60 * 2;
                     // 执行定时任务
                     scheduler.schedule(task, delay, TimeUnit.SECONDS);
                     return new Result(10000, "修改成功！", true);
@@ -216,7 +230,7 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
                     billPcr.setPassDate(sdf.parse(sdf.format(new Date())));
 
                     baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
-                    baseProcess.setCurrentLocation(baseProcess.getCurrentLocation() );
+                    baseProcess.setCurrentLocation(baseProcess.getCurrentLocation());
                     baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId());
                     String status = baseProcess.getCurrentStatus();
                     String substring = status.substring(0, status.length() - 1);
@@ -234,7 +248,7 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
                         }
                     };
                     // 设定延迟时间（两小时后执行，单位为秒）
-                    long delay = 60*60*2;
+                    long delay = 60 * 60 * 2;
                     // 执行定时任务
                     scheduler.schedule(task, delay, TimeUnit.SECONDS);
                     return new Result(10000, "修改成功！", true);
@@ -244,11 +258,11 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
                         billPcr.setPcrType(1);
                         baseProcess.setProcessType(2);
                     } else {
-                        baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," +sdf.format(new Date()));
+                        baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
                         baseProcess.setProcessType(2);
                     }
-                    baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," +sdf.format(new Date()));
-                    baseProcess.setCurrentLocation(baseProcess.getCurrentLocation() );
+                    baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
+                    baseProcess.setCurrentLocation(baseProcess.getCurrentLocation());
                     baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId());
                     String status = baseProcess.getCurrentStatus();
                     String substring = status.substring(0, status.length() - 1);
@@ -272,13 +286,14 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
 
     }
 
-    private void xiugaiPro(BaseProcess baseProcess,BillPcr billPcr) {
+    private void xiugaiPro(BaseProcess baseProcess, BillPcr billPcr) {
         baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + new Date());
         baseProcess.setCurrentLocation(baseProcess.getCurrentLocation() + "," + billPcr.getTestLocation());
         baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId() + "," + billPcr.getTestLocationId());
         baseProcess.setCurrentStatus(baseProcess.getCurrentStatus() + "," + 2);
     }
-    public String add()  {
+
+    public String add() {
         ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(10);
         Runnable task = new Runnable() {
             @Override

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

@@ -272,26 +272,34 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
     @Override
     public Result listPrc(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String type = paramsMap.get("type");//类型
+        String pageNum = paramsMap.get("pageNum");
+        String pageSize = paramsMap.get("pageSize");
+        if ("".equals(pageNum) || null == pageNum) {
+            pageNum = "1";
+        }
+        if ("".equals(pageSize) || null == pageSize) {
+            pageSize = "20";
+        }
+        Page<BillPcr> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         if ("".equals(type) || null == type) {
             type = "0";
         }
         String farmId = paramsMap.get("farmId");
         QueryWrapper<BillPcr> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("farm_id", farmId).eq("pcr_type", 1).eq("test_location_id",TokenSign.getWorkIdByJwtToken(httpServletRequest));
+        queryWrapper.eq("farm_id", farmId).eq("test_location_id",TokenSign.getWorkIdByJwtToken(httpServletRequest));
         if ("0".equals(type)) {
-            queryWrapper.in("bill_status", 0, 1, 2, 3);
+            queryWrapper.in("pcr_type",  1, 2, 3);
         }
         if ("1".equals(type)) {
-            queryWrapper.eq("bill_status", 0);
+            queryWrapper.eq("pcr_type", 1);
         }
         if ("2".equals(type)) {
-            queryWrapper.eq("bill_status", 1);
+            queryWrapper.eq("pcr_type", 2);
         }
         if ("3".equals(type)) {
-            queryWrapper.in("bill_status", 2, 3);
+            queryWrapper.eq("pcr_type",  3);
         }
-        List<BillPcr> billPcrs = pcrMapper.selectList(queryWrapper);
-        return new Result(ResultCode.SUCCESS, billPcrs);
+        return new Result(ResultCode.SUCCESS,  pcrMapper.selectPage(page,queryWrapper));
     }
 
     @Override
@@ -306,7 +314,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         String type = paramsMap.get("type");
         String id = paramsMap.get("id");
         String data = paramsMap.get("data");
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
         if (StringUtils.isBlank(data)) {
             data = sdf.format(new Date());
         }
@@ -327,6 +335,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
             if (billPcr.getDestId() > billPcr.getTestLocationId()) { //说明当前不是目的地
                 if ("1".equals(type)) {
                     billPcr.setBillStatus(1);
+                    billPcr.setPcrType(2);
                     billPcr.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
                     billPcr.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
                     billPcr.setTestLocation(baseLocation.getLocationName());
@@ -365,6 +374,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                     return new Result(10000, "修改成功！", true);
                 } else {
                     billPcr.setBillStatus(2);
+                    billPcr.setPcrType(3);
                     billPcr.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
                     billPcr.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
                     billPcr.setTestLocation(baseLocation.getLocationName());
@@ -387,6 +397,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
             } else {
                 if ("1".equals(type)) {
                     billPcr.setBillStatus(1);
+                    billPcr.setPcrType(2);
                     billPcr.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
                     billPcr.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
                     billPcr.setTestLocation(baseLocation.getLocationName());
@@ -413,6 +424,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                     baseProcess.setCurrentStatus(substring + "2");
                     baseProcess.setProcessType(2);
                     billPcr.setBillStatus(2);
+                    billPcr.setPcrType(3);
                     billPcr.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
                     billPcr.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
                     billPcr.setTestLocation(baseLocation.getLocationName());
@@ -432,6 +444,15 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
     @Override
     public Result listIsolate(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String type = paramsMap.get("type");//类型
+        String pageNum = paramsMap.get("pageNum");
+        String pageSize = paramsMap.get("pageSize");
+        if ("".equals(pageNum) || null == pageNum) {
+            pageNum = "1";
+        }
+        if ("".equals(pageSize) || null == pageSize) {
+            pageSize = "20";
+        }
+        Page<BillIsolate> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         if ("".equals(type) || null == type) {
             type = "0";
         }
@@ -450,7 +471,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         if ("3".equals(type)) {
             queryWrapper.in("bill_status", 2, 3);
         }
-        return new Result(ResultCode.SUCCESS, isolateMapper.selectList(queryWrapper));
+        return new Result(ResultCode.SUCCESS, isolateMapper.selectPage(page,queryWrapper));
     }
 
     @Override
@@ -465,11 +486,10 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         Date startDate = billIsolate.getIsolateStartDate();
         Integer dayNum = billIsolate.getIsolateDayNum();//隔离天数
         Date endDate = DataUill.getNextDay(startDate, dayNum);
-        isolate.setIsolateLocation(billIsolate.getIsolateLocation());
-        isolate.setIsolateLocationId(billIsolate.getIsolateLocationId());
         isolate.setIsolateStartDate(startDate);
         isolate.setIsolateEndDate(endDate);
         isolate.setIsolateDayNum(dayNum);
+        isolate.setBillStatus(1);
         isolateMapper.updateById(isolate);
         return new Result(10000, "提交成功！", true);
     }
@@ -555,6 +575,15 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
     @Override
     public Result listClean(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String type = paramsMap.get("type");//类型
+        String pageNum = paramsMap.get("pageNum");
+        String pageSize = paramsMap.get("pageSize");
+        if ("".equals(pageNum) || null == pageNum) {
+            pageNum = "1";
+        }
+        if ("".equals(pageSize) || null == pageSize) {
+            pageSize = "20";
+        }
+        Page<BillClean> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         if ("".equals(type) || null == type) {
             type = "0";
         }
@@ -573,7 +602,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         if ("3".equals(type)) {
             queryWrapper.eq("bill_status", 2);
         }
-        return new Result(ResultCode.SUCCESS,  cleanMapper.selectList(queryWrapper));
+        return new Result(ResultCode.SUCCESS,  cleanMapper.selectPage(page,queryWrapper));
 
     }
 }