重构

src/main/resources/mybatis/wisdom/RkInfoMapper.xml

@@ -57,6 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="isDelete"    column="is_delete"    />
         <result property="hasMoved" column="has_moved"/>
         <result property="lihuoYName" column="lihuo_y_name"/>
+        <result property="isDelivery" column="is_delivery"/>
     </resultMap>
 
     <sql id="selectRkInfoVo">
@@ -67,7 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             ri.rk_type, st.type_name AS rk_type_name,
             ri.wl_type, mt.type_name AS wl_type_name,
             ri.cangku, wh.warehouse_name AS cangku_name,
-            ri.rk_time, ri.lihuo_y, ri.is_chuku, ri.is_borrowed, ri.remark,
+            ri.rk_time, ri.lihuo_y, ri.is_chuku, ri.is_borrowed, ri.is_delivery,ri.remark,
             ri.ck_lihuo_y, ri.ck_type, sot.type_name AS ck_type_name,
             ri.team_code, ct.team_name,
             ri.ck_remark,
@@ -818,6 +819,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isBorrowed != null">is_borrowed = #{isBorrowed},</if>
             <if test="billNoCk != null">bill_no_ck = #{billNoCk},</if>
             <if test="ckType != null">ck_type = #{ckType},</if>
+            <if test="isDelivery != null">is_delivery = #{isDelivery},</if>
             <if test="ckLihuoY != null">ck_lihuo_y = #{ckLihuoY},</if>
             <if test="teamCode != null">team_code = #{teamCode},</if>
             <if test="ckRemark != null">ck_remark = #{ckRemark},</if>
@@ -897,5 +899,51 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ORDER BY t.rk_time DESC, t.id DESC
     </select>
 
+    <select id="selectDeliveryAll"
+            parameterType="com.zg.project.wisdom.domain.RkInfo"
+            resultMap="RkInfoResult">
+        <include refid="selectRkInfoVo"/>
+        <where>
+            ri.is_delete = '0'
+            AND ri.is_delivery = '1'
+
+            <!-- 可选筛选：按你当前 RkInfo 实体常用查询项补充 -->
+            <if test="billNoCk != null and billNoCk != ''">
+                AND ri.bill_no_ck = #{billNoCk}
+            </if>
+            <if test="ckType != null and ckType != ''">
+                AND ri.ck_type = #{ckType}
+            </if>
+            <if test="teamCode != null and teamCode != ''">
+                AND ri.team_code = #{teamCode}
+            </if>
+            <if test="status != null and status != ''">
+                AND ri.status = #{status}
+            </if>
+
+            <!-- 领用(出库)时间范围 -->
+            <if test="lyStartTime != null">
+                AND ri.ly_time <![CDATA[ >= ]]> #{lyStartTime}
+            </if>
+            <if test="lyEndTime != null">
+                AND ri.ly_time <![CDATA[ <= ]]> #{lyEndTime}
+            </if>
+
+            <!-- 关键字模糊（项目/物料/供应商/出库单号等） -->
+            <if test="keyword != null and keyword != ''">
+                AND (
+                ri.xm_no_ck   LIKE CONCAT('%', #{keyword}, '%')
+                OR ri.xm_ms_ck   LIKE CONCAT('%', #{keyword}, '%')
+                OR ri.wl_no      LIKE CONCAT('%', #{keyword}, '%')
+                OR ri.wl_ms      LIKE CONCAT('%', #{keyword}, '%')
+                OR ri.gys_no     LIKE CONCAT('%', #{keyword}, '%')
+                OR ri.gys_mc     LIKE CONCAT('%', #{keyword}, '%')
+                OR ri.bill_no_ck LIKE CONCAT('%', #{keyword}, '%')
+                )
+            </if>
+        </where>
+        ORDER BY ri.ly_time DESC, ri.id DESC
+    </select>
+
 
 </mapper>