营收列表查询返回增加用户性质名称

sms_water/src/main/java/com/huaxu/dto/MonthRevenueDto.java

@@ -64,6 +64,6 @@ public class MonthRevenueDto extends MonthRevenueEntity {
     private String userType;
 
     @ApiModelProperty(value = "用水性质列表")
-    private List<MonthSellwaterEntity> monthSellList;
+    private List<MonthSellwaterDto> monthSellList;
 
 }

sms_water/src/main/resources/mapper/RevenueMapper.xml

@@ -12,10 +12,11 @@
         <result property="bigUserUsage" column="big_user_usage" jdbcType="VARCHAR"/>
         <result property="generalUserUsageReceived" column="general_user_usage_received" jdbcType="VARCHAR"/>
         <result property="bigUserUsageReceived" column="big_user_usage_received" jdbcType="VARCHAR"/>
-        <collection property="monthSellList" ofType="com.huaxu.entity.MonthSellwaterEntity" javaType="list">
+        <collection property="monthSellList" ofType="com.huaxu.dto.MonthSellwaterDto" javaType="list">
             <result property="id" column="sell_id" jdbcType="INTEGER"/>
             <result property="propertyId" column="property_id" jdbcType="INTEGER"/>
             <result property="waterUsage" column="water_usage" jdbcType="VARCHAR"/>
+            <result property="propertyName" column="property_name" jdbcType="VARCHAR"/>
         </collection>
     </resultMap>
 
@@ -314,7 +315,7 @@
     <select id="selectList" resultMap="revenueDtoMap">
         select t1.id,date_format(t1.collect_date,'%Y-%m') as collect_date_string,meter_reading_usage*10000 as meter_reading_usage
                ,receivable_total_amount*10000 as receivable_total_amount,received_total_amount*10000 as received_total_amount,big_user_usage*10000 as big_user_usage
-               ,general_user_usage*10000 as general_user_usage,t2.id as property_id,t3.id as sell_id,t3.water_usage*10000 as water_usage
+               ,general_user_usage*10000 as general_user_usage,t2.id as property_id,t3.id as sell_id,t3.water_usage*10000 as water_usage,t2.property_name
                ,general_user_usage_received*10000 as general_user_usage_received,big_user_usage_received*10000 as big_user_usage_received
         from sms_month_revenue t1
         left join sms_water_property t2 on t1.company_org_id=t2.company_org_id and t1.tenant_id=t2.tenant_id and t2.status=1