Merge remote-tracking branch 'origin/20210716' into 20210716

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/pay/BaseWaterPropertyMapper.java

@@ -15,7 +15,7 @@ public interface BaseWaterPropertyMapper {
     public BaseWaterPropertyDto get(@Param("id") BigInteger id, @Param("tenantId") String tenantId);
 
 
-    public List<BaseWaterPropertyDto> getList(@Param("name") String name,@Param("tenantId") String tenantId);
+    public List<BaseWaterPropertyDto> getList(@Param("name") String name, @Param("tenantId") String tenantId, @Param("companyId") Integer companyId);
 
     public int delete(@Param("id") BigInteger id);
 

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/pay/MeasurementRecordMapper.java

@@ -125,4 +125,6 @@ public interface MeasurementRecordMapper {
     AmountWaterUsedAmount getWaterUse(Long id);
 
     List<MeasurementRecord> getWaterUsedAmountByMeterId(Long deviceId);
+
+    List<Long> findUnauditedWaterMeter(@Param("rids") List<Long> rids);
 }

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/pay/PayBaseWatercategoryMapper.java

@@ -27,7 +27,7 @@ public interface PayBaseWatercategoryMapper {
 
 
 
-    List<PayBaseWatercategoryDto> getAll(@Param("name") String name, @Param("tenantId") String tenantId);
+    List<PayBaseWatercategoryDto> getAll(@Param("name") String name, @Param("tenantId") String tenantId, @Param("companyId") Integer companyId);
     //判断数据是否存在
     List<Long> ExitsData(@Param("id") String id, @Param("name") String name, @Param("tenantId") String tenantId);
 

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/pay/PayBaseWaterpriceMapper.java

@@ -16,7 +16,7 @@ import java.util.List;
 @Mapper
 public interface PayBaseWaterpriceMapper {
 
-    List<PayBaseWaterpriceSelectDto> getAll(@Param("feename") String feename, @Param("tenantId") String tenantId, @Param("ladderlevel") Integer ladderLevel, UserCondition userCondition);
+    List<PayBaseWaterpriceSelectDto> getAll(@Param("feename") String feename, @Param("tenantId") String tenantId, @Param("ladderlevel") Integer ladderLevel, @Param("userCondition") UserCondition userCondition, @Param("companyId") Integer companyId);
 
     int insert(@Param("payBaseWaterprice") PayBaseWaterprice payBaseWaterprice);
 
@@ -30,4 +30,6 @@ public interface PayBaseWaterpriceMapper {
     int isUsed(@Param("id") BigInteger id, @Param("siteId") BigInteger siteId, @Param("customerId") BigInteger customerId);
     //是否存在 用水价格名称(name)、费用类型(type),同一类型下不能有相同的名称
     List<PayBaseWaterprice> ExitsData(@Param("id") String id, @Param("feename") String feename, @Param("feeType") String feeType, @Param("tenantId") String tenantId);
+
+    List<PayBaseWaterpriceSelectDto> getPrice(@Param("waterProperId") Long waterProperId, @Param("tenantId") String tenantId);
 }

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/pay/PayPayAgentbranchMapper.java

@@ -27,7 +27,7 @@ public interface PayPayAgentbranchMapper {
 
 
 
-    List<PayPayAgentbranchSelectDto> getAll(@Param("questParams") String questParams, @Param("tenantId") String tenantId, @Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("userCondition") UserCondition userCondition);
+    List<PayPayAgentbranchSelectDto> getAll(@Param("questParams") String questParams, @Param("tenantId") String tenantId, @Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("userCondition") UserCondition userCondition, @Param("companyId") Integer companyId);
     //判断数据是否存在
     List<Long> ExitsData(@Param("id") String id, @Param("name") String name, @Param("code") String code, @Param("appid") String appid, @Param("mchid") String mchid, @Param("tenantId") String tenantId);
 }

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/pay/archives/PayBaseCustomerandmeterrelaMapper.java

@@ -60,9 +60,9 @@ public interface PayBaseCustomerandmeterrelaMapper {
 
     public List<DeviceListInfo> queryNoOpenAccount(@Param("siteId") Integer siteId, @Param("customerId") Integer customerId);
 
-    public List<MeterListInfo> selectAccountInfo(@Param("siteId") Integer siteId, @Param("customerId") Integer customerId, @Param("accountnumber") String accountnumber);
+    public List<MeterListInfo> selectAccountInfo(@Param("tenantId") String tenantId, @Param("accountnumber") String accountnumber);
 
-    List<CustomerListInfo> selectAccountWater(@Param("siteId") Integer siteId, @Param("customerId") Integer customerId, @Param("accountnumber") String accountnumber);
+    List<CustomerListInfo> selectAccountWater(@Param("tenantId") String tenantId, @Param("accountnumber") String accountnumber);
 
     public List<MeterListInfo> queryMetercode(@Param("siteId") Integer siteId, @Param("customerId") Integer customerId);
     public List<PayAccountInfo> selectAccountMeterInfo(@Param("tenantId") String tenantId, @Param("metercode") String metercode);

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/entity/pay/MeasurementRecord.java

@@ -103,4 +103,5 @@ public class MeasurementRecord implements Serializable {
     private Integer month;
     private Date installdate;
     private Date billingPeriod;
+    private Double realWaterConsumption;
 }

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

@@ -429,18 +429,13 @@
         account.telephone as telephone,
         account.idcardno as idcardno
         from pay_base_account account
-        inner join sc_device device on account.id = device.account_id and device.customer_id  = #{customerId}
+        inner join sc_device device on account.id = device.account_id and device.tenant_id  = #{tenantId}
         <where>
             device.metercode not in(select metercode from pay_base_customerandmeterrela where businessstate = '1')
             <if test="accountnumber != null">
                 and account.accountnumber =#{accountnumber}
             </if>
-            <!-- <if test="siteId != null">
-                 and  account.site_id = #{siteId}
-             </if>-->
-            <if test="customerId != null">
-                and account.customer_id = #{customerId}
-            </if>
+
             order by account.create_date desc
         </where>
     </select>
@@ -515,19 +510,14 @@
             account.address as installAddress,
             device.water_meter_no as "metereleno"
         from pay_base_account account
-        inner join sc_device device on account.id = device.account_id and device.customer_id =#{customerId}
+        inner join sc_device device on account.id = device.account_id and device.tenant_id=#{tenantId}
         <where>
             (account.accountnumber not in (select accountnumber from pay_base_customerandmeterrela where businessstate ='1' ))
             and device.water_meter_no is not null
             <if test="accountnumber != null">
                 and account.accountnumber like concat('%',#{accountnumber},'%')
             </if>
-            <if test="siteId != null">
-                and  account.site_id = #{siteId}
-            </if>
-            <if test="customerId != null">
-                and account.customer_id = #{customerId}
-            </if>
+
             order by account.create_date desc
         </where>
     </select>

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

@@ -201,11 +201,11 @@
         update sc_site_user set status = 0,update_date=NOW() where status=1 and user_id = #{userId} and site_id = #{siteId}
     </update>
     <insert id="replaceInsertSelective" useGeneratedKeys="true" keyProperty="user.id">
-        REPLACE INTO sc_community
+        REPLACE INTO sc_user
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="user.id!=null"> id,</if>
             <if test="user.username!=null"> username,</if>
-
+            <if test="user.username!=null"> name,</if>
         </trim>
         VALUES
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -213,7 +213,8 @@
             </if>
             <if test="user.username!=null">#{user.username,jdbcType=VARCHAR},
             </if>
-
+            <if test="user.username!=null">#{user.username,jdbcType=VARCHAR},
+            </if>
         </trim>
     </insert>
 

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

@@ -58,6 +58,7 @@
     </select>
 
 	<select id="getList" resultType="com.zcxk.rmcp.pay.dto.pay.AmountWaterUsedAmountDto">
+
 		SELECT
 		<include refid="amountWaterusedamountColumns"/>
 			FROM pay_amount_waterusedamount a

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

@@ -59,6 +59,7 @@
 		a.tenant_id = #{tenantId}
 
 		<if test="name!=null">and a.name like concat('%',#{name},'%')</if>
+		<if test="companyId!=null">and a.company_org_id=#{companyId}</if>
 		order by a.create_date desc
 	</select>
 
@@ -166,9 +167,9 @@
 			<if test="baseWaterPropertyDto.updateDate != null">update_date = #{baseWaterPropertyDto.updateDate},</if>
 			<if test="baseWaterPropertyDto.remarks != null">remarks = #{baseWaterPropertyDto.remarks},</if>
 			<if test="baseWaterPropertyDto.siteId != null">site_id = #{baseWaterPropertyDto.siteId},</if>
-			<if test="baseWaterPropertyDto.customerId != null">customer_id = #{baseWaterPropertyDto.customerId}</if>
-			<if test="baseWaterPropertyDto.companyOrgId != null"> company_org_id = #{baseWaterPropertyDto.companyOrgId}</if>
-			<if test="baseWaterPropertyDto.deptOrgId != null"> dept_org_id = #{baseWaterPropertyDto.deptOrgId}</if>
+			<if test="baseWaterPropertyDto.customerId != null">customer_id = #{baseWaterPropertyDto.customerId},</if>
+			<if test="baseWaterPropertyDto.companyOrgId != null"> company_org_id = #{baseWaterPropertyDto.companyOrgId},</if>
+			<if test="baseWaterPropertyDto.deptOrgId != null"> dept_org_id = #{baseWaterPropertyDto.deptOrgId},</if>
 
 		</set>
 		WHERE id = #{baseWaterPropertyDto.id}

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

@@ -75,14 +75,14 @@
     <insert id="batchInsert">
         insert into rmcp_measurement_record(id, meter_no, file_meter_no, approval_status, last_reading, current_reading,
         location, plan_id, water_consumption, create_date, update_date, create_by, update_by, status,device_id,
-                                            last_period_date,current_period_date)
+                                            last_period_date,current_period_date,real_water_consumption)
         values
         <foreach collection="measurementRecords" item="item" index="index" separator=",">
             (
             #{item.id}, #{item.meterNo}, #{item.fileMeterNo}, #{item.approvalStatus}, #{item.lastReading},
             #{item.currentReading}, #{item.location}, #{item.planId}, #{item.waterConsumption}, #{item.createDate},
             #{item.updateDate}, #{item.createBy}, #{item.updateBy}, #{item.status}, #{item.deviceId}
-            , #{item.lastPeriodDate}  , #{item.currentPeriodDate}  )
+            , #{item.lastPeriodDate}  , #{item.currentPeriodDate},#{item.realWaterConsumption}  )
         </foreach>
     </insert>
 
@@ -171,5 +171,12 @@
             select a.*,b.billing_period from rmcp_measurement_record a join rmcp_measurement_instance  b
             on a.plan_id=b.id where device_id= #{deviceId} order by create_date desc limit 2
     </select>
+    <select id="findUnauditedWaterMeter" resultType="java.lang.Long">
+        select id from rmcp_measurement_record where approval_status=0
+        and id in
+        <foreach item="item" collection="rids" separator="," open="(" close=")" index="">
+                  #{item, jdbcType=NUMERIC}
+             </foreach>
+    </select>
 
 </mapper>

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

@@ -38,9 +38,9 @@
             <if test="payBaseWatercategory.name != null"> `name` = #{payBaseWatercategory.name,jdbcType=VARCHAR},</if>
             <if test="payBaseWatercategory.remarks != null"> remarks = #{payBaseWatercategory.remarks,jdbcType = VARCHAR},</if>
             <if test="payBaseWatercategory.updateBy != null"> update_by = #{payBaseWatercategory.updateBy,jdbcType = BIGINT},</if>
-            <if test="payBaseWatercategory.updateDate != null"> update_date = #{payBaseWatercategory.updateDate,jdbcType=TIMESTAMP}</if>
-            <if test="payBaseWatercategory.companyOrgId != null"> company_org_id = #{payBaseWatercategory.companyOrgId}</if>
-            <if test="payBaseWatercategory.deptOrgId != null"> dept_org_id = #{payBaseWatercategory.deptOrgId}</if>
+            <if test="payBaseWatercategory.updateDate != null"> update_date = #{payBaseWatercategory.updateDate,jdbcType=TIMESTAMP},</if>
+            <if test="payBaseWatercategory.companyOrgId != null"> company_org_id = #{payBaseWatercategory.companyOrgId},</if>
+            <if test="payBaseWatercategory.deptOrgId != null"> dept_org_id = #{payBaseWatercategory.deptOrgId},</if>
 
         </set>
         where id=#{payBaseWatercategory.id,jdbcType=BIGINT}
@@ -74,7 +74,9 @@
             <if test="1 == 1 "> pbw.del_flag='0' </if>
             <if test="tenantId != null"> and pbw.tenant_id=#{tenantId}</if>
             <if test="name != null"> and pbw.`name` like concat('%',#{name,jdbcType = VARCHAR} ,'%') </if>
-
+            <if test="companyId!=null">
+                and pbw.company_org_id=#{companyId}
+            </if>
         </where>
         order by pbw.create_date desc
     </select>

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

@@ -53,9 +53,9 @@
             <if test="payBaseWaterprice.growthrate != null">growthrate=#{payBaseWaterprice.growthrate,jdbcType=DECIMAL},</if>
             <if test="payBaseWaterprice.remarks != null"> remarks = #{payBaseWaterprice.remarks,jdbcType = VARCHAR},</if>
             <if test="payBaseWaterprice.updateBy != null"> update_by = #{payBaseWaterprice.updateBy,jdbcType = BIGINT},</if>
-            <if test="payBaseWaterprice.updateDate != null"> update_date = #{payBaseWaterprice.updateDate,jdbcType=TIMESTAMP}</if>
-            <if test="payBaseWaterprice.companyOrgId != null"> company_org_id = #{payBaseWaterprice.companyOrgId}</if>
-            <if test="payBaseWaterprice.deptOrgId != null"> dept_org_id = #{payBaseWaterprice.deptOrgId}</if>
+            <if test="payBaseWaterprice.updateDate != null"> update_date = #{payBaseWaterprice.updateDate,jdbcType=TIMESTAMP},</if>
+            <if test="payBaseWaterprice.companyOrgId != null"> company_org_id = #{payBaseWaterprice.companyOrgId},</if>
+            <if test="payBaseWaterprice.deptOrgId != null"> dept_org_id = #{payBaseWaterprice.deptOrgId},</if>
 
         </set>
         where id=#{payBaseWaterprice.id,jdbcType=BIGINT}
@@ -92,7 +92,7 @@
 
             <if test="feename != null"> and pbw.feename like concat('%',#{feename,jdbcType = VARCHAR} ,'%') </if>
 			<if test="ladderlevel != null and ladderlevel!=''"> and pbw.ladderlevel=#{ladderlevel,jdbcType=INTEGER} </if>
-        <include refid="permissionCondition"/>
+            <if test="companyId!=null">and pbw.company_org_id=#{companyId} </if>
         </where>
         order by pbw.create_date desc
     </select>
@@ -129,7 +129,7 @@
     <select id="isUsed" resultType="int">
         select count(id)
         from pay_base_priceofwaterproperty
-        where waterprice_id = #{id} and site_id=#{siteId,jdbcType=BIGINT} and customer_id=#{customerId,jdbcType=BIGINT}
+        where waterprice_id = #{id}
     </select>
 
     <select id="ExitsData" resultType="com.zcxk.rmcp.pay.entity.pay.PayBaseWaterprice">
@@ -147,5 +147,36 @@
         and pbw.feename = #{feename} and pbw.feetype = #{feeType}
         <if test="id != null and id != ''"> and pbw.id <![CDATA[ <> ]]> #{id,jdbcType=BIGINT}</if>
     </select>
+    <select id="getPrice" resultType="com.zcxk.rmcp.pay.dto.pay.PayBaseWaterpriceSelectDto">
+        select
+        pbw.id,
+        pbw.feename,
+        psd.value as feetype,
+        psd.label as feetypeName,
+        pbw.price,
+        psd2.value as ladderlevel,
+        psd2.label as ladderlevelName,
+        pbw.ladderlimit,
+        pbw.growthrate,
+        pbw.create_by as createBy,
+        pbw.create_date as createDate,
+        pbw.update_by as updateBy,
+        pbw.update_date as updateDate,
+        su.name as createByName,
+        pbw.remarks
+        from  pay_base_waterprice pbw
+        inner join pay_base_priceofwaterproperty t on t.waterprice_id = pbw.id
+        left join  sc_user su on pbw.create_by = su.id
+        left join  pay_sys_dict psd on psd.value = pbw.feetype and psd.type='收费类型' and psd.tenant_id=#{tenantId}
+        left join  pay_sys_dict psd2 on psd2.value = pbw.ladderlevel and psd2.type='阶梯水价' and psd2.tenant_id=#{tenantId}
+        <where>
+            <if test="1 == 1 "> pbw.del_flag='0' </if>
+            <if test="tenantId != null"> and pbw.tenant_id=#{tenantId}</if>
+
+          <if test="waterProperId != null"> and t.waterproperty_id=#{waterProperId} </if>
+
+        </where>
+        order by pbw.create_date desc
+    </select>
 
 </mapper>

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

@@ -60,9 +60,9 @@
 
             <if test="payPayAgentbranch.remarks != null"> remarks = #{payPayAgentbranch.remarks,jdbcType = VARCHAR},</if>
             <if test="payPayAgentbranch.updateBy != null"> update_by = #{payPayAgentbranch.updateBy,jdbcType = BIGINT},</if>
-            <if test="payPayAgentbranch.updateDate != null"> update_date = #{payPayAgentbranch.updateDate,jdbcType=TIMESTAMP}</if>
-            <if test="payPayAgentbranch.companyOrgId != null"> company_org_id = #{payPayAgentbranch.companyOrgId}</if>
-            <if test="payPayAgentbranch.deptOrgId != -1"> dept_org_id = #{payPayAgentbranch.deptOrgId}</if>
+            <if test="payPayAgentbranch.updateDate != null"> update_date = #{payPayAgentbranch.updateDate,jdbcType=TIMESTAMP},</if>
+            <if test="payPayAgentbranch.companyOrgId != null"> company_org_id = #{payPayAgentbranch.companyOrgId},</if>
+            <if test="payPayAgentbranch.deptOrgId != -1"> dept_org_id = #{payPayAgentbranch.deptOrgId},</if>
 
         </set>
         where
@@ -128,7 +128,7 @@
             <if test="questParams != null"> (pa1.code like concat('%',#{questParams,jdbcType=VARCHAR} ,'%') or pa1.name like concat('%',#{questParams,jdbcType=VARCHAR} ,'%'))</if>
 
             <if test="tenantId != null"> and pa1.tenant_id=#{tenantId}</if>
-        <include refid="permissionCondition"/>
+            <if test="companyId!=null">and pa1.company_org_id=#{companyId}</if>
         </where>
         order by pa1.create_date desc
     </select>

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

@@ -61,7 +61,7 @@
         FROM
         pay_pay_received ppt
         INNER JOIN pay_base_account ppa ON ppt.accountnumber = ppa.accountnumber
-        INNER JOIN sc_user scu ON ppt.create_by = scu.id
+        LEFT JOIN sc_user scu ON ppt.create_by = scu.id
         INNER JOIN pay_sys_dict psd ON psd.VALUE = ppt.payway AND psd.type = '支付方式'
         AND psd.tenant_id = #{tenantId}
         WHERE

zoniot-pay/zoniot-pay-web/src/main/java/com/zcxk/rmcp/pay/controller/pay/BaseWaterPropertyController.java

@@ -41,8 +41,10 @@ public class BaseWaterPropertyController {
             @ApiParam(value = "名称") @RequestParam(required = false) String name,
             @ApiParam(value = "页数,非必传，默认第一页", required = false, defaultValue = "1") @RequestParam(required = false, defaultValue = "1") int pageNum,
             @ApiParam(value = "条数，非必传，默认15条", required = false, defaultValue = "15") @RequestParam(required = false, defaultValue = "15") int pageSize
+            ,@ApiParam(value = "机构id", required = false) @RequestParam(required = false) Integer companyId
+
     ){
-        Pagination<BaseWaterPropertyDto>  pageInfo = baseWaterPropertyService.getList(name,pageNum,pageSize);
+        Pagination<BaseWaterPropertyDto>  pageInfo = baseWaterPropertyService.getList(name,pageNum,pageSize,companyId);
         return new AjaxMessage<>(ResultStatus.OK, pageInfo);
     }
 
@@ -51,7 +53,7 @@ public class BaseWaterPropertyController {
     @GetMapping("/getPrice")
     @ApiOperation(value = "添加时请求各阶用水价格")
     public AjaxMessage<List<PayBaseWaterpriceSelectDto>> getPrice(
-            @ApiParam(value = "阶梯级别") @RequestParam(required = false) Integer ladderLevel
+            @ApiParam(value = "阶梯级别") @RequestParam(required = false) Long ladderLevel
     ){
         List<PayBaseWaterpriceSelectDto>   pageInfo =  payBaseWaterpriceService.getPrice(null,null,null,ladderLevel);
         return new AjaxMessage<>(ResultStatus.OK, pageInfo);

zoniot-pay/zoniot-pay-web/src/main/java/com/zcxk/rmcp/pay/controller/pay/PayBaseWatercategoryController.java

@@ -39,9 +39,11 @@ public class PayBaseWatercategoryController {
     public AjaxMessage<Pagination<PayBaseWatercategoryDto>> getAllBaseWatercategory(
             @ApiParam(value = "用水类别名称", required = false) @RequestParam(required = false) String name,
             @ApiParam(value = "页数,非必传，默认第一页", required = false, defaultValue = "1") @RequestParam(required = false, defaultValue = "1") int pageNum,
-            @ApiParam(value = "条数，非必传，默认15条", required = false, defaultValue = "15") @RequestParam(required = false, defaultValue = "15") int pageSize
+            @ApiParam(value = "条数，非必传，默认15条", required = false, defaultValue = "15") @RequestParam(required = false, defaultValue = "15") int pageSize,
+            @ApiParam(value = "机构id", required = false) @RequestParam(required = false) Integer companyId
     ){
-        Pagination<PayBaseWatercategoryDto> payBaseWatercategoryDtoPagination = payBaseWatercategoryService.getAll(name,pageNum,pageSize);
+        Pagination<PayBaseWatercategoryDto> payBaseWatercategoryDtoPagination =
+                payBaseWatercategoryService.getAll(name,pageNum,pageSize,companyId);
         return new AjaxMessage<>(ResultStatus.OK,payBaseWatercategoryDtoPagination);
     }
 

zoniot-pay/zoniot-pay-web/src/main/java/com/zcxk/rmcp/pay/controller/pay/PayBaseWaterpriceController.java

@@ -41,8 +41,11 @@ public class PayBaseWaterpriceController {
             @ApiParam(value = "费用名称", required = false) @RequestParam(required = false) String feename,
             @ApiParam(value = "页数,非必传，默认第一页", required = false, defaultValue = "1") @RequestParam(required = false, defaultValue = "1") int pageNum,
             @ApiParam(value = "条数，非必传，默认15条", required = false, defaultValue = "15") @RequestParam(required = false, defaultValue = "15") int pageSize
+            ,@ApiParam(value = "机构id", required = false) @RequestParam(required = false) Integer companyId
+
     ){
-        Pagination<PayBaseWaterpriceSelectDto> payBaseWaterpriceSelectDtoPagination = payBaseWaterpriceService.getAll(feename,pageNum,pageSize,null);
+        Pagination<PayBaseWaterpriceSelectDto> payBaseWaterpriceSelectDtoPagination = payBaseWaterpriceService.getAll(feename,pageNum,
+                pageSize,null,companyId);
         return new AjaxMessage<>(ResultStatus.OK,payBaseWaterpriceSelectDtoPagination);
     }
 

zoniot-pay/zoniot-pay-web/src/main/java/com/zcxk/rmcp/pay/controller/pay/PayPayAgentbranchController.java

@@ -42,8 +42,10 @@ public class PayPayAgentbranchController {
             @ApiParam(value = "机构代码/机构名称", required = false) @RequestParam(required = false) String questParams,
             @ApiParam(value = "页数,非必传，默认第一页", required = false, defaultValue = "1") @RequestParam(required = false, defaultValue = "1") int pageNum,
             @ApiParam(value = "条数，非必传，默认15条", required = false, defaultValue = "15") @RequestParam(required = false, defaultValue = "15") int pageSize
+            ,@ApiParam(value = "机构id", required = false) @RequestParam(required = false) Integer companyId
     ){
-        Pagination<PayPayAgentbranchSelectDto> payPayAgentbranchSelectDtoPagination = payPayAgentbranchService.getAll(questParams,pageNum,pageSize);
+        Pagination<PayPayAgentbranchSelectDto> payPayAgentbranchSelectDtoPagination = payPayAgentbranchService
+                .getAll(questParams,pageNum,pageSize,companyId);
         return new AjaxMessage<>(ResultStatus.OK,payPayAgentbranchSelectDtoPagination);
     }
 

zoniot-pay/zoniot-pay-web/src/main/java/com/zcxk/rmcp/pay/service/impl/MeasurementSettlementServiceImpl.java

@@ -241,11 +241,15 @@ public class MeasurementSettlementServiceImpl implements MeasurementSettlementSe
         recordDtos.forEach(recordDto->{
             rids.add(recordDto.getId());
         });
-        measurementRecordMapper.auditWater(rids);
-       measurementInstanceMapper.modifyTheNumberOfAudits(0,
+        List<Long>ids=measurementRecordMapper.findUnauditedWaterMeter(rids);
+        if(!CollectionUtils.isEmpty(ids)){
+            measurementRecordMapper.auditWater(ids);
+            measurementInstanceMapper.modifyTheNumberOfAudits(0,
                     recordDtos.get(0).getPlanId());
 
-        useMultiThreadedAuditTasks(rids);
+            useMultiThreadedAuditTasks(ids);
+        }
+
 
 
     }
@@ -276,6 +280,8 @@ public class MeasurementSettlementServiceImpl implements MeasurementSettlementSe
     //月阶梯用户 新安装户相差天数>31天或者跨账期结算则非阶梯结算
     private void reviewWaterUsedAmount(Long id, LoginUser loginUser) {
         MeasurementRecord measurementRecord = measurementRecordMapper.selectById(id);
+        //需要账期数据
+
         Date billingPeriod = measurementRecord.getBillingPeriod();
         measurementRecord.setYear(DateUtil.getYear(billingPeriod));
         measurementRecord.setMonth(DateUtil.getMonth(billingPeriod));
@@ -331,6 +337,7 @@ public class MeasurementSettlementServiceImpl implements MeasurementSettlementSe
          }
         //划扣
         deduction(flag,debtFlag,measurementRecord,loginUser,payBaseAccount);
+
     }
     private void deduction(int flag, int debtFlag,MeasurementRecord measurementRecord,LoginUser loginUser,PayBaseAccount payBaseAccount){
         //划扣

zoniot-pay/zoniot-pay-web/src/main/java/com/zcxk/rmcp/pay/service/impl/pay/BaseWaterPropertyServiceImpl.java

@@ -41,11 +41,11 @@ public class BaseWaterPropertyServiceImpl implements BaseWaterPropertyService {
     private BigDecimal maxValue;
 
     @Override
-    public Pagination<BaseWaterPropertyDto> getList(String name,Integer pageNum,Integer pageSize) {
+    public Pagination<BaseWaterPropertyDto> getList(String name, Integer pageNum, Integer pageSize, Integer companyId) {
         LoginUser loginUser = UserUtil.getCurrentUser();
 
         PageHelper.startPage(pageNum, pageSize);
-        List<BaseWaterPropertyDto> baseWaterProperties =  baseWaterPropertyMapper.getList(name,loginUser.getTenantId())
+        List<BaseWaterPropertyDto> baseWaterProperties =  baseWaterPropertyMapper.getList(name,loginUser.getTenantId(),companyId)
                 ;
         return new Pagination<BaseWaterPropertyDto>(baseWaterProperties);
     }
@@ -75,6 +75,7 @@ public class BaseWaterPropertyServiceImpl implements BaseWaterPropertyService {
         baseWaterPropertyDto.setUpdateDate(LocalDateTime.now());
         baseWaterPropertyDto.setTenantId(loginUser.getTenantId());
         baseWaterPropertyDto.setDelFlag("0");
+        baseWaterPropertyDto.setCompanyOrgId(baseWaterPropertyFormDto.getCompanyOrgId());
         BigDecimal total =new BigDecimal(0);
 
         //重新计算合计
@@ -145,6 +146,8 @@ public class BaseWaterPropertyServiceImpl implements BaseWaterPropertyService {
         baseWaterPropertyDto.setUpdateBy(BigInteger.valueOf(loginUser.getId()));
         baseWaterPropertyDto.setUpdateDate(LocalDateTime.now());
         baseWaterPropertyDto.setTenantId(loginUser.getTenantId());
+        baseWaterPropertyDto.setCompanyOrgId(baseWaterPropertyFormDto.getCompanyOrgId());
+        baseWaterPropertyDto.setCompanyOrgId(baseWaterPropertyFormDto.getCompanyOrgId());
         //删除之前的关联关系
         basePriceOfWaterPropertyMapper.delete(id);
 
@@ -155,8 +158,7 @@ public class BaseWaterPropertyServiceImpl implements BaseWaterPropertyService {
         basePriceOfWaterProperty.setCreateDate(LocalDateTime.now());
         basePriceOfWaterProperty.setUpdateBy(BigInteger.valueOf(loginUser.getId()));
         basePriceOfWaterProperty.setUpdateDate(LocalDateTime.now());
-        basePriceOfWaterProperty.setSiteId(BigInteger.valueOf(loginUser.getSiteId()));
-        basePriceOfWaterProperty.setCustomerId(BigInteger.valueOf(loginUser.getCustomerId()));
+
         basePriceOfWaterProperty.setDelFlag("0");
         basePriceOfWaterProperty.setWaterPropertyId(id);
 

zoniot-pay/zoniot-pay-web/src/main/java/com/zcxk/rmcp/pay/service/impl/pay/PayBaseWatercategoryServiceImpl.java

@@ -26,11 +26,13 @@ public class PayBaseWatercategoryServiceImpl implements PayBaseWatercategoryServ
     PayBaseWatercategoryMapper payBaseWatercategoryMapper;
 
     @Override
-     public Pagination<PayBaseWatercategoryDto> getAll(String name, int pageNum, int pageSize)
+     public Pagination<PayBaseWatercategoryDto> getAll(String name, int pageNum, int pageSize
+            ,Integer companyId)
     {
         LoginUser loginUser = UserUtil.getCurrentUser();
         PageHelper.startPage(pageNum, pageSize);
-        List<PayBaseWatercategoryDto> payBaseWatercategoryDtoList =  payBaseWatercategoryMapper.getAll(name,loginUser.getTenantId());
+        List<PayBaseWatercategoryDto> payBaseWatercategoryDtoList =
+                payBaseWatercategoryMapper.getAll(name,loginUser.getTenantId(),companyId);
 
         return new Pagination<>(payBaseWatercategoryDtoList);
     }
@@ -38,7 +40,7 @@ public class PayBaseWatercategoryServiceImpl implements PayBaseWatercategoryServ
     public List<PayBaseWatercategoryDto> getAll()
     {
         LoginUser loginUser = UserUtil.getCurrentUser();
-        return payBaseWatercategoryMapper.getAll(null,loginUser.getTenantId());
+        return payBaseWatercategoryMapper.getAll(null,loginUser.getTenantId(), null);
     }
 
     @Override

zoniot-pay/zoniot-pay-web/src/main/java/com/zcxk/rmcp/pay/service/impl/pay/PayBaseWaterpriceServiceImpl.java

@@ -34,11 +34,10 @@ public class PayBaseWaterpriceServiceImpl implements PayBaseWaterpriceService {
     public int delete(BigInteger id)
     {
         LoginUser loginUser = UserUtil.getCurrentUser();
-        BigInteger siteId = new BigInteger(String.valueOf(loginUser.getSiteId()));
-        BigInteger customerId =new BigInteger(String.valueOf(loginUser.getCustomerId()));
+
 
         //判断是否使得
-        int useCount = payBaseWaterpriceMapper.isUsed(id,siteId,customerId);
+        int useCount = payBaseWaterpriceMapper.isUsed(id,null,null);
         if(useCount > 0)
             throw new ServiceException(-717,"该用水价格已被应用，无法删除。");
 
@@ -62,22 +61,24 @@ public class PayBaseWaterpriceServiceImpl implements PayBaseWaterpriceService {
     }
 
     @Override
-    public Pagination<PayBaseWaterpriceSelectDto> getAll(String feename, int pageNum, int pageSize,Integer ladderLevel)
+    public Pagination<PayBaseWaterpriceSelectDto> getAll(String feename, int pageNum, int pageSize, Integer ladderLevel, Integer companyId)
     {
         LoginUser loginUser = UserUtil.getCurrentUser();
 
         PageHelper.startPage(pageNum,pageSize);
-        List<PayBaseWaterpriceSelectDto> payBaseWaterpriceSelectDtoList = payBaseWaterpriceMapper.getAll(feename,loginUser.getTenantId(),ladderLevel,loginUser.getUserCondition() );
+        List<PayBaseWaterpriceSelectDto> payBaseWaterpriceSelectDtoList = payBaseWaterpriceMapper.getAll(feename,loginUser.getTenantId(),
+                ladderLevel,loginUser.getUserCondition(),companyId);
 
         return new Pagination<>(payBaseWaterpriceSelectDtoList);
     }
 
     @Override
-    public List<PayBaseWaterpriceSelectDto> getPrice(String feename, Integer pageNum, Integer pageSize,Integer ladderLevel)
+    public List<PayBaseWaterpriceSelectDto> getPrice(String feename, Integer pageNum, Integer pageSize,Long waterProperId)
     {
-        LoginUser loginUser = UserUtil.getCurrentUser();
 
-        List<PayBaseWaterpriceSelectDto> payBaseWaterpriceSelectDtoList = payBaseWaterpriceMapper.getAll(feename,loginUser.getTenantId(),ladderLevel, loginUser.getUserCondition());
+
+        List<PayBaseWaterpriceSelectDto> payBaseWaterpriceSelectDtoList =
+                payBaseWaterpriceMapper.getPrice(waterProperId,UserUtil.getCurrentUser().getTenantId());
 
         return payBaseWaterpriceSelectDtoList;
     }
@@ -105,7 +106,7 @@ public class PayBaseWaterpriceServiceImpl implements PayBaseWaterpriceService {
         payBaseWaterprice.setGrowthrate(payBaseWaterpriceRequestDto.getGrowthrate());
         payBaseWaterprice.setRemarks(payBaseWaterpriceRequestDto.getRemarks());
 
-
+        payBaseWaterprice.setCompanyOrgId(payBaseWaterpriceRequestDto.getCompanyOrgId());
         payBaseWaterprice.setUpdateBy(new BigInteger(String.valueOf(loginUser.getId())));
         payBaseWaterprice.setUpdateDate(LocalDateTime.now());
         payBaseWaterprice.setCreateBy(new BigInteger(String.valueOf(loginUser.getId())));
@@ -120,11 +121,10 @@ public class PayBaseWaterpriceServiceImpl implements PayBaseWaterpriceService {
     public int edit(PayBaseWaterprice payBaseWaterprice)
     {
         LoginUser loginUser = UserUtil.getCurrentUser();
-        BigInteger siteId =  new BigInteger(String.valueOf(loginUser.getSiteId()));
-        BigInteger customerId = new BigInteger(String.valueOf(loginUser.getCustomerId()));
+
 
         //是否已使用
-        int useCount = payBaseWaterpriceMapper.isUsed(payBaseWaterprice.getId(),siteId,customerId);
+        int useCount = payBaseWaterpriceMapper.isUsed(payBaseWaterprice.getId(),null,null);
         if(useCount > 0)
             throw new ServiceException(-717,"该用水价格已被应用，无法编辑。");
 
@@ -137,6 +137,7 @@ public class PayBaseWaterpriceServiceImpl implements PayBaseWaterpriceService {
 
         payBaseWaterprice.setUpdateBy(new BigInteger(String.valueOf(loginUser.getId())));
         payBaseWaterprice.setUpdateDate(LocalDateTime.now());
+
         return payBaseWaterpriceMapper.update(payBaseWaterprice);
     }
 

zoniot-pay/zoniot-pay-web/src/main/java/com/zcxk/rmcp/pay/service/impl/pay/PayPayAgentbranchServiceImpl.java

@@ -58,7 +58,8 @@ public class PayPayAgentbranchServiceImpl implements PayPayAgentbranchService {
     }
 
     @Override
-    public Pagination<PayPayAgentbranchSelectDto> getAll(String questParams, int pageNum, int pageSize)
+    public Pagination<PayPayAgentbranchSelectDto> getAll(String questParams, int pageNum,
+                                                         int pageSize,Integer companyId)
     {
         LoginUser loginUser = UserUtil.getCurrentUser();
 
@@ -77,7 +78,7 @@ public class PayPayAgentbranchServiceImpl implements PayPayAgentbranchService {
 
         PageHelper.startPage(pageNum,pageSize);
         payPayAgentbranchSelectDtoList = payPayAgentbranchMapper.getAll(questParams,
-                loginUser.getTenantId(),startTime,endTime,loginUser.getUserCondition());
+                loginUser.getTenantId(),startTime,endTime,loginUser.getUserCondition(),companyId);
 
         return new Pagination<>(payPayAgentbranchSelectDtoList);
     }

zoniot-pay/zoniot-pay-web/src/main/java/com/zcxk/rmcp/pay/service/pay/BaseWaterPropertyService.java

@@ -15,7 +15,7 @@ import java.util.List;
  */
 public interface BaseWaterPropertyService {
 
-    public Pagination<BaseWaterPropertyDto> getList(String name, Integer pageNum, Integer pageSize);
+    public Pagination<BaseWaterPropertyDto> getList(String name, Integer pageNum, Integer pageSize, Integer companyId);
 
     public int delete(BigInteger id);
 

zoniot-pay/zoniot-pay-web/src/main/java/com/zcxk/rmcp/pay/service/pay/PayBaseWatercategoryService.java

@@ -18,7 +18,7 @@ public interface PayBaseWatercategoryService {
 
     int add(PayBaseWatercategory payBaseWatercategory);
 
-    Pagination<PayBaseWatercategoryDto> getAll(String name, int pageNum, int pageSize);
+    Pagination<PayBaseWatercategoryDto> getAll(String name, int pageNum, int pageSize,Integer companyId);
 
     //是查询所有用水类别,不分页
     List<PayBaseWatercategoryDto>getAll();

zoniot-pay/zoniot-pay-web/src/main/java/com/zcxk/rmcp/pay/service/pay/PayBaseWaterpriceService.java

@@ -14,7 +14,7 @@ import java.util.List;
  */
 public interface PayBaseWaterpriceService {
 
-    Pagination<PayBaseWaterpriceSelectDto> getAll(String feename, int pageNum, int pageSize, Integer ladderLevel);
+    Pagination<PayBaseWaterpriceSelectDto> getAll(String feename, int pageNum, int pageSize, Integer ladderLevel, Integer companyId);
 
     int add(PayBaseWaterpriceRequestDto payBaseWaterpriceRequestDto);
 
@@ -27,5 +27,6 @@ public interface PayBaseWaterpriceService {
     List<PaySysDictSelectDto> getLadderlevel();
 
 
-    List<PayBaseWaterpriceSelectDto> getPrice(String feename, Integer pageNum, Integer pageSize, Integer ladderLevel);
+    List<PayBaseWaterpriceSelectDto> getPrice(String feename, Integer pageNum,
+                                              Integer pageSize, Long ladderLevel);
 }

zoniot-pay/zoniot-pay-web/src/main/java/com/zcxk/rmcp/pay/service/pay/PayPayAgentbranchService.java

@@ -15,7 +15,7 @@ public interface PayPayAgentbranchService {
 
     int add(PayPayAgentbranch payPayAgentbranch);
 
-    Pagination<PayPayAgentbranchSelectDto> getAll(String questParams, int pageNum, int pageSize);
+    Pagination<PayPayAgentbranchSelectDto> getAll(String questParams, int pageNum, int pageSize,Integer companyId);
 
     int delete(BigInteger id);
 

zoniot-pay/zoniot-pay-web/src/main/java/com/zcxk/rmcp/pay/service/pay/archives/impl/PayBaseCustomerandmeterrelaServiceImpl.java

@@ -156,11 +156,11 @@ public class PayBaseCustomerandmeterrelaServiceImpl implements PayBaseCustomeran
         CustomerListInfo customer = new CustomerListInfo();//返回集合所需实体
         List<MeterListInfo> codeList = new ArrayList<MeterListInfo>();//返回水表档案信息集合
         //根据客户编码查找该客户下的用水性质跟结算方式
-        List<CustomerListInfo> accountList = payBaseCustomerandmeterrelaMapper.selectAccountWater(loginUser.getSiteId(),loginUser.getCustomerId(),accountnumber);
+        List<CustomerListInfo> accountList = payBaseCustomerandmeterrelaMapper.selectAccountWater(loginUser.getTenantId(),accountnumber);
         if(accountList != null && accountList.size() > 0){
             for(int i=0; i<accountList.size(); i++){
                 String numbers = accountList.get(i) != null && accountList.get(i).getAccountnumber() != null ? accountList.get(i).getAccountnumber() : "";
-                codeList = payBaseCustomerandmeterrelaMapper.selectAccountInfo(loginUser.getSiteId(),loginUser.getCustomerId(),numbers);
+                codeList = payBaseCustomerandmeterrelaMapper.selectAccountInfo(loginUser.getTenantId(),numbers);
                 accountList.get(i).setMetercodeList(codeList);
             }
         }
@@ -850,7 +850,7 @@ public class PayBaseCustomerandmeterrelaServiceImpl implements PayBaseCustomeran
             //查找待开户信息
             List<PayMeter> meterInfoList = payBaseAccountMapper.findMeterInfo(null,null,"1",null,null,loginUser.getTenantId(),null,null,loginUser.getUserCondition());
             //2.查找用水性质集合
-            List<BaseWaterPropertyDto> propertyList = baseWaterPropertyMapper.getList(null,loginUser.getTenantId());
+            List<BaseWaterPropertyDto> propertyList = baseWaterPropertyMapper.getList(null,loginUser.getTenantId(), null);
             //3.查找结算方式集合
             List<PaySysDictSelectDto> settlementList  = paySysDictMapper.getAll(null,null,"结算方式",loginUser.getTenantId());
             //4.查找证件类型集合

zoniot-pay/zoniot-pay-xxljob-client/src/main/java/com/zcxk/rmcp/pay/job/MeasurementSettlementRecordHander.java

@@ -160,6 +160,7 @@ public class MeasurementSettlementRecordHander {
         double lastWsv = Double.parseDouble(item.getLastReading());
         item.setWaterConsumption(currenntWsv-lastWsv);
         item.setFileMeterNo(device.getMetercode());
+        item.setRealWaterConsumption(item.getWaterConsumption());
         return item ;
     }
     /**