修复可销毁空安瓿

jmai-physic/src/main/java/com/jmai/physic/dto/PhysicDestroyCreateReq.java

 package com.jmai.physic.dto;
 package com.jmai.physic.dto;
 
 
 
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 
 
 import java.util.Date;
 import java.util.Date;
 
 
 @Data
 @Data
 public class PhysicDestroyCreateReq {
 public class PhysicDestroyCreateReq {
+    @ApiModelProperty(value = "病号")
     private String sickName;
     private String sickName;
+    @ApiModelProperty(value = "剩余")
     private String surplus;
     private String surplus;
+    @ApiModelProperty(value = "图片")
     private String images;
     private String images;
+    @ApiModelProperty(value = "销毁时间")
     private Date destroyTime;
     private Date destroyTime;
 }
 }

jmai-physic/src/main/resources/mapper/PhysicDestroyCheckMapper.xml

@@ -4,8 +4,13 @@
 
 
 
 
     <select id="selectCheckPage" resultType="com.jmai.physic.vo.PhysicDestroyCheckVO">
     <select id="selectCheckPage" resultType="com.jmai.physic.vo.PhysicDestroyCheckVO">
-        select a.*,b.name as createName from physic_destroy_check a left join sys_user b on a.create_by =b.id
-        where a.del_flag =0 and a.status=#{req.status}
+        select a.*,b.name as createName
+        from physic_destroy_check a
+            left join sys_user b on a.create_by =b.id
+        where a.del_flag =0
+        <if test="req.status != null and req.status != ''">
+            AND a.status=#{req.status}
+        </if>
         <if test="req.keyword != null and req.keyword != ''">
         <if test="req.keyword != null and req.keyword != ''">
             AND (
             AND (
             a.apply_name LIKE CONCAT('%', #{req.keyword}, '%')
             a.apply_name LIKE CONCAT('%', #{req.keyword}, '%')

jmai-physic/src/main/resources/mapper/PhysicStorageAmpouleMapper.xml

@@ -47,7 +47,7 @@
             a.destroy_status,
             a.destroy_status,
             d.status AS destroyCheckStatus
             d.status AS destroyCheckStatus
         FROM physic_storage_ampoule a
         FROM physic_storage_ampoule a
-            INNER JOIN physic_destroy_check d ON a.order_no = d.order_no
+            LEFT JOIN physic_destroy_check d ON a.order_no = d.order_no
         WHERE a.del_flag = 0
         WHERE a.del_flag = 0
             AND a.accept_dept_id = #{deptId}
             AND a.accept_dept_id = #{deptId}
             -- 2-移至销毁
             -- 2-移至销毁
@@ -55,7 +55,7 @@
             -- 销毁状态：0-待销毁 1-已销毁
             -- 销毁状态：0-待销毁 1-已销毁
             AND a.destroy_status = 0
             AND a.destroy_status = 0
             -- 销毁状态：0-5审批中， 6-已销毁
             -- 销毁状态：0-5审批中， 6-已销毁
-            AND d.status != 6
+            AND (d.id IS NULL OR d.status != 6)
         GROUP BY a.physic_name,a.physic_spec,a.batch_no,a.factory_name,a.accept_dept_id
         GROUP BY a.physic_name,a.physic_spec,a.batch_no,a.factory_name,a.accept_dept_id
     </select>
     </select>
 </mapper>
 </mapper>