修改人员白名单处mid值

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

@@ -123,7 +123,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
             if ("0".equals(data)) {
                 String[] s = {TokenSign.getWorkIdByJwtToken(httpServletRequest)};
                 System.out.println("传入自定义sql的位置参数形式：" + s);
-                if (Integer.parseInt(TokenSign.getWorkIdByJwtToken(httpServletRequest)) == 47) {
+                if (Integer.parseInt(TokenSign.getUserNameByJwtToken(httpServletRequest)) == 47) {
                     cleanDryGoodPage = cleanMapper.listCleanDryGoodsNo(page, type, "0,1,2,3".split(","), s);
                 } else {
                     cleanDryGoodPage = cleanMapper.listCleanDryGoods(page, farmId, type, "0,1,2,3".split(","), s);
@@ -251,7 +251,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
 
         String[] s = {TokenSign.getMemberIdByJwtToken(httpServletRequest).toString()};
         System.out.println("传入自定义sql的位置参数形式：" + s);
-        cleanDryGoodPage = cleanMapper.listCleanDryGoods(page, farmId, vistitType, "0,1".split(","), s);
+        cleanDryGoodPage = cleanMapper.listCleanDryGoods2(page, farmId, vistitType, "0,1".split(","), s);
 //        queryWrapper.in("test_location_id", TokenSign.getWorkIdByJwtToken(httpServletRequest));
 //        queryWrapper2.in("test_location_id", TokenSign.getWorkIdByJwtToken(httpServletRequest));
 //        queryWrapper3.in("current_location_id", TokenSign.getWorkIdByJwtToken(httpServletRequest));

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

@@ -537,7 +537,8 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
                                 }
                             }
                             //人员基地外围
-                            if (billPcr.getMidId() == 60 || billPcr.getMidId() == 79 || billPcr.getMidId() == 98 || billPcr.getMidId() == 41) {
+                            if (billPcr.getMidId() == 60 || billPcr.getMidId() == 79 || billPcr.getMidId() == 98 || billPcr.getMidId() == 41
+                                    ||billPcr.getMidId() == 78 || billPcr.getMidId() == 40 || billPcr.getMidId() == 59 || billPcr.getMidId() == 97) {
                                 DeviceList deviceList = deviceListMapper.selectOne(new QueryWrapper<DeviceList>().eq("farm_id", billPcr.getFarmId()));
                                 PeopleList peopleList = new PeopleList();
                                 peopleList.setFarmId(billPcr.getFarmId().toString());
@@ -653,7 +654,10 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
 
                                 }
                                 //人员基地外围
-                                if (billPcr.getMidId() == 60 || billPcr.getMidId() == 79 || billPcr.getMidId() == 98 || billPcr.getMidId() == 41) {
+                                if (billPcr.getMidId() == 60 || billPcr.getMidId() == 79 || billPcr.getMidId() == 98 || billPcr.getMidId() == 41
+                                ||billPcr.getMidId() == 78 || billPcr.getMidId() == 40 || billPcr.getMidId() == 59 || billPcr.getMidId() == 97
+
+                                ) {
                                     DeviceList deviceList = deviceListMapper.selectOne(new QueryWrapper<DeviceList>().eq("farm_id", billPcr.getFarmId()));
                                     PeopleList peopleList = new PeopleList();
                                     peopleList.setFarmId(billPcr.getFarmId().toString());
@@ -869,7 +873,8 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
                             }
                         }
                         //人员基地外围
-                        if (billPcr.getMidId() == 60 || billPcr.getMidId() == 79 || billPcr.getMidId() == 98 || billPcr.getMidId() == 41) {
+                        if (billPcr.getMidId() == 60 || billPcr.getMidId() == 79 || billPcr.getMidId() == 98 || billPcr.getMidId() == 41
+                                ||billPcr.getMidId() == 78 || billPcr.getMidId() == 40 || billPcr.getMidId() == 59 || billPcr.getMidId() == 97) {
                             DeviceList deviceList = deviceListMapper.selectOne(new QueryWrapper<DeviceList>().eq("farm_id", billPcr.getFarmId()));
                             PeopleList peopleList = new PeopleList();
                             peopleList.setFarmId(billPcr.getFarmId().toString());
@@ -1231,7 +1236,8 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
                                     }
                                 }
                                 //人员基地外围
-                                if (billPcr.getMidId() == 60 || billPcr.getMidId() == 79 || billPcr.getMidId() == 98 || billPcr.getMidId() == 41) {
+                                if (billPcr.getMidId() == 60 || billPcr.getMidId() == 79 || billPcr.getMidId() == 98 || billPcr.getMidId() == 41
+                                                ||billPcr.getMidId() == 78 || billPcr.getMidId() == 40 || billPcr.getMidId() == 59 || billPcr.getMidId() == 97) {
                                     DeviceList deviceList = deviceListMapper.selectOne(new QueryWrapper<DeviceList>().eq("farm_id", billPcr.getFarmId()));
                                     PeopleList peopleList = new PeopleList();
                                     peopleList.setFarmId(billPcr.getFarmId().toString());
@@ -1347,7 +1353,8 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
 
                                     }
                                     //人员基地外围
-                                    if (billPcr.getMidId() == 60 || billPcr.getMidId() == 79 || billPcr.getMidId() == 98 || billPcr.getMidId() == 41) {
+                                    if (billPcr.getMidId() == 60 || billPcr.getMidId() == 79 || billPcr.getMidId() == 98 || billPcr.getMidId() == 41
+                                                    ||billPcr.getMidId() == 78 || billPcr.getMidId() == 40 || billPcr.getMidId() == 59 || billPcr.getMidId() == 97) {
                                         DeviceList deviceList = deviceListMapper.selectOne(new QueryWrapper<DeviceList>().eq("farm_id", billPcr.getFarmId()));
                                         PeopleList peopleList = new PeopleList();
                                         peopleList.setFarmId(billPcr.getFarmId().toString());
@@ -1562,7 +1569,8 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
                                 }
                             }
                             //人员基地外围
-                            if (billPcr.getMidId() == 60 || billPcr.getMidId() == 79 || billPcr.getMidId() == 98 || billPcr.getMidId() == 41) {
+                            if (billPcr.getMidId() == 60 || billPcr.getMidId() == 79 || billPcr.getMidId() == 98 || billPcr.getMidId() == 41
+                                            ||billPcr.getMidId() == 78 || billPcr.getMidId() == 40 || billPcr.getMidId() == 59 || billPcr.getMidId() == 97) {
                                 DeviceList deviceList = deviceListMapper.selectOne(new QueryWrapper<DeviceList>().eq("farm_id", billPcr.getFarmId()));
                                 PeopleList peopleList = new PeopleList();
                                 peopleList.setFarmId(billPcr.getFarmId().toString());

huimv-receive/src/main/resources/com/huimv/receive/mapper/BillCleanMapper.xml

@@ -144,7 +144,7 @@ ORDER BY
     </select>
     <select id="listCleanDryGoods" resultType="com.huimv.receive.entity.vo.CleanDryGoodsVo">
         select id,vistit_Type,test_location,admission_user_name,car_num,clean_time,null as 'dryTime',check_date,sub_date,bill_status,img_status,1 AS 'type' from bill_clean where farm_id=#{farmId} and vistit_type=#{type}
-        and admission_user_id in
+        and test_location_id in
         <foreach collection="locations" item="location" separator="," open="(" close=")">
             #{location}
         </foreach>
@@ -154,7 +154,7 @@ ORDER BY
         </foreach>
         union all
         select id,vistit_Type,test_location,admission_user_name,car_num,null as 'cleanTime',dry_time,check_date,sub_date,bill_status,img_status,2 AS 'type' from bill_dry where farm_id=#{farmId} and vistit_type=#{type}
-        and admission_user_id in
+        and test_location_id in
         <foreach collection="locations" item="location" separator="," open="(" close=")">
             #{location}
         </foreach>
@@ -164,7 +164,7 @@ ORDER BY
         </foreach>
         union all
         select id,vistit_type,test_location as 'testLocation',admission_user_name,car_num,null as 'cleanTime',null as 'dryTime',null as 'checkDate' ,sub_date,bill_status as 'billStatus' ,null,3 AS 'type' from bill_goods_inventory where farm_id=#{farmId}
-        and admission_user_id in
+        and test_location_id in
         <foreach collection="locations" item="location" separator="," open="(" close=")">
             #{location}
         </foreach>