流程修改

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

@@ -105,9 +105,9 @@ public class BillGoodsInventory implements Serializable {
 
     private Integer departureId;
 
-    private Integer userId;
+    private Integer passUserId;
 
-    private String userName;
+    private String passUserName;
 
     private String phone;
 

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

@@ -1150,7 +1150,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                 billClean.setCheckDate(sdf.parse(date));
                 billClean.setPassDate(sdf.parse(sdf.format(new Date())));
                 billClean.setCleanTime("10");
-                cleanMapper.updateById(billClean);
+
                 baseProcess.setProcessType(2);
                 baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
                 baseProcess.setCurrentLocation(baseProcess.getCurrentLocation());
@@ -1158,11 +1158,16 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                 String status = baseProcess.getCurrentStatus();
                 String substring = status.substring(0, status.length() - 1);
                 baseProcess.setCurrentStatus(substring + "2");
+
+
+                int i = allLocationId.indexOf(billClean.getTestLocationId().toString());
                 String status1 = baseProcess.getAllLocationStatus();
+                System.out.println(status1);
                 StringBuilder sb = new StringBuilder(status1);
-                Integer a = status1.length() - 3;
-                sb.setCharAt(a, '3');
+                sb.setCharAt(i, '3');
                 baseProcess.setAllLocationStatus(sb.toString());
+
+                cleanMapper.updateById(billClean);
                 processMapper.updateById(baseProcess);
             }
             return new Result(10000, "修改成功！", true);
@@ -1464,10 +1469,11 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                     String status = baseProcess.getCurrentStatus();
                     String substring = status.substring(0, status.length() - 1);
                     baseProcess.setCurrentStatus(substring + "2");
+
+                    int i = allLocationId.indexOf(billClean.getTestLocationId().toString());
                     String status1 = baseProcess.getAllLocationStatus();
                     StringBuilder sb = new StringBuilder(status1);
-                    Integer a = status1.length() - 3;
-                    sb.setCharAt(a, '3');
+                    sb.setCharAt(i, '3');
                     baseProcess.setAllLocationStatus(sb.toString());
 
                     processMapper.updateById(baseProcess);

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

@@ -90,8 +90,8 @@ public class BillGoodsInventoryServiceImpl extends ServiceImpl<BillGoodsInventor
         goodsInventory.setGoodsType(goods);
         goodsInventory.setGoodsNums(goodsNum);
         goodsInventory.setGoodsTypeName(goodsTypeName);
-        goodsInventory.setUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
-        goodsInventory.setUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
+        goodsInventory.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
+        goodsInventory.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
         goodsInventory.setGoodsUnit(goodsUnit);
         goodsInventory.setBillStatus(1);
         goodsInventory.setSubDate(LocalDateTime.now());

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

@@ -740,23 +740,24 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
     }
 
     public static void main(String[] args) {
-        String s = "0,1,0,2,0,3,0";
-        String a = "1,1,1,1,1,1,1";
-        String s1 = "3";
-        String s3 = a.substring(0, s.indexOf(s1) + 3);
-//        System.out.println(s.indexOf(s1));
-        String[] split = s3.split(",");
-        String s2 = "";
-        for (int i = 0; i < split.length; i++) {
-            if (i == split.length - 1) {
-                s2 = s2 + split[i].replaceAll(split[i], "2");
-            } else {
-                s2 = split[i].replaceAll(split[i], "2") + "," + s2;
-            }
-        }
-        System.out.println(s2);
-        s2 = s2 + s.substring(s.indexOf(s1) + 3);
-        System.out.println(s2);
+        String s = "0,1,0,2,0";
+        String a = "0,1,0,2,0";
+        String s1 = "1";
+        int i = s.indexOf(s1);
+        StringBuilder sb = new StringBuilder(a);
+        sb.setCharAt(i, '3');
+        System.out.println(sb);
+
+//        String s3 = a.substring(0, s.indexOf(s1) + 3);
+////        System.out.println(s.indexOf(s1));
+//        String[] split = s3.split(",");
+//        String s2 = "";
+//        for (int i = 0; i < split.length; i++) {
+//
+//        }
+//        System.out.println(s2);
+//        s2 = s2 + s.substring(s.indexOf(s1) + 3);
+//        System.out.println(s2);
 //        String[] split = s.split(",");
 //        Integer index = 0;
 //        for (int i = 0; i < split.length; i++) {

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

@@ -1426,10 +1426,12 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                 baseProcess.setCurrentStatus(substring + "2");
                 baseProcess.setProcessType(2);
 
+
+                System.out.println("这里是pcr复审拒绝的当前位置id："+billPcr.getTestLocationId());
+                int i = allLocationId.indexOf(billPcr.getTestLocationId().toString());
                 String status1 = baseProcess.getAllLocationStatus();
                 StringBuilder sb = new StringBuilder(status1);
-                Integer a = status1.length() - 3;
-                sb.setCharAt(a, '3');
+                sb.setCharAt(i, '3');
                 baseProcess.setAllLocationStatus(sb.toString());
 
                 processMapper.updateById(baseProcess);