生物安全车辆修改12

huimv-admin/src/main/java/com/huimv/admin/mapper/BillCleanMapper.java

@@ -25,4 +25,6 @@ public interface BillCleanMapper extends BaseMapper<BillClean> {
     Page<CleanAndDryVo2> CleanAndDry(Page<CleanAndDryVo2> page, String farmId,String type,String[] status,String location);
 
     Page<CleanAndDryVo2> CleanAndDry2(Page<CleanAndDryVo2> page, String farmId,String[] status);
+
+    Page<CleanAndDryVo2> CleanList(Page<CleanAndDryVo2> page, String farmId,String[] status,String location);
 }

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

@@ -95,7 +95,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                 queryWrapper.eq("bill_status", 1);
             }
             return new Result(ResultCode.SUCCESS, cleanMapper.selectPage(page, queryWrapper));
-        } else if (type.equals("4")) {
+        }/* else if (type.equals("4")) {
             Page<BillClean> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
             QueryWrapper<BillClean> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("farm_id", farmId).eq("vistit_type", 4).orderByDesc("sub_date")
@@ -111,7 +111,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                 queryWrapper.eq("bill_status", 1);
             }
             return new Result(ResultCode.SUCCESS, cleanMapper.selectPage(page, queryWrapper));
-        } else {
+        }*/ else {
             Page<CleanAndDryVo2> cleanAndDryVo2Page = null;
             Page<CleanAndDryVo2> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
             if ("0".equals(data)) {

huimv-admin/src/main/resources/application-prod.yml

@@ -9,6 +9,12 @@ spring:
   application:
     name: huimv-admin
 
+
+  servlet:
+    multipart:
+      max-request-size: 100MB
+      max-file-size: 10MB
+
   datasource:
     druid:
       url: jdbc:mysql://115.238.57.190:3306/huimv-huatong?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai

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

@@ -82,4 +82,19 @@
         </foreach>
         ORDER BY sub_date DESC
     </select>
+
+    <select id="CleanList" resultType="com.huimv.admin.entity.vo.CleanAndDryVo2">
+        select *,1 AS 'type' from bill_clean where farm_id=#{farmId} and vistit_type=4 and test_location_id=#{location}
+        and bill_status in
+        <foreach collection="status" item="statu" separator="," open="(" close=")">
+            #{statu}
+        </foreach>
+        union all
+        select *,2 AS 'type' from bill_dry where farm_id=#{farmId} and vistit_type=4 and test_location_id=#{location}
+        and bill_status in
+        <foreach collection="status" item="statu" separator="," open="(" close=")">
+            #{statu}
+        </foreach>
+        ORDER BY sub_date DESC
+    </select>
 </mapper>