Merge remote-tracking branch 'origin/master'

huimv-receive/src/main/java/com/huimv/receive/common/utils/FlowUtil.java

@@ -0,0 +1,103 @@
+package com.huimv.receive.common.utils;
+
+import com.huimv.receive.entity.*;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+
+@Component
+public class FlowUtil {
+    public Object getEntity(Integer nextFlowId,Integer vistitType, String destName, Integer destId, Integer userId, String userName, String phone, LocalDateTime vistitDate, Integer locationId, String locationName, Integer farmId, Integer processId){
+        if (nextFlowId == 1){
+            BillSampling billSampling = new BillSampling();
+            billSampling.setVistitType(vistitType);
+            billSampling.setDestName(destName);
+            billSampling.setDestId(destId);
+            billSampling.setAdmissionUserName(userName);
+            billSampling.setAdmissionUserId(userId);
+            billSampling.setVistitDate(vistitDate);
+            billSampling.setSubDate(LocalDateTime.now());
+            billSampling.setPhone(phone);
+            billSampling.setTestLocation(locationName);
+            billSampling.setTestLocationId(locationId);
+            billSampling.setProcessId(processId);
+            billSampling.setFarmId(String.valueOf(farmId));
+            return billSampling;
+        }else if (nextFlowId == 2){
+            BillPcr billPcr = new BillPcr();
+            billPcr.setVistitType(vistitType);
+            billPcr.setDestName(destName);
+            billPcr.setDestId(destId);
+            billPcr.setAdmissionUserName(userName);
+            billPcr.setAdmissionUserId(userId);
+            billPcr.setVistitDate(vistitDate);
+            billPcr.setSubDate(LocalDateTime.now());
+            billPcr.setPhone(phone);
+            billPcr.setTestLocation(locationName);
+            billPcr.setTestLocationId(locationId);
+            billPcr.setProcessId(processId);
+            billPcr.setFarmId(farmId);
+            return billPcr;
+        }else if (nextFlowId == 3){
+            BillClean billClean = new BillClean();
+            billClean.setVistitType(vistitType);
+            billClean.setDestName(destName);
+            billClean.setDestId(destId);
+            billClean.setAdmissionUserName(userName);
+            billClean.setAdmissionUserId(userId);
+            billClean.setVistitDate(vistitDate);
+            billClean.setSubDate(LocalDateTime.now());
+            billClean.setPhone(phone);
+            billClean.setTestLocation(locationName);
+            billClean.setTestLocationId(locationId);
+            billClean.setProcessId(processId);
+            billClean.setFarmId(farmId);
+            return billClean;
+        }else if (nextFlowId == 4){
+            BillIsolate billIsolate = new BillIsolate();
+            billIsolate.setVistitType(vistitType);
+            billIsolate.setDestName(destName);
+            billIsolate.setDestId(destId);
+            billIsolate.setAdmissionUserName(userName);
+            billIsolate.setAdmissionUserId(userId);
+            billIsolate.setVistitDate(vistitDate);
+            billIsolate.setSubDate(LocalDateTime.now());
+            billIsolate.setPhone(phone);
+            billIsolate.setIsolateLocation(locationName);
+            billIsolate.setIsolateLocationId(locationId);
+            billIsolate.setProcessId(processId);
+            billIsolate.setFarmId(farmId);
+            return billIsolate;
+        }else if (nextFlowId == 5){
+            BillDry billDry = new BillDry();
+            billDry.setVistitType(vistitType);
+            billDry.setDestName(destName);
+            billDry.setDestId(destId);
+            billDry.setAdmissionUserName(userName);
+            billDry.setAdmissionUserId(userId);
+            billDry.setVistitDate(vistitDate);
+            billDry.setSubDate(LocalDateTime.now());
+            billDry.setPhone(phone);
+            billDry.setTestLocation(locationName);
+            billDry.setTestLocationId(locationId);
+            billDry.setProcessId(processId);
+            billDry.setFarmId(farmId);
+            return billDry;
+        }else {
+            BillCleanBefore billCleanBefore = new BillCleanBefore();
+            billCleanBefore.setVistitType(vistitType);
+            billCleanBefore.setDestName(destName);
+            billCleanBefore.setDestId(destId);
+            billCleanBefore.setAdmissionUserName(userName);
+            billCleanBefore.setAdmissionUserId(userId);
+            billCleanBefore.setVistitDate(vistitDate);
+            billCleanBefore.setSubDate(LocalDateTime.now());
+            billCleanBefore.setPhone(phone);
+            billCleanBefore.setTestLocation(locationName);
+            billCleanBefore.setTestLocationId(locationId);
+            billCleanBefore.setProcessId(processId);
+            billCleanBefore.setFarmId(String.valueOf(farmId));
+            return billCleanBefore;
+        }
+    }
+}

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

@@ -3,17 +3,22 @@ package com.huimv.receive.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.api.R;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.receive.common.utils.Result;
 import com.huimv.receive.common.utils.ResultCode;
 import com.huimv.receive.common.utils.ResultUtil;
 import com.huimv.receive.entity.BaseLocation;
+import com.huimv.receive.entity.BillSampling;
 import com.huimv.receive.entity.Exist;
+import com.huimv.receive.service.IBaseFarmService;
 import com.huimv.receive.service.IBaseLocationService;
 import com.huimv.receive.service.IExistService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -30,6 +35,8 @@ import java.util.Map;
 public class BaseLocationController {
     @Autowired
     private IBaseLocationService baseLocationService;
+    @Autowired
+    private IBaseFarmService baseFarmService;
 
     @PostMapping("/listAll")
     public Result listAll(@RequestBody Map<String, String> paramsMap) {
@@ -38,6 +45,25 @@ public class BaseLocationController {
                 .like(BaseLocation::getFarmIds,farmId)));
     }
 
+    @PostMapping("/page")
+    public Result page(@RequestBody Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String pageNo = paramsMap.get("pageNum");
+        String pageSize = paramsMap.get("pageSize");
+        Page<BaseLocation> page = new Page<>(Integer.parseInt(pageNo),Integer.parseInt(pageSize));
+        Page<BaseLocation> baseLocationPage = baseLocationService.page(page, new QueryWrapper<BaseLocation>().lambda()
+                .like(BaseLocation::getFarmIds, farmId));
+        for (BaseLocation record : baseLocationPage.getRecords()) {
+            String[] strings = record.getFarmIds().split(",");
+            List farmNameList = new ArrayList();
+            for (String farm : strings) {
+                farmNameList.add(baseFarmService.getById(farm).getFarmName());
+            }
+            record.setFarmNames(String.join(",",farmNameList));
+        }
+        return new Result(ResultCode.SUCCESS, baseLocationPage);
+    }
+
     @PostMapping("/listLuggageLocation")
     public Result listLuggageLocation(@RequestBody Map<String, String> paramsMap) {
         String farmId = paramsMap.get("farmId");
@@ -50,6 +76,11 @@ public class BaseLocationController {
         return baseLocationService.add(httpServletRequest,baseLocation);
     }
 
+    @PostMapping("/edit")
+    public Result edit(HttpServletRequest httpServletRequest, @RequestBody BaseLocation baseLocation){
+        return baseLocationService.edit(httpServletRequest,baseLocation);
+    }
+
     @PostMapping("/delete")
     public Result delete(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap){
         return baseLocationService.delete(httpServletRequest,paramsMap);

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

@@ -1,7 +1,10 @@
 package com.huimv.receive.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.receive.common.utils.Result;
+import com.huimv.receive.common.utils.ResultCode;
+import com.huimv.receive.entity.BaseWashoutPoint;
 import com.huimv.receive.entity.dto.GetWashoutPointDto;
 import com.huimv.receive.service.IBaseWashoutPointService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -45,4 +48,12 @@ public class BaseWashoutPointController {
     public Result delete(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
         return washoutPointService.delete(httpServletRequest, paramsMap);
     }
+
+    @RequestMapping("/listDest")
+    public Result listDest(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        return new Result(ResultCode.SUCCESS,washoutPointService.list(new QueryWrapper<BaseWashoutPoint>().lambda()
+                .like(BaseWashoutPoint::getFarmIds,farmId)
+                .orderByAsc(BaseWashoutPoint::getPointLevel)));
+    }
 }

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

@@ -1,9 +1,13 @@
 package com.huimv.receive.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.huimv.receive.common.utils.Result;
+import com.huimv.receive.service.IBillCleanBeforeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
 
 /**
  * <p>
@@ -15,6 +19,15 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/bill-clean-before")
+@CrossOrigin
 public class BillCleanBeforeController {
 
+    @Autowired
+    private IBillCleanBeforeService billCleanBeforeService;
+
+    @PostMapping("/listPersonalCleanBefore")
+    public Result listPersonalCleanBefore(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap){
+        return billCleanBeforeService.listPersonalCleanBefore(httpServletRequest,paramsMap);
+    }
+
 }

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

@@ -54,13 +54,15 @@ public class BillPersonnelAdmissionController {
                                @RequestParam(value = "img",required = false) String img,
                                @RequestParam("vistitDate") String vistitDate,
                                @RequestParam("vistitReson") String vistitReson,
+                               @RequestParam("departureId") String departureId,
+                               @RequestParam("departureName") String departureName,
                                @RequestParam("destId") String destId,
                                @RequestParam("destName") String destName,
                                @RequestParam(value = "carNum",required = false) String carNum,
                                @RequestParam(value = "source",required = false) String source,
                                @RequestParam(value = "goods",required = false) String goods,
                                @RequestParam("farmId") String farmId) throws IOException {
-        return billPersonnelAdmissionService.addAdmission(httpServletRequest,admissionType,vistitType,userName,phone,workName,papersType,papersCode,imgUrl,img,vistitDate,vistitReson,destId,destName,farmId,carNum,source,goods);
+        return billPersonnelAdmissionService.addAdmission(httpServletRequest,admissionType,vistitType,userName,phone,workName,papersType,papersCode,imgUrl,img,vistitDate,vistitReson,destId,destName,farmId,carNum,source,goods,departureId,departureName);
     }
 
     @PostMapping("/listPersonalAdmission")

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

@@ -1,9 +1,14 @@
 package com.huimv.receive.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.huimv.receive.common.utils.Result;
+import com.huimv.receive.common.utils.ResultCode;
+import com.huimv.receive.service.IBillSamplingService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
 
 /**
  * <p>
@@ -15,6 +20,20 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/bill-sampling")
+@CrossOrigin
 public class BillSamplingController {
 
+    @Autowired
+    private IBillSamplingService billSamplingService;
+
+    @PostMapping("/listPersonalSample")
+    public Result listPersonalSample(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap){
+        return billSamplingService.listPersonalSample(httpServletRequest,paramsMap);
+    }
+
+    @PostMapping("/getDetail")
+    public Result getDetail(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap){
+        return new Result(ResultCode.SUCCESS,billSamplingService.getById(paramsMap.get("id")));
+    }
+
 }

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

@@ -1,6 +1,7 @@
 package com.huimv.receive.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -37,5 +38,8 @@ public class BaseLocation implements Serializable {
 
     private String farmIds;
 
+    @TableField(exist = false)
+    private String farmNames;
+
 
 }

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

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -56,11 +58,13 @@ public class BillCleanBefore implements Serializable {
     /**
      * 来访时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
     private LocalDateTime vistitDate;
 
     /**
      * 提交时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
     private LocalDateTime subDate;
 
     private String farmId;
@@ -93,6 +97,7 @@ public class BillCleanBefore implements Serializable {
     /**
      * 检测时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
     private LocalDateTime checkDate;
 
     /**

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

@@ -41,6 +41,16 @@ public class BillPersonnelAdmission implements Serializable {
     private Integer vistitType;
 
     /**
+     * 出发地
+     */
+    private String departureName;
+
+    /**
+     * 出发地 id
+     */
+    private Integer departureId;
+
+    /**
      * 目的地
      */
     private String destName;

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

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -56,11 +58,13 @@ public class BillSampling implements Serializable {
     /**
      * 来访时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
     private LocalDateTime vistitDate;
 
     /**
      * 提交时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
     private LocalDateTime subDate;
 
     private String farmId;
@@ -73,6 +77,7 @@ public class BillSampling implements Serializable {
     /**
      * 处理时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
     private LocalDateTime passDate;
 
     /**
@@ -93,6 +98,7 @@ public class BillSampling implements Serializable {
     /**
      * 检测时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
     private LocalDateTime checkDate;
 
     /**

huimv-receive/src/main/java/com/huimv/receive/service/IBaseLocationService.java

@@ -20,4 +20,6 @@ public interface IBaseLocationService extends IService<BaseLocation> {
     Result add(HttpServletRequest httpServletRequest, BaseLocation baseLocation);
 
     Result delete(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
+
+    Result edit(HttpServletRequest httpServletRequest, BaseLocation baseLocation);
 }

huimv-receive/src/main/java/com/huimv/receive/service/IBillCleanBeforeService.java

@@ -1,8 +1,12 @@
 package com.huimv.receive.service;
 
+import com.huimv.receive.common.utils.Result;
 import com.huimv.receive.entity.BillCleanBefore;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
 /**
  * <p>
  * 洗消表 服务类
@@ -13,4 +17,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IBillCleanBeforeService extends IService<BillCleanBefore> {
 
+    Result listPersonalCleanBefore(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 }

huimv-receive/src/main/java/com/huimv/receive/service/IBillPersonnelAdmissionService.java

@@ -42,7 +42,7 @@ public interface IBillPersonnelAdmissionService extends IService<BillPersonnelAd
     Result listByIdClean(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
     Result editClean(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) throws ParseException;
     Result editDry(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) throws ParseException;
-    Result addAdmission(HttpServletRequest httpServletRequest, String admissionType, String vistitType, String userName, String phone, String workName, String papersType, String papersCode, MultipartFile imgUrl, String img, String vistitDate, String vistitReson, String destId, String destName, String farmId, String carNum, String source, String goods) throws IOException;
+    Result addAdmission(HttpServletRequest httpServletRequest, String admissionType, String vistitType, String userName, String phone, String workName, String papersType, String papersCode, MultipartFile imgUrl, String img, String vistitDate, String vistitReson, String destId, String destName, String farmId, String carNum, String source, String goods, String departureId, String departureName) throws IOException;
 
     Result listPersonalAdmission(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 

huimv-receive/src/main/java/com/huimv/receive/service/IBillSamplingService.java

@@ -1,8 +1,12 @@
 package com.huimv.receive.service;
 
+import com.huimv.receive.common.utils.Result;
 import com.huimv.receive.entity.BillSampling;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
 /**
  * <p>
  * 洗消表 服务类
@@ -13,4 +17,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IBillSamplingService extends IService<BillSampling> {
 
+    Result listPersonalSample(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 }

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

@@ -50,4 +50,18 @@ public class BaseLocationServiceImpl extends ServiceImpl<BaseLocationMapper, Bas
         String id = paramsMap.get("id");
         return ResultUtil.deleteResult(baseLocationMapper.deleteById(id));
     }
+
+    @Override
+    public Result edit(HttpServletRequest httpServletRequest, BaseLocation baseLocation) {
+        String[] farmIds = baseLocation.getFarmIds().split(",");
+        for (String farmId : farmIds) {
+            int locationCount = baseLocationMapper.selectCount(new QueryWrapper<BaseLocation>().lambda()
+                    .ne(BaseLocation::getId,baseLocation.getId()).like(BaseLocation::getFarmIds,farmId).eq(BaseLocation::getLocationName,baseLocation.getLocationName()));
+            if (locationCount > 0){
+                Farm farm = farmMapper.selectById(farmId);
+                return new Result(10001,farm.getFarmName()+"存在相同地点!",false);
+            }
+        }
+        return ResultUtil.updateResult(baseLocationMapper.updateById(baseLocation));
+    }
 }

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

@@ -1,11 +1,23 @@
 package com.huimv.receive.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huimv.receive.common.token.TokenSign;
+import com.huimv.receive.common.utils.Result;
+import com.huimv.receive.common.utils.ResultCode;
 import com.huimv.receive.entity.BillCleanBefore;
+import com.huimv.receive.entity.BillSampling;
 import com.huimv.receive.mapper.BillCleanBeforeMapper;
 import com.huimv.receive.service.IBillCleanBeforeService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
 /**
  * <p>
  * 洗消表 服务实现类
@@ -17,4 +29,24 @@ import org.springframework.stereotype.Service;
 @Service
 public class BillCleanBeforeServiceImpl extends ServiceImpl<BillCleanBeforeMapper, BillCleanBefore> implements IBillCleanBeforeService {
 
+    @Autowired
+    private BillCleanBeforeMapper billCleanBeforeMapper;
+
+    @Override
+    public Result listPersonalCleanBefore(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String pageNo = paramsMap.get("pageNum");
+        String pageSize = paramsMap.get("pageSize");
+        String vistitType = paramsMap.get("vistitType");
+        Integer userId = TokenSign.getMemberIdByJwtToken(httpServletRequest);
+        Page<BillCleanBefore> page = new Page<>(Integer.parseInt(pageNo),Integer.parseInt(pageSize));
+        LambdaQueryWrapper<BillCleanBefore> queryWrapper = new QueryWrapper<BillCleanBefore>().lambda()
+                .eq(BillCleanBefore::getFarmId,farmId)
+                .eq(BillCleanBefore::getAdmissionUserId,userId)
+                .eq(ObjectUtil.isNotEmpty(vistitType),BillCleanBefore::getVistitType,vistitType)
+                .orderByDesc(BillCleanBefore::getSubDate);
+        Page<BillCleanBefore> billCleanBeforePage = billCleanBeforeMapper.selectPage(page, queryWrapper);
+        Integer count = billCleanBeforeMapper.selectCount(queryWrapper);
+        return new Result(ResultCode.SUCCESS,billCleanBeforePage,count);
+    }
 }

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

@@ -87,10 +87,16 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
     private PeopleListMapper peopleListMapper;
     @Autowired
     private BaseWashoutPointMapper baseWashoutPointMapper;
+    @Autowired
+    private BillSamplingMapper billSamplingMapper;
+    @Autowired
+    private BillCleanBeforeMapper billCleanBeforeMapper;
+    @Autowired
+    private FlowUtil flowUtil;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Result addAdmission(HttpServletRequest httpServletRequest, String admissionType, String vistitType, String userName, String phone, String workName, String papersType, String papersCode, MultipartFile imgUrl, String img, String vistitDate, String vistitReson, String destId, String destName, String farmId, String carNum, String source, String goods) throws IOException {
+    public Result addAdmission(HttpServletRequest httpServletRequest, String admissionType, String vistitType, String userName, String phone, String workName, String papersType, String papersCode, MultipartFile imgUrl, String img, String vistitDate, String vistitReson, String destId, String destName, String farmId, String carNum, String source, String goods, String departureId, String departureName) throws IOException {
         Integer userId = TokenSign.getMemberIdByJwtToken(httpServletRequest);
         if (!PhoneNumberValidator.isValidPhoneNumber(phone)) {
             return new Result(10001, "手机号格式错误！", false);
@@ -108,6 +114,8 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         billPersonnelAdmission.setVistitType(Integer.parseInt(vistitType));
         billPersonnelAdmission.setDestId(Integer.parseInt(destId));
         billPersonnelAdmission.setDestName(destName);
+        billPersonnelAdmission.setDepartureName(departureName);
+        billPersonnelAdmission.setDepartureId(Integer.valueOf(departureId));
         billPersonnelAdmission.setAdmissionUserId(userId);
         billPersonnelAdmission.setAdmissionUserName(userName);
         billPersonnelAdmission.setVistitDate(LocalDateTime.parse(vistitDate, dateTimeFormatter));
@@ -141,7 +149,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         baseProcess.setAdmissionUserId(userId);
         baseProcess.setAdmissionUserName(userName);
         baseProcess.setSubDate(DateTime.now());
-        baseProcess.setUpdateDate(LocalDateTime.now().format(dateTimeFormatter));
+//        baseProcess.setUpdateDate(LocalDateTime.now().format(dateTimeFormatter));
         baseProcess.setCurrentStatus("0");
 
         String allLocation = "场外";
@@ -302,11 +310,13 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
             }
             //通过
             billPersonnelAdmission.setBillStatus(1);
-            //获取pcr位置
-            String locationId = baseProcess.getCurrentLocationId();
-            String[] strings = locationId.split(",");
-            String laseLocationId = strings[strings.length - 1];
-            BaseLocation baseLocation = baseLocationMapper.selectById(laseLocationId);
+
+            //获取下一步位置
+            String allLocationId = baseProcess.getAllLocationId();
+            String[] strings = allLocationId.split(",");
+            String nextLocationId = strings[1];
+            BaseLocation baseLocation = baseLocationMapper.selectById(nextLocationId);
+
             if (userType == 3) {
                 String[] split = baseProcess.getCurrentStatus().split(",");
                 split[split.length - 1] = "1";
@@ -324,32 +334,111 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                 split1[0] = "2";
                 split1[1] = "1";
                 baseProcess.setAllLocationStatus(split1[0] + "," + split1[1] + status.substring(3));
-
-                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());
+                String[] split2 = baseProcess.getAllFlowId().split(",");
+                String nextFlowId = split2[baseProcess.getCurrentFlowId().split(",").length];
+                baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextFlowId);
+
+                if (Integer.valueOf(nextFlowId) == 1){
+                    BillSampling billSampling = (BillSampling) flowUtil.getEntity(Integer.valueOf(nextFlowId),
+                            billPersonnelAdmission.getVistitType(),
+                            billPersonnelAdmission.getDestName(),
+                            billPersonnelAdmission.getDestId(),
+                            billPersonnelAdmission.getAdmissionUserId(),
+                            billPersonnelAdmission.getAdmissionUserName(),
+                            billPersonnelAdmission.getPhone(),
+                            billPersonnelAdmission.getVistitDate(),
+                            baseLocation.getId(),
+                            baseLocation.getLocationName(),
+                            billPersonnelAdmission.getFarmId(),
+                            baseProcess.getId());
+                    if (ObjectUtil.isNotEmpty(billPersonnelAdmission.getCarNum())){
+                        billSampling.setCarNum(billPersonnelAdmission.getCarNum());
+                    }
+                    billSamplingMapper.insert(billSampling);
+                }else if (Integer.valueOf(nextFlowId) == 2){
+                    BillPcr billPcr = (BillPcr) flowUtil.getEntity(Integer.valueOf(nextFlowId),
+                            billPersonnelAdmission.getVistitType(),
+                            billPersonnelAdmission.getDestName(),
+                            billPersonnelAdmission.getDestId(),
+                            billPersonnelAdmission.getAdmissionUserId(),
+                            billPersonnelAdmission.getAdmissionUserName(),
+                            billPersonnelAdmission.getPhone(),
+                            billPersonnelAdmission.getVistitDate(),
+                            baseLocation.getId(),
+                            baseLocation.getLocationName(),
+                            billPersonnelAdmission.getFarmId(),
+                            baseProcess.getId());
+                    if (ObjectUtil.isNotEmpty(billPersonnelAdmission.getCarNum())){
+                        billPcr.setCarNum(billPersonnelAdmission.getCarNum());
+                    }
+                    pcrMapper.insert(billPcr);
+                }else if (Integer.valueOf(nextFlowId) == 3){
+                    BillClean billClean = (BillClean) flowUtil.getEntity(Integer.valueOf(nextFlowId),
+                            billPersonnelAdmission.getVistitType(),
+                            billPersonnelAdmission.getDestName(),
+                            billPersonnelAdmission.getDestId(),
+                            billPersonnelAdmission.getAdmissionUserId(),
+                            billPersonnelAdmission.getAdmissionUserName(),
+                            billPersonnelAdmission.getPhone(),
+                            billPersonnelAdmission.getVistitDate(),
+                            baseLocation.getId(),
+                            baseLocation.getLocationName(),
+                            billPersonnelAdmission.getFarmId(),
+                            baseProcess.getId());
+                    if (ObjectUtil.isNotEmpty(billPersonnelAdmission.getCarNum())){
+                        billClean.setCarNum(billPersonnelAdmission.getCarNum());
+                    }
+                    cleanMapper.insert(billClean);
+                }else if (Integer.valueOf(nextFlowId) == 4){
+                    BillIsolate billIsolate = (BillIsolate) flowUtil.getEntity(Integer.valueOf(nextFlowId),
+                            billPersonnelAdmission.getVistitType(),
+                            billPersonnelAdmission.getDestName(),
+                            billPersonnelAdmission.getDestId(),
+                            billPersonnelAdmission.getAdmissionUserId(),
+                            billPersonnelAdmission.getAdmissionUserName(),
+                            billPersonnelAdmission.getPhone(),
+                            billPersonnelAdmission.getVistitDate(),
+                            baseLocation.getId(),
+                            baseLocation.getLocationName(),
+                            billPersonnelAdmission.getFarmId(),
+                            baseProcess.getId());
+                    billIsolateMapper.insert(billIsolate);
+                }else if (Integer.valueOf(nextFlowId) == 5){
+                    BillDry billDry = (BillDry) flowUtil.getEntity(Integer.valueOf(nextFlowId),
+                            billPersonnelAdmission.getVistitType(),
+                            billPersonnelAdmission.getDestName(),
+                            billPersonnelAdmission.getDestId(),
+                            billPersonnelAdmission.getAdmissionUserId(),
+                            billPersonnelAdmission.getAdmissionUserName(),
+                            billPersonnelAdmission.getPhone(),
+                            billPersonnelAdmission.getVistitDate(),
+                            baseLocation.getId(),
+                            baseLocation.getLocationName(),
+                            billPersonnelAdmission.getFarmId(),
+                            baseProcess.getId());
+                    dryMapper.insert(billDry);
+                }else {
+                    BillCleanBefore billCleanBefore = (BillCleanBefore) flowUtil.getEntity(Integer.valueOf(nextFlowId),
+                            billPersonnelAdmission.getVistitType(),
+                            billPersonnelAdmission.getDestName(),
+                            billPersonnelAdmission.getDestId(),
+                            billPersonnelAdmission.getAdmissionUserId(),
+                            billPersonnelAdmission.getAdmissionUserName(),
+                            billPersonnelAdmission.getPhone(),
+                            billPersonnelAdmission.getVistitDate(),
+                            baseLocation.getId(),
+                            baseLocation.getLocationName(),
+                            billPersonnelAdmission.getFarmId(),
+                            baseProcess.getId());
+                    if (ObjectUtil.isNotEmpty(billPersonnelAdmission.getCarNum())){
+                        billCleanBefore.setCarNum(billPersonnelAdmission.getCarNum());
+                    }
+                    billCleanBeforeMapper.insert(billCleanBefore);
                 }
-                billPcr.setTestLocation(baseLocation.getLocationName());
-                billPcr.setTestLocationId(baseLocation.getId());
-                billPcrMapper.insert(billPcr);
-//                SendSMS.sendSMS(phoneList,"通过入场申请测试");
             } else {
                 baseProcess.setCurrentStatus("1");
                 baseProcess.setProcessType(1);
-//                baseProcess.setAllLocationStatus("2"+);
-//                baseProcess.setCurrentLocation(baseProcess.getCurrentLocation()+","+baseLocation.getLocationName());
-//                baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId() +","+baseLocation.getId());
+                baseProcess.setAllLocationStatus("2");
                 //TODO 紧急入场通过先不处理
             }
 
@@ -462,8 +551,6 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                         }
                     }
 
-
-
                     JSONObject jsonObject1 = new JSONObject();
                     JSONArray jsonArray = new JSONArray();
                     JSONObject object1 = new JSONObject();

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

@@ -1,11 +1,22 @@
 package com.huimv.receive.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huimv.receive.common.token.TokenSign;
+import com.huimv.receive.common.utils.Result;
+import com.huimv.receive.common.utils.ResultCode;
 import com.huimv.receive.entity.BillSampling;
 import com.huimv.receive.mapper.BillSamplingMapper;
 import com.huimv.receive.service.IBillSamplingService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
 /**
  * <p>
  * 洗消表 服务实现类
@@ -17,4 +28,24 @@ import org.springframework.stereotype.Service;
 @Service
 public class BillSamplingServiceImpl extends ServiceImpl<BillSamplingMapper, BillSampling> implements IBillSamplingService {
 
+    @Autowired
+    private BillSamplingMapper billSamplingMapper;
+
+    @Override
+    public Result listPersonalSample(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String pageNo = paramsMap.get("pageNum");
+        String pageSize = paramsMap.get("pageSize");
+        String vistitType = paramsMap.get("vistitType");
+        Integer userId = TokenSign.getMemberIdByJwtToken(httpServletRequest);
+        Page<BillSampling> page = new Page<>(Integer.parseInt(pageNo),Integer.parseInt(pageSize));
+        LambdaQueryWrapper<BillSampling> queryWrapper = new QueryWrapper<BillSampling>().lambda()
+                .eq(BillSampling::getFarmId,farmId)
+                .eq(BillSampling::getAdmissionUserId, userId)
+                .eq(ObjectUtil.isNotEmpty(vistitType), BillSampling::getVistitType, vistitType)
+                .orderByDesc(BillSampling::getSubDate);
+        Page<BillSampling> billSamplingPage = billSamplingMapper.selectPage(page,queryWrapper);
+        Integer count = billSamplingMapper.selectCount(queryWrapper);
+        return new Result(ResultCode.SUCCESS,billSamplingPage,count);
+    }
 }