测试

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

@@ -68,7 +68,7 @@ public class BaseLocationController {
     public Result listLuggageLocation(@RequestBody Map<String, String> paramsMap) {
         String farmId = paramsMap.get("farmId");
         return new Result(ResultCode.SUCCESS, baseLocationService.list(new QueryWrapper<BaseLocation>()
-                .eq("is_luggage", 1).like("farmId", farmId)));
+                .eq("is_luggage", 1).like("farm_Ids", farmId)));
     }
 
     @PostMapping("/add")

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

@@ -135,7 +135,7 @@ public class BillCleanController {
 
     @PostMapping("/goodsCarClean")
     public Result goodsCarClean(HttpServletRequest httpServletRequest, @RequestParam("id") String id,
-                                @RequestParam("data") String data,
+                                @RequestParam("date") String date,
                                 @RequestParam(value = "img1", required = false) MultipartFile img1,
                                 @RequestParam(value = "img2", required = false) MultipartFile img2,
                                 @RequestParam(value = "img3", required = false) MultipartFile img3,
@@ -144,7 +144,7 @@ public class BillCleanController {
                                 @RequestParam("farmId") String farmId,
                                 @RequestParam("type") String type,
                                 @RequestParam("result") String result) throws IOException, ParseException {
-        return cleanService.goodsCarClean(httpServletRequest, farmId, id, data, img1, img2, img3, img4, img5, type, result);
+        return cleanService.goodsCarClean(httpServletRequest, farmId, id, date, img1, img2, img3, img4, img5, type, result);
     }
 
 

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

@@ -885,6 +885,8 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                     BillClean pcr = (BillClean) newObject;
                     cleanMapper.insert(pcr);
                 }else if (nextId == 4) {
+                    BillIsolate billIsolate = (BillIsolate) newObject;
+                    isolateMapper.insert(billIsolate);
                     //新增隔离
                 }else if (nextId == 5) {
                     BillDry pcr = (BillDry) newObject;

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

@@ -632,6 +632,7 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
             billPcr.setSubDate(subDate);
             billPcr.setBillStatus(0);
             billPcr.setProcessId(processId);
+            billPcr.setPhone(phone);
             billPcr.setFarmId(farmId);
             billPcr.setTestLocationId(testLocationId);
             billPcr.setTestLocation(testLocation);
@@ -651,6 +652,7 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
             billPcr.setBillStatus(0);
             billPcr.setProcessId(processId);
             billPcr.setFarmId(farmId);
+            billPcr.setPhone(phone);
             billPcr.setIsolateLocation(testLocation);
             billPcr.setIsolateLocationId(testLocationId);
             billPcr.setDepartureName(departureName);
@@ -669,6 +671,7 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
             billPcr.setBillStatus(0);
             billPcr.setProcessId(processId);
             billPcr.setFarmId(farmId);
+            billPcr.setPhone(phone);
             billPcr.setTestLocationId(testLocationId);
             billPcr.setTestLocation(testLocation);
             billPcr.setDepartureName(departureName);