修改结算标志

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dto/measurementsettlement/MeasurementSettlementDto.java

@@ -147,7 +147,8 @@ public class MeasurementSettlementDto {
         }
         return billingPeriodStr;
     }
-
+    @ApiModelProperty(value = "结账标志")
+    private Integer checkoutId;
 
 
 }

zoniot-pay/zoniot-pay-core/src/main/resources/mapper/pay/MeasurementInstanceMapper.xml

@@ -44,12 +44,12 @@
         mi.id,mi.total_water_meters,mi.number_of_water_meters_reviewed,mi.billing_period
         ,ms.plan_name,mi.clearing_end_date,mi.clearing_start_date,
                company.ORG_NAME companyOrgName,depart.ORG_NAME deptOrgName,
-        commuity.name communityName
+        commuity.name communityName,mi.checkout_id
         from rmcp_measurement_instance mi  join rmcp_measurement_settlement ms on
             mi.plan_id=ms.id
         join rmcp_org company on mi.company_org_id=company.ID
         left join rmcp_org depart on mi.dept_org_id=depart.ID
-        left join  rmcp_community commuity on mi.community_id=commuity.id
+        left join  sc_community commuity on mi.community_id=commuity.id
         <where>
             mi.status=1
             <if test="measurement.companyOrgId != null">