开始开发楼栋公摊

java110-bean/src/main/java/com/java110/dto/floorShareMeter/FloorShareMeterDto.java

@@ -1,6 +1,7 @@
 package com.java110.dto.floorShareMeter;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -15,15 +16,17 @@ import java.util.Date;
 public class FloorShareMeterDto extends PageDto implements Serializable {
 
     private String floorId;
-private String meterNum;
-private String meterType;
-private String fsmId;
-private String formulaValue;
-private String communityId;
-private String curDegree;
-private String shareType;
-private String floorNum;
-private String curReadingTime;
+    private String meterNum;
+    private String meterType;
+    private String meterTypeName;
+    private String fsmId;
+    private String formulaValue;
+    private String communityId;
+    private String curDegree;
+    private String shareType;
+    private String shareTypeName;
+    private String floorNum;
+    private String curReadingTime;
 
 
     private Date createTime;
@@ -34,61 +37,80 @@ private String curReadingTime;
     public String getFloorId() {
         return floorId;
     }
-public void setFloorId(String floorId) {
+
+    public void setFloorId(String floorId) {
         this.floorId = floorId;
     }
-public String getMeterNum() {
+
+    public String getMeterNum() {
         return meterNum;
     }
-public void setMeterNum(String meterNum) {
+
+    public void setMeterNum(String meterNum) {
         this.meterNum = meterNum;
     }
-public String getMeterType() {
+
+    public String getMeterType() {
         return meterType;
     }
-public void setMeterType(String meterType) {
+
+    public void setMeterType(String meterType) {
         this.meterType = meterType;
     }
-public String getFsmId() {
+
+    public String getFsmId() {
         return fsmId;
     }
-public void setFsmId(String fsmId) {
+
+    public void setFsmId(String fsmId) {
         this.fsmId = fsmId;
     }
-public String getFormulaValue() {
+
+    public String getFormulaValue() {
         return formulaValue;
     }
-public void setFormulaValue(String formulaValue) {
+
+    public void setFormulaValue(String formulaValue) {
         this.formulaValue = formulaValue;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
-public String getCurDegree() {
+
+    public String getCurDegree() {
         return curDegree;
     }
-public void setCurDegree(String curDegree) {
+
+    public void setCurDegree(String curDegree) {
         this.curDegree = curDegree;
     }
-public String getShareType() {
+
+    public String getShareType() {
         return shareType;
     }
-public void setShareType(String shareType) {
+
+    public void setShareType(String shareType) {
         this.shareType = shareType;
     }
-public String getFloorNum() {
+
+    public String getFloorNum() {
         return floorNum;
     }
-public void setFloorNum(String floorNum) {
+
+    public void setFloorNum(String floorNum) {
         this.floorNum = floorNum;
     }
-public String getCurReadingTime() {
+
+    public String getCurReadingTime() {
         return curReadingTime;
     }
-public void setCurReadingTime(String curReadingTime) {
+
+    public void setCurReadingTime(String curReadingTime) {
         this.curReadingTime = curReadingTime;
     }
 
@@ -108,4 +130,20 @@ public void setCurReadingTime(String curReadingTime) {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getMeterTypeName() {
+        return meterTypeName;
+    }
+
+    public void setMeterTypeName(String meterTypeName) {
+        this.meterTypeName = meterTypeName;
+    }
+
+    public String getShareTypeName() {
+        return shareTypeName;
+    }
+
+    public void setShareTypeName(String shareTypeName) {
+        this.shareTypeName = shareTypeName;
+    }
 }

java110-db/src/main/resources/mapper/fee/FloorShareMeterV1ServiceDaoImplMapper.xml

@@ -19,8 +19,12 @@
     <select id="getFloorShareMeterInfo" parameterType="Map" resultType="Map">
         select t.floor_id floorId,t.meter_num meterNum,t.meter_type meterType,t.fsm_id fsmId,t.formula_value
         formulaValue,t.status_cd statusCd,t.community_id communityId,t.cur_degree curDegree,t.share_type
-        shareType,t.floor_num floorNum,t.cur_reading_time curReadingTime,t.create_time createTime
+        shareType,t.floor_num floorNum,t.cur_reading_time curReadingTime,t.create_time createTime,td.name meterTypeName,
+        td1.name shareTypeName
         from floor_share_meter t
+        left join t_dict td on t.meter_type = td.status_cd and td.table_name = 'floor_share_meter' and td.table_columns = 'meter_type'
+        left join t_dict td1 on t.share_type = td1.status_cd and td1.table_name = 'floor_share_meter' and td1.table_columns = 'share_type'
+
         where 1 =1
         <if test="floorId !=null and floorId != ''">
             and t.floor_id= #{floorId}

service-fee/src/main/java/com/java110/fee/cmd/meter/SaveFloorShareMeterCmd.java

@@ -23,6 +23,7 @@ import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.dto.floor.FloorDto;
+import com.java110.dto.floorShareMeter.FloorShareMeterDto;
 import com.java110.intf.community.IFloorInnerServiceSMO;
 import com.java110.intf.fee.IFloorShareMeterV1InnerServiceSMO;
 import com.java110.po.floorShareMeter.FloorShareMeterPo;