入库功能调整

src/main/resources/mybatis/mappers/standard/jilinsscgsdp/KeyDmInboundRecordDao.xml

@@ -12,8 +12,11 @@
             <if test="params.params.batch_no != null">
                 AND batch_no LIKE CONCAT('%', #{params.params.batch_no}, '%')
             </if>
-            <if test="params.params.startDate != null and params.params.endDate != null">
-                AND inbound_date &gt;= #{params.params.startDate} and inbound_date &lt;= #{params.params.endDate}
+            <if test="params.params.startDate != null">
+                AND inbound_date &gt;= #{params.params.startDate}
+            </if>
+            <if test="params.params.endDate != null">
+                AND inbound_date &lt;= #{params.params.endDate}
             </if>
             <if test="params.params.inbound_type != null">
                 AND inbound_type = #{params.params.inbound_type}
@@ -56,8 +59,11 @@
         SELECT * FROM jl_key_dm_inventory
         <where>
             AND is_used = 1
-            <if test="params.params.material_name != null and params.params.material_name != ''">
-                AND (material_name LIKE CONCAT('%', #{params.params.material_name}, '%') OR material_code LIKE CONCAT('%', #{params.params.material_name}, '%'))
+            <if test="params.params.material_name != null">
+                AND material_name LIKE CONCAT('%', #{params.params.material_name}, '%')
+            </if>
+            <if test="params.params.material_code != null">
+                AND material_code LIKE CONCAT('%', #{params.params.material_code}, '%')
             </if>
         </where>
         ORDER BY material_name ASC
@@ -152,7 +158,8 @@
 
     <select id="selectPendingReturnList" parameterType="map" resultType="map">
         select ba.id,ba.applicant_id,ba.application_no,ba.applicant_name,ba.department_id,
-        ba.department_name,ba.issue_status,ba.expected_return_date,ba.issue_time
+        ba.department_name,ba.issue_status,ba.expected_return_date,ba.issue_time,ba.approval_time,
+        ba.borrow_purpose,ba.submit_time
         from jl_key_dm_borrow_application as ba
         left join jl_key_dm_borrow_application_detail as bad on bad.application_id = ba.id
         left join jl_key_dm_material as m on bad.material_id = m.id
@@ -160,10 +167,10 @@
             m.can_borrow = 1 and ba.issue_status = 1
             and bad.returned_quantity + bad.damaged_quantity != bad.apply_quantity
             <if test="params.params.applicant_name != null and params.params.applicant_name != ''">
-                and applicant_name = concat('%',#{params.params.applicant_name},'%')
+                and applicant_name like concat('%',#{params.params.applicant_name},'%')
             </if>
-            <if test="params.params.application_no != null and params.params.application_no != ''">
-                and application_no = concat('%',#{params.params.application_no},'%')
+            <if test="params.params.department_name != null">
+                and department_name like concat('%',#{params.params.department_name},'%')
             </if>
         </where>
         group by ba.id