优化代码

java110-bean/src/main/java/com/java110/dto/purchaseApplyDetail/PurchaseApplyDetailDto.java

@@ -44,6 +44,7 @@ public class PurchaseApplyDetailDto extends PageDto implements Serializable {
     private String specName;
     private String rstId;
     private String rssId;
+    private String storeId;
 
     public String getApplyOrderId() {
         return applyOrderId;
@@ -292,4 +293,12 @@ public class PurchaseApplyDetailDto extends PageDto implements Serializable {
     public void setCreateUserId(String createUserId) {
         this.createUserId = createUserId;
     }
+
+    public String getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(String storeId) {
+        this.storeId = storeId;
+    }
 }

java110-db/src/main/resources/mapper/store/PurchaseApplyDetailServiceDaoImplMapper.xml

@@ -83,7 +83,7 @@
         rst.name rstName,
         rss.spec_name specName
         from purchase_apply_detail t
-        left join purchase_apply pa on t.apply_order_id = pa.apply_order_id
+        inner join purchase_apply pa on t.apply_order_id = pa.apply_order_id
         left join resource_store rs on rs.res_id = t.res_id
         left join resource_supplier rsp on rsp.rs_id = t.rs_id
         left join t_dict td1 on pa.res_order_type = td1.status_cd and td1.table_name = 'purchase_apply' and
@@ -158,6 +158,9 @@
         <if test="resId !=null and resId != ''">
             and t.res_id= #{resId}
         </if>
+        <if test="storeId !=null and storeId != ''">
+            and pa.store_id= #{storeId}
+        </if>
         <if test="rssId !=null and rssId != ''">
             and rs.rss_id= #{rssId}
         </if>
@@ -215,7 +218,7 @@
     <select id="queryPurchaseApplyDetailsCount" parameterType="Map" resultType="Map">
         select count(1) count
         from purchase_apply_detail t
-        left join purchase_apply pa on t.apply_order_id = pa.apply_order_id
+        inner join purchase_apply pa on t.apply_order_id = pa.apply_order_id
         left join resource_store rs on rs.res_id = t.res_id
         left join resource_supplier rsp on rsp.rs_id = t.rs_id
         left join t_dict td1 on pa.res_order_type = td1.status_cd and td1.table_name = 'purchase_apply' and
@@ -293,6 +296,9 @@
         <if test="resId !=null and resId != ''">
             and t.res_id= #{resId}
         </if>
+        <if test="storeId !=null and storeId != ''">
+            and pa.store_id= #{storeId}
+        </if>
         <if test="rssId !=null and rssId != ''">
             and rs.rss_id= #{rssId}
         </if>