地址

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

@@ -31,12 +31,16 @@ 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)));
+        if (vistitType.equals("5")){
+            return new Result(ResultCode.SUCCESS,baseLocationService.list(new QueryWrapper<BaseLocation>().eq("farm_id",farmId).eq("vistit_type",vistitType).ne("parent_id",0)));
+        }else {
+            return new Result(ResultCode.SUCCESS,baseLocationService.list(new QueryWrapper<BaseLocation>().eq("farm_id",farmId).eq("vistit_type",vistitType)));
+        }
     }
 
     @PostMapping("/listLuggageLocation")
     public Result listLuggageLocation(@RequestBody Map<String, String> paramsMap){
         String farmId = paramsMap.get("farmId");
-        return new Result(ResultCode.SUCCESS,baseLocationService.list(new QueryWrapper<BaseLocation>().eq("farm_id",farmId).eq("parent_id",1)));
+        return new Result(ResultCode.SUCCESS,baseLocationService.list(new QueryWrapper<BaseLocation>().eq("farm_id",farmId).eq("vistit_type",0).eq("parent_id",0)));
     }
 }

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

@@ -41,6 +41,7 @@ public class BillGoodsInventory implements Serializable {
 
     private String goodsName;
 
+    private String goodsUnit;
 
     /**
      * 申请单id

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

@@ -139,13 +139,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         //获取位置
         BaseLocation baseLocation;
         if (vistitType.equals("5")){
-            if (Integer.parseInt(destId) <= 47){
-                baseLocation = baseLocationMapper.selectOne(new QueryWrapper<BaseLocation>().eq("farm_id", farmId).eq("vistit_type", vistitType).eq("parent_id", 0));
-            }else if (Integer.parseInt(destId) <= 50){
-                baseLocation = baseLocationMapper.selectOne(new QueryWrapper<BaseLocation>().eq("farm_id", farmId).eq("vistit_type", vistitType).eq("location_type", 2).eq("parent_id",1));
-            }else {
-                baseLocation = baseLocationMapper.selectOne(new QueryWrapper<BaseLocation>().eq("farm_id", farmId).eq("vistit_type", vistitType).eq("location_type", 3).eq("parent_id",1));
-            }
+            baseLocation = baseLocationMapper.selectOne(new QueryWrapper<BaseLocation>().eq("next_id", destId));
         }else {
             baseLocation = baseLocationMapper.selectOne(new QueryWrapper<BaseLocation>().eq("farm_id", farmId).eq("vistit_type", vistitType).eq("parent_id", 0));
         }
@@ -170,19 +164,12 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
             List<BillGoodsInventory> admissionAndGoods = objectMapper.readValue(goods, new TypeReference<List<BillGoodsInventory>>() {});
             for (BillGoodsInventory good : admissionAndGoods) {
                 good.setBillAdmission(billPersonnelAdmission.getId());
-                if (Integer.parseInt(destId) <= 50){
-                    BaseLocation baseLocation1 = baseLocationMapper.selectOne(new QueryWrapper<BaseLocation>().eq("vistit_type", vistitType).eq("location_type", 2).eq("parent_id",1));
-                    good.setCurrentLocation(baseLocation1.getLocationName());
-                    good.setCurrentLocationId(baseLocation1.getId());
-                }else {
-                    BaseLocation baseLocation2 = baseLocationMapper.selectOne(new QueryWrapper<BaseLocation>().eq("vistit_type", vistitType).eq("location_type", 3).eq("parent_id",1));
-                    good.setCurrentLocation(baseLocation2.getLocationName());
-                    good.setCurrentLocationId(baseLocation2.getId());
-                }
+                BaseLocation baseLocation1 = baseLocationMapper.selectOne(new QueryWrapper<BaseLocation>().eq("next_id", destId));
+                good.setCurrentLocation(baseLocation1.getLocationName());
+                good.setCurrentLocationId(baseLocation1.getId());
                 billGoodsInventoryMapper.insert(good);
             }
         }
-
         return Result.SUCCESS();
     }
 
@@ -250,13 +237,9 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         billPersonnelAdmission.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
         billPersonnelAdmission.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
         BaseProcess baseProcess = baseProcessMapper.selectById(billPersonnelAdmission.getProcessId());
-        List<BaseLocation> baseLocations = baseLocationMapper.selectList(new QueryWrapper<BaseLocation>().eq("serial_number", 0));
+
         ArrayList<String> phoneList = new ArrayList<>();
         phoneList.add(billPersonnelAdmission.getPhone());
-        List<Integer> locationIds = new ArrayList<>();
-        for (BaseLocation baseLocation : baseLocations) {
-            locationIds.add(baseLocation.getId());
-        }
         if (StringUtils.isBlank(baseProcess.getUpdateDate())) {
             baseProcess.setUpdateDate(LocalDateTime.now().format(dateTimeFormatter));
         } else {
@@ -270,7 +253,6 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
             baseProcess.setProcessType(2);
             baseProcess.setCurrentStatus(String.join(",",split));
             SendSMS.sendSMS(phoneList,"拒绝入场申请测试");
-//            SendSMS.sendSMS(phoneList,"污渍倒了");
         } else {
             //通过
             billPersonnelAdmission.setBillStatus(1);
@@ -278,44 +260,42 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
             String locationId = baseProcess.getCurrentLocationId();
             String[] strings = locationId.split(",");
             String laseLocationId = strings[strings.length-1];
-            BaseLocation laseLocation = baseLocationMapper.selectById(laseLocationId);
-            BaseLocation baseLocation = baseLocationMapper.selectById(laseLocation.getNextId());
+            BaseLocation baseLocation;
+            if (!"9".equals(billPersonnelAdmission.getDestId())){
+                baseLocation = baseLocationMapper.selectById(laseLocationId);
+            }else {
+                baseLocation = baseLocationMapper.selectById(billPersonnelAdmission.getDestId());
+            }
             if (userType == 3) {
                 String[] split = baseProcess.getCurrentStatus().split(",");
                 split[split.length-1]="1";
-                if (locationIds.contains(billPersonnelAdmission.getDestId())) {
-                    baseProcess.setCurrentStatus(String.join(",",split));
-                    baseProcess.setProcessType(1);
-                } else {
-                    StringBuilder result = new StringBuilder();
-                    for (String element : split) {
-                        result.append(element).append(",");
-                    }
-                    result.append("0");
-                    baseProcess.setCurrentStatus(result.toString());
-                    baseProcess.setCurrentLocation(baseProcess.getCurrentLocation() + "," + baseLocation.getLocationName());
-                    baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId() + "," + baseLocation.getId());
-                    BillPcr billPcr = new BillPcr();
-                    billPcr.setVistitType(billPersonnelAdmission.getVistitType());
-                    billPcr.setDestName(billPersonnelAdmission.getDestName());
-                    billPcr.setDestId(billPersonnelAdmission.getDestId());
-                    billPcr.setPhone(billPersonnelAdmission.getPhone());
-                    billPcr.setAdmissionUserId(billPersonnelAdmission.getAdmissionUserId());
-                    billPcr.setAdmissionUserName(billPersonnelAdmission.getAdmissionUserName());
-                    billPcr.setSubDate(LocalDateTime.now());
-                    billPcr.setVistitDate(billPersonnelAdmission.getVistitDate());
-                    billPcr.setFarmId(billPersonnelAdmission.getFarmId());
-                    billPcr.setProcessId(billPersonnelAdmission.getProcessId());
-                    billPcr.setAdmissionId(Integer.parseInt(id));
-                    if (ObjectUtil.isNotEmpty(billPersonnelAdmission.getCarNum())) {
-                        billPcr.setCarNum(billPersonnelAdmission.getCarNum());
-                    }
-                    billPcr.setTestLocation(baseLocation.getLocationName());
-                    billPcr.setTestLocationId(baseLocation.getId());
-                    billPcrMapper.insert(billPcr);
-                    SendSMS.sendSMS(phoneList,"通过入场申请测试");
-//                    SendSMS.sendSMS(phoneList,"污渍,永远滴神！");
+                StringBuilder result = new StringBuilder();
+                for (String element : split) {
+                    result.append(element).append(",");
+                }
+                result.append("0");
+                baseProcess.setCurrentStatus(result.toString());
+                baseProcess.setCurrentLocation(baseProcess.getCurrentLocation() + "," + baseLocation.getLocationName());
+                baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId() + "," + baseLocation.getId());
+                BillPcr billPcr = new BillPcr();
+                billPcr.setVistitType(billPersonnelAdmission.getVistitType());
+                billPcr.setDestName(billPersonnelAdmission.getDestName());
+                billPcr.setDestId(billPersonnelAdmission.getDestId());
+                billPcr.setPhone(billPersonnelAdmission.getPhone());
+                billPcr.setAdmissionUserId(billPersonnelAdmission.getAdmissionUserId());
+                billPcr.setAdmissionUserName(billPersonnelAdmission.getAdmissionUserName());
+                billPcr.setSubDate(LocalDateTime.now());
+                billPcr.setVistitDate(billPersonnelAdmission.getVistitDate());
+                billPcr.setFarmId(billPersonnelAdmission.getFarmId());
+                billPcr.setProcessId(billPersonnelAdmission.getProcessId());
+                billPcr.setAdmissionId(Integer.parseInt(id));
+                if (ObjectUtil.isNotEmpty(billPersonnelAdmission.getCarNum())) {
+                    billPcr.setCarNum(billPersonnelAdmission.getCarNum());
                 }
+                billPcr.setTestLocation(baseLocation.getLocationName());
+                billPcr.setTestLocationId(baseLocation.getId());
+                billPcrMapper.insert(billPcr);
+                SendSMS.sendSMS(phoneList,"通过入场申请测试");
             } else {
                 baseProcess.setCurrentStatus("1");
 //                baseProcess.setCurrentLocation(baseProcess.getCurrentLocation()+","+baseLocation.getLocationName());