1

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

@@ -630,7 +630,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                 Date now = new Date();
                 Calendar calendar = Calendar.getInstance();
                 calendar.setTime(now);
-                calendar.add(Calendar.HOUR_OF_DAY, 6);
+                calendar.add(Calendar.HOUR_OF_DAY, 24);
                 Date date1 = calendar.getTime();
                 SysAccountMultilevel sysAccountMultilevel = multilevelMapper.selectById(billPersonnelAdmission.getAdmissionUserId());
                 PeopleList peopleList1 = new PeopleList();
@@ -1590,7 +1590,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                     Date now = new Date();
                     Calendar calendar = Calendar.getInstance();
                     calendar.setTime(now);
-                    calendar.add(Calendar.HOUR_OF_DAY, 6);
+                    calendar.add(Calendar.HOUR_OF_DAY, 24);
                     Date date1 = calendar.getTime();
                     SysAccountMultilevel sysAccountMultilevel = multilevelMapper.selectById(billPersonnelAdmission.getAdmissionUserId());
                     PeopleList peopleList1 = new PeopleList();

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

@@ -163,7 +163,7 @@ ORDER BY
             #{statu}
         </foreach>
         union all
-        select id,vistitType,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}
+        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 test_location_id in
         <foreach collection="locations" item="location" separator="," open="(" close=")">
             #{location}
@@ -195,7 +195,7 @@ ORDER BY
             #{statu}
         </foreach>
         union all
-        select id,vistitType,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
+        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
          test_location_id in
         <foreach collection="locations" item="location" separator="," open="(" close=")">
             #{location}
@@ -228,7 +228,7 @@ ORDER BY
             #{statu}
         </foreach>
         union all
-        select id,vistitType,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}
+        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
         <foreach collection="locations" item="location" separator="," open="(" close=")">
             #{location}