后台修改4

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

@@ -19,6 +19,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.text.DecimalFormat;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
@@ -66,11 +67,14 @@ public class BaseDeviceServiceImpl extends ServiceImpl<BaseDeviceMapper, BaseDev
         queryWrapper1.eq("device_status", 1);
         Integer count1 = deviceMapper.selectCount(queryWrapper1);//离线
         Integer allCount = count + count1;
-        Double rank;
+        DecimalFormat def = new DecimalFormat("0.00");
+        String rank;
         if (allCount == 0 || allCount == null) {
-            rank  = Double.valueOf("0");
+          Double ranks  = Double.valueOf("0.00");
+            rank = ranks.toString();
         } else {
-            rank = (Double.valueOf(count.toString()) / Double.valueOf(allCount.toString())) * 100;
+           Double ranks = (Double.valueOf(count.toString()) / Double.valueOf(allCount.toString())) * 100;
+           rank = def.format(ranks);
         }
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("count", allCount);

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

@@ -24,6 +24,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
@@ -216,21 +217,80 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
         queryWrapper3.eq("farm_id", farmId);
         Configuration configuration = configurationMapper.selectOne(queryWrapper3);
 
-        if (baseProcess.getProcessType() == 2 || baseProcess.getProcessType() == 1) {
-            return new Result(10001, "修改失败！该申请已提前结束或者被拒绝", false);
-        } else {
-            if (billClean.getDestId() >= billClean.getTestLocationId()) { //不是目的地
+        if (billClean.getBillStatus() != 0) {
+            return new Result(10001, "该订单已通过，无需再次提交！", false);
+        }
+        if (billClean.getDestId() >= billClean.getTestLocationId()) { //不是目的地
 
-                if ("1".equals(result)) {
-                    billClean.setBillStatus(1);
-                    billClean.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
-                    billClean.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
-                    billClean.setTestLocation(baseLocation.getLocationName());
-                    billClean.setTestLocationId(baseLocation.getId());
-                    billClean.setCheckDate(sdf.parse(date));
-                    billClean.setPassDate(sdf.parse(sdf.format(new Date())));
+            if ("1".equals(result)) {
+                billClean.setBillStatus(1);
+                billClean.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
+                billClean.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
+                billClean.setTestLocation(baseLocation.getLocationName());
+                billClean.setTestLocationId(baseLocation.getId());
+                billClean.setCheckDate(sdf.parse(date));
+                billClean.setPassDate(sdf.parse(sdf.format(new Date())));
 
-                    if (baseLocation.getId() == 1 && baseProcess.getDestId() > 2) {
+                if (baseLocation.getId() == 1 && baseProcess.getDestId() > 2) {
+                    //生成pcr检测申请
+                    BillPcr billPcr = new BillPcr();
+                    billPcr.setPcrType(0);
+                    billPcr.setPhone(billClean.getPhone());
+                    billPcr.setVistitType(billClean.getVistitType());
+                    billPcr.setDestName(billClean.getDestName());
+                    billPcr.setDestId(billClean.getDestId());
+                    billPcr.setAdmissionUserName(billClean.getAdmissionUserName());
+                    billPcr.setAdmissionUserId(billClean.getAdmissionUserId());
+                    billPcr.setVistitDate(billClean.getVistitDate());
+                    billPcr.setSubDate(LocalDateTime.now());
+                    billPcr.setBillStatus(0);
+                    billPcr.setProcessId(billClean.getProcessId());
+                    billPcr.setFarmId(billClean.getFarmId());
+                    billPcr.setTestLocation("人员二级洗消站");
+                    billPcr.setTestLocationId(3);
+                    billPcr.setQualifiedDate(configuration.getPcr());
+                    pcrMapper.insert(billPcr);
+
+                    String status = baseProcess.getAllLocationStatus();
+                    String[] split1 = status.split(",");
+                    split1[0] = "2";
+                    split1[1] = "2";
+                    split1[2] = "2";
+                    split1[3] = "1";
+                    baseProcess.setAllLocationStatus(split1[0] + "," + split1[1] + "," + split1[2] + "," + split1[3] + status.substring(7));
+                }
+                if (baseLocation.getId() == 3) {
+                    //生成隔离申请
+                    BillIsolate isolate = new BillIsolate();
+                    isolate.setPhone(billClean.getPhone());
+                    isolate.setVistitType(billClean.getVistitType());
+                    isolate.setDestName(billClean.getDestName());
+                    isolate.setDestId(billClean.getDestId());
+                    isolate.setAdmissionUserName(billClean.getAdmissionUserName());
+                    isolate.setAdmissionUserId(billClean.getAdmissionUserId());
+                    isolate.setVistitDate(billClean.getVistitDate());
+                    isolate.setSubDate(billClean.getSubDate());
+                    isolate.setFarmId(billClean.getFarmId());
+                    isolate.setBillStatus(0);
+                    isolate.setIsolateDayNum("");
+                    isolate.setProcessId(billClean.getProcessId());
+                    isolate.setIsolateLocation(baseLocation.getLocationName());
+                    isolate.setIsolateLocationId(baseLocation.getId());
+                    isolateMapper.insert(isolate);
+
+                    String status = baseProcess.getAllLocationStatus();
+                    String[] split1 = status.split(",");
+                    split1[0] = "2";
+                    split1[1] = "2";
+                    split1[2] = "2";
+                    split1[3] = "1";
+                    baseProcess.setAllLocationStatus(split1[0] + "," + split1[1] + "," + split1[2] + "," + split1[3] + status.substring(7));
+                }
+
+                if (baseLocation.getId() == 4) {
+                    QueryWrapper<BillPcr> queryWrapper1 = new QueryWrapper<>();
+                    queryWrapper1.eq("farm_id", farmId).eq("process_id", baseProcess.getId()).eq("test_location_id", 4);
+                    if (ObjectUtil.isEmpty(pcrMapper.selectOne(queryWrapper1))) {
                         //生成pcr检测申请
                         BillPcr billPcr = new BillPcr();
                         billPcr.setPcrType(0);
@@ -245,8 +305,8 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                         billPcr.setBillStatus(0);
                         billPcr.setProcessId(billClean.getProcessId());
                         billPcr.setFarmId(billClean.getFarmId());
-                        billPcr.setTestLocation("人员二级洗消站");
-                        billPcr.setTestLocationId(3);
+                        billPcr.setTestLocation("场内");
+                        billPcr.setTestLocationId(4);
                         billPcr.setQualifiedDate(configuration.getPcr());
                         pcrMapper.insert(billPcr);
 
@@ -255,10 +315,10 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                         split1[0] = "2";
                         split1[1] = "2";
                         split1[2] = "2";
-                        split1[3] = "1";
-                        baseProcess.setAllLocationStatus(split1[0] + "," + split1[1] + "," + split1[2] + "," + split1[3] + status.substring(7));
-                    }
-                    if (baseLocation.getId() == 3) {
+                        split1[3] = "2";
+                        split1[4] = "1";
+                        baseProcess.setAllLocationStatus(split1[0] + "," + split1[1] + "," + split1[2] + "," + split1[3] + "," + split1[4] + status.substring(9));
+                    } else {
                         //生成隔离申请
                         BillIsolate isolate = new BillIsolate();
                         isolate.setPhone(billClean.getPhone());
@@ -268,13 +328,13 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                         isolate.setAdmissionUserName(billClean.getAdmissionUserName());
                         isolate.setAdmissionUserId(billClean.getAdmissionUserId());
                         isolate.setVistitDate(billClean.getVistitDate());
-                        isolate.setSubDate(billClean.getSubDate());
+                        isolate.setSubDate(LocalDateTime.now());
                         isolate.setFarmId(billClean.getFarmId());
                         isolate.setBillStatus(0);
                         isolate.setIsolateDayNum("");
                         isolate.setProcessId(billClean.getProcessId());
-                        isolate.setIsolateLocation(baseLocation.getLocationName());
-                        isolate.setIsolateLocationId(baseLocation.getId());
+                        isolate.setIsolateLocation(baseLocation.getNextLocation());
+                        isolate.setIsolateLocationId(baseLocation.getNextId());
                         isolateMapper.insert(isolate);
 
                         String status = baseProcess.getAllLocationStatus();
@@ -282,127 +342,21 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                         split1[0] = "2";
                         split1[1] = "2";
                         split1[2] = "2";
-                        split1[3] = "1";
-                        baseProcess.setAllLocationStatus(split1[0] + "," + split1[1] + "," + split1[2] + "," + split1[3] + status.substring(7));
-                    }
-
-                    if (baseLocation.getId() == 4) {
-                        QueryWrapper<BillPcr> queryWrapper1 = new QueryWrapper<>();
-                        queryWrapper1.eq("farm_id", farmId).eq("process_id", baseProcess.getId()).eq("test_location_id", 4);
-                        if (ObjectUtil.isEmpty(pcrMapper.selectOne(queryWrapper1))) {
-                            //生成pcr检测申请
-                            BillPcr billPcr = new BillPcr();
-                            billPcr.setPcrType(0);
-                            billPcr.setPhone(billClean.getPhone());
-                            billPcr.setVistitType(billClean.getVistitType());
-                            billPcr.setDestName(billClean.getDestName());
-                            billPcr.setDestId(billClean.getDestId());
-                            billPcr.setAdmissionUserName(billClean.getAdmissionUserName());
-                            billPcr.setAdmissionUserId(billClean.getAdmissionUserId());
-                            billPcr.setVistitDate(billClean.getVistitDate());
-                            billPcr.setSubDate(LocalDateTime.now());
-                            billPcr.setBillStatus(0);
-                            billPcr.setProcessId(billClean.getProcessId());
-                            billPcr.setFarmId(billClean.getFarmId());
-                            billPcr.setTestLocation("场内");
-                            billPcr.setTestLocationId(4);
-                            billPcr.setQualifiedDate(configuration.getPcr());
-                            pcrMapper.insert(billPcr);
-
-                            String status = baseProcess.getAllLocationStatus();
-                            String[] split1 = status.split(",");
-                            split1[0] = "2";
-                            split1[1] = "2";
-                            split1[2] = "2";
-                            split1[3] = "2";
-                            split1[4] = "1";
-                            baseProcess.setAllLocationStatus(split1[0] + "," + split1[1] + "," + split1[2] + "," + split1[3] + "," + split1[4] + status.substring(9));
-                        } else {
-                            //生成隔离申请
-                            BillIsolate isolate = new BillIsolate();
-                            isolate.setPhone(billClean.getPhone());
-                            isolate.setVistitType(billClean.getVistitType());
-                            isolate.setDestName(billClean.getDestName());
-                            isolate.setDestId(billClean.getDestId());
-                            isolate.setAdmissionUserName(billClean.getAdmissionUserName());
-                            isolate.setAdmissionUserId(billClean.getAdmissionUserId());
-                            isolate.setVistitDate(billClean.getVistitDate());
-                            isolate.setSubDate(LocalDateTime.now());
-                            isolate.setFarmId(billClean.getFarmId());
-                            isolate.setBillStatus(0);
-                            isolate.setIsolateDayNum("");
-                            isolate.setProcessId(billClean.getProcessId());
-                            isolate.setIsolateLocation(baseLocation.getNextLocation());
-                            isolate.setIsolateLocationId(baseLocation.getNextId());
-                            isolateMapper.insert(isolate);
-
-                            String status = baseProcess.getAllLocationStatus();
-                            String[] split1 = status.split(",");
-                            split1[0] = "2";
-                            split1[1] = "2";
-                            split1[2] = "2";
-                            split1[3] = "2";
-                            split1[4] = "2";
-                            baseProcess.setAllLocationStatus(split1[0] + "," + split1[1] + "," + split1[2] + "," + split1[3] + "," + split1[4] + "," + "1");
-
-                        }
-                    }
-
-                    baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
-                    baseProcess.setCurrentLocation(baseProcess.getCurrentLocation() + "," + baseLocation.getLocationName());
-                    baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId() + "," + baseLocation.getId());
-                    String status = baseProcess.getCurrentStatus();
-                    String substring = status.substring(0, status.length() - 1);
-                    baseProcess.setCurrentStatus(substring + "1," + 0);
-                } else {
-                    billClean.setBillStatus(2);
-                    billClean.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
-                    billClean.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
-                    billClean.setTestLocation(baseLocation.getLocationName());
-                    billClean.setTestLocationId(baseLocation.getId());
-                    billClean.setCheckDate(sdf.parse(date));
-                    billClean.setPassDate(sdf.parse(sdf.format(new Date())));
+                        split1[3] = "2";
+                        split1[4] = "2";
+                        baseProcess.setAllLocationStatus(split1[0] + "," + split1[1] + "," + split1[2] + "," + split1[3] + "," + split1[4] + "," + "1");
 
-                    if (baseLocation.getId() == 1 && baseProcess.getDestId() > 2) {
-                        String status = baseProcess.getAllLocationStatus();
-                        String[] split1 = status.split(",");
-                        split1[0] = "2";
-                        split1[1] = "2";
-                        split1[2] = "2";
-                        split1[3] = "3";
-                        baseProcess.setAllLocationStatus(split1[0] + "," + split1[1] + "," + split1[2] + "," + split1[3] + status.substring(7));
                     }
-                    if (baseLocation.getId() == 3 || baseLocation.getId() == 4) {
-                        String status = baseProcess.getAllLocationStatus();
-                        String[] split1 = status.split(",");
-                        split1[0] = "2";
-                        split1[1] = "2";
-                        split1[2] = "2";
-                        split1[3] = "3";
-                        split1[4] = "0";
-                        baseProcess.setAllLocationStatus(split1[0] + "," + split1[1] + "," + split1[2] + "," + split1[3] + "," + split1[4] + status.substring(9));
-                    }
-
-                    baseProcess.setProcessType(2);
-                    baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
-                    baseProcess.setCurrentLocation(baseProcess.getCurrentLocation());
-                    baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId());
-                    String status = baseProcess.getCurrentStatus();
-                    String substring = status.substring(0, status.length() - 1);
-                    baseProcess.setCurrentStatus(substring + "2");
                 }
-                cleanMapper.updateById(billClean);
-                processMapper.updateById(baseProcess);
-                return new Result(10000, "修改成功！", true);
+
+                baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
+                baseProcess.setCurrentLocation(baseProcess.getCurrentLocation() + "," + baseLocation.getLocationName());
+                baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId() + "," + baseLocation.getId());
+                String status = baseProcess.getCurrentStatus();
+                String substring = status.substring(0, status.length() - 1);
+                baseProcess.setCurrentStatus(substring + "1," + 0);
             } else {
-                //当前是目的地
-                if ("1".equals(result)) {
-                    billClean.setBillStatus(1);
-                    baseProcess.setProcessType(1);
-                } else {
-                    billClean.setBillStatus(2);
-                    baseProcess.setProcessType(2);
-                }
+                billClean.setBillStatus(2);
                 billClean.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
                 billClean.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
                 billClean.setTestLocation(baseLocation.getLocationName());
@@ -410,31 +364,78 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                 billClean.setCheckDate(sdf.parse(date));
                 billClean.setPassDate(sdf.parse(sdf.format(new Date())));
 
+                if (baseLocation.getId() == 1 && baseProcess.getDestId() > 2) {
+                    String status = baseProcess.getAllLocationStatus();
+                    String[] split1 = status.split(",");
+                    split1[0] = "2";
+                    split1[1] = "2";
+                    split1[2] = "2";
+                    split1[3] = "3";
+                    baseProcess.setAllLocationStatus(split1[0] + "," + split1[1] + "," + split1[2] + "," + split1[3] + status.substring(7));
+                }
+                if (baseLocation.getId() == 3 || baseLocation.getId() == 4) {
+                    String status = baseProcess.getAllLocationStatus();
+                    String[] split1 = status.split(",");
+                    split1[0] = "2";
+                    split1[1] = "2";
+                    split1[2] = "2";
+                    split1[3] = "3";
+                    split1[4] = "0";
+                    baseProcess.setAllLocationStatus(split1[0] + "," + split1[1] + "," + split1[2] + "," + split1[3] + "," + split1[4] + status.substring(9));
+                }
+
+                baseProcess.setProcessType(2);
                 baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
                 baseProcess.setCurrentLocation(baseProcess.getCurrentLocation());
                 baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId());
                 String status = baseProcess.getCurrentStatus();
                 String substring = status.substring(0, status.length() - 1);
-                baseProcess.setCurrentStatus(substring + "1");
+                baseProcess.setCurrentStatus(substring + "2");
+            }
+            cleanMapper.updateById(billClean);
+            processMapper.updateById(baseProcess);
+            return new Result(10000, "修改成功！", true);
+        } else {
+            //当前是目的地
+            if ("1".equals(result)) {
+                billClean.setBillStatus(1);
+                baseProcess.setProcessType(1);
+            } else {
+                billClean.setBillStatus(2);
+                baseProcess.setProcessType(2);
+            }
+            billClean.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
+            billClean.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
+            billClean.setTestLocation(baseLocation.getLocationName());
+            billClean.setTestLocationId(baseLocation.getId());
+            billClean.setCheckDate(sdf.parse(date));
+            billClean.setPassDate(sdf.parse(sdf.format(new Date())));
 
-                String s = baseProcess.getAllLocationId();
-                String[] split = s.split(",");
-                Integer s2 = 0;
-                for (int i = 0; i < split.length; i++) {
-                    if (Integer.parseInt(split[i]) == baseLocation.getId()) {
-                        s2 = i;
-                    }
+            baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
+            baseProcess.setCurrentLocation(baseProcess.getCurrentLocation());
+            baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId());
+            String status = baseProcess.getCurrentStatus();
+            String substring = status.substring(0, status.length() - 1);
+            baseProcess.setCurrentStatus(substring + "1");
+
+            String s = baseProcess.getAllLocationId();
+            String[] split = s.split(",");
+            Integer s2 = 0;
+            for (int i = 0; i < split.length; i++) {
+                if (Integer.parseInt(split[i]) == baseLocation.getId()) {
+                    s2 = i;
                 }
-                String status1 = baseProcess.getAllLocationStatus();
-                StringBuilder split1 = new StringBuilder(status1);
-                split1.replace(s2, s2 + 1, "3");
-                baseProcess.setAllLocationStatus(split1.toString());
-
-                processMapper.updateById(baseProcess);
-                cleanMapper.updateById(billClean);
-                return new Result(10000, "修改成功！", true);
             }
+            String status1 = baseProcess.getAllLocationStatus();
+            StringBuilder split1 = new StringBuilder(status1);
+            split1.replace(s2, s2 + 1, "3");
+            baseProcess.setAllLocationStatus(split1.toString());
+
+            processMapper.updateById(baseProcess);
+            cleanMapper.updateById(billClean);
+            return new Result(10000, "修改成功！", true);
         }
+
     }
 
     @Resource
@@ -459,6 +460,11 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
         if (StringUtils.isBlank(data)) {
             data = sdf.format(new Date());
         }
+
+        BillClean billClean1 = cleanMapper.selectById(id);//某条洗消记录
+        if (billClean1.getBillStatus() != 0) {
+            return new Result(10001, "该订单已通过，无需再次提交！", false);
+        }
         if ("1".equals(type)) {
             //洗消上传
             BillClean billClean = cleanMapper.selectById(id);//某条洗消记录
@@ -637,6 +643,10 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
         if (StringUtils.isBlank(date)) {
             date = sdf.format(new Date());
         }
+        BillClean billClean1 = cleanMapper.selectById(id);//某条洗消记录
+        if (billClean1.getBillStatus() != 0) {
+            return new Result(10001, "该订单已通过，无需再次提交！", false);
+        }
         String s1 = "";
         String s2 = "";
         String s3 = "";
@@ -952,13 +962,15 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
         queryWrapper1.eq("bill_status", 2);
         Integer count1 = billCleanMapper.selectCount(queryWrapper1);//异常
         Integer allCount = count + count1;
-        Double rank;
+        DecimalFormat def = new DecimalFormat("0.00");
+        String rank;
         if (allCount == 0 || allCount == null) {
-            rank = Double.valueOf("0");
+            Double ranks = Double.valueOf("0.00");
+            rank = ranks.toString();
         } else {
-            rank = (Double.valueOf(count.toString()) / Double.valueOf(allCount.toString())) * 100;
+            Double ranks = (Double.valueOf(count.toString()) / Double.valueOf(allCount.toString())) * 100;
+            rank = def.format(ranks);
         }
-
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("count", allCount);
         jsonObject.put("count1", count);

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

@@ -303,6 +303,9 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
         queryWrapper.eq("farm_id", farmId);
         Configuration configuration = configurationMapper.selectOne(queryWrapper);
 
+        if (billPcr.getBillStatus() != 0) {
+            return new Result(10001, "该订单已通过，无需再次提交！", false);
+        }
         if (baseProcess.getProcessType() == 2 || baseProcess.getProcessType() == 1) {
             return new Result(10001, "修改失败！该申请已提前结束或者被拒绝", false);
         } else {

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

@@ -287,6 +287,10 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
             baseProcess.setAllLocationStatus(split1[0] + status.substring(1));
 //            SendSMS.sendSMS(phoneList,"拒绝入场申请测试");
         } else {
+
+            if (billPersonnelAdmission.getBillStatus() != 0) {
+                return new Result(10001, "该订单已通过，无需再次点击！", false);
+            }
             //通过
             billPersonnelAdmission.setBillStatus(1);
             //获取pcr位置
@@ -694,8 +698,14 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         if (baseProcess.getProcessType() == 2 || baseProcess.getProcessType() == 1) {
             return new Result(10001, "修改失败！该申请已提前结束或者被拒绝", false);
         } else {
-            if (billPcr.getDestId() >= billPcr.getTestLocationId()) { //说明当前不是目的地
+            if (billPcr.getDestId() >= billPcr.getTestLocationId()) {
+                if (billPcr.getBillStatus() != 0) {
+                    return new Result(10001, "该订单已通过，无需再次提交！", false);
+                }//说明当前不是目的地
                 if ("1".equals(type)) {
+
+
+
                     billPcr.setBillStatus(1);
                     billPcr.setPcrType(2);
                     billPcr.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
@@ -766,7 +776,11 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                     return new Result(10000, "修改成功！", true);
                 }
             } else {
+                if (billPcr.getBillStatus() != 0) {
+                    return new Result(10001, "该订单已通过，无需再次提交！", false);
+                }
                 if ("1".equals(type)) {
+
                     billPcr.setBillStatus(1);
                     billPcr.setPcrType(2);
                     billPcr.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
@@ -961,6 +975,9 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         String start = sdf.format(billIsolate.getIsolateStartDate());
         String now = sdf.format(new Date());
         int res = now.compareTo(end);
+        if (billIsolate.getBillStatus() != 0) {
+            return new Result(10001, "该订单已通过，无需再次提交！", false);
+        }
         if (res > 0) {//当前时间晚于隔离结束时间
             if (baseProcess.getDestId().equals(billIsolate.getIsolateLocationId()) || baseProcess.getDestId() >= 13) {
                 //目的地就是当前隔离地点
@@ -1170,6 +1187,10 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         locationQueryWrapper.eq("farm_id", farmId).eq("id", billClean.getTestLocationId());
         BaseLocation baseLocation = locationMapper.selectOne(locationQueryWrapper);//当前洗消检测所在的位置
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+
+        if (billClean.getBillStatus() != 0) {
+            return new Result(10001, "该订单已通过，无需再次提交！", false);
+        }
         if (billClean.getDestId() >= billClean.getTestLocationId()) { //说明当前不是目的地
             if ("1".equals(result)) {
                 billClean.setBillStatus(1);
@@ -1358,7 +1379,9 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         locationQueryWrapper.eq("farm_id", farmId).eq("id", billClean.getTestLocationId());
         BaseLocation baseLocation = locationMapper.selectOne(locationQueryWrapper);//当前洗消检测所在的位置
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
-
+        if (billClean.getBillStatus() != 0) {
+            return new Result(10001, "该订单已通过，无需再次提交！", false);
+        }
         if (billClean.getDestId() >= billClean.getTestLocationId()) { //说明当前不是目的地
             if ("1".equals(result)) {
                 billClean.setBillStatus(1);