来访类型固定

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

@@ -52,15 +52,13 @@ public class BaseVisitingController {
     public Result page(@RequestBody Map<String,String> paramsMap){
         String pageNum = paramsMap.get("pageNum");
         String pageSize = paramsMap.get("pageSize");
-        String farmId = paramsMap.get("farmId");
         Page<BaseVisiting> baseVisitingPage = new Page<>(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
-        return new Result(ResultCode.SUCCESS,baseVisitingService.page(baseVisitingPage,new QueryWrapper<BaseVisiting>().lambda().eq(BaseVisiting::getFarmId,farmId)));
+        return new Result(ResultCode.SUCCESS,baseVisitingService.page(baseVisitingPage,new QueryWrapper<>()));
     }
 
     @PostMapping("/list")
     public Result list(@RequestBody Map<String,String> paramsMap){
-        String farmId = paramsMap.get("farmId");
-        return new Result(ResultCode.SUCCESS,baseVisitingService.list(new QueryWrapper<BaseVisiting>().lambda().eq(BaseVisiting::getFarmId,farmId)));
+        return new Result(ResultCode.SUCCESS,baseVisitingService.list(new QueryWrapper<>()));
     }
 
 

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

@@ -2,6 +2,7 @@ package com.huimv.receive.controller;
 
 
 import com.huimv.receive.common.utils.Result;
+import com.huimv.receive.common.utils.ResultCode;
 import com.huimv.receive.service.IBillCleanBeforeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -30,4 +31,9 @@ public class BillCleanBeforeController {
         return billCleanBeforeService.listPersonalCleanBefore(httpServletRequest,paramsMap);
     }
 
+    @PostMapping("/getDetail")
+    public Result getDetail(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap){
+        return new Result(ResultCode.SUCCESS,billCleanBeforeService.getById(paramsMap.get("id")));
+    }
+
 }

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

@@ -40,8 +40,6 @@ public class BaseVisiting implements Serializable {
      */
     private String visitingName;
 
-    private Integer farmId;
-
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime createTime;
 

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

@@ -32,8 +32,7 @@ public class BaseVisitingServiceImpl extends ServiceImpl<BaseVisitingMapper, Bas
     public Result add(HttpServletRequest httpServletRequest, BaseVisiting baseVisiting) {
         Integer userId = TokenSign.getMemberIdByJwtToken(httpServletRequest);
         if (baseVisitingMapper.selectCount(new QueryWrapper<BaseVisiting>().lambda()
-                .eq(BaseVisiting::getVisitingName,baseVisiting.getVisitingName())
-                .eq(BaseVisiting::getFarmId,baseVisiting.getFarmId())) > 0) {
+                .eq(BaseVisiting::getVisitingName,baseVisiting.getVisitingName())) > 0) {
             return new Result(10001,"来访类型已存在!",false);
         }
         baseVisiting.setCreateUser(userId);

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

@@ -44,7 +44,7 @@ public class BaseWashoutPointServiceImpl extends ServiceImpl<BaseWashoutPointMap
     @Override
     public Result list(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String farmId = paramsMap.get("farmId");
-        List<BaseVisiting> visitings = visitingMapper.selectList(new QueryWrapper<BaseVisiting>().eq("farm_id", farmId));
+        List<BaseVisiting> visitings = visitingMapper.selectList(new QueryWrapper<>());
         List<GetWashoutPointDto> washoutPointDtos = new ArrayList<>();
         if (ObjectUtil.isEmpty(visitings)) {
             return new Result(ResultCode.SUCCESS, washoutPointDtos);

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

@@ -106,6 +106,13 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                 return new Result(10001, "身份证号格式错误!", false);
             }
         }
+        BaseWashoutPoint baseWashoutPoint1 = baseWashoutPointMapper.selectOne(new QueryWrapper<BaseWashoutPoint>().lambda().eq(BaseWashoutPoint::getLocationId, departureId).like(BaseWashoutPoint::getFarmIds, farmId).eq(BaseWashoutPoint::getVisitingType, vistitType));
+        BaseWashoutPoint baseWashoutPoint2 = baseWashoutPointMapper.selectOne(new QueryWrapper<BaseWashoutPoint>().lambda().eq(BaseWashoutPoint::getLocationId, destId).like(BaseWashoutPoint::getFarmIds, farmId).eq(BaseWashoutPoint::getVisitingType, vistitType));
+        if (!departureId.equals("0")){
+            if (baseWashoutPoint1.getPointLevel()>baseWashoutPoint2.getPointLevel()){
+                return new Result(10001, "出发地应在目的地之前!", false);
+            }
+        }
         SysAccountMultilevel sysAccountMultilevel1 = sysAccountMultilevelMapper.selectById(userId);
 
         DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
@@ -156,7 +163,13 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         String allLocationId = departureId;
         String allLocationStatus = "0";
         String allFlowId = "";
-        List<BaseWashoutPoint> baseWashoutPoints = baseWashoutPointMapper.selectList(new QueryWrapper<BaseWashoutPoint>().lambda().eq(BaseWashoutPoint::getVisitingType, vistitType).like(BaseWashoutPoint::getFarmIds, farmId).orderByAsc(BaseWashoutPoint::getPointLevel));
+
+        List<BaseWashoutPoint> baseWashoutPoints = new ArrayList<>();
+        if (ObjectUtil.isEmpty(baseWashoutPoint1)){
+            baseWashoutPoints = baseWashoutPointMapper.selectList(new QueryWrapper<BaseWashoutPoint>().lambda().eq(BaseWashoutPoint::getVisitingType, vistitType).like(BaseWashoutPoint::getFarmIds, farmId).orderByAsc(BaseWashoutPoint::getPointLevel));
+        }else {
+            baseWashoutPoints = baseWashoutPointMapper.selectList(new QueryWrapper<BaseWashoutPoint>().lambda().eq(BaseWashoutPoint::getVisitingType, vistitType).like(BaseWashoutPoint::getFarmIds, farmId).ge(BaseWashoutPoint::getPointLevel,baseWashoutPoint1.getPointLevel()).orderByAsc(BaseWashoutPoint::getPointLevel));
+        }
         for (BaseWashoutPoint baseWashoutPoint : baseWashoutPoints) {
             allLocation = allLocation + "," + baseLocationMapper.selectById(baseWashoutPoint.getLocationId()).getLocationName();
             allLocationId = allLocationId + "," + baseWashoutPoint.getLocationId();