洗消

huimv-admin/src/main/java/com/huimv/admin/controller/BillCleanController.java

@@ -56,7 +56,7 @@ public class BillCleanController {
     }
 
     @PostMapping("/getCleanAndDryDetail")
-    public Result getCleanAndDryDetail(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap){
+    public Result getCleanAndDryDetail(@RequestBody Map<String, String> paramsMap){
         String type = paramsMap.get("type");
         if (type.equals("1")){
             return new Result(ResultCode.SUCCESS,billCleanService.getById(paramsMap.get("id")));

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

@@ -227,7 +227,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
         String pageNo = paramsMap.get("pageNum");
         String pageSize = paramsMap.get("pageSize");
         Page<BillClean> page = new Page<>(Integer.parseInt(pageNo),Integer.parseInt(pageSize));
-        return new Result(ResultCode.SUCCESS,billCleanMapper.selectPage(page,new QueryWrapper<BillClean>().eq("admission_user_id", TokenSign.getMemberIdByJwtToken(httpServletRequest)).orderByDesc("sub_date")));
+        return new Result(ResultCode.SUCCESS,billCleanMapper.selectPage(page,new QueryWrapper<BillClean>().eq("admission_user_id", TokenSign.getMemberIdByJwtToken(httpServletRequest)).eq("img_status",1).orderByDesc("sub_date")));
     }
 
     @Override

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

@@ -24,7 +24,7 @@
 
     <select id="listCleanAndDry" resultType="com.huimv.admin.entity.vo.CleanAndDryVo">
         SELECT id,car_num,bill_status,test_location,check_date,vistit_type,sub_date,1 AS 'type'
-        FROM `bill_clean` WHERE farm_id = #{farmId} AND vistit_type != 0
+        FROM `bill_clean` WHERE farm_id = #{farmId} AND vistit_type != 0 AND img_status = 1
         <if test="status != null">
             AND bill_status = #{status}
         </if>
@@ -32,7 +32,7 @@
         UNION ALL
 
         SELECT id,car_num,bill_status,test_location,check_date,vistit_type,sub_date,2 AS 'type'
-        FROM `bill_dry` WHERE farm_id = #{farmId} AND vistit_type != 0
+        FROM `bill_dry` WHERE farm_id = #{farmId} AND vistit_type != 0 AND img_status = 1
         <if test="status != null">
             AND bill_status = #{status}
         </if>
@@ -41,12 +41,12 @@
 
     <select id="listPersonalCleanAndDry" resultType="com.huimv.admin.entity.vo.CleanAndDryVo">
         SELECT id,car_num,bill_status,test_location,check_date,vistit_type,sub_date,1 AS 'type'
-        FROM `bill_clean` WHERE admission_user_id = #{userId} AND vistit_type != 0
+        FROM `bill_clean` WHERE admission_user_id = #{userId} AND vistit_type != 0 AND img_status = 1
 
         UNION ALL
 
         SELECT id,car_num,bill_status,test_location,check_date,vistit_type,sub_date,2 AS 'type'
-        FROM `bill_dry` WHERE admission_user_id = #{userId} AND vistit_type != 0
+        FROM `bill_dry` WHERE admission_user_id = #{userId} AND vistit_type != 0 AND img_status = 1
         ORDER BY sub_date DESC
     </select>