优化代码

java110-bean/src/main/java/com/java110/dto/resourceStore/ResourceStoreDto.java

@@ -49,6 +49,8 @@ public class ResourceStoreDto extends PageDto implements Serializable {
 
     private String statusCd = "0";
 
+    private String shName;
+
 
     public String getResName() {
         return resName;
@@ -210,4 +212,12 @@ public class ResourceStoreDto extends PageDto implements Serializable {
     public void setShId(String shId) {
         this.shId = shId;
     }
+
+    public String getShName() {
+        return shName;
+    }
+
+    public void setShName(String shName) {
+        this.shName = shName;
+    }
 }

java110-bean/src/main/java/com/java110/vo/api/resourceStore/ApiResourceStoreDataVo.java

@@ -29,6 +29,8 @@ public class ApiResourceStoreDataVo implements Serializable {
     //手机端是否显示(N否 Y是)
     private String showMobile;
     private Date createTime;
+    private String shName;
+    private String shId;
     private List<String> fileUrls;
 
     public String getResId() {
@@ -158,4 +160,20 @@ public class ApiResourceStoreDataVo implements Serializable {
     public void setFileUrls(List<String> fileUrls) {
         this.fileUrls = fileUrls;
     }
+
+    public String getShName() {
+        return shName;
+    }
+
+    public void setShName(String shName) {
+        this.shName = shName;
+    }
+
+    public String getShId() {
+        return shId;
+    }
+
+    public void setShId(String shId) {
+        this.shId = shId;
+    }
 }

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

@@ -136,10 +136,10 @@
         statusCd,t.store_id,t.store_id storeId,t.stock,t.b_id,t.b_id bId,t.res_id,t.res_id resId,t.out_low_price,
         t.out_low_price outLowPrice,td.name goodsTypeName,t.out_high_price,t.out_high_price outHighPrice,t.goods_type,
         t.goods_type goodsType,t.unit_code,t.unit_code unitCode,t.remark,t.show_mobile,t.show_mobile showMobile,
-        t.create_time,t.create_time createTime,t.sh_id,t.sh_id shId
+        t.create_time,t.create_time createTime,t.sh_id,t.sh_id shId,sh.sh_name shName
         from resource_store t
-        left join t_dict td on t.goods_type = td.status_cd
-        and td.table_name = 'resource_store' and td.table_columns ='goods_type'
+        left join t_dict td on t.goods_type = td.status_cd and td.table_name = 'resource_store' and td.table_columns ='goods_type'
+        left join storehouse sh on t.sh_id = sh.sh_id and t.store_id = sh.store_id and sh.status_cd = '0'
         where 1 =1
         <if test="resName !=null and resName != ''">
             and t.res_name like concat('%',#{resName},'%')