流程修改

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

@@ -36,4 +36,13 @@ public class BaseProcessController {
         return processService.pageByLocationId(map);
     }
 
+    @PostMapping("/listAll")
+    public Result listAll(@RequestBody Map<String,String> map) {
+        return processService.listAll(map);
+    }
+
+    @PostMapping("/edit")
+    public Result edit(HttpServletRequest httpServletRequest,@RequestBody Map<String,String> map) {
+        return processService.edit(httpServletRequest,map);
+    }
 }

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

@@ -6,11 +6,14 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.receive.common.utils.PdfUtil;
 import com.huimv.receive.common.utils.Result;
 import com.huimv.receive.common.utils.ResultCode;
+import com.huimv.receive.entity.BaseProcess;
 import com.huimv.receive.entity.BillGoodsInventory;
 import com.huimv.receive.entity.BillIsolate;
 import com.huimv.receive.entity.BillPersonnelAdmission;
 import com.huimv.receive.entity.vo.BillAdmissionAndGoods;
+import com.huimv.receive.entity.vo.BillPersonnelAdmissionVo;
 import com.huimv.receive.mapper.BillGoodsInventoryMapper;
+import com.huimv.receive.service.IBaseProcessService;
 import com.huimv.receive.service.IBillPersonnelAdmissionService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -41,6 +44,8 @@ public class BillPersonnelAdmissionController {
     private IBillPersonnelAdmissionService billPersonnelAdmissionService;
     @Resource
     private BillGoodsInventoryMapper billGoodsInventoryMapper;
+    @Autowired
+    private IBaseProcessService processService;
 
     @PostMapping("/addAdmission")
     public Result addAdmission(HttpServletRequest httpServletRequest, @RequestParam("admissionType") String admissionType,
@@ -129,8 +134,15 @@ public class BillPersonnelAdmissionController {
     @PostMapping("/getById")
     public Result getById(@RequestBody Map<String, String> paramsMap) {
         BillPersonnelAdmission billPersonnelAdmission = billPersonnelAdmissionService.getById(paramsMap.get("id"));
+        QueryWrapper<BaseProcess> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("id", billPersonnelAdmission.getProcessId());
+        BaseProcess process = processService.getOne(queryWrapper);
+
+        BillPersonnelAdmissionVo admissionVo = new BillPersonnelAdmissionVo();
+        BeanUtil.copyProperties(billPersonnelAdmission, admissionVo);
+        admissionVo.setProcessType(process.getProcessType());
         BillAdmissionAndGoods billAdmissionAndGoods = new BillAdmissionAndGoods();
-        BeanUtil.copyProperties(billPersonnelAdmission, billAdmissionAndGoods);
+        BeanUtil.copyProperties(admissionVo, billAdmissionAndGoods);
         List<BillGoodsInventory> billGoodsInventories = billGoodsInventoryMapper.selectList(new QueryWrapper<BillGoodsInventory>().eq("bill_admission", paramsMap.get("id")));
         billAdmissionAndGoods.setGoods(billGoodsInventories);
         return new Result(ResultCode.SUCCESS, billAdmissionAndGoods);

huimv-receive/src/main/java/com/huimv/receive/entity/vo/BillAdmissionAndGoods.java

@@ -7,6 +7,6 @@ import lombok.Data;
 import java.util.List;
 
 @Data
-public class BillAdmissionAndGoods extends BillPersonnelAdmission {
+public class BillAdmissionAndGoods extends BillPersonnelAdmissionVo {
     private List<BillGoodsInventory> goods;
 }

huimv-receive/src/main/java/com/huimv/receive/entity/vo/BillPersonnelAdmissionVo.java

@@ -0,0 +1,9 @@
+package com.huimv.receive.entity.vo;
+
+import com.huimv.receive.entity.BillPersonnelAdmission;
+import lombok.Data;
+
+@Data
+public class BillPersonnelAdmissionVo extends BillPersonnelAdmission {
+    private Integer processType;
+}

huimv-receive/src/main/java/com/huimv/receive/entity/vo/ProcessVo.java

@@ -0,0 +1,17 @@
+package com.huimv.receive.entity.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.huimv.receive.entity.BaseProcess;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class ProcessVo extends BaseProcess {
+    private Integer vistitType;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
+    private Date vistitDate;
+
+    private Integer admissionId;
+}

huimv-receive/src/main/java/com/huimv/receive/mapper/BaseProcessMapper.java

@@ -1,10 +1,14 @@
 package com.huimv.receive.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.receive.entity.BaseProcess;
+import com.huimv.receive.entity.BillPersonnelAdmission;
 import com.huimv.receive.entity.vo.BaseProcessByLocationVo;
+import com.huimv.receive.entity.vo.ProcessVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -20,4 +24,6 @@ import java.util.List;
 public interface BaseProcessMapper extends BaseMapper<BaseProcess> {
 
     List<BaseProcessByLocationVo> pageByLocationId(@Param("locationId")String locationId, @Param("processId")String processId);
+
+    IPage<ProcessVo> listAll(@Param(Constants.WRAPPER) QueryWrapper<BaseProcess> queryWrapper,IPage<ProcessVo> page);
 }

huimv-receive/src/main/java/com/huimv/receive/mapper/BillPersonnelAdmissionMapper.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.receive.entity.BillPersonnelAdmission;
 import com.huimv.receive.entity.vo.BillAdmissionVo;
+import com.huimv.receive.entity.vo.BillPersonnelAdmissionVo;
 import com.huimv.receive.entity.vo.FactoryDirectorVo;
 import com.huimv.receive.entity.vo.ListAdmissionVo;
 import org.apache.ibatis.annotations.Param;
@@ -30,4 +31,7 @@ public interface BillPersonnelAdmissionMapper extends BaseMapper<BillPersonnelAd
     List<ListAdmissionVo> countAdmission(@Param(Constants.WRAPPER) QueryWrapper<BillPersonnelAdmission> queryWrapper);
 
     List<BillAdmissionVo> admissionTail(@Param(Constants.WRAPPER) QueryWrapper<BillPersonnelAdmission> queryWrapper);
+
+
+    IPage<BillPersonnelAdmissionVo> listPersonAndProcess(@Param(Constants.WRAPPER) QueryWrapper<BillPersonnelAdmission> queryWrapper,IPage<BillPersonnelAdmissionVo> page);
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.huimv.receive.common.utils.Result;
 import com.huimv.receive.entity.BaseProcess;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 
 /**
@@ -21,4 +22,10 @@ public interface IBaseProcessService extends IService<BaseProcess> {
     Result getOne(Map<String, String> map);
 
     Result pageByLocationId(Map<String, String> map);
+
+    //进程展示
+    Result listAll(Map<String, String> map);
+
+    //进程终止
+    Result edit(HttpServletRequest httpServletRequest,Map<String, String> paramsMap);
 }

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

@@ -6,23 +6,23 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+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.BaseLocation;
-import com.huimv.receive.entity.BaseProcess;
+import com.huimv.receive.entity.*;
 import com.huimv.receive.entity.vo.BaseProcessByLocationVo;
 import com.huimv.receive.entity.vo.BaseProcessVo;
+import com.huimv.receive.entity.vo.ProcessVo;
 import com.huimv.receive.entity.vo.UserAccountVo;
-import com.huimv.receive.mapper.BaseProcessMapper;
+import com.huimv.receive.mapper.*;
 import com.huimv.receive.service.IBaseLocationService;
 import com.huimv.receive.service.IBaseProcessService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+import java.util.*;
 
 /**
  * <p>
@@ -37,6 +37,20 @@ public class BaseProcessServiceImpl extends ServiceImpl<BaseProcessMapper, BaseP
 
     @Autowired
     private BaseProcessMapper baseProcessMapper;
+    @Autowired
+    private BillPcrMapper pcrMapper;
+    @Autowired
+    private BillCleanMapper cleanMapper;
+    @Autowired
+    private BillCleanBeforeMapper cleanBeforeMapper;
+    @Autowired
+    private BillDryMapper dryMapper;
+    @Autowired
+    private BillIsolateMapper isolateMapper;
+    @Autowired
+    private BillSamplingMapper samplingMapper;
+    @Autowired
+    private BillGoodsInventoryMapper goodsInventoryMapper;
     @Override
     public Result getOne(Map<String, String> map) {
         String id = map.get("processId");
@@ -70,4 +84,138 @@ public class BaseProcessServiceImpl extends ServiceImpl<BaseProcessMapper, BaseP
         }
         return new Result(ResultCode.SUCCESS,baseProcessByLocationVos);
     }
+
+    @Override
+    public Result listAll(Map<String, String> map) {
+        String farmId = map.get("farmId");
+        String type = map.get("type");//0 全部 1进行中 2 已完成
+        String pageNum = map.get("pageNum");
+        String pageSize = map.get("pageSize");
+        if ("".equals(type) || null == type) {
+            type = "0";
+        }
+        QueryWrapper<BaseProcess> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("a.farm_id", farmId);
+        if ("0".equals(type)) {
+            queryWrapper.in("a.process_type", 0, 1, 2,3);
+        } else if ("1".equals(type)) {
+            queryWrapper.eq("a.process_type", 0);
+        } else {
+            queryWrapper.in("a.process_type", 1, 2,3);
+        }
+        queryWrapper.orderByDesc("a.sub_date");
+        Page<ProcessVo> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        QueryWrapper<BaseProcess> queryWrapper1 = new QueryWrapper<>();
+        queryWrapper1.eq("farm_id", farmId).eq("process_type", 0);
+        return new Result(ResultCode.SUCCESS, baseProcessMapper.listAll(queryWrapper, page),baseProcessMapper.selectCount(queryWrapper1));
+    }
+
+    @Override
+    public Result edit(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String processId = paramsMap.get("processId");
+        BaseProcess baseProcess = baseProcessMapper.selectById(processId);
+        baseProcess.setProcessType(3);
+        String currentFlowId = baseProcess.getCurrentFlowId();
+
+
+        String[] strings = currentFlowId.split(",");
+        String ss2 = "";
+        for (int i = 0; i < strings.length; i++) {
+            strings[i].replaceAll(strings[i], "4");
+            if (i == strings.length - 1) {
+                ss2 = ss2 + strings[i].replaceAll(strings[i], "4");
+            } else {
+                ss2 = strings[i].replaceAll(strings[i], "4") + "," + ss2;
+            }
+        }
+        baseProcess.setAllLocationStatus(ss2);
+
+        String s = currentFlowId.substring(currentFlowId.length() - 1);
+        if ("1".equals(s)) {
+            BillSampling billSampling = samplingMapper.selectOne(new QueryWrapper<BillSampling>()
+                    .eq("process_id", processId).orderByDesc("id").last(" limit 1"));
+            if (ObjectUtil.isNotEmpty(billSampling)) {
+                billSampling.setBillStatus(2);
+                billSampling.setPassDate(LocalDateTime.now());
+                billSampling.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
+                billSampling.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
+                samplingMapper.updateById(billSampling);
+            }
+
+        } else if ("2".equals(s)) {
+            BillPcr billSampling = pcrMapper.selectOne(new QueryWrapper<BillPcr>()
+                    .eq("process_id", processId).orderByDesc("id").last(" limit 1"));
+            if (ObjectUtil.isNotEmpty(billSampling)) {
+                billSampling.setBillStatus(2);
+                billSampling.setPassDate(new Date());
+                billSampling.setPcrType(3);
+                billSampling.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
+                billSampling.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
+                pcrMapper.updateById(billSampling);
+            }
+
+        }else if ("3".equals(s)) {
+            BillClean billSampling = cleanMapper.selectOne(new QueryWrapper<BillClean>()
+                    .eq("process_id", processId).orderByDesc("id").last(" limit 1"));
+            if (ObjectUtil.isNotEmpty(billSampling)) {
+                billSampling.setBillStatus(2);
+                billSampling.setPassDate(new Date());
+                billSampling.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
+                billSampling.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
+                cleanMapper.updateById(billSampling);
+            }
+
+        }else if ("4".equals(s)) {
+            BillIsolate billSampling = isolateMapper.selectOne(new QueryWrapper<BillIsolate>()
+                    .eq("process_id", processId).orderByDesc("id").last(" limit 1"));
+            if (ObjectUtil.isNotEmpty(billSampling)) {
+                billSampling.setBillStatus(2);
+                billSampling.setPassDate(new Date());
+                billSampling.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
+                billSampling.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
+                isolateMapper.updateById(billSampling);
+            }
+
+        }else if ("5".equals(s)) {
+            BillDry billSampling = dryMapper.selectOne(new QueryWrapper<BillDry>()
+                    .eq("process_id", processId).orderByDesc("id").last(" limit 1"));
+            if (ObjectUtil.isNotEmpty(billSampling)) {
+                billSampling.setBillStatus(2);
+                billSampling.setPassDate(new Date());
+                billSampling.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
+                billSampling.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
+                dryMapper.updateById(billSampling);
+            }
+
+        }else if ("6".equals(s)) {
+            BillCleanBefore billSampling = cleanBeforeMapper.selectOne(new QueryWrapper<BillCleanBefore>()
+                    .eq("process_id", processId).orderByDesc("id").last(" limit 1"));
+            if (ObjectUtil.isNotEmpty(billSampling)) {
+                billSampling.setBillStatus(2);
+                billSampling.setPassDate(LocalDateTime.now());
+                billSampling.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
+                billSampling.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
+                cleanBeforeMapper.updateById(billSampling);
+            }
+
+        }else if ("7".equals(s)) {
+            BillGoodsInventory billSampling = goodsInventoryMapper.selectOne(new QueryWrapper<BillGoodsInventory>()
+                    .eq("process_id", processId).orderByDesc("id").last(" limit 1"));
+            if (ObjectUtil.isNotEmpty(billSampling)) {
+                billSampling.setBillStatus(1);
+                billSampling.setSubDate(LocalDateTime.now());
+                billSampling.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
+                billSampling.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
+                goodsInventoryMapper.updateById(billSampling);
+            }
+
+        }
+        baseProcessMapper.updateById(baseProcess);
+        return new Result(ResultCode.SUCCESS);
+    }
+
+    public static void main(String[] args) {
+        String s = "0,1,2,3,4,5,6";
+        System.out.println(s.substring(s.length() - 1));
+    }
 }

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

@@ -288,7 +288,7 @@ public class BillCleanBeforeServiceImpl extends ServiceImpl<BillCleanBeforeMappe
                 baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId + "," + split[1]);
 
                 Integer locationId = cleanBefore.getTestLocationId();
-                int indexOf = allLocationId.indexOf(locationId);//当前位置在所有流程位置中的下标
+                int indexOf = allLocationId.indexOf(locationId.toString());//当前位置在所有流程位置中的下标
                 String substring = baseProcess.getAllLocationStatus().substring(0, indexOf + 3);//截取已经过的位置状态
                 String[] split1 = substring.split(",");
                 String sb2 = "";

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

@@ -1026,7 +1026,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                         }
                         baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId + "," + splits[1]);
                         Integer locationId = billClean.getTestLocationId();
-                        int indexOf = allLocationId.indexOf(locationId);//当前位置在所有流程位置中的下标
+                        int indexOf = allLocationId.indexOf(locationId.toString());//当前位置在所有流程位置中的下标
                         String substring = baseProcess.getAllLocationStatus().substring(0, indexOf + 3);//截取已经过的位置状态
                         String[] split1 = substring.split(",");
                         String sb2 = "";
@@ -1333,7 +1333,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                             baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId + "," + splits[1]);
 
                             Integer locationId = billClean.getTestLocationId();
-                            int indexOf = allLocationId.indexOf(locationId);//当前位置在所有流程位置中的下标
+                            int indexOf = allLocationId.indexOf(locationId.toString());//当前位置在所有流程位置中的下标
                             String substring = baseProcess.getAllLocationStatus().substring(0, indexOf + 3);//截取已经过的位置状态
                             String[] split1 = substring.split(",");
                             String sb2 = "";

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

@@ -241,7 +241,7 @@ public class BillGoodsInventoryServiceImpl extends ServiceImpl<BillGoodsInventor
                 }
                 baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId + "," + split[1]);
                 Integer locationId = goodsInventory.getTestLocationId();
-                int indexOf = allLocationId.indexOf(locationId);//当前位置在所有流程位置中的下标
+                int indexOf = allLocationId.indexOf(locationId.toString());//当前位置在所有流程位置中的下标
                 String substring = baseProcess.getAllLocationStatus().substring(0, indexOf + 3);//截取已经过的位置状态
                 String[] split1 = substring.split(",");
                 String sb2 = "";

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

@@ -533,7 +533,7 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
                         baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId + "," + split[1]);
 
                         Integer locationId = billPcr.getTestLocationId();
-                        int indexOf = allLocationId.indexOf(locationId);//当前位置在所有流程位置中的下标
+                        int indexOf = allLocationId.indexOf(locationId.toString());//当前位置在所有流程位置中的下标
                         String substring = baseProcess.getAllLocationStatus().substring(0, indexOf + 3);//截取已经过的位置状态
                         String[] split1 = substring.split(",");
                         String sb2 = "";

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

@@ -369,17 +369,17 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         String pageNo = paramsMap.get("pageNum");
         String pageSize = paramsMap.get("pageSize");
         String vistitType = paramsMap.get("vistitType");
-        Page<BillPersonnelAdmission> page = new Page<>(Integer.parseInt(pageNo), Integer.parseInt(pageSize));
+        Page<BillPersonnelAdmissionVo> page = new Page<>(Integer.parseInt(pageNo), Integer.parseInt(pageSize));
         QueryWrapper<BillPersonnelAdmission> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(StringUtils.isNotBlank(vistitType), "vistit_type", vistitType).eq("farm_id", farmId)
                 .eq("admission_user_id", TokenSign.getMemberIdByJwtToken(httpServletRequest))
                 .orderByDesc("sub_date");
-        Page<BillPersonnelAdmission> billPersonnelAdmissionPage = billPersonnelAdmissionMapper.selectPage(page, new QueryWrapper<BillPersonnelAdmission>()
-                .eq(StringUtils.isNotBlank(vistitType), "vistit_type", vistitType)
-                .eq("admission_user_id", TokenSign.getMemberIdByJwtToken(httpServletRequest))
-                .eq("farm_id", farmId)
-                .orderByDesc("sub_date"));
-        return new Result(ResultCode.SUCCESS, billPersonnelAdmissionPage, billPersonnelAdmissionMapper.selectCount(queryWrapper));
+        IPage<BillPersonnelAdmissionVo> voIPage = billPersonnelAdmissionMapper.listPersonAndProcess(new QueryWrapper<BillPersonnelAdmission>()
+                .eq(StringUtils.isNotBlank(vistitType), "a.vistit_type", vistitType)
+                .eq("a.admission_user_id", TokenSign.getMemberIdByJwtToken(httpServletRequest))
+                .eq("a.farm_id", farmId)
+                .orderByDesc("a.sub_date"), page);
+        return new Result(ResultCode.SUCCESS, voIPage, billPersonnelAdmissionMapper.selectCount(queryWrapper));
     }
 
     @Override
@@ -1369,7 +1369,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                         billPcr.getProcessId(), billPcr.getFarmId(), billPcr.getTestLocation(), billPcr.getTestLocationId(),billPcr.getVistitType(),
                         billPcr.getPhone(),billPcr.getDepartureName(),billPcr.getDepartureId());
                 if (nextId == 0) {
-                    int index = allLocationId.indexOf(baseLocation.getId());
+                    int index = allLocationId.indexOf(baseLocation.getId().toString());
                     StringBuilder status = new StringBuilder(baseProcess.getAllLocationId());
                     status.setCharAt(index, '1');
                     status.setCharAt(index + 2, '1');
@@ -1705,7 +1705,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                 }
                 baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId + "," + splits[1]);
                 Integer locationId = billIsolate.getIsolateLocationId();
-                int indexOf = allLocationId.indexOf(locationId);//当前位置在所有流程位置中的下标
+                int indexOf = allLocationId.indexOf(locationId.toString());//当前位置在所有流程位置中的下标
                 String substring = baseProcess.getAllLocationStatus().substring(0, indexOf + 3);//截取已经过的位置状态
                 String[] split1 = substring.split(",");
                 String sb2 = "";

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

@@ -289,7 +289,7 @@ public class BillSamplingServiceImpl extends ServiceImpl<BillSamplingMapper, Bil
                 }
                 baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId + "," + split[1]);
                 Integer locationId = sampling.getTestLocationId();
-                int indexOf = allLocationId.indexOf(locationId);//当前位置在所有流程位置中的下标
+                int indexOf = allLocationId.indexOf(locationId.toString());//当前位置在所有流程位置中的下标
                 String substring = baseProcess.getAllLocationStatus().substring(0, indexOf + 3);//截取已经过的位置状态
                 String[] split1 = substring.split(",");
                 String sb2 = "";
@@ -406,4 +406,25 @@ public class BillSamplingServiceImpl extends ServiceImpl<BillSamplingMapper, Bil
         billSamplingMapper.updateById(sampling);
         return new Result(10000, "修改成功!", true);
     }
+
+    public static void main(String[] args) {
+        String s = "0,1,0,2,0,3,0";
+        int i = s.indexOf("2");
+        System.out.println(i);
+        String s1 = "2,2,2,1,0,0,0";
+        String s2 = s1.substring(0, i + 3);
+        System.out.println("s2:"+s2);
+        String[] split = s2.split(",");
+        String sb2 = "";
+        for (int j = 0; j < split.length; j++) {
+            if (j == split.length - 1) {
+                sb2 = sb2 + split[j].replaceAll(split[j], "2");
+            } else {
+                sb2 = split[j].replaceAll(split[j], "2") + "," + sb2;
+            }
+        }
+        sb2 = sb2 + s1.substring(i + 3);
+        System.out.println(sb2);
+
+    }
 }

huimv-receive/src/main/java/com/huimv/receive/timer/SafeTimer.java

@@ -202,7 +202,7 @@ public class SafeTimer {
                         }
                         baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId + "," + splits[1]);
                         Integer locationId = billIsolate.getIsolateLocationId();
-                        int indexOf = allLocationId.indexOf(locationId);//当前位置在所有流程位置中的下标
+                        int indexOf = allLocationId.indexOf(locationId.toString());//当前位置在所有流程位置中的下标
                         String substring = baseProcess.getAllLocationStatus().substring(0, indexOf + 3);//截取已经过的位置状态
                         String[] split1 = substring.split(",");
                         String sb2 = "";

huimv-receive/src/main/resources/com/huimv/receive/mapper/BaseProcessMapper.xml

@@ -60,4 +60,9 @@
 
     </select>
 
+    <select id="listAll" resultType="com.huimv.receive.entity.vo.ProcessVo">
+        SELECT a.*,b.vistit_type vistitType,b.vistit_date vistitDate,b.id admissionId from base_process a INNER JOIN bill_personnel_admission b
+on a.id=b.process_id
+  ${ew.customSqlSegment}
+    </select>
 </mapper>

huimv-receive/src/main/resources/com/huimv/receive/mapper/BillPersonnelAdmissionMapper.xml

@@ -95,4 +95,9 @@ ORDER BY
     DATE(sub_date)
     </select>
 
+    <select id="listPersonAndProcess" resultType="com.huimv.receive.entity.vo.BillPersonnelAdmissionVo">
+        select a.*,b.process_type processType from bill_personnel_admission a inner  join base_process b
+        on a.process_id=b.id
+        ${ew.customSqlSegment}
+    </select>
 </mapper>