后台修改5

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

@@ -461,11 +461,12 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
             data = sdf.format(new Date());
         }
 
-        BillClean billClean1 = cleanMapper.selectById(id);//某条洗消记录
-        if (billClean1.getBillStatus() != 0) {
-            return new Result(10001, "该订单已通过，无需再次提交！", false);
-        }
+
         if ("1".equals(type)) {
+            BillClean billClean1 = cleanMapper.selectById(id);//某条洗消记录
+            if (billClean1.getBillStatus() != 0) {
+                return new Result(10001, "该订单已通过，无需再次提交！", false);
+            }
             //洗消上传
             BillClean billClean = cleanMapper.selectById(id);//某条洗消记录
             System.out.println("洗消记录的id:" + billClean.getTestLocationId());
@@ -533,6 +534,9 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
 
         } else {
             BillDry billClean = dryMapper.selectById(id);//某条烘干记录
+            if (billClean.getBillStatus() != 0) {
+                return new Result(10001, "该订单已通过，无需再次提交！", false);
+            }
             System.out.println("洗消记录的id:" + billClean.getTestLocationId());
             Integer testId = billClean.getTestLocationId();
             QueryWrapper<BaseLocation> locationQueryWrapper = new QueryWrapper<>();

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

@@ -532,6 +532,9 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
             queryWrapper.ge("sub_date", timesMonthmorning);
             admissionVos = billPersonnelAdmissionMapper.admissionTail(queryWrapper);
         }
+        for (BillAdmissionVo admissionVo : admissionVos) {
+            admissionVo.setCommitCount(admissionVo.getPassCount()+admissionVo.getRefuseCount());
+        }
         return new Result(ResultCode.SUCCESS, admissionVos);
     }