接口修改

huimv-receive/src/main/java/com/huimv/receive/controller/BillCleanController.java

@@ -107,31 +107,31 @@ public class BillCleanController {
         return cleanService.listByIdDry(httpServletRequest, paramsMap);
     }
 
-    @RequestMapping("/editClean")
-    public Result editClean(HttpServletRequest httpServletRequest,
-                            @RequestParam("farmId") String farmId,
-                            @RequestParam("id") String id,
-                            @RequestParam("date") String date,
-                            @RequestParam("result") String result,
-                            @RequestParam(value = "img1",required = false) MultipartFile img1,
-                            @RequestParam(value = "img2",required = false) MultipartFile img2,
-                            @RequestParam(value = "img3",required = false) MultipartFile img3
-    ) throws ParseException, IOException {
-        return cleanService.commitClean(httpServletRequest, farmId, id, date, result, img1,img2,img3);
-    }
-
-    @PostMapping("/carCommit")
-    public Result addAdmission(HttpServletRequest httpServletRequest, @RequestParam("id") String id,
-                               @RequestParam("data") String data,
-                               @RequestParam(value = "img1", required = false) MultipartFile img1,
-                               @RequestParam(value = "img2", required = false) MultipartFile img2,
-                               @RequestParam(value = "img3", required = false) MultipartFile img3,
-                               @RequestParam(value = "img4", required = false) MultipartFile img4,
-                               @RequestParam(value = "img5", required = false) MultipartFile img5,
-                               @RequestParam("farmId") String farmId,
-                               @RequestParam("type") String type) throws IOException, ParseException {
-        return cleanService.carClean(httpServletRequest, farmId, id, data, img1, img2, img3, img4, img5, type);
-    }
+//    @RequestMapping("/editClean")
+//    public Result editClean(HttpServletRequest httpServletRequest,
+//                            @RequestParam("farmId") String farmId,
+//                            @RequestParam("id") String id,
+//                            @RequestParam("date") String date,
+//                            @RequestParam("result") String result,
+//                            @RequestParam(value = "img1",required = false) MultipartFile img1,
+//                            @RequestParam(value = "img2",required = false) MultipartFile img2,
+//                            @RequestParam(value = "img3",required = false) MultipartFile img3
+//    ) throws ParseException, IOException {
+//        return cleanService.commitClean(httpServletRequest, farmId, id, date, result, img1,img2,img3);
+//    }
+//
+//    @PostMapping("/carCommit")
+//    public Result addAdmission(HttpServletRequest httpServletRequest, @RequestParam("id") String id,
+//                               @RequestParam("data") String data,
+//                               @RequestParam(value = "img1", required = false) MultipartFile img1,
+//                               @RequestParam(value = "img2", required = false) MultipartFile img2,
+//                               @RequestParam(value = "img3", required = false) MultipartFile img3,
+//                               @RequestParam(value = "img4", required = false) MultipartFile img4,
+//                               @RequestParam(value = "img5", required = false) MultipartFile img5,
+//                               @RequestParam("farmId") String farmId,
+//                               @RequestParam("type") String type) throws IOException, ParseException {
+//        return cleanService.carClean(httpServletRequest, farmId, id, data, img1, img2, img3, img4, img5, type);
+//    }
 
     @PostMapping("/goodsCarClean")
     public Result goodsCarClean(HttpServletRequest httpServletRequest, @RequestParam("id") String id,

huimv-receive/src/main/java/com/huimv/receive/controller/SysUserController.java

@@ -87,7 +87,7 @@ public class SysUserController {
                       @RequestParam(value = "job",required = false) String job,
                       @RequestParam(value = "jobType",required = false) String jobType,
                       @RequestParam(value = "workLocation",required = false) String workLocation,
-                      @RequestParam(value = "workLocationType",required = false) Integer workLocationType,
+                      @RequestParam(value = "workLocationType",required = false) String workLocationType,
                       @RequestParam(value = "farmId",required = false) String farmId,
                       @RequestParam(value = "emergentUser",required = false) String emergentUser,
                       @RequestParam(value = "emergentUserPhone",required = false) String emergentUserPhone,

huimv-receive/src/main/java/com/huimv/receive/entity/SysAccountMultilevel.java

@@ -50,7 +50,7 @@ public class SysAccountMultilevel extends Model {
     private Integer type;
 
     private String workLocation;
-    private Integer workLocationType;
+    private String workLocationType;
     //工作岗位 1 场长 2 紧急进程审核员  ，3生物安全负责人 ，4 pcr 检测人员，5洗消站点工作人员
     private String workPost;
     private String phone;

huimv-receive/src/main/java/com/huimv/receive/entity/SysUser.java

@@ -149,7 +149,7 @@ public class SysUser implements Serializable {
     /**
      * 1人员初级洗消站 2净区 3人员二级洗消站 4场内 5生产区 6车辆初级洗消站 7车辆二级洗消站 8中转料塔外围 9车辆三级洗消站 10销售中转站 11环保区洗消中心 12环保区净区 13洗消中心净区
      */
-    private Integer workLocationType;
+    private String workLocationType;
     private String farmId;
     private String emergentUser;
     private String emergentUserPhone;

huimv-receive/src/main/java/com/huimv/receive/entity/vo/UserVo.java

@@ -150,7 +150,7 @@ public class UserVo implements Serializable {
     /**
      * 1人员初级洗消站 2净区 3人员二级洗消站 4场内 5生产区 6车辆初级洗消站 7车辆二级洗消站 8中转料塔外围 9车辆三级洗消站 10销售中转站 11环保区洗消中心 12环保区净区 13洗消中心净区
      */
-    private Integer workLocationType;
+    private String workLocationType;
     private String farmId;
     private String emergentUser;
     private String emergentUserPhone;

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

@@ -305,7 +305,7 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
         }
         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)).orderByDesc("sub_date");
+        queryWrapper.eq("farm_id", farmId).orderByDesc("sub_date");
         if ("0".equals(type)) {
             queryWrapper.in("bill_status", 0, 1, 2, 3);
         }
@@ -319,7 +319,7 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
             queryWrapper.in("bill_status", 2, 3);
         }
         QueryWrapper<BillPcr> queryWrapper2 = new QueryWrapper<>();
-        queryWrapper2.eq("farm_id", farmId).eq("test_location_id", TokenSign.getWorkIdByJwtToken(httpServletRequest)).orderByDesc("sub_date");
+        queryWrapper2.eq("farm_id", farmId).orderByDesc("sub_date");
         queryWrapper2.eq("bill_status", 0);
         return new Result(ResultCode.SUCCESS, pcrMapper.selectPage(page, queryWrapper), pcrMapper.selectCount(queryWrapper2));
     }

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

@@ -1548,7 +1548,6 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
 
 
         //提前结束隔离
-        baseProcess.setProcessType(1);
         baseProcess.setCurrentLocation(baseProcess.getCurrentLocation());
         baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId());
         billIsolate.setIsolateRealEndDate(new Date());

huimv-receive/src/main/java/com/huimv/receive/service/impl/SysAccountMultilevelServiceImpl.java

@@ -168,7 +168,7 @@ public class SysAccountMultilevelServiceImpl extends ServiceImpl<SysAccountMulti
             sysAccountMultilevel.setWorkLocation(workLocation);
         }
         if (ObjectUtil.isNotEmpty(workLocationId)) {
-            sysAccountMultilevel.setWorkLocationType(Integer.parseInt(workLocationId));
+            sysAccountMultilevel.setWorkLocationType(workLocationId);
         }
         if (ObjectUtil.isNotEmpty(workName)) {
             sysAccountMultilevel.setWorkName(workName);