修改10

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

@@ -182,7 +182,7 @@ public class SysUserController {
                 return new Result(10001,"手机号格式不正确",false);
             }
             int count = sysUserService.count(new QueryWrapper<SysUser>().eq("user_phone", userPhone)) ;
-            if (count >1) {
+            if (count >0) {
                 return new Result(10001,"手机号已存在",false);
             }
         }
@@ -191,7 +191,7 @@ public class SysUserController {
                 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 >0) {
                 return new Result(10001,"身份证已存在",false);
             }
         }

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

@@ -74,7 +74,7 @@ public class BillCleanBeforeServiceImpl extends ServiceImpl<BillCleanBeforeMappe
         Page<BillCleanBefore> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         QueryWrapper<BillCleanBefore> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("farm_id", farmId)
-                .in("test_location_id", TokenSign.getWorkIdByJwtToken(httpServletRequest)).orderByDesc("sub_date").eq("vistit_type",type);
+                .in("test_location_id", TokenSign.getWorkIdByJwtToken(httpServletRequest)).orderByDesc("sub_date").eq("vistit_type", type);
         if ("0".equals(data)) {
             queryWrapper.in("bill_status", 0, 1, 2, 3);
         }
@@ -166,7 +166,7 @@ public class BillCleanBeforeServiceImpl extends ServiceImpl<BillCleanBeforeMappe
         Object newObject = BillPcrServiceImpl.getNewObject(nextId, cleanBefore.getDestName(), cleanBefore.getDestId(), cleanBefore.getAdmissionUserName(),
                 cleanBefore.getAdmissionUserId(), cleanBefore.getVistitDate(), cleanBefore.getSubDate(),
                 cleanBefore.getProcessId(), Integer.parseInt(cleanBefore.getFarmId()), cleanBefore.getTestLocation(), cleanBefore.getTestLocationId(),
-                cleanBefore.getVistitType(), cleanBefore.getPhone(),cleanBefore.getDepartureName(),cleanBefore.getDepartureId());
+                cleanBefore.getVistitType(), cleanBefore.getPhone(), cleanBefore.getDepartureName(), cleanBefore.getDepartureId());
         if (nextId == 0) {
             if (split.length == 1) {
                 baseProcess.setProcessType(1);
@@ -269,7 +269,7 @@ public class BillCleanBeforeServiceImpl extends ServiceImpl<BillCleanBeforeMappe
                         before.setRemark(cleanBefore.getRemark());
                     }
                     billCleanBeforeMapper.insert(before);
-                }else if (Integer.parseInt(split[1]) == 7) {
+                } else if (Integer.parseInt(split[1]) == 7) {
                     //新增洗澡前拍照
                     BillGoodsInventory before = (BillGoodsInventory) entity;
                     if (cleanBefore.getVistitType() != 0) {
@@ -286,7 +286,7 @@ public class BillCleanBeforeServiceImpl extends ServiceImpl<BillCleanBeforeMappe
 
                 Integer locationId = cleanBefore.getTestLocationId();
                 String[] split2 = allLocationId.split(",");
-                int a=0;
+                int a = 0;
                 for (int i = 0; i < split2.length; i++) {
                     if (locationId.toString().equals(split2[i])) {
                         a = i + 1;
@@ -322,7 +322,7 @@ public class BillCleanBeforeServiceImpl extends ServiceImpl<BillCleanBeforeMappe
             }
             samplingMapper.insert(billSampling);
             baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
-        }else if (nextId == 2) {
+        } else if (nextId == 2) {
             //新增pcr
             BillPcr billClean = (BillPcr) newObject;
             if (cleanBefore.getVistitType() != 0) {
@@ -335,7 +335,7 @@ public class BillCleanBeforeServiceImpl extends ServiceImpl<BillCleanBeforeMappe
             }
             pcrMapper.insert(billClean);
             baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
-        }else if (nextId == 3) {
+        } else if (nextId == 3) {
             //新增洗澡
             BillClean billClean = (BillClean) newObject;
             if (cleanBefore.getVistitType() != 0) {
@@ -348,7 +348,7 @@ public class BillCleanBeforeServiceImpl extends ServiceImpl<BillCleanBeforeMappe
             }
             cleanMapper.insert(billClean);
             baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
-        }else if (nextId == 4) {
+        } else if (nextId == 4) {
             //新增隔离
             BillIsolate pcr = (BillIsolate) newObject;
             if (cleanBefore.getVistitType() != 0) {
@@ -361,7 +361,7 @@ public class BillCleanBeforeServiceImpl extends ServiceImpl<BillCleanBeforeMappe
             }
             isolateMapper.insert(pcr);
             baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
-        }else if (nextId == 5) {
+        } else if (nextId == 5) {
             BillDry billClean = (BillDry) newObject;
             if (cleanBefore.getVistitType() != 0) {
                 billClean.setCarNum(cleanBefore.getCarNum());
@@ -374,7 +374,7 @@ public class BillCleanBeforeServiceImpl extends ServiceImpl<BillCleanBeforeMappe
             dryMapper.insert(billClean);
             baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
             //新增烘干
-        }else if (nextId == 6) {
+        } else if (nextId == 6) {
             //新增洗澡前拍照
             BillCleanBefore before = (BillCleanBefore) newObject;
             if (cleanBefore.getVistitType() != 0) {
@@ -387,8 +387,7 @@ public class BillCleanBeforeServiceImpl extends ServiceImpl<BillCleanBeforeMappe
             }
             billCleanBeforeMapper.insert(before);
             baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
-        }
-        else if (nextId == 7) {
+        } else if (nextId == 7) {
             //新增洗澡前拍照
             BillGoodsInventory before = (BillGoodsInventory) newObject;
             if (cleanBefore.getVistitType() != 0) {
@@ -424,7 +423,7 @@ public class BillCleanBeforeServiceImpl extends ServiceImpl<BillCleanBeforeMappe
 
         Page<BillCleanBefore> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         QueryWrapper<BillCleanBefore> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("farm_id", farmId).orderByDesc("sub_date").eq("vistit_type",type);
+        queryWrapper.eq("farm_id", farmId).orderByDesc("sub_date").eq("vistit_type", type);
         if ("0".equals(data)) {
             queryWrapper.in("bill_status", 0, 1, 2, 3);
         }
@@ -437,6 +436,6 @@ public class BillCleanBeforeServiceImpl extends ServiceImpl<BillCleanBeforeMappe
         if ("3".equals(data)) {
             queryWrapper.eq("bill_status", 3);
         }
-        return new Result(ResultCode.SUCCESS,billCleanBeforeMapper.selectPage(page,queryWrapper));
+        return new Result(ResultCode.SUCCESS, billCleanBeforeMapper.selectPage(page, queryWrapper));
     }
 }