增加接口

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

@@ -50,59 +50,90 @@ public class BillPersonnelAdmissionController {
                                @RequestParam("workName") String workName,
                                @RequestParam("papersType") String papersType,
                                @RequestParam("papersCode") String papersCode,
-                               @RequestParam(value = "imgUrl",required = false) MultipartFile imgUrl,
-                               @RequestParam(value = "img",required = false) String img,
+                               @RequestParam(value = "imgUrl", required = false) MultipartFile imgUrl,
+                               @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(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,departureId,departureName);
+        return billPersonnelAdmissionService.addAdmission(httpServletRequest, admissionType, vistitType, userName, phone, workName, papersType, papersCode, imgUrl, img, vistitDate, vistitReson, destId, destName, farmId, carNum, source, goods, departureId, departureName);
+    }
+
+    @PostMapping("/addAdmissionFeed")
+    public Result addAdmissionFeed(HttpServletRequest httpServletRequest, @RequestParam("admissionType") String admissionType,
+                                   @RequestParam("vistitType") String vistitType,
+                                   @RequestParam("userName") String userName,
+                                   @RequestParam("phone") String phone,
+                                   @RequestParam("workName") String workName,
+                                   @RequestParam("papersType") String papersType,
+                                   @RequestParam("papersCode") String papersCode,
+                                   @RequestParam(value = "imgUrl", required = false) MultipartFile imgUrl,
+                                   @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,
+                                   @RequestParam("resource") String resource,
+                                   @RequestParam("feedImgUrl") MultipartFile feedImgUrl,
+                                   @RequestParam("cleanId") Integer cleanId,
+                                   @RequestParam("cleanName") String cleanName,
+                                   @RequestParam("remark") String remark) throws IOException {
+        return billPersonnelAdmissionService.addAdmissionFeed(httpServletRequest, admissionType,
+                vistitType, userName, phone, workName, papersType, papersCode, imgUrl, img, vistitDate, vistitReson, destId
+                , destName, farmId, carNum, source, goods, departureId, departureName,resource,feedImgUrl,cleanId,cleanName,remark);
     }
 
     @PostMapping("/listPersonalAdmission")
-    public Result listPersonalAdmission(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap){
-        return billPersonnelAdmissionService.listPersonalAdmission(httpServletRequest,paramsMap);
+    public Result listPersonalAdmission(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        return billPersonnelAdmissionService.listPersonalAdmission(httpServletRequest, paramsMap);
     }
 
     @PostMapping("/listAdmission")
-    public Result listAdmission(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap){
-        return billPersonnelAdmissionService.listAdmission(httpServletRequest,paramsMap);
+    public Result listAdmission(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        return billPersonnelAdmissionService.listAdmission(httpServletRequest, paramsMap);
     }
+
     @PostMapping("/uploadImgAndAdmissin")
     public Result uploadImgAndAdmissin(@RequestParam(value = "imgUrl") MultipartFile imgUrl,
                                        @RequestParam(value = "id") Integer id) throws IOException {
-        return billPersonnelAdmissionService.uploadImgAndAdmissin(imgUrl,id);
+        return billPersonnelAdmissionService.uploadImgAndAdmissin(imgUrl, id);
     }
 
     @PostMapping("/handleAdmission")
-    public Result handleAdmission (HttpServletRequest httpServletRequest,@RequestBody Map<String, String> paramsMap) throws IOException {
-        return billPersonnelAdmissionService.handleAdmission(httpServletRequest,paramsMap);
+    public Result handleAdmission(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) throws IOException {
+        return billPersonnelAdmissionService.handleAdmission(httpServletRequest, paramsMap);
     }
 
     @PostMapping("/listAll")
-    public Result listAll(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap){
-        return billPersonnelAdmissionService.listAll(httpServletRequest,paramsMap);
+    public Result listAll(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        return billPersonnelAdmissionService.listAll(httpServletRequest, paramsMap);
     }
 
     @PostMapping("/getDetail")
-    public Result getDetail(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap){
-        return billPersonnelAdmissionService.getDetail(httpServletRequest,paramsMap);
+    public Result getDetail(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        return billPersonnelAdmissionService.getDetail(httpServletRequest, paramsMap);
     }
 
     @PostMapping("/getById")
-    public Result getById(@RequestBody Map<String, String> paramsMap){
+    public Result getById(@RequestBody Map<String, String> paramsMap) {
         BillPersonnelAdmission billPersonnelAdmission = billPersonnelAdmissionService.getById(paramsMap.get("id"));
         BillAdmissionAndGoods billAdmissionAndGoods = new BillAdmissionAndGoods();
-        BeanUtil.copyProperties(billPersonnelAdmission,billAdmissionAndGoods);
+        BeanUtil.copyProperties(billPersonnelAdmission, billAdmissionAndGoods);
         List<BillGoodsInventory> billGoodsInventories = billGoodsInventoryMapper.selectList(new QueryWrapper<BillGoodsInventory>().eq("bill_admission", paramsMap.get("id")));
         billAdmissionAndGoods.setGoods(billGoodsInventories);
-        return new Result(ResultCode.SUCCESS,billAdmissionAndGoods);
+        return new Result(ResultCode.SUCCESS, billAdmissionAndGoods);
     }
 
     @Autowired
@@ -112,18 +143,22 @@ public class BillPersonnelAdmissionController {
     public Result listAll2(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
         return admissionService.listPrc(httpServletRequest, paramsMap);
     }
+
     @RequestMapping("/listById")
     public Result listById(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
         return admissionService.listById(httpServletRequest, paramsMap);
     }
+
     @RequestMapping("/editStatus")
     public Result editStatus(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) throws ParseException {
         return admissionService.editStatus(httpServletRequest, paramsMap);
     }
+
     @RequestMapping("/listIsolate")
     public Result listIsolate(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
         return admissionService.listIsolate(httpServletRequest, paramsMap);
     }
+
     @RequestMapping("/IsolateById")
     public Result isolateById(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
         return admissionService.isolateById(httpServletRequest, paramsMap);
@@ -133,10 +168,12 @@ public class BillPersonnelAdmissionController {
     public Result listAll(HttpServletRequest httpServletRequest, @RequestBody BillIsolate billIsolate) throws IOException {
         return admissionService.commitIsolate(httpServletRequest, billIsolate);
     }
+
     @RequestMapping("/editIsolate")
     public Result editIsolate(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) throws ParseException {
         return admissionService.editIsolate(httpServletRequest, paramsMap);
     }
+
     @RequestMapping("/listClean")
     public Result listClean(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
         return admissionService.listClean(httpServletRequest, paramsMap);
@@ -146,6 +183,7 @@ public class BillPersonnelAdmissionController {
     public Result cleanById(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
         return admissionService.listByIdClean(httpServletRequest, paramsMap);
     }
+
     @RequestMapping("/editClean")
     public Result editClean(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) throws ParseException {
         return admissionService.editClean(httpServletRequest, paramsMap);
@@ -161,18 +199,22 @@ public class BillPersonnelAdmissionController {
     public Result countAdmission(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) throws ParseException {
         return admissionService.countAdmission(httpServletRequest, paramsMap);
     }
+
     @RequestMapping("/listTop")
     public Result listTop(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) throws ParseException {
         return admissionService.listTop(httpServletRequest, paramsMap);
     }
+
     @RequestMapping("/admissionTail")
     public Result admissionTail(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) throws ParseException {
         return admissionService.admissionTail(httpServletRequest, paramsMap);
     }
+
     @RequestMapping("/selectList")
     public Result selectList(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) throws ParseException {
         return admissionService.selectList(httpServletRequest, paramsMap);
     }
+
     @RequestMapping("/delete")
     public Result delete(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) throws ParseException {
         String ids = paramsMap.get("ids");
@@ -182,6 +224,7 @@ public class BillPersonnelAdmissionController {
         }
         return new Result(10000, "删除成功！", true);
     }
+
     @GetMapping("/printAdmission")
     public void printAdmission(HttpServletResponse response, @RequestParam(name = "ids") String ids) throws Exception {
         Map<String, String> map = new HashMap<>();
@@ -195,6 +238,7 @@ public class BillPersonnelAdmissionController {
     public Result jingJiAdmission(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) throws ParseException {
         return admissionService.jingJiAdmission(httpServletRequest, paramsMap);
     }
+
     @RequestMapping("/allCount")
     public Result allCount(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) throws ParseException {
         return admissionService.allCount(httpServletRequest, paramsMap);

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

@@ -140,19 +140,23 @@ public class SysUserController {
                 sysUser.setImgUrl(imageCom);
             }
         }
-        if ("身份证".equals(cardType) && !IDCardValidator.isValidIDCard(cardNum))
+        if ("身份证".equals(cardType) && !IDCardValidator.isValidIDCard(cardNum)) {
             return new Result(10001,"身份证格式不正确",false);
+        }
 
-        if (!PhoneNumberValidator.isValidPhoneNumber(userPhone))
+        if (!PhoneNumberValidator.isValidPhoneNumber(userPhone)) {
             return new Result(10001,"手机号格式不正确",false);
+        }
 
         int count = sysUserService.count(new QueryWrapper<SysUser>().eq("card_type", cardType).eq("card_num", cardNum));
-        if (count >0)
+        if (count >0) {
             return new Result(10001,"身份证已存在",false);
+        }
 
         int countUserPhone = sysUserService.count(new QueryWrapper<SysUser>().eq("user_phone", userPhone));
-        if (countUserPhone >0)
+        if (countUserPhone >0) {
             return new Result(10001,"手机号已存在",false);
+        }
         if (ObjectUtil.isNotEmpty(sysUser.getBirthday())){
             sysUser.setAge(DateUtil.ageOfNow(sysUser.getBirthday()));
         }
@@ -174,18 +178,22 @@ public class SysUserController {
 
         String userPhone = sysUser.getUserPhone();
         if(StringUtils.isNotBlank(userPhone)){
-            if (!PhoneNumberValidator.isValidPhoneNumber(userPhone))
+            if (!PhoneNumberValidator.isValidPhoneNumber(userPhone)) {
                 return new Result(10001,"手机号格式不正确",false);
+            }
             int count = sysUserService.count(new QueryWrapper<SysUser>().eq("user_phone", userPhone)) ;
-            if (count >1)
+            if (count >1) {
                 return new Result(10001,"手机号已存在",false);
+            }
         }
         if(StringUtils.isNotBlank(cardNum)){
-            if (StringUtils.isNotBlank(cardNum) && "身份证".equals(cardType) && !IDCardValidator.isValidIDCard(cardNum))
+            if (StringUtils.isNotBlank(cardNum) && "身份证".equals(cardType) && !IDCardValidator.isValidIDCard(cardNum)) {
                 return new Result(10001,"身份证格式不正确",false);
+            }
             int countUserPhone = sysUserService.count(new QueryWrapper<SysUser>().eq("card_type", cardType).eq("card_num", cardNum));
-            if (countUserPhone >1)
+            if (countUserPhone >1) {
                 return new Result(10001,"身份证已存在",false);
+            }
         }
 
         if (ObjectUtil.isNotEmpty(sysUser.getBirthday())){
@@ -249,8 +257,9 @@ public class SysUserController {
     @Transactional
     public Result remove(@RequestBody Map<String,String> map) {
         String ids = map.get("ids");
-        if (StringUtils.isBlank(ids))
+        if (StringUtils.isBlank(ids)) {
             return new Result(10001,"所选用户不存在",false);
+        }
         List<String> collection = Arrays.stream(ids.split(","))
                 .collect(Collectors.toList());
          sysUserService.removeByIds(collection);

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

@@ -147,5 +147,15 @@ public class BillPersonnelAdmission implements Serializable {
 
     private String userImgUrl;
 
+    private String resource;
+
+    private String feedImgUrl;
+
+    private Integer cleanId;
+
+    private String cleanName;
+
+    private String remark;
+
 
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.huimv.receive.common.utils.Result;
 import com.huimv.receive.entity.BillIsolate;
 import com.huimv.receive.entity.BillPersonnelAdmission;
+import org.bytedeco.opencv.presets.opencv_core;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
@@ -43,6 +44,9 @@ public interface IBillPersonnelAdmissionService extends IService<BillPersonnelAd
     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, String departureId, String departureName) throws IOException;
+    Result addAdmissionFeed(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,
+                            String resource, MultipartFile feedImgUrl,Integer cleanId,String cleanName,String remark) throws IOException;
 
     Result listPersonalAdmission(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 

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

@@ -220,6 +220,140 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
     }
 
     @Override
+    public Result addAdmissionFeed(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,
+                                   String resource, MultipartFile feedImgUrl,Integer cleanId,String cleanName,String remark) throws IOException {
+        Integer userId = TokenSign.getMemberIdByJwtToken(httpServletRequest);
+        if (!PhoneNumberValidator.isValidPhoneNumber(phone)) {
+            return new Result(10001, "手机号格式错误！", false);
+        }
+        if (papersType.equals("0")) {
+            if (!IDCardValidator.isValidIDCard(papersCode)) {
+                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");
+        BillPersonnelAdmission billPersonnelAdmission = new BillPersonnelAdmission();
+        billPersonnelAdmission.setAdmissionType(Integer.parseInt(admissionType));
+        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));
+        billPersonnelAdmission.setSubDate(LocalDateTime.now());
+        billPersonnelAdmission.setPhone(phone);
+        billPersonnelAdmission.setWorkName(workName);
+        billPersonnelAdmission.setPapersType(Integer.parseInt(papersType));
+        billPersonnelAdmission.setPapersCode(papersCode);
+        billPersonnelAdmission.setUserImgUrl(sysAccountMultilevel1.getImgUrl());
+        if (uploadImage.getImageCom(feedImgUrl).equals("上传失败")) {
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return new Result(10001, "图片上传失败", false);
+        }
+        billPersonnelAdmission.setFeedImgUrl(uploadImage.getImageCom(feedImgUrl));
+        billPersonnelAdmission.setResource(resource);
+        billPersonnelAdmission.setRemark(remark);
+        billPersonnelAdmission.setCleanId(cleanId);
+        billPersonnelAdmission.setCleanName(cleanName);
+        if (ObjectUtil.isNotEmpty(carNum)) {
+            billPersonnelAdmission.setCarNum(carNum);
+        }
+        if (ObjectUtil.isNotEmpty(imgUrl)) {
+            if (uploadImage.getImageCom(imgUrl).equals("上传失败")) {
+                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                return new Result(10001, "图片上传失败", false);
+            }
+            billPersonnelAdmission.setImgUrl(uploadImage.getImageCom(imgUrl));
+        }
+        if (ObjectUtil.isNotEmpty(img)) {
+            billPersonnelAdmission.setImgUrl(img);
+        }
+        if (ObjectUtil.isNotEmpty(source)) {
+            billPersonnelAdmission.setSource(source);
+        }
+        billPersonnelAdmission.setVistitReson(vistitReson);
+        billPersonnelAdmission.setFarmId(Integer.parseInt(farmId));
+        BaseProcess baseProcess = new BaseProcess();
+        baseProcess.setDestName(destName);
+        baseProcess.setDestId(Integer.parseInt(destId));
+        baseProcess.setAdmissionUserId(userId);
+        baseProcess.setAdmissionUserName(userName);
+        baseProcess.setSubDate(DateTime.now());
+//        baseProcess.setUpdateDate(LocalDateTime.now().format(dateTimeFormatter));
+        baseProcess.setCurrentStatus("0");
+
+        String allLocation = departureName;
+        String allLocationId = departureId;
+        String allLocationStatus = "0";
+        String allFlowId = "";
+
+        List<BaseWashoutPoint> baseWashoutPoints = new ArrayList<>();
+        if (ObjectUtil.isEmpty(baseWashoutPoint1)){
+            baseWashoutPoints = baseWashoutPointMapper.selectList(new QueryWrapper<BaseWashoutPoint>().lambda().le(BaseWashoutPoint::getPointLevel,baseWashoutPoint2.getPointLevel()).eq(BaseWashoutPoint::getVisitingType, vistitType).like(BaseWashoutPoint::getFarmIds, farmId).orderByAsc(BaseWashoutPoint::getPointLevel));
+        }else {
+            baseWashoutPoints = baseWashoutPointMapper.selectList(new QueryWrapper<BaseWashoutPoint>().lambda().le(BaseWashoutPoint::getPointLevel,baseWashoutPoint2.getPointLevel()).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();
+            allLocationStatus = allLocationStatus + "," + "0";
+            allFlowId = allFlowId + "0," + baseWashoutPoint.getFlowList();
+
+            allLocation = allLocation + "," + baseWashoutPoint.getTailLocationName();
+            allLocationId = allLocationId + "," + "0";
+            allLocationStatus = allLocationStatus + "," + "0";
+            if (!baseWashoutPoint.equals(baseWashoutPoints.get(baseWashoutPoints.size() - 1))) {
+                allFlowId = allFlowId + ",";
+            }
+        }
+        baseProcess.setAllLocation(allLocation);
+        baseProcess.setAllLocationId(allLocationId);
+        baseProcess.setAllLocationStatus(allLocationStatus);
+        baseProcess.setAllFlowId(allFlowId+",0");
+        baseProcess.setCurrentFlowId("0");
+        baseProcess.setCurrentLocation("场外");
+        baseProcess.setCurrentLocationId("0");
+        baseProcess.setFarmId(Integer.parseInt(farmId));
+        baseProcessMapper.insert(baseProcess);
+        billPersonnelAdmission.setProcessId(baseProcess.getId());
+        billPersonnelAdmissionMapper.insert(billPersonnelAdmission);
+        ArrayList<String> phoneList = new ArrayList<>();
+        List<SysAccountMultilevel> safe = sysAccountMultilevelMapper.selectList(new QueryWrapper<SysAccountMultilevel>().eq("farm_ids", farmId).eq("type", 3));
+        for (SysAccountMultilevel sysAccountMultilevel : safe) {
+            phoneList.add(sysAccountMultilevel.getPhone());
+        }
+//        SendSMS.sendSMS(phoneList,TokenSign.getUserNameByJwtToken(httpServletRequest)+"入场申请测试");
+        if (ObjectUtil.isNotEmpty(goods)) {
+            ObjectMapper objectMapper = new ObjectMapper();
+            List<BillGoodsInventory> admissionAndGoods = objectMapper.readValue(goods, new TypeReference<List<BillGoodsInventory>>() {
+            });
+            for (BillGoodsInventory good : admissionAndGoods) {
+                good.setBillAdmission(billPersonnelAdmission.getId());
+                BaseLocation baseLocation1 = baseLocationMapper.selectById(destId);
+                good.setCurrentLocation(baseLocation1.getLocationName());
+                good.setCurrentLocationId(baseLocation1.getId());
+                good.setCreateDate(new Date());
+                good.setFarmId(farmId);
+                billGoodsInventoryMapper.insert(good);
+            }
+        }
+        return Result.SUCCESS();
+    }
+
+    @Override
     public Result listPersonalAdmission(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String farmId = paramsMap.get("farmId");
         String pageNo = paramsMap.get("pageNum");