Kaynağa Gözat

优化代码

java110 5 yıl önce
ebeveyn
işleme
e4387a0923

+ 9 - 0
java110-bean/src/main/java/com/java110/dto/feeReceipt/FeeReceiptDto.java

@@ -26,6 +26,7 @@ public class FeeReceiptDto extends PageDto implements Serializable {
     private String[] receiptIds;
     private String objType;
     private String feeTypeCd;
+    private String feeName;
 
     //商户名称
     private String storeName;
@@ -148,4 +149,12 @@ public class FeeReceiptDto extends PageDto implements Serializable {
     public void setRoomName(String roomName) {
         this.roomName = roomName;
     }
+
+    public String getFeeName() {
+        return feeName;
+    }
+
+    public void setFeeName(String feeName) {
+        this.feeName = feeName;
+    }
 }

+ 39 - 25
java110-bean/src/main/java/com/java110/po/feeReceipt/FeeReceiptPo.java

@@ -1,67 +1,81 @@
 package com.java110.po.feeReceipt;
 
 import java.io.Serializable;
-import java.util.Date;
 
 public class FeeReceiptPo implements Serializable {
 
     private String amount;
-private String objId;
-private String remark;
-private String statusCd = "0";
-private String objName;
-private String communityId;
-private String receiptId;
-private String objType;
-public String getAmount() {
+    private String objId;
+    private String remark;
+    private String statusCd = "0";
+    private String objName;
+    private String communityId;
+    private String receiptId;
+    private String objType;
+
+    public String getAmount() {
         return amount;
     }
-public void setAmount(String amount) {
+
+    public void setAmount(String amount) {
         this.amount = amount;
     }
-public String getObjId() {
+
+    public String getObjId() {
         return objId;
     }
-public void setObjId(String objId) {
+
+    public void setObjId(String objId) {
         this.objId = objId;
     }
-public String getRemark() {
+
+    public String getRemark() {
         return remark;
     }
-public void setRemark(String remark) {
+
+    public void setRemark(String remark) {
         this.remark = remark;
     }
-public String getStatusCd() {
+
+    public String getStatusCd() {
         return statusCd;
     }
-public void setStatusCd(String statusCd) {
+
+    public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
-public String getObjName() {
+
+    public String getObjName() {
         return objName;
     }
-public void setObjName(String objName) {
+
+    public void setObjName(String objName) {
         this.objName = objName;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
-public String getReceiptId() {
+
+    public String getReceiptId() {
         return receiptId;
     }
-public void setReceiptId(String receiptId) {
+
+    public void setReceiptId(String receiptId) {
         this.receiptId = receiptId;
     }
-public String getObjType() {
+
+    public String getObjType() {
         return objType;
     }
-public void setObjType(String objType) {
+
+    public void setObjType(String objType) {
         this.objType = objType;
     }
 
 
-
 }

+ 2 - 1
java110-db/src/main/resources/mapper/fee/FeeReceiptServiceDaoImplMapper.xml

@@ -30,8 +30,9 @@
     <select id="getFeeReceiptInfo" parameterType="Map" resultType="Map">
         select t.amount,t.obj_id,t.obj_id objId,t.remark,t.status_cd,t.status_cd statusCd,t.obj_name,t.obj_name
         objName,t.community_id,t.community_id communityId,t.receipt_id,t.receipt_id receiptId,t.obj_type,t.obj_type
-        objType,t.create_time createTime
+        objType,t.create_time createTime,frd.fee_name feeName
         from fee_receipt t
+        left join fee_receipt_detail frd on t.receipt_id = frd.receipt_id and frd.status_cd = '0'
         where 1 =1
         <if test="amount !=null and amount != ''">
             and t.amount= #{amount}