后台修改1

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

@@ -30,7 +30,7 @@ public class BaseLocationController {
     public Result listAll(@RequestBody Map<String, String> paramsMap){
         String farmId = paramsMap.get("farmId");
         String vistitType = paramsMap.get("vistitType");
-        return new Result(ResultCode.SUCCESS,baseLocationService.list(new QueryWrapper<BaseLocation>().eq("farm_id",farmId).eq("vistit_type",vistitType)));
+        return new Result(ResultCode.SUCCESS, baseLocationService.list(new QueryWrapper<BaseLocation>().eq("farm_id", farmId).eq("vistit_type", vistitType).ne("location_type", 0)));
     }
 
     @PostMapping("/listLuggageLocation")

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

@@ -115,4 +115,10 @@ public class BillPcrController {
         configurationService.updateById(configuration);
         return new Result(10000,"保存成功！",true);
     }
+
+    @PostMapping("/listConfiguration")
+    public Result listConfiguration(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        return new Result(ResultCode.SUCCESS,configurationService.getOne(new QueryWrapper<Configuration>().eq("farm_id", farmId)));
+    }
 }

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

@@ -120,26 +120,37 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         baseProcess.setCurrentStatus("0");
 
         QueryWrapper<BaseLocation> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("vistit_type", vistitType).eq("farm_id", farmId).orderByAsc("id");
+        queryWrapper.eq("vistit_type", vistitType).eq("farm_id", farmId).orderByAsc("location_type");
         List<BaseLocation> baseLocations = baseLocationMapper.selectList(queryWrapper);
-        String allLocation = "";
-        String allLocationId = "";
-        String allLocationStatus = "";
-        for (BaseLocation baseLocation : baseLocations) {
-            if (baseLocation.getId() < Integer.parseInt(destId)) {
-                allLocation = allLocation + baseLocation.getLocationName() + ",";
-                allLocationId = allLocationId + baseLocation.getId() + ",";
-                allLocationStatus = allLocationStatus + "0" + ",";
-            }
-            if (baseLocation.getId() == Integer.parseInt(destId)) {
-                allLocation = allLocation + baseLocation.getLocationName();
-                allLocationId = allLocationId + baseLocation.getId();
-                allLocationStatus = allLocationStatus + "0";
+        if (admissionType.equals("1")) {
+            baseProcess.setAllLocation("场外," + destName);
+            QueryWrapper<BaseLocation> queryWrapper1 = new QueryWrapper<>();
+            queryWrapper1.eq("farm_id", farmId).eq("vistit_type", vistitType).eq("location_type", 0);
+            baseProcess.setCurrentLocationId(baseLocationMapper.selectOne(queryWrapper1).getId() + "," + destId);
+            baseProcess.setAllLocationStatus("1,0");
+        } else {
+            String allLocation = "";
+            String allLocationId = "";
+            String allLocationStatus = "";
+            for (BaseLocation baseLocation : baseLocations) {
+                if (baseLocation.getId() < Integer.parseInt(destId)) {
+                    allLocation = allLocation + baseLocation.getLocationName() + ",";
+                    allLocationId = allLocationId + baseLocation.getId() + ",";
+                    allLocationStatus = allLocationStatus + "0" + ",";
+                }
+                if (baseLocation.getId() == Integer.parseInt(destId)) {
+                    allLocation = allLocation + baseLocation.getLocationName();
+                    allLocationId = allLocationId + baseLocation.getId();
+                    allLocationStatus = allLocationStatus + "0";
+                }
             }
+            baseProcess.setAllLocation(allLocation);
+            baseProcess.setAllLocationId(allLocationId);
+            String[] split = allLocationStatus.split(",");
+            split[0] = "1";
+            baseProcess.setAllLocationStatus(split[0] + allLocationStatus.substring(1));
         }
-        baseProcess.setAllLocation(allLocation);
-        baseProcess.setAllLocationId(allLocationId);
-        baseProcess.setAllLocationStatus(allLocationStatus);
+
 
         //获取位置
         BaseLocation baseLocation;
@@ -322,6 +333,8 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
 //                SendSMS.sendSMS(phoneList,"通过入场申请测试");
             } else {
                 baseProcess.setCurrentStatus("1");
+                baseProcess.setProcessType(1);
+                baseProcess.setAllLocationStatus("2,2");
 //                baseProcess.setCurrentLocation(baseProcess.getCurrentLocation()+","+baseLocation.getLocationName());
 //                baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId() +","+baseLocation.getId());
                 //TODO 紧急入场通过先不处理