xiaogang лет назад: 5
Родитель
Сommit
d27fe7fac6

+ 9 - 3
java110-bean/src/main/java/com/java110/dto/resourceStoreUseRecord/ResourceStoreUseRecordDto.java

@@ -25,8 +25,7 @@ public class ResourceStoreUseRecordDto extends PageDto implements Serializable {
     private String storeId;
     private String resId;
     private String communityId;
-
-
+    private String resName;
     private Date createTime;
 
     private String statusCd = "0";
@@ -111,7 +110,6 @@ public class ResourceStoreUseRecordDto extends PageDto implements Serializable {
         this.communityId = communityId;
     }
 
-
     public Date getCreateTime() {
         return createTime;
     }
@@ -127,4 +125,12 @@ public class ResourceStoreUseRecordDto extends PageDto implements Serializable {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getResName() {
+        return resName;
+    }
+
+    public void setResName(String resName) {
+        this.resName = resName;
+    }
 }

+ 7 - 0
java110-bean/src/main/java/com/java110/po/resourceStoreUseRecord/ResourceStoreUseRecordPo.java

@@ -15,6 +15,7 @@ public class ResourceStoreUseRecordPo implements Serializable {
     private String storeId;
     private String resId;
     private String communityId;
+    private String resName;
 
     public String getRepairId() {
         return repairId;
@@ -96,5 +97,11 @@ public class ResourceStoreUseRecordPo implements Serializable {
         this.communityId = communityId;
     }
 
+    public String getResName() {
+        return resName;
+    }
 
+    public void setResName(String resName) {
+        this.resName = resName;
+    }
 }

+ 4 - 3
java110-db/src/main/resources/mapper/store/ResourceStoreUseRecordServiceDaoImplMapper.xml

@@ -107,10 +107,11 @@
         select t.unit_price,t.unit_price unitPrice,t.create_user_id,t.create_user_id
         createUserId,t.quantity,t.rsur_id,t.rsur_id rsurId,t.repair_id,t.repair_id
         repairId,t.create_user_name,t.create_user_name createUserName,t.status_cd,t.status_cd
-        statusCd,t.remark,t.store_id,t.store_id storeId,t.res_id,t.res_id resId,t.b_id,t.b_id
-        bId,t.community_id,t.community_id communityId
+        statusCd,t.remark,t.store_id,t.store_id storeId,t.res_id,t.res_id resId,rs.res_name resName,
+        t.b_id,t.b_id bId,t.community_id,t.community_id communityId
         from resource_store_use_record t
-        where 1 =1
+        left join resource_store rs on rs.res_id = t.res_id
+        where 1 = 1
         <if test="unitPrice !=null and unitPrice != ''">
             and t.unit_price= #{unitPrice}
         </if>