测试

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

@@ -127,49 +127,34 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
         }*/ else {
             Page<CleanAndDryVo2> cleanAndDryVo2Page = null;
             Page<CleanAndDryVo2> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
-            QueryWrapper<BaseLocation> queryWrapper1 = new QueryWrapper<>();
-            queryWrapper1.eq("location_type", TokenSign.getWorkIdByJwtToken(httpServletRequest));
-            List<BaseLocation> baseLocations = locationMapper.selectList(queryWrapper1);
             QueryWrapper<BillClean> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("farm_id", farmId).eq("vistit_type", type);
             QueryWrapper<BillDry> queryWrapper2 = new QueryWrapper<>();
             queryWrapper2.eq("farm_id", farmId).eq("vistit_type", type);
             if ("0".equals(data)) {
-                ArrayList<String> arrayList = new ArrayList<>();
-                for (BaseLocation baseLocation : baseLocations) {
-                    arrayList.add(baseLocation.getId().toString());
-                }
-                String[] s = arrayList.toArray(new String[arrayList.size()]);
+                String[] s = {TokenSign.getWorkIdByJwtToken(httpServletRequest)};
                 System.out.println("传入自定义sql的位置参数形式：" + s);
                 cleanAndDryVo2Page = cleanMapper.CleanAndDry(page, farmId, type, "0,1".split(","), s);
-                queryWrapper.in("test_location_id", arrayList);
-                queryWrapper2.in("test_location_id", arrayList);
+                queryWrapper.in("test_location_id", TokenSign.getWorkIdByJwtToken(httpServletRequest));
+                queryWrapper2.in("test_location_id", TokenSign.getWorkIdByJwtToken(httpServletRequest));
             }
             if ("1".equals(data)) {
-                ArrayList<String> integerArrayList = new ArrayList<>();
-                for (BaseLocation baseLocation : baseLocations) {
-                    integerArrayList.add(baseLocation.getId().toString());
-                }
-                String[] ids = integerArrayList.toArray(new String[integerArrayList.size()]);
+                String[] ids = {TokenSign.getWorkIdByJwtToken(httpServletRequest)};
                 ArrayList<String> arrayList = new ArrayList<>();
                 arrayList.add("0");
                 String[] s = arrayList.toArray(new String[arrayList.size()]);
                 cleanAndDryVo2Page = cleanMapper.CleanAndDry(page, farmId, type, s, ids);
-                queryWrapper.in("test_location_id", integerArrayList);
-                queryWrapper2.in("test_location_id", integerArrayList);
+                queryWrapper.in("test_location_id", TokenSign.getWorkIdByJwtToken(httpServletRequest));
+                queryWrapper2.in("test_location_id", TokenSign.getWorkIdByJwtToken(httpServletRequest));
             }
             if ("2".equals(data)) {
-                ArrayList<String> integerArrayList = new ArrayList<>();
-                for (BaseLocation baseLocation : baseLocations) {
-                    integerArrayList.add(baseLocation.getId().toString());
-                }
-                String[] ids = integerArrayList.toArray(new String[integerArrayList.size()]);
+                String[] ids = {TokenSign.getWorkIdByJwtToken(httpServletRequest)};
                 ArrayList<String> arrayList = new ArrayList<>();
                 arrayList.add("1");
                 String[] s = arrayList.toArray(new String[arrayList.size()]);
                 cleanAndDryVo2Page = cleanMapper.CleanAndDry(page, farmId, type, s, ids);
-                queryWrapper.in("test_location_id", integerArrayList);
-                queryWrapper2.in("test_location_id", integerArrayList);
+                queryWrapper.in("test_location_id", TokenSign.getWorkIdByJwtToken(httpServletRequest));
+                queryWrapper2.in("test_location_id", TokenSign.getWorkIdByJwtToken(httpServletRequest));
             }
             queryWrapper.eq("img_status", 0);
             queryWrapper2.eq("img_status", 0);

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

@@ -605,6 +605,7 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
         if (id == 2) {
             //pcr
             BillPcr billPcr = new BillPcr();
+            billPcr.setVistitType(vistitType);
             billPcr.setDestName(destName);
             billPcr.setDestId(destId);
             billPcr.setAdmissionUserId(admissionUserId);
@@ -624,6 +625,7 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
         if (id == 3) {
             //洗消
             BillClean billPcr = new BillClean();
+            billPcr.setVistitType(vistitType);
             billPcr.setDestName(destName);
             billPcr.setDestId(destId);
             billPcr.setAdmissionUserId(admissionUserId);
@@ -643,6 +645,7 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
         if (id == 4) {
             //隔离
             BillIsolate billPcr = new BillIsolate();
+            billPcr.setVistitType(vistitType);
             billPcr.setDestName(destName);
             billPcr.setDestId(destId);
             billPcr.setAdmissionUserId(admissionUserId);
@@ -662,6 +665,7 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
         if (id == 5) {
             //烘干
             BillDry billPcr = new BillDry();
+            billPcr.setVistitType(vistitType);
             billPcr.setDestName(destName);
             billPcr.setDestId(destId);
             billPcr.setAdmissionUserId(admissionUserId);
@@ -682,6 +686,7 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
             //洗澡前拍照
             BillCleanBefore billCleanBefore = new BillCleanBefore();
             billCleanBefore.setVistitType(vistitType);
+            billCleanBefore.setVistitType(vistitType);
             billCleanBefore.setDestName(destName);
             billCleanBefore.setDestId(destId);
             billCleanBefore.setAdmissionUserName(admissionUserName);