生物安全车辆修改13

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

@@ -144,7 +144,7 @@ public class LoginController {
             accessToken.setFarmId(data.getFarmIds());
             accessToken.setType(data.getType());
             accessToken.setId(data.getId());
-            String token = TokenSign.sign(data.getUserName(), data.getId(), data.getFarmIds(), data.getWorkLocationId(), data.getType());
+            String token = TokenSign.sign(data.getUserName(), data.getId(), data.getFarmIds(), data.getWorkLocationType(), data.getType());
             accessToken.setToken(token);
             Integer lastFarmId = data.getLastFarmId();
             if (ObjectUtil.isEmpty(lastFarmId)) {
@@ -254,7 +254,7 @@ public class LoginController {
             accessToken.setFarmId(data.getFarmIds());
             accessToken.setType(data.getType());
             accessToken.setId(data.getId());
-            String token = TokenSign.sign(data.getUserName(), data.getId(), data.getFarmIds(), data.getWorkLocationId(), 7);
+            String token = TokenSign.sign(data.getUserName(), data.getId(), data.getFarmIds(), data.getWorkLocationType(), 7);
             accessToken.setToken(token);
             Integer lastFarmId = data.getLastFarmId();
             if (ObjectUtil.isEmpty(lastFarmId)) {
@@ -316,7 +316,7 @@ public class LoginController {
         accessToken.setFarmId(sysAccountMultilevel.getFarmIds());
         accessToken.setType(sysAccountMultilevel.getType());
         accessToken.setId(sysAccountMultilevel.getId());
-        String token = TokenSign.sign(sysAccountMultilevel.getUserName(), sysAccountMultilevel.getId(), sysAccountMultilevel.getFarmIds(), sysAccountMultilevel.getWorkLocationId(), sysAccountMultilevel.getType());
+        String token = TokenSign.sign(sysAccountMultilevel.getUserName(), sysAccountMultilevel.getId(), sysAccountMultilevel.getFarmIds(), sysAccountMultilevel.getWorkLocationType(), sysAccountMultilevel.getType());
         accessToken.setToken(token);
         Integer lastFarmId = sysAccountMultilevel.getLastFarmId();
         if (ObjectUtil.isEmpty(lastFarmId)) {

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

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

huimv-admin/src/main/java/com/huimv/admin/mapper/BillCleanMapper.java

@@ -22,7 +22,7 @@ public interface BillCleanMapper extends BaseMapper<BillClean> {
 
     Page<CleanAndDryVo> listPersonalCleanAndDry(Page<CleanAndDryVo> page, Integer userId,String vistitType);
 
-    Page<CleanAndDryVo2> CleanAndDry(Page<CleanAndDryVo2> page, String farmId,String type,String[] status,String location);
+    Page<CleanAndDryVo2> CleanAndDry(Page<CleanAndDryVo2> page, String farmId,String type,String[] status,String[] locations);
 
     Page<CleanAndDryVo2> CleanAndDry2(Page<CleanAndDryVo2> page, String farmId,String[] status);
 

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

@@ -28,6 +28,7 @@ import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 
 import javax.annotation.Resource;
@@ -80,10 +81,19 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
             data = "0";
         }
         if (type.equals("0")) {
+
+            QueryWrapper<BaseLocation> queryWrapper1 = new QueryWrapper<>();
+            queryWrapper1.eq("farm_id", farmId).eq("location_type", TokenSign.getWorkIdByJwtToken(httpServletRequest));
+            List<BaseLocation> baseLocations = locationMapper.selectList(queryWrapper1);
+            List<Integer> ids = new ArrayList<>();
+            for (BaseLocation baseLocation : baseLocations) {
+                ids.add(baseLocation.getId());
+            }
+
             Page<BillClean> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
             QueryWrapper<BillClean> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("farm_id", farmId).eq("vistit_type", type).orderByDesc("sub_date")
-                    .eq("test_location_id", TokenSign.getWorkIdByJwtToken(httpServletRequest));
+                    .in("test_location_id", ids);
 
             if ("0".equals(data)) {
                 queryWrapper.in("bill_status", 0, 1, 2);
@@ -114,19 +124,39 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
         }*/ else {
             Page<CleanAndDryVo2> cleanAndDryVo2Page = null;
             Page<CleanAndDryVo2> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+            QueryWrapper<BaseLocation> queryWrapper1 = new QueryWrapper<>();
+            queryWrapper1.eq("farm_id", farmId).eq("location_type", TokenSign.getWorkIdByJwtToken(httpServletRequest));
+            List<BaseLocation> baseLocations = locationMapper.selectList(queryWrapper1);
             if ("0".equals(data)) {
-                cleanAndDryVo2Page = cleanMapper.CleanAndDry(page, farmId, type, "0,1".split(","), TokenSign.getWorkIdByJwtToken(httpServletRequest));
+                ArrayList<String> arrayList = new ArrayList<>();
+                for (BaseLocation baseLocation : baseLocations) {
+                    arrayList.add(baseLocation.getId().toString());
+                }
+                String[] s = arrayList.toArray(new String[arrayList.size()]);
+                System.out.println("传入自定义sql的位置参数形式："+s);
+                cleanAndDryVo2Page = cleanMapper.CleanAndDry(page, farmId, type, "0,1".split(","), s);
             }
-            ArrayList<String> arrayList = new ArrayList<>();
             if ("1".equals(data)) {
+                ArrayList<String> integerArrayList = new ArrayList<>();
+                for (BaseLocation baseLocation : baseLocations) {
+                    integerArrayList.add(baseLocation.getId().toString());
+                }
+                String[] ids = integerArrayList.toArray(new String[integerArrayList.size()]);
+                ArrayList<String> arrayList = new ArrayList<>();
                 arrayList.add("0");
                 String[] s = arrayList.toArray(new String[arrayList.size()]);
-                cleanAndDryVo2Page = cleanMapper.CleanAndDry(page, farmId, type, s, TokenSign.getWorkIdByJwtToken(httpServletRequest));
+                cleanAndDryVo2Page = cleanMapper.CleanAndDry(page, farmId, type, s, ids);
             }
             if ("2".equals(data)) {
+                ArrayList<String> integerArrayList = new ArrayList<>();
+                for (BaseLocation baseLocation : baseLocations) {
+                    integerArrayList.add(baseLocation.getId().toString());
+                }
+                String[] ids = integerArrayList.toArray(new String[integerArrayList.size()]);
+                ArrayList<String> arrayList = new ArrayList<>();
                 arrayList.add("1");
                 String[] s = arrayList.toArray(new String[arrayList.size()]);
-                cleanAndDryVo2Page = cleanMapper.CleanAndDry(page, farmId, type, s, TokenSign.getWorkIdByJwtToken(httpServletRequest));
+                cleanAndDryVo2Page = cleanMapper.CleanAndDry(page, farmId, type, s, ids);
             }
             return new Result(ResultCode.SUCCESS, cleanAndDryVo2Page);
         }
@@ -180,7 +210,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                     billClean.setCheckDate(sdf.parse(date));
                     billClean.setPassDate(sdf.parse(sdf.format(new Date())));
 
-                    if (baseLocation.getId() == 4 || baseLocation.getId() == 10) {
+                    if (baseLocation.getId() == 1 && baseProcess.getDestId() > 2) {
                         //生成pcr检测申请
                         BillPcr billPcr = new BillPcr();
                         billPcr.setPcrType(0);
@@ -195,11 +225,49 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                         billPcr.setBillStatus(0);
                         billPcr.setProcessId(billClean.getProcessId());
                         billPcr.setFarmId(billClean.getFarmId());
-                        billPcr.setTestLocation(baseLocation.getNextLocation());
-                        billPcr.setTestLocationId(baseLocation.getNextId());
+                        billPcr.setTestLocation("人员二级洗消站");
+                        billPcr.setTestLocationId(3);
                         pcrMapper.insert(billPcr);
                     }
-                    if (baseLocation.getId() == 7 || baseLocation.getId() == 12) {
+                 /*   if (baseLocation.getId() == 3 ) {
+                        //生成隔离申请
+                        BillIsolate isolate = new BillIsolate();
+                        isolate.setPhone(billClean.getPhone());
+                        isolate.setVistitType(billClean.getVistitType());
+                        isolate.setDestName(billClean.getDestName());
+                        isolate.setDestId(billClean.getDestId());
+                        isolate.setAdmissionUserName(billClean.getAdmissionUserName());
+                        isolate.setAdmissionUserId(billClean.getAdmissionUserId());
+                        isolate.setVistitDate(billClean.getVistitDate());
+                        isolate.setSubDate(billClean.getSubDate());
+                        isolate.setFarmId(billClean.getFarmId());
+                        isolate.setBillStatus(0);
+                        isolate.setProcessId(billClean.getProcessId());
+                        isolate.setIsolateLocation(baseLocation.getLocationName());
+                        isolate.setIsolateLocationId(baseLocation.getId());
+                        isolateMapper.insert(isolate);
+                    }*/
+                    QueryWrapper<BillPcr> queryWrapper1 = new QueryWrapper<>();
+                    queryWrapper1.eq("farm_id", farmId).eq("process_id", baseProcess.getId()).eq("test_location_id", 4);
+                    if (ObjectUtil.isEmpty(pcrMapper.selectOne(queryWrapper1))) {
+                        //生成pcr检测申请
+                        BillPcr billPcr = new BillPcr();
+                        billPcr.setPcrType(0);
+                        billPcr.setPhone(billClean.getPhone());
+                        billPcr.setVistitType(billClean.getVistitType());
+                        billPcr.setDestName(billClean.getDestName());
+                        billPcr.setDestId(billClean.getDestId());
+                        billPcr.setAdmissionUserName(billClean.getAdmissionUserName());
+                        billPcr.setAdmissionUserId(billClean.getAdmissionUserId());
+                        billPcr.setVistitDate(billClean.getVistitDate());
+                        billPcr.setSubDate(billClean.getSubDate());
+                        billPcr.setBillStatus(0);
+                        billPcr.setProcessId(billClean.getProcessId());
+                        billPcr.setFarmId(billClean.getFarmId());
+                        billPcr.setTestLocation("场内");
+                        billPcr.setTestLocationId(4);
+                        pcrMapper.insert(billPcr);
+                    } else {
                         //生成隔离申请
                         BillIsolate isolate = new BillIsolate();
                         isolate.setPhone(billClean.getPhone());
@@ -213,13 +281,13 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                         isolate.setFarmId(billClean.getFarmId());
                         isolate.setBillStatus(0);
                         isolate.setProcessId(billClean.getProcessId());
-                        isolate.setIsolateLocation(baseLocation.getNextLocation());
-                        isolate.setIsolateLocationId(baseLocation.getNextId());
+                        isolate.setIsolateLocation(baseLocation.getLocationName());
+                        isolate.setIsolateLocationId(baseLocation.getId());
                         isolateMapper.insert(isolate);
                     }
                     baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
-                    baseProcess.setCurrentLocation(baseProcess.getCurrentLocation() + "," + baseLocation.getNextLocation());
-                    baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId() + "," + baseLocation.getNextId());
+                    baseProcess.setCurrentLocation(baseProcess.getCurrentLocation() + "," + baseLocation.getLocationName());
+                    baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId() + "," + baseLocation.getId());
                     String status = baseProcess.getCurrentStatus();
                     String substring = status.substring(0, status.length() - 1);
                     baseProcess.setCurrentStatus(substring + "1," + 0);
@@ -536,8 +604,8 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                         billClean.setImgStatus(1);
                         cleanMapper.updateById(billClean);
 
-                        if (billClean.getTestLocationId() == 47 || billClean.getTestLocationId() == 50) {
-                            if (billClean.getDestId() > 47 || billClean.getDestId() > 50) {
+                        if (billClean.getTestLocationId() == 9 || billClean.getTestLocationId() == 10) {
+                            if (billClean.getDestId() > 9 || billClean.getDestId() > 10) {
                                 Integer processId = billClean.getProcessId();
                                 QueryWrapper<BillPersonnelAdmission> queryWrapper1 = new QueryWrapper<>();
                                 queryWrapper1.eq("farm_id", farmId).eq("process_id", processId);
@@ -552,7 +620,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                         }
 
                         //第一次通过生成洗消
-                        if (billClean.getTestLocationId() == 33) {
+                        if (billClean.getTestLocationId() == 6) {
                             BillClean clean = new BillClean();
                             clean.setVistitType(billClean.getVistitType());
                             clean.setVistitDate(billClean.getVistitDate());
@@ -571,7 +639,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                             clean.setTestLocation(baseLocation.getNextLocation());
                             cleanMapper.insert(clean);
                         }
-                        if (billClean.getTestLocationId() == 35) {
+                        if (billClean.getTestLocationId() == 7) {
                             //生成烘干申请
                             BillDry billPcr = new BillDry();
                             billPcr.setPhone(billClean.getPhone());
@@ -587,13 +655,13 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                             billPcr.setCarNum(billClean.getCarNum());
                             billPcr.setProcessId(billClean.getProcessId());
                             billPcr.setFarmId(billClean.getFarmId());
-                            billPcr.setTestLocation(baseLocation.getNextLocation());
-                            billPcr.setTestLocationId(baseLocation.getNextId());
+                            billPcr.setTestLocation(baseLocation.getLocationName());
+                            billPcr.setTestLocationId(baseLocation.getId());
                             dryMapper.insert(billPcr);
                         }
                         baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
-                        baseProcess.setCurrentLocation(baseProcess.getCurrentLocation() + "," + baseLocation.getNextLocation());
-                        baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId() + "," + baseLocation.getNextId());
+                        baseProcess.setCurrentLocation(baseProcess.getCurrentLocation() + "," + baseLocation.getLocationName());
+                        baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId() + "," + baseLocation.getId());
                         String status = baseProcess.getCurrentStatus();
                         String substring = status.substring(0, status.length() - 1);
                         baseProcess.setCurrentStatus(substring + "1," + 0);

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

@@ -20,9 +20,7 @@ import org.springframework.stereotype.Service;
 import javax.servlet.http.HttpServletRequest;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -79,8 +77,15 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
             pageSize = "20";
         }
         Page<BillPcr> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        QueryWrapper<BaseLocation> queryWrapper1 = new QueryWrapper<>();
+        queryWrapper1.eq("farm_id", farmId).eq("location_type", TokenSign.getWorkIdByJwtToken(httpServletRequest));
+        List<BaseLocation> baseLocations = locationMapper.selectList(queryWrapper1);
+        List<Integer> ids = new ArrayList<>();
+        for (BaseLocation baseLocation : baseLocations) {
+            ids.add(baseLocation.getId());
+        }
         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).in("test_location_id", ids).orderByDesc("sub_date");
         if ("0".equals(type)) {
             queryWrapper.in("bill_status", 0, 1, 2, 3);
         }
@@ -154,16 +159,16 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
                     billClean.setPassDate(billPcr.getPassDate());
                     billClean.setPassUserId(billPcr.getPassUserId());
                     billClean.setProcessId(billPcr.getProcessId());
-                    billClean.setTestLocation(baseLocation.getNextLocation());
-                    billClean.setTestLocationId(baseLocation.getNextId());
+                    billClean.setTestLocation(baseLocation.getLocationName());
+                    billClean.setTestLocationId(baseLocation.getId());
                     billClean.setPhone(billPcr.getPhone());
                     billClean.setImgStatus(0);
                     billClean.setCarNum(billPcr.getCarNum());
                     cleanMapper.insert(billClean);
 
                     baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
-                    baseProcess.setCurrentLocation(baseProcess.getCurrentLocation() + "," + baseLocation.getNextLocation());
-                    baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId() + "," + baseLocation.getNextId());
+                    baseProcess.setCurrentLocation(baseProcess.getCurrentLocation() + "," + baseLocation.getLocationName());
+                    baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId() + "," + baseLocation.getId());
                     String status = baseProcess.getCurrentStatus();
                     String substring = status.substring(0, status.length() - 1);
 
@@ -201,37 +206,37 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
                     String substring = status.substring(0, status.length() - 1);
 
                     baseProcess.setCurrentStatus(substring + "2," + 0);
-                    if (baseLocation.getId() == 2) {
+                    if (baseLocation.getId() == 1) {
                         //第一次检测不合格
                         billPcr.setPcrType(1);
                         baseProcess.setCurrentLocation(baseProcess.getCurrentLocation() + ",初级洗消站污区");
                         baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId() + ",2");
                     }
-                    if (baseLocation.getId() == 17) {
+                    if (baseLocation.getId() == 12) {
                         //环保车第一次不合格
                         billPcr.setPcrType(1);
-                        baseProcess.setCurrentLocation(baseProcess.getCurrentLocation() + ",育肥淘汰有机肥洗消中心");
+                        baseProcess.setCurrentLocation(baseProcess.getCurrentLocation() + ",销售中转站");
                         baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId() + ",2");
                     }
-                    if (baseLocation.getId() == 26) {
+                    if (baseLocation.getId() == 15) {
                         //拉猪车第一次不合格
                         billPcr.setPcrType(1);
-                        baseProcess.setCurrentLocation(baseProcess.getCurrentLocation() + ",育肥淘汰有机肥洗消中心");
+                        baseProcess.setCurrentLocation(baseProcess.getCurrentLocation() + ",销售中转站");
                         baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId() + ",2");
                     }
-                    if (baseLocation.getId() == 32) {
+                    if (baseLocation.getId() == 6) {
                         //饲料车第一次不合格
                         billPcr.setPcrType(1);
-                        baseProcess.setCurrentLocation(baseProcess.getCurrentLocation() + ",猪场初级中转站");
+                        baseProcess.setCurrentLocation(baseProcess.getCurrentLocation() + ",车辆初级洗消站");
                         baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId() + ",2");
                     }
-                    if (baseLocation.getId() == 6) {
+                    if (baseLocation.getId() == 3) {
                         //第二次检测不合格
                         baseProcess.setProcessType(2);
                         baseProcess.setCurrentLocation(baseProcess.getCurrentLocation());
                         baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId());
                     }
-                    if (baseLocation.getId() == 11) {
+                    if (baseLocation.getId() == 4) {
                         //第三次不合格
                         baseProcess.setProcessType(2);
                         baseProcess.setCurrentLocation(baseProcess.getCurrentLocation());
@@ -281,15 +286,15 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
                         //第一次检测不合格
                         billPcr.setPcrType(1);
                         baseProcess.setProcessType(2);
-                    } else if (baseLocation.getId() == 17) {
+                    } else if (baseLocation.getId() == 12) {
                         //环保车检测不合格
                         billPcr.setPcrType(1);
                         baseProcess.setProcessType(2);
-                    } else if (baseLocation.getId() == 26) {
+                    } else if (baseLocation.getId() == 15) {
                         //拉猪车检测不合格
                         billPcr.setPcrType(1);
                         baseProcess.setProcessType(2);
-                    } else if (baseLocation.getId() == 32) {
+                    } else if (baseLocation.getId() == 6) {
                         //饲料车检测不合格
                         billPcr.setPcrType(1);
                         baseProcess.setProcessType(2);

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

@@ -677,7 +677,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                 baseProcess.setCurrentLocation(baseProcess.getCurrentLocation() + "," + baseLocation.getNextLocation());
                 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());
@@ -692,8 +692,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);
             }
@@ -857,7 +857,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                     billClean.setCheckDate(sdf.parse(sdf.format(new Date())));
 
                     //拉猪车结束
-                    if (billClean.getTestLocationId() == 29) {
+                    if (billClean.getTestLocationId() == 16) {
                         baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
                         baseProcess.setCurrentLocation(baseProcess.getCurrentLocation());
                         baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId());
@@ -876,7 +876,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
 
 
                     //环保车洗消合格生成烘干申请
-                    if (billClean.getTestLocationId() == 18 || billClean.getTestLocationId() == 21) {
+                    if (billClean.getTestLocationId() == 12 || billClean.getTestLocationId() == 13) {
                         BillDry billDry = new BillDry();
                         billDry.setVistitType(billClean.getVistitType());
                         billDry.setDestName(billClean.getDestName());
@@ -888,15 +888,15 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                         billDry.setFarmId(billClean.getFarmId());
                         billDry.setBillStatus(0);
                         billDry.setProcessId(billClean.getProcessId());
-                        billDry.setTestLocation(baseLocation.getNextLocation());
-                        billDry.setTestLocationId(baseLocation.getNextId());
+                        billDry.setTestLocation(baseLocation.getLocationName());
+                        billDry.setTestLocationId(baseLocation.getId());
                         billDry.setPhone(billClean.getPhone());
                         billDry.setCarNum(billClean.getCarNum());
                         billDry.setImgStatus(0);
                         dryMapper.insert(billDry);
                     }
                     //拉猪车洗消合格生成烘干申请
-                    if (billClean.getTestLocationId() == 27) {
+                    if (billClean.getTestLocationId() == 15) {
                         BillDry billDry = new BillDry();
                         billDry.setVistitType(billClean.getVistitType());
                         billDry.setDestName(billClean.getDestName());
@@ -908,15 +908,15 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                         billDry.setFarmId(billClean.getFarmId());
                         billDry.setBillStatus(0);
                         billDry.setProcessId(billClean.getProcessId());
-                        billDry.setTestLocation(baseLocation.getNextLocation());
-                        billDry.setTestLocationId(baseLocation.getNextId());
+                        billDry.setTestLocation(baseLocation.getLocationName());
+                        billDry.setTestLocationId(baseLocation.getId());
                         billDry.setPhone(billClean.getPhone());
                         billDry.setCarNum(billClean.getCarNum());
                         billDry.setImgStatus(0);
                         dryMapper.insert(billDry);
                     }
                     //送猪车洗消合格生成烘干申请
-                    if (billClean.getTestLocationId() == 42) {
+                    if (billClean.getTestLocationId() == 17) {
                         BillDry billDry = new BillDry();
                         billDry.setVistitType(billClean.getVistitType());
                         billDry.setDestName(billClean.getDestName());
@@ -928,8 +928,8 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                         billDry.setFarmId(billClean.getFarmId());
                         billDry.setBillStatus(0);
                         billDry.setProcessId(billClean.getProcessId());
-                        billDry.setTestLocation(baseLocation.getNextLocation());
-                        billDry.setTestLocationId(baseLocation.getNextId());
+                        billDry.setTestLocation(baseLocation.getLocationName());
+                        billDry.setTestLocationId(baseLocation.getId());
                         billDry.setPhone(billClean.getPhone());
                         billDry.setCarNum(billClean.getCarNum());
                         billDry.setImgStatus(0);
@@ -1053,7 +1053,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                     }
 
                     //环保车烘干合格生成洗消申请
-                    if (billClean.getTestLocationId() == 19) {
+                    if (billClean.getTestLocationId() == 12) {
                         BillClean clean = new BillClean();
                         clean.setVistitType(billClean.getVistitType());
                         clean.setDestName(billClean.getDestName());
@@ -1072,9 +1072,28 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                         clean.setImgStatus(0);
                         cleanMapper.insert(clean);
                     }
+                    if (billClean.getTestLocationId() == 13) {
+                        BillClean clean = new BillClean();
+                        clean.setVistitType(billClean.getVistitType());
+                        clean.setDestName(billClean.getDestName());
+                        clean.setDestId(billClean.getDestId());
+                        clean.setAdmissionUserName(billClean.getAdmissionUserName());
+                        clean.setAdmissionUserId(billClean.getAdmissionUserId());
+                        clean.setVistitDate(billClean.getVistitDate());
+                        clean.setSubDate(billClean.getSubDate());
+                        clean.setFarmId(billClean.getFarmId());
+                        clean.setBillStatus(0);
+                        clean.setProcessId(billClean.getProcessId());
+                        clean.setTestLocationId(baseLocation.getId());
+                        clean.setTestLocation(baseLocation.getLocationName());
+                        clean.setPhone(billClean.getPhone());
+                        clean.setCarNum(billClean.getCarNum());
+                        clean.setImgStatus(0);
+                        cleanMapper.insert(clean);
+                    }
 
                     //拉猪车烘干合格生成洗消申请
-                    if (billClean.getTestLocationId() == 28) {
+                    if (billClean.getTestLocationId() == 15) {
                         BillClean clean = new BillClean();
                         clean.setVistitType(billClean.getVistitType());
                         clean.setDestName(billClean.getDestName());
@@ -1086,8 +1105,8 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                         clean.setFarmId(billClean.getFarmId());
                         clean.setBillStatus(0);
                         clean.setProcessId(billClean.getProcessId());
-                        clean.setTestLocationId(baseLocation.getNextId());
-                        clean.setTestLocation(baseLocation.getNextLocation());
+                        clean.setTestLocationId(baseLocation.getId());
+                        clean.setTestLocation(baseLocation.getLocationName());
                         clean.setPhone(billClean.getPhone());
                         clean.setCarNum(billClean.getCarNum());
                         clean.setImgStatus(0);

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

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

huimv-admin/src/main/resources/com/huimv/admin/mapper/BillCleanMapper.xml

@@ -51,13 +51,21 @@
     </select>
 
     <select id="CleanAndDry" resultType="com.huimv.admin.entity.vo.CleanAndDryVo2">
-        select *,1 AS 'type' from bill_clean where farm_id=#{farmId} and vistit_type=#{type} and test_location_id=#{location}
+        select *,1 AS 'type' from bill_clean where farm_id=#{farmId} and vistit_type=#{type}
+        and test_location_id in
+        <foreach collection="locations" item="location" separator="," open="(" close=")">
+            #{location}
+        </foreach>
         and img_status in
         <foreach collection="status" item="statu" separator="," open="(" close=")">
             #{statu}
         </foreach>
         union all
-        select *,2 AS 'type' from bill_dry where farm_id=#{farmId} and vistit_type=#{type} and test_location_id=#{location}
+        select *,2 AS 'type' from bill_dry where farm_id=#{farmId} and vistit_type=#{type}
+        and test_location_id in
+        <foreach collection="locations" item="location" separator="," open="(" close=")">
+            #{location}
+        </foreach>
         and img_status in
         <foreach collection="status" item="statu" separator="," open="(" close=")">
             #{statu}