超架空期 字段增加

unis-plugin/unis-plugin-biz/src/main/java/com/unis/purchaseAndSalesSupervision/modular/yjbj/entity/StorageJkqWarning.java

@@ -77,4 +77,7 @@ public class StorageJkqWarning {
 
     private String endDate;
 
+    private String storehouseName;
+    private String warehouseName;
+
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/purchaseAndSalesSupervision/modular/yjbj/mapper/mapping/YjbjMapper.xml

@@ -82,15 +82,17 @@
         select
             id, ch, hwh, lspz, lsxz, kcsl, scnf, zhycrq, cbnx, cccxrq, bjrq, bjlx, clzt, clr,
             clsj, org_id, scsj, updatetime, remark, clyj
-        from storage_rotation_warning
+        from depot_qh.storage_rotation_warning
         where id = #{id,jdbcType=VARCHAR}
     </select>
 
     <select id="selectCjkqList" resultType="com.unis.purchaseAndSalesSupervision.modular.yjbj.entity.StorageJkqWarning" parameterType="map">
         select
-            id, org_id, ch, hwh, jhwh, lhnd, jkqzt, jkqjzr, jzrqylrsl, jzrqsylrsl, yjrq, clzt,
-            clr, clsj, scsj, updatetime, clyj
-        from storage_jkq_warning
+        srw.id, srw.org_id, srw.ch, srw.hwh, srw.jhwh, srw.lhnd, srw.jkqzt, srw.jkqjzr, srw.jzrqylrsl, srw.jzrqsylrsl, srw.yjrq, srw.clzt,
+        srw.clr, srw.clsj, srw.scsj, srw.updatetime, srw.clyj,bs.storehouse_name storehouseName,bw.warehouse_name warehouseName
+        from depot_qh.storage_jkq_warning srw
+        left join depot_qh.basic_storehouse bs on bs.storehouse_id=srw.ch
+        left join depot_qh.basic_warehouse bw on bw.warehouse_id=srw.hwh
         where 1=1
         <if test="record.orgId != null">
             and org_id = #{record.orgId, jdbcType=INTEGER}
@@ -108,11 +110,11 @@
         select
             id, org_id, ch, hwh, jhwh, lhnd, jkqzt, jkqjzr, jzrqylrsl, jzrqsylrsl, yjrq, clzt,
             clr, clsj, scsj, updatetime, clyj
-        from storage_jkq_warning
+        from depot_qh.storage_jkq_warning
         where id = #{id,jdbcType=VARCHAR}
     </select>
 
-    <select id="getXwcjfxList" parameterType="com.unis.purchaseAndSalesSupervision.modular.yjbj.param.XwcjfxPageParam" resultType="java.util.Map">
+    <select id="getXwcjfxList" parameterType="com.unis.purchaseAndSalesSupervision.modular.yjbj.param.XwcjfxPageParam" resultType="java.util.List">
         select * from (
         SELECT
             a.cph,
@@ -175,7 +177,7 @@
         ORDER BY rcsj
     </select>
 
-    <select id="getCkjhzxjgList" parameterType="com.unis.purchaseAndSalesSupervision.modular.yjbj.param.XwcjfxPageParam" resultType="java.util.Map">
+    <select id="getCkjhzxjgList" parameterType="com.unis.purchaseAndSalesSupervision.modular.yjbj.param.XwcjfxPageParam" resultType="java.util.List">
         SELECT
             -- a.id,
             a.org_id,