计量结算模块

zoniot-rmcp/zoniot-rmcp-api/src/main/java/com/zcxk/rmcp/api/dto/measurementSettlement/MeasurementRecordDto.java

@@ -1,4 +1,79 @@
 package com.zcxk.rmcp.api.dto.measurementSettlement;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@ApiModel(value="结算计划详情")
+@Data
 public class MeasurementRecordDto {
+    @ApiModelProperty(value = "")
+    private Long id;
+    /**
+     * 水表电子号
+     */
+    @ApiModelProperty(value = "水表电子号")
+    private String meterNo;
+    /**
+     * 水表档案号
+     */
+    @ApiModelProperty(value = "水表档案号")
+    private String fileMeterNo;
+    /**
+     * 审核状态 0：未审核，1已审核
+     */
+    @ApiModelProperty(value = "审核状态 0：未审核，1已审核")
+    private String approvalStatus;
+    /**
+     * 上期读数
+     */
+    @ApiModelProperty(value = "上期读数")
+    private String lastReading;
+    /**
+     * 本期读数
+     */
+    @ApiModelProperty(value = "本期读数")
+    private String currentReading;
+    /**
+     * 位置
+     */
+    @ApiModelProperty(value = "位置")
+    private String location;
+    /**
+     * 计划id
+     */
+    @ApiModelProperty(value = "计划id")
+    private Integer planId;
+    /**
+     * 用水量
+     */
+    @ApiModelProperty(value = "用水量")
+    private Double waterConsumption;
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间")
+    private Date createDate;
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间")
+    private Date updateDate;
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+    /**
+     * 更新人
+     */
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+    /**
+     * 删除标识
+     */
+    @ApiModelProperty(value = "删除标识")
+    private Integer status;
 }

zoniot-rmcp/zoniot-rmcp-api/src/main/java/com/zcxk/rmcp/api/dto/measurementSettlement/MeasurementRecordPageDto.java

@@ -1,6 +1,20 @@
 package com.zcxk.rmcp.api.dto.measurementSettlement;
 
 import com.zcxk.rmcp.api.dto.BasePageDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
+@Data
+@ApiModel(value="结算计划详细（分页")
 public class MeasurementRecordPageDto extends BasePageDto {
+
+    @ApiModelProperty(value = "起度")
+    private double startingDegree;
+
+    @ApiModelProperty(value = "止度")
+    private double stop;
+
+    @ApiModelProperty(value = "审核状态")
+    private int status;
 }

zoniot-rmcp/zoniot-rmcp-api/src/main/java/com/zcxk/rmcp/api/dto/measurementSettlement/MeasurementSettlementDto.java

@@ -1,4 +1,106 @@
 package com.zcxk.rmcp.api.dto.measurementSettlement;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+@Data
+@ApiModel(value="结算计划")
 public class MeasurementSettlementDto {
+    /**
+     * 主键id
+     */
+
+    @ApiModelProperty(value = "主键id")
+    private Integer id;
+    /**
+     * 计划名称
+     */
+    @ApiModelProperty(value = "计划名称")
+    private String planName;
+    /**
+     * 结算时间
+     */
+    @ApiModelProperty(value = "结算时间")
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    private Date settlementTime;
+    /**
+     * 公司id
+     */
+    @ApiModelProperty(value = "公司id")
+    private Integer companyOrgId;
+    /**
+     * 部门id
+     */
+    @ApiModelProperty(value = "部门id")
+    private Integer deptOrgId;
+    /**
+     * 小区id
+     */
+    @ApiModelProperty(value = "小区id")
+    private Integer communityId;
+    /**
+     * 结算表总数
+     */
+    @ApiModelProperty(value = "结算表总数",hidden = true)
+    private Integer totalWaterMeters;
+    /**
+     * 已审核水表数
+     */
+    @ApiModelProperty(value = "已审核水表数",hidden = true)
+    private Integer numberOfWaterMetersReviewed;
+    /**
+     * 账期
+     */
+    @ApiModelProperty(value = "账期")
+    private Date billingPeriod;
+    /**
+     * 结算周期
+     */
+    @ApiModelProperty(value = "结算周期")
+    private Integer billingCycle;
+    /**
+     * 计划状态 0 未生成计划，1已生成计划
+     */
+    @ApiModelProperty(value = "计划状态 0 未生成计划，1已生成计划",hidden = true)
+    private Integer planStatus;
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间",hidden = true)
+    @JsonIgnore
+    private Date createDate;
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间",hidden = true)
+    @JsonIgnore
+    private Date updateDate;
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人",hidden = true)
+    @JsonIgnore
+    private String createBy;
+    /**
+     * 更新人
+     */
+    @ApiModelProperty(value = "更新人",hidden = true)
+    @JsonIgnore
+    private String updateBy;
+    /**
+     * 状态
+     */
+    @ApiModelProperty(value = "状态",hidden = true)
+    @JsonIgnore
+    private Integer status;
+    /**
+     * 定时任务id
+     */
+    @ApiModelProperty(value = "定时任务id",hidden = true)
+    @JsonIgnore
+    private Long taskId;
 }

zoniot-rmcp/zoniot-rmcp-api/src/main/java/com/zcxk/rmcp/api/dto/measurementSettlement/MeasurementSettlementPageDto.java

@@ -1,27 +1,21 @@
 package com.zcxk.rmcp.api.dto.measurementSettlement;
 
 import com.zcxk.rmcp.api.dto.BasePageDto;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
 @Data
+@ApiModel(value="结算计划（分页")
 public class MeasurementSettlementPageDto extends BasePageDto {
-    /**
-     * 主键id
-     */
-    @ApiModelProperty(value = "主键id")
-    private Integer id;
+
     /**
      * 计划名称
      */
     @ApiModelProperty(value = "计划名称")
     private String planName;
-    /**
-     * 结算时间
-     */
-    @ApiModelProperty(value = "结算时间")
-    private Date settlementTime;
+
     /**
      * 公司id
      */
@@ -32,60 +26,7 @@ public class MeasurementSettlementPageDto extends BasePageDto {
      */
     @ApiModelProperty(value = "部门id")
     private Integer deptOrgId;
-    /**
-     * 小区id
-     */
-    @ApiModelProperty(value = "小区id")
-    private Integer communityId;
-    /**
-     * 结算表总数
-     */
-    @ApiModelProperty(value = "结算表总数")
-    private Integer totalWaterMeters;
-    /**
-     * 已审核水表数
-     */
-    @ApiModelProperty(value = "已审核水表数")
-    private Integer numberOfWaterMetersReviewed;
-    /**
-     * 账期
-     */
-    @ApiModelProperty(value = "账期")
-    private Date billingPeriod;
-    /**
-     * 结算周期
-     */
-    @ApiModelProperty(value = "结算周期")
-    private Integer billingCycle;
-    /**
-     * 计划状态 0 未生成计划，1已生成计划
-     */
-    @ApiModelProperty(value = "计划状态 0 未生成计划，1已生成计划")
-    private Integer planStatus;
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty(value = "创建时间")
-    private Date createDate;
-    /**
-     * 更新时间
-     */
-    @ApiModelProperty(value = "更新时间")
-    private Date updateDate;
-    /**
-     * 创建人
-     */
-    @ApiModelProperty(value = "创建人")
-    private String createBy;
-    /**
-     * 更新人
-     */
-    @ApiModelProperty(value = "更新人")
-    private String updateBy;
-    /**
-     * 状态
-     */
-    @ApiModelProperty(value = "状态")
-    private String status;
+
+
 
 }

zoniot-rmcp/zoniot-rmcp-api/src/main/java/com/zcxk/rmcp/api/dto/measurementSettlement/WaterConsumptionUpdateDto.java

@@ -1,4 +1,14 @@
 package com.zcxk.rmcp.api.dto.measurementSettlement;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value="修改用水量")
 public class WaterConsumptionUpdateDto {
+    @ApiModelProperty(value="记录id")
+    private Integer recordId;
+    @ApiModelProperty(value="用水量")
+    private double waterConsumption;
 }

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

@@ -2,7 +2,7 @@ package com.zcxk.rmcp.core.dao;
 
 
 import com.zcxk.rmcp.api.dto.measurementSettlement.MeasurementRecordDto;
-import com.zcxk.rmcp.api.dto.measurementSettlement.MeasurementSettlementDto;
+import com.zcxk.rmcp.api.dto.measurementSettlement.MeasurementRecordPageDto;
 import com.zcxk.rmcp.api.dto.measurementSettlement.WaterConsumptionUpdateDto;
 import com.zcxk.rmcp.core.entity.MeasurementRecord;
 import org.apache.ibatis.annotations.Mapper;
@@ -41,7 +41,7 @@ public interface MeasurementRecordMapper {
      * @param measurementRecord 实例对象
      * @return 对象列表
      */
-    List<MeasurementRecordDto> selectList(MeasurementRecord measurementRecord);
+    List<MeasurementRecordDto> selectList(MeasurementRecordPageDto measurementRecord);
 
     /**
      * 新增数据
@@ -85,7 +85,7 @@ public interface MeasurementRecordMapper {
 
     void auditWater(List<Integer> ids);
 
-    void auditAllWater(Integer companyId, Integer departmentId);
+    void auditAllWater(Integer planId);
 
     void modifyTheAmountOfWater(WaterConsumptionUpdateDto waterConsumptionUpdateDto);
 }

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

@@ -1,8 +1,8 @@
 package com.zcxk.rmcp.core.dao;
 
 
+import com.zcxk.core.common.pojo.UserCondition;
 import com.zcxk.rmcp.api.dto.measurementSettlement.MeasurementSettlementDto;
-import com.zcxk.rmcp.core.entity.MeasurementRecord;
 import com.zcxk.rmcp.core.entity.MeasurementSettlement;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -38,9 +38,11 @@ public interface MeasurementSettlementMapper {
      * 通过实体作为筛选条件查询
      *
      * @param measurementSettlement 实例对象
+     * @param userCondition
      * @return 对象列表
      */
-    List<MeasurementSettlementDto> selectList(MeasurementSettlement measurementSettlement);
+    List<MeasurementSettlementDto> selectList(@Param("measurement") MeasurementSettlement measurementSettlement,
+                                              @Param("userCondition")UserCondition userCondition);
 
     /**
      * 新增数据
@@ -82,11 +84,11 @@ public interface MeasurementSettlementMapper {
     int count();
 
 
-    List<MeasurementSettlementDto> selectRecordList(MeasurementRecord measurementRecord);
+    List<MeasurementSettlementDto> selectRecordList(MeasurementSettlement measurementRecord);
 
     void deletePlan(List<Integer> ids);
 
-    void deleteAll(Integer companyId, Integer departmentId);
+    void deleteAll(@Param("userCondition")UserCondition userCondition);
 
     void setBillingPeriod(MeasurementSettlementDto measurementSettlementDto);
 }

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

@@ -96,10 +96,12 @@ public class MeasurementSettlement implements Serializable {
      * 状态
      */
     @ApiModelProperty(value = "状态")
-    private String status;
+    private Integer status;
     /**
      * 定时任务id
      */
     @ApiModelProperty(value = "定时任务id")
     private Long taskId;
+    @ApiModelProperty(value = "定时任务id")
+    private String tenantId;
 }

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/mapper/MeasurementRecordMapper.xml

@@ -45,48 +45,17 @@
         <include refid="Base_Column_List"/>
         from rmcp_measurement_record
         <where>
-            <if test="id != null">
-                and id = #{id}
+            status=1
+            <if test="startingDegree != null">
+                and water_consumption <![CDATA[  >= ]]> #{startingDegree}
             </if>
-            <if test="meterNo != null and meterNo != ''">
-                and meter_no = #{meterNo}
-            </if>
-            <if test="fileMeterNo != null and fileMeterNo != ''">
-                and file_meter_no = #{fileMeterNo}
-            </if>
-            <if test="approvalStatus != null and approvalStatus != ''">
-                and approval_status = #{approvalStatus}
-            </if>
-            <if test="lastReading != null and lastReading != ''">
-                and last_reading = #{lastReading}
-            </if>
-            <if test="currentReading != null and currentReading != ''">
-                and current_reading = #{currentReading}
-            </if>
-            <if test="location != null and location != ''">
-                and location = #{location}
-            </if>
-            <if test="planId != null">
-                and plan_id = #{planId}
-            </if>
-            <if test="waterConsumption != null">
-                and water_consumption = #{waterConsumption}
-            </if>
-            <if test="createDate != null">
-                and create_date = #{createDate}
-            </if>
-            <if test="updateDate != null">
-                and update_date = #{updateDate}
-            </if>
-            <if test="createBy != null and createBy != ''">
-                and create_by = #{createBy}
-            </if>
-            <if test="updateBy != null and updateBy != ''">
-                and update_by = #{updateBy}
+            <if test="stop != null">
+                and water_consumption  <![CDATA[  < ]]> #{stop}
             </if>
             <if test="status != null">
-                and status = #{status}
+                and approval_status = #{status}
             </if>
+
         </where>
     </select>
 
@@ -158,9 +127,22 @@
         </set>
         where id = #{id}
     </update>
-    <update id="auditWater"></update>
-    <update id="auditAllWater"></update>
-    <update id="modifyTheAmountOfWater"></update>
+    <update id="auditWater">
+        update rmcp_measurement_record set approval_status=1
+        where id  in
+        <foreach collection="list" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </update>
+    <update id="auditAllWater">
+        update rmcp_measurement_record set approval_status=1
+        where plan_id =#{planId}
+
+    </update>
+    <update id="modifyTheAmountOfWater">
+        update rmcp_measurement_record set water_consumption=#{waterConsumption}
+        where id=#{recordId}
+    </update>
 
     <!--通过主键删除-->
     <delete id="deleteById">

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/mapper/MeasurementSettlementMapper.xml

@@ -18,7 +18,7 @@
         <result property="updateDate" column="update_date" jdbcType="TIMESTAMP"/>
         <result property="createBy" column="create_by" jdbcType="VARCHAR"/>
         <result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
-        <result property="status" column="status" jdbcType="VARCHAR"/>
+        <result property="status" column="status" jdbcType="INTEGER"/>
         <result property="taskId" column="task_id" jdbcType="INTEGER"/>
     </resultMap>
 
@@ -46,59 +46,61 @@
     <select id="selectList" resultType="com.zcxk.rmcp.api.dto.measurementSettlement.MeasurementSettlementDto">
         select
         <include refid="Base_Column_List"/>
-        from rmcp_measurement_settlement
+        from rmcp_measurement_settlement ms
         <where>
-            <if test="id != null">
-                and id = #{id}
+            status=1
+            <if test="measurement.id != null">
+                and id = #{measurement.id}
             </if>
-            <if test="planName != null and planName != ''">
-                and plan_name = #{planName}
+            <if test="measurement.planName != null and measurement.planName != ''">
+                and plan_name  like concat('%',#{measurement.planName} ,'%')
             </if>
-            <if test="settlementTime != null">
-                and settlement_time = #{settlementTime}
+            <if test="measurement.settlementTime != null">
+                and settlement_time = #{measurement.settlementTime}
             </if>
-            <if test="companyOrgId != null">
-                and company_org_id = #{companyOrgId}
+            <if test="measurement.companyOrgId != null">
+                and company_org_id = #{measurement.companyOrgId}
             </if>
-            <if test="deptOrgId != null">
-                and dept_org_id = #{deptOrgId}
+            <if test="measurement.deptOrgId != null">
+                and dept_org_id = #{measurement.deptOrgId}
             </if>
-            <if test="communityId != null">
-                and community_id = #{communityId}
+            <if test="measurement.communityId != null">
+                and community_id = #{measurement.communityId}
             </if>
-            <if test="totalWaterMeters != null">
-                and total_water_meters = #{totalWaterMeters}
+            <if test="measurement.totalWaterMeters != null">
+                and total_water_meters = #{measurement.totalWaterMeters}
             </if>
-            <if test="numberOfWaterMetersReviewed != null">
-                and number_of_water_meters_reviewed = #{numberOfWaterMetersReviewed}
+            <if test="measurement.numberOfWaterMetersReviewed != null">
+                and number_of_water_meters_reviewed = #{measurement.numberOfWaterMetersReviewed}
             </if>
-            <if test="billingPeriod != null">
-                and billing_period = #{billingPeriod}
+            <if test="measurement.billingPeriod != null">
+                and billing_period = #{measurement.billingPeriod}
             </if>
-            <if test="billingCycle != null">
-                and billing_cycle = #{billingCycle}
+            <if test="measurement.billingCycle != null">
+                and billing_cycle = #{measurement.billingCycle}
             </if>
-            <if test="planStatus != null">
-                and plan_status = #{planStatus}
+            <if test="measurement.planStatus != null">
+                and plan_status = #{measurement.planStatus}
             </if>
-            <if test="createDate != null">
-                and create_date = #{createDate}
+            <if test="measurement.createDate != null">
+                and create_date = #{measurement.createDate}
             </if>
-            <if test="updateDate != null">
-                and update_date = #{updateDate}
+            <if test="measurement.updateDate != null">
+                and update_date = #{measurement.updateDate}
             </if>
-            <if test="createBy != null and createBy != ''">
-                and create_by = #{createBy}
+            <if test="measurement.createBy != null and measurement.createBy != ''">
+                and create_by = #{measurement.createBy}
             </if>
-            <if test="updateBy != null and updateBy != ''">
-                and update_by = #{updateBy}
+            <if test="measurement.updateBy != null and measurement.updateBy != ''">
+                and update_by = #{measurement.updateBy}
             </if>
-            <if test="status != null and status != ''">
-                and status = #{status}
+            <if test="measurement.status != null and measurement.status != ''">
+                and status = #{measurement.status}
             </if>
-            <if test="taskId != null">
-                and task_id = #{taskId}
+            <if test="measurement.taskId != null">
+                and task_id = #{measurement.taskId}
             </if>
+            <include refid="permissionCondition"/>
         </where>
     </select>
 
@@ -107,10 +109,10 @@
         insert into rmcp_measurement_settlement(id, plan_name, settlement_time, company_org_id, dept_org_id,
                                                 community_id, total_water_meters, number_of_water_meters_reviewed,
                                                 billing_period, billing_cycle, plan_status, create_date, update_date,
-                                                create_by, update_by, status, task_id)
+                                                create_by, update_by, status, task_id,tenant_id)
         values (#{id}, #{planName}, #{settlementTime}, #{companyOrgId}, #{deptOrgId}, #{communityId},
                 #{totalWaterMeters}, #{numberOfWaterMetersReviewed}, #{billingPeriod}, #{billingCycle}, #{planStatus},
-                #{createDate}, #{updateDate}, #{createBy}, #{updateBy}, #{status}, #{taskId})
+                #{createDate}, #{updateDate}, #{createBy}, #{updateBy}, #{status}, #{taskId},#{tenantId})
     </insert>
 
     <!-- 批量新增 -->
@@ -174,7 +176,7 @@
             <if test="updateBy != null and updateBy != ''">
                 update_by = #{updateBy},
             </if>
-            <if test="status != null and status != ''">
+            <if test="status != null">
                 status = #{status},
             </if>
             <if test="taskId != null">
@@ -183,7 +185,10 @@
         </set>
         where id = #{id}
     </update>
-    <update id="setBillingPeriod"></update>
+    <update id="setBillingPeriod">
+        update rmcp_measurement_settlement set billing_period=#{billingPeriod}
+        where id=#{id}
+    </update>
 
     <!--通过主键删除-->
     <delete id="deleteById">
@@ -191,8 +196,19 @@
         from rmcp_measurement_settlement
         where id = #{id}
     </delete>
-    <delete id="deletePlan"></delete>
-    <delete id="deleteAll"></delete>
+    <update id="deletePlan">
+        update rmcp_measurement_settlement set status=0
+        where id  in
+        <foreach collection="list" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </update>
+    <update id="deleteAll">
+        update rmcp_measurement_settlement ms set status=1
+        <where>
+            <include refid="permissionCondition"/>
+        </where>
+    </update>
 
     <!-- 总数 -->
     <select id="count" resultType="int">
@@ -201,5 +217,95 @@
     </select>
 
     <select id="selectRecordList"
-            resultType="com.zcxk.rmcp.api.dto.measurementSettlement.MeasurementSettlementDto"></select>
+            resultType="com.zcxk.rmcp.api.dto.measurementSettlement.MeasurementSettlementDto">
+        select
+        <include refid="Base_Column_List"/>
+        from rmcp_measurement_settlement ms
+        <where>
+        status=1
+            <if test="measurement.id != null">
+                and id = #{measurement.id}
+            </if>
+            <if test="measurement.planName != null and measurement.planName != ''">
+                and plan_name  like concat('%',#{measurement.planName} ,'%')
+            </if>
+            <if test="measurement.settlementTime != null">
+                and settlement_time = #{measurement.settlementTime}
+            </if>
+            <if test="measurement.companyOrgId != null">
+                and company_org_id = #{measurement.companyOrgId}
+            </if>
+            <if test="measurement.deptOrgId != null">
+                and dept_org_id = #{measurement.deptOrgId}
+            </if>
+            <if test="measurement.communityId != null">
+                and community_id = #{measurement.communityId}
+            </if>
+            <if test="measurement.totalWaterMeters != null">
+                and total_water_meters = #{measurement.totalWaterMeters}
+            </if>
+            <if test="measurement.numberOfWaterMetersReviewed != null">
+                and number_of_water_meters_reviewed = #{measurement.numberOfWaterMetersReviewed}
+            </if>
+            <if test="measurement.billingPeriod != null">
+                and billing_period = #{measurement.billingPeriod}
+            </if>
+            <if test="measurement.billingCycle != null">
+                and billing_cycle = #{measurement.billingCycle}
+            </if>
+            <if test="measurement.planStatus ==1">
+                and plan_status in(1,2)
+            </if>
+            <if test="measurement.createDate != null">
+                and create_date = #{measurement.createDate}
+            </if>
+            <if test="measurement.updateDate != null">
+                and update_date = #{measurement.updateDate}
+            </if>
+            <if test="measurement.createBy != null and measurement.createBy != ''">
+                and create_by = #{measurement.createBy}
+            </if>
+            <if test="measurement.updateBy != null and measurement.updateBy != ''">
+                and update_by = #{measurement.updateBy}
+            </if>
+            <if test="measurement.status != null and measurement.status != ''">
+                and status = #{measurement.status}
+            </if>
+            <if test="measurement.taskId != null">
+                and task_id = #{measurement.taskId}
+            </if>
+            <include refid="permissionCondition"/>
+        </where>
+    </select>
+   
+    <sql id="permissionCondition">
+        <if test="userCondition.tenantId != null">and ms.tenant_id = #{userCondition.tenantId}</if>
+        <if test="userCondition.userType!=null and userCondition.userType!=-999 and userCondition.userType!=-9999 and  userCondition.programItems != null and userCondition.programItems.size() > 0">
+            <if test="userCondition.permissionType == 5 or userCondition.permissionType == 2">
+                and ( ms.dept_org_id in
+                <foreach collection="userCondition.programItems" item="item" open="(" close=")" separator=",">
+                    #{item.orgId}
+                </foreach>
+                or
+                ms.company_org_id in
+                <foreach collection="userCondition.programItems" item="item" open="(" close=")" separator=",">
+                    #{item.orgId}
+                </foreach>
+                )
+            </if>
+            <if test="userCondition.permissionType == 4 or userCondition.permissionType == 3">
+                and ms.dept_org_id in
+                <foreach collection="userCondition.programItems" item="item" open="(" close=")" separator=",">
+                    #{item.orgId}
+                </foreach>
+            </if>
+            <if test="userCondition.permissionType == 1">
+                and ms.company_org_id in
+                <foreach collection="userCondition.programItems" item="item" open="(" close=")" separator=",">
+                    #{item.orgId}
+                </foreach>
+                and (ms.dept_org_id is null or ms.dept_org_id =0)
+            </if>
+        </if>
+    </sql>
 </mapper>

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

@@ -9,6 +9,7 @@ import com.zcxk.rmcp.web.service.MeasurementSettlementService;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
@@ -72,8 +73,8 @@ public class MeasurementSettlementController {
     }
     @RequestMapping(value = "/auditAll", method = RequestMethod.POST)
     @ApiOperation(value = "审核所有水量")
-    public AjaxMessage<Void> auditAllWater() {
-        measurementSettlementService.auditAllWater();
+    public AjaxMessage<Void> auditAllWater(@RequestParam Integer planId) {
+        measurementSettlementService.auditAllWater(planId);
         return AjaxMessage.success();
     }
     @RequestMapping(value = "/modifyTheAmountOfWater", method = RequestMethod.POST)

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

@@ -77,8 +77,9 @@ public interface MeasurementSettlementService {
      * @author hym
      * @updateTime 2021/7/22 16:06
      * @throws
+     * @param planId
      */
-    void auditAllWater();
+    void auditAllWater(Integer planId);
     /**
      *
      * @description 更改用水量

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

@@ -8,13 +8,13 @@ import com.zcxk.core.mysql.pageing.Pagination;
 import com.zcxk.rmcp.api.dto.measurementSettlement.*;
 import com.zcxk.rmcp.core.dao.MeasurementRecordMapper;
 import com.zcxk.rmcp.core.dao.MeasurementSettlementMapper;
-import com.zcxk.rmcp.core.entity.MeasurementRecord;
 import com.zcxk.rmcp.core.entity.MeasurementSettlement;
 import com.zcxk.rmcp.web.service.MeasurementSettlementService;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
+import java.util.Date;
 import java.util.List;
 @Service
 public class MeasurementSettlementServiceImpl implements MeasurementSettlementService {
@@ -26,9 +26,12 @@ public class MeasurementSettlementServiceImpl implements MeasurementSettlementSe
     @Override
     public Pagination<MeasurementSettlementDto> pageMeasurementSettlement(MeasurementSettlementPageDto pageDto) {
         MeasurementSettlement measurementSettlement=new MeasurementSettlement();
-        BeanCopyUtils.copyProperties(pageDto, measurementSettlement, MeasurementSettlementDto.class);
+        BeanCopyUtils.copyProperties(pageDto, measurementSettlement, MeasurementSettlement.class);
         PageHelper.startPage(pageDto.getPageNum(), pageDto.getPageSize());
-        List<MeasurementSettlementDto> measurementRecords = measurementSettlementMapper.selectList(measurementSettlement);
+        measurementSettlement.setPlanStatus(0);
+        List<MeasurementSettlementDto> measurementRecords = measurementSettlementMapper.
+                selectList(measurementSettlement,UserUtil.getCurrentUser().getUserCondition());
+
         return setReturn(measurementRecords);
 
     }
@@ -41,25 +44,37 @@ public class MeasurementSettlementServiceImpl implements MeasurementSettlementSe
     @Override
     public Pagination<MeasurementSettlementDto> pageMeasurementSettlementRecord(MeasurementSettlementPageDto pageDto) {
 
-        MeasurementRecord measurementRecord=new MeasurementRecord();
-        BeanCopyUtils.copyProperties(pageDto, measurementRecord, MeasurementSettlementDto.class);
+        MeasurementSettlement measurementSettlement=new MeasurementSettlement();
+        BeanCopyUtils.copyProperties(pageDto, measurementSettlement, MeasurementSettlement.class);
         PageHelper.startPage(pageDto.getPageNum(), pageDto.getPageSize());
-        List<MeasurementSettlementDto> measurementRecords = measurementSettlementMapper.selectRecordList(measurementRecord);
+        measurementSettlement.setPlanStatus(1);
+        List<MeasurementSettlementDto> measurementRecords = measurementSettlementMapper.selectRecordList(measurementSettlement);
         return setReturn(measurementRecords);
     }
 
     @Override
     public void addPlan(MeasurementSettlementDto measurementSettlementDto) {
         MeasurementSettlement measurementSettlement=new MeasurementSettlement();
-        BeanCopyUtils.copyProperties(measurementSettlementDto, measurementSettlement, MeasurementSettlementDto.class);
+        BeanCopyUtils.copyProperties(measurementSettlementDto, measurementSettlement, MeasurementSettlement.class);
+        LoginUser currentUser = UserUtil.getCurrentUser();
+        measurementSettlement.setCreateBy(currentUser.getName());
+        measurementSettlement.setCreateDate(new Date());
+        measurementSettlement.setStatus(1);
+        measurementSettlement.setTenantId(currentUser.getTenantId());
+        measurementSettlement.setPlanStatus(0);
         measurementSettlementMapper.insert(measurementSettlement);
+        //todo 提交xxl-job
     }
 
     @Override
     public void updatePlan(MeasurementSettlementDto measurementSettlementDto) {
         MeasurementSettlement measurementSettlement=new MeasurementSettlement();
-        BeanCopyUtils.copyProperties(measurementSettlementDto, measurementSettlement, MeasurementSettlementDto.class);
+        BeanCopyUtils.copyProperties(measurementSettlementDto, measurementSettlement, MeasurementSettlement.class);
+        LoginUser currentUser = UserUtil.getCurrentUser();
+        measurementSettlement.setUpdateBy(currentUser.getUsername());
+        measurementSettlement.setUpdateDate(new Date());
         measurementSettlementMapper.update(measurementSettlement);
+        //todo 修改xxl-job
     }
 
     @Override
@@ -69,29 +84,28 @@ public class MeasurementSettlementServiceImpl implements MeasurementSettlementSe
 
     @Override
     public void deleteAll() {
-        LoginUser currentUser = UserUtil.getCurrentUser();
-        measurementSettlementMapper.deleteAll(currentUser.getCompanyId(),currentUser.getDepartmentId());
+        measurementSettlementMapper.deleteAll(UserUtil.getCurrentUser().getUserCondition());
     }
 
 
     @Override
     public Pagination<MeasurementRecordDto> pageMeasurementRecord(MeasurementRecordPageDto pageDto) {
-        MeasurementRecord measurementRecord=new MeasurementRecord();
-        BeanCopyUtils.copyProperties(pageDto, measurementRecord, MeasurementRecord.class);
+
         PageHelper.startPage(pageDto.getPageNum(), pageDto.getPageSize());
-        List<MeasurementRecordDto> measurementSettlementDtos = measurementRecordMapper.selectList(measurementRecord);
+        List<MeasurementRecordDto> measurementSettlementDtos = measurementRecordMapper.selectList(pageDto);
         return setReturn(measurementSettlementDtos);
     }
 
     @Override
     public void auditWater(List<Integer> ids) {
+
         measurementRecordMapper.auditWater(ids);
     }
 
     @Override
-    public void auditAllWater() {
-        LoginUser currentUser = UserUtil.getCurrentUser();
-        measurementRecordMapper.auditAllWater(currentUser.getCompanyId(),currentUser.getDepartmentId());
+    public void auditAllWater(Integer planId) {
+
+        measurementRecordMapper.auditAllWater(planId);
     }
 
     @Override