Merge branch '0727' of http://114.135.61.188:53000/ZONIOT/water-iot into 0727

smart-city-platform/src/main/java/com/bz/smart_city/dto/pay/payfee/PrintInvoiceData.java

@@ -24,7 +24,7 @@ public class PrintInvoiceData {
     private Integer printType ;
     @ApiModelProperty(value = "票据号码")
     private String invoiceNo ;
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    @JsonFormat(pattern="yyyy-MM-dd",timezone="GMT+8")
     @ApiModelProperty(value = "充值日期" ,hidden = true)
     private LocalDateTime createDate;	//充值日期
     @ApiModelProperty(value = "本期余额")
@@ -45,14 +45,14 @@ public class PrintInvoiceData {
     private BigDecimal reading;	//抄表止度
     @ApiModelProperty(value = "收费日期")
     private String paydate;	//收费日期
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    @JsonFormat(pattern="yyyy-MM-dd",timezone="GMT+8")
     @ApiModelProperty(value = "抄表日期" ,hidden = true)
     private LocalDateTime recorddate;	//抄表日期
     @ApiModelProperty(value = "应收金额")
     private BigDecimal receivablefee;	//应收金额
     @ApiModelProperty(value = "上期止度")
     private BigDecimal lastreading;	//上期止度
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    @JsonFormat(pattern="yyyy-MM-dd",timezone="GMT+8")
     @ApiModelProperty(value = "上期抄表日期", hidden = true)
     private LocalDateTime lastrecorddate;	//上期抄表日期
     @ApiModelProperty(value = "收费账期区间")

smart-city-platform/src/main/java/com/bz/smart_city/dto/pay/payfee/PrintReceivedInfo.java

@@ -24,6 +24,8 @@ public class PrintReceivedInfo {
     private String ladderlevel;
     @ApiModelProperty(value = "阶梯标签")
     private String ladderlevelname;
+    @ApiModelProperty(value = "项目名称")
+    private String itemname;
     @ApiModelProperty(value = "水量")
     private BigDecimal payamount;
     @ApiModelProperty(value = "单价")

smart-city-platform/src/main/java/com/bz/smart_city/service/impl/pay/PayInvoiceServiceImpl.java

@@ -117,7 +117,7 @@ public class PayInvoiceServiceImpl implements PayinvoiceService {
 
         for(PayTransactiondetails payTransactiondetails:payTransactiondetailsList){
             //转预存或充值金额
-            if(payTransactiondetails.getPayway()!=4&&(payTransactiondetails.getTranstype()==1||payTransactiondetails.getTranstype()==4)){
+            if(payTransactiondetails.getPayway()!=5&&(payTransactiondetails.getTranstype()==1||payTransactiondetails.getTranstype()==4)){
                 countReceivedamount = countReceivedamount.add(payTransactiondetails.getTransamount()!=null?payTransactiondetails.getTransamount():BigDecimal.ZERO);
 
                 invoice.setAccountId(payTransactiondetails.getAccountId());
@@ -133,7 +133,7 @@ public class PayInvoiceServiceImpl implements PayinvoiceService {
 
         for(PayPayReceived received:Receiveds){
             //非预存划扣（即支付金额抵扣）
-            if(received.getPayway()!=4){
+            if(received.getPayway()!=5){
                 countReceivedamount = countReceivedamount.add(received.getReceivedamount()!=null?received.getReceivedamount():BigDecimal.ZERO);
 
                 invoice.setAccountId(received.getAccountId());

smart-city-platform/src/main/resources/mapper/BuildingMapper.xml

@@ -1023,8 +1023,9 @@
             <if test="days != null"> and swmed.days = #{days} </if>
             <if test="startDays != null"> and swmed.days >= #{startDays} </if>
             <if test="endDays != null"> and swmed.days <![CDATA[ <= ]]> #{endDays} </if>
-            <if test="valveStatus != null and valveStatus != 2"> and swmed.valve_status = #{valveStatus} and sdt.is_valve = 1 </if>
-            <if test="valveStatus != null and valveStatus == 2"> and sdt.is_valve = 0 </if>
+            <if test="valveStatus != null and valveStatus == 0"> and swmed.valve_status = #{valveStatus} and sdt.is_valve = 1</if>
+            <if test="valveStatus != null and valveStatus == 1"> and (swmed.valve_status = #{valveStatus} or swmed.valve_status is null ) and sdt.is_valve = 1</if>
+            <if test="valveStatus != null and valveStatus == 2"> and sdt.is_valve = 0</if>
             <if test="registerStatus != null"> and sd.register_status = #{registerStatus} </if>
             <if test="programItems != null and programItems.size() != 0"> and
                 <foreach collection="programItems" item="item" open="(" separator=" or " close=")">

smart-city-platform/src/main/resources/mapper/DeviceMapper.xml

@@ -393,7 +393,8 @@
         <if test="collectorNo != null and collectorNo != ''"> AND scol.collector_no LIKE concat('%',#{collectorNo},'%')</if>
         <if test="errorType != null and errorType != ''"> AND swmed.last_error_type LIKE concat('%',#{errorType},'%')</if>
         <if test="customerId != null"> and sd.customer_id = #{customerId}</if>
-        <if test="valveStatus != null and valveStatus != 2"> and swmed.valve_status = #{valveStatus} and sdt.is_valve = 1</if>
+        <if test="valveStatus != null and valveStatus == 0"> and swmed.valve_status = #{valveStatus} and sdt.is_valve = 1</if>
+        <if test="valveStatus != null and valveStatus == 1"> and (swmed.valve_status = #{valveStatus} or swmed.valve_status is null ) and sdt.is_valve = 1</if>
         <if test="valveStatus != null and valveStatus == 2"> and sdt.is_valve = 0</if>
         <if test="registerStatus != null"> and sd.register_status = #{registerStatus}</if>
         <if test="days != null">
@@ -420,6 +421,61 @@
         </if>
     </select>
 
+    <!--自定义getList的count统计-->
+    <select id="getList_COUNT" resultType="Long">
+        select count(1)
+        from sc_device sd
+        <if test="(equipmentType != null and equipmentType != '') or (model != null and model != '') or (valveStatus != null)">left join sc_device_type sdt on (sdt.id = sd.device_type and sdt.status = 1)</if>
+        <if test="province != null or city != null or region != null or community != null">left join sc_building sb on (sb.id = sd.building_id and sb.status = 1)</if>
+        <if test="(concentratorNo != null and concentratorNo != '') or (collectorNo != null and collectorNo != '') ">left join sc_water_related_device swrd on ( swrd.device_id = sd.id and swrd.status = 1)</if>
+        <if test="concentratorNo != null and concentratorNo != ''">left join sc_concentrator scon on ( scon.id = swrd.concentrator_id and scon.status = 1)</if>
+        <if test="collectorNo != null and collectorNo != ''">left join sc_collector scol on ( scol.id = swrd.collector_id)</if>
+        <if test="(errorType != null and errorType != '') or days != null or startDays != null or endDays != null or (valveStatus != null)">left join sc_water_meter_error_days swmed on ( swmed.device_id = sd.id)</if>
+        <if test="programItems != null and programItems.size() != 0">left join sc_device_dimension sdd on (sdd.device_id = sd.id and sdd.status = 1)</if>
+        where sd.status = 1
+        <if test="sysId != null"> AND sd.sys_id = #{sysId}</if>
+        <if test="buildingId != null"> AND sd.building_id = #{buildingId}</if>
+        <if test="siteId != null"> AND sd.site_id = #{siteId}</if>
+        <if test="deviceNo != null and deviceNo != ''"> AND (sd.device_no LIKE concat('%',#{deviceNo},'%') or sd.water_meter_no LIKE concat('%',#{deviceNo},'%') or sd.water_meter_file_no LIKE concat('%',#{deviceNo},'%'))</if>
+        <if test="status != null"> AND sd.device_status = #{status}</if>
+        <if test="manufacturerId != null"> AND sd.manufacturer_id = #{manufacturerId}</if>
+        <if test="equipmentType != null and equipmentType != ''"> AND sdt.equipment_type LIKE concat('%',#{equipmentType},'%')</if>
+        <if test="model != null and model != ''"> AND sdt.model LIKE concat('%',#{model},'%')</if>
+        <if test="deviceTypeId != null"> AND sd.device_type = #{deviceTypeId}</if>
+        <if test="floor != null"> AND sd.floor = #{floor}</if>
+        <if test="isTag != null"> AND sd.is_tag = #{isTag}</if>
+        <if test="locDesc != null and locDesc != ''"> AND sd.loc_desc LIKE concat('%',#{locDesc},'%')</if>
+        <if test="province != null"> and sb.province = #{province}</if>
+        <if test="city != null"> and sb.city = #{city}</if>
+        <if test="region != null"> and sb.region = #{region}</if>
+        <if test="community != null"> and sb.community = #{community}</if>
+        <if test="concentratorNo != null and concentratorNo != ''"> AND scon.serial_number LIKE concat('%',#{concentratorNo},'%')</if>
+        <if test="collectorNo != null and collectorNo != ''"> AND scol.collector_no LIKE concat('%',#{collectorNo},'%')</if>
+        <if test="errorType != null and errorType != ''"> AND swmed.last_error_type LIKE concat('%',#{errorType},'%')</if>
+        <if test="customerId != null"> and sd.customer_id = #{customerId}</if>
+        <if test="valveStatus != null and valveStatus == 0"> and swmed.valve_status = #{valveStatus} and sdt.is_valve = 1</if>
+        <if test="valveStatus != null and valveStatus == 1"> and (swmed.valve_status = #{valveStatus} or swmed.valve_status is null ) and sdt.is_valve = 1</if>
+        <if test="valveStatus != null and valveStatus == 2"> and sdt.is_valve = 0</if>
+        <if test="registerStatus != null"> and sd.register_status = #{registerStatus}</if>
+        <if test="days != null">
+            <choose>
+                <when test="days == 0">
+                    and (swmed.days = #{days} or swmed.days is null )
+                </when>
+                <otherwise>
+                    and swmed.days = #{days}
+                </otherwise>
+            </choose>
+        </if>
+        <if test="startDays != null"> and swmed.days >= #{startDays} </if>
+        <if test="endDays != null"> and swmed.days <![CDATA[ <= ]]> #{endDays} </if>
+        <if test="programItems != null and programItems.size() != 0"> and
+            <foreach collection="programItems" item="item" open="(" separator=" or " close=")">
+                sdd.${item.dimensionCode} = #{item.dimensionValue}
+            </foreach>
+        </if>
+    </select>
+
     <select id="getWaterMeterListByDeviceNo" resultType="com.bz.smart_city.dto.DeviceDto">
         select sd.*,sdt.equipment_type,sdt.model,sdm.name manufacturer_name,sb.name as building_name,sc.channel_name as system_name,
         sb.longitude,sb.latitude,
@@ -485,60 +541,6 @@
         <if test="locDesc != null and locDesc != ''"> AND sd.loc_desc LIKE concat('%',#{locDesc},'%')</if>
     </select>
 
-    <!--自定义getList的count统计-->
-    <select id="getList_COUNT" resultType="Long">
-        select count(1)
-        from sc_device sd
-        <if test="(equipmentType != null and equipmentType != '') or (model != null and model != '') or (valveStatus != null)">left join sc_device_type sdt on (sdt.id = sd.device_type and sdt.status = 1)</if>
-        <if test="province != null or city != null or region != null or community != null">left join sc_building sb on (sb.id = sd.building_id and sb.status = 1)</if>
-        <if test="(concentratorNo != null and concentratorNo != '') or (collectorNo != null and collectorNo != '') ">left join sc_water_related_device swrd on ( swrd.device_id = sd.id and swrd.status = 1)</if>
-        <if test="concentratorNo != null and concentratorNo != ''">left join sc_concentrator scon on ( scon.id = swrd.concentrator_id and scon.status = 1)</if>
-        <if test="collectorNo != null and collectorNo != ''">left join sc_collector scol on ( scol.id = swrd.collector_id)</if>
-        <if test="(errorType != null and errorType != '') or days != null or startDays != null or endDays != null or (valveStatus != null)">left join sc_water_meter_error_days swmed on ( swmed.device_id = sd.id)</if>
-        <if test="programItems != null and programItems.size() != 0">left join sc_device_dimension sdd on (sdd.device_id = sd.id and sdd.status = 1)</if>
-        where sd.status = 1
-        <if test="sysId != null"> AND sd.sys_id = #{sysId}</if>
-        <if test="buildingId != null"> AND sd.building_id = #{buildingId}</if>
-        <if test="siteId != null"> AND sd.site_id = #{siteId}</if>
-        <if test="deviceNo != null and deviceNo != ''"> AND (sd.device_no LIKE concat('%',#{deviceNo},'%') or sd.water_meter_no LIKE concat('%',#{deviceNo},'%') or sd.water_meter_file_no LIKE concat('%',#{deviceNo},'%'))</if>
-        <if test="status != null"> AND sd.device_status = #{status}</if>
-        <if test="manufacturerId != null"> AND sd.manufacturer_id = #{manufacturerId}</if>
-        <if test="equipmentType != null and equipmentType != ''"> AND sdt.equipment_type LIKE concat('%',#{equipmentType},'%')</if>
-        <if test="model != null and model != ''"> AND sdt.model LIKE concat('%',#{model},'%')</if>
-        <if test="deviceTypeId != null"> AND sd.device_type = #{deviceTypeId}</if>
-        <if test="floor != null"> AND sd.floor = #{floor}</if>
-        <if test="isTag != null"> AND sd.is_tag = #{isTag}</if>
-        <if test="locDesc != null and locDesc != ''"> AND sd.loc_desc LIKE concat('%',#{locDesc},'%')</if>
-        <if test="province != null"> and sb.province = #{province}</if>
-        <if test="city != null"> and sb.city = #{city}</if>
-        <if test="region != null"> and sb.region = #{region}</if>
-        <if test="community != null"> and sb.community = #{community}</if>
-        <if test="concentratorNo != null and concentratorNo != ''"> AND scon.serial_number LIKE concat('%',#{concentratorNo},'%')</if>
-        <if test="collectorNo != null and collectorNo != ''"> AND scol.collector_no LIKE concat('%',#{collectorNo},'%')</if>
-        <if test="errorType != null and errorType != ''"> AND swmed.last_error_type LIKE concat('%',#{errorType},'%')</if>
-        <if test="customerId != null"> and sd.customer_id = #{customerId}</if>
-        <if test="valveStatus != null and valveStatus != 2"> and swmed.valve_status = #{valveStatus}</if>
-        <if test="valveStatus != null and valveStatus == 2"> and sdt.is_valve = 0</if>
-        <if test="registerStatus != null"> and sd.register_status = #{registerStatus}</if>
-        <if test="days != null">
-            <choose>
-                <when test="days == 0">
-                    and (swmed.days = #{days} or swmed.days is null )
-                </when>
-                <otherwise>
-                    and swmed.days = #{days}
-                </otherwise>
-            </choose>
-        </if>
-        <if test="startDays != null"> and swmed.days >= #{startDays} </if>
-        <if test="endDays != null"> and swmed.days <![CDATA[ <= ]]> #{endDays} </if>
-        <if test="programItems != null and programItems.size() != 0"> and
-            <foreach collection="programItems" item="item" open="(" separator=" or " close=")">
-                sdd.${item.dimensionCode} = #{item.dimensionValue}
-            </foreach>
-        </if>
-    </select>
-
     <update id="batchDelete">
         update sc_device set status = 0,date_update=NOW(),update_by=#{updateBy}
         where status = 1

smart-city-platform/src/main/resources/mapper/pay/PayInvoiceMapper.xml

@@ -223,42 +223,54 @@
     </select>
 
     <select id="getPayfeeInfoPrint" resultType="com.bz.smart_city.dto.pay.payfee.PrintReceivedInfo">
-        select * from (
         select
-        a.account_id as "accountId",
-        re.feetypename,
-        re.ladderlevel,
-        (case when re.ladderlevel = 1 then '一阶'
-        when re.ladderlevel = 2 then '二阶'
-        when re.ladderlevel = 3 then '三阶'
-        when re.ladderlevel = 4 then '四阶'
-        else '' end) as "ladderlevelname",
-        re.payamount,
-        re.waterbasicprice,
-        sum(case when payway != 4 then reced.receivedamount else 0 end ) receivedamount,
-        sum(case when payway = 4 then reced.receivedamount else 0 end ) autoReceivedamount
-        from pay_amount_waterusedamount a
-        left join pay_pay_receivable re on a.id=re.usedamount_id
-        left join pay_pay_received reced on reced.receivable_id=re.id
-        where  re.feetype=1   and a.`year`*12+a.`month` >= #{minPeriod} and a.`year`*12+a.`month` &lt;= #{maxPeriod} and  a.account_id=#{accountId}
-        group by a.account_id, re.feetypename,re.ladderlevel,re.payamount,re.waterbasicprice
-        union all
-        select
-        a.account_id,
-        re.feetypename,
-        '' as "ladderlevel",
-        '' as "ladderlevelname",
-        sum(re.payamount) as "payamount",
-        max(re.waterbasicprice) as "waterbasicprice",
-        sum(case when payway != 4 then reced.receivedamount else 0 end ) receivedamount,
-        sum(case when payway = 4 then reced.receivedamount else 0 end ) autoReceivedamount
-        from pay_amount_waterusedamount a
-        left join pay_pay_receivable re on a.id=re.usedamount_id
-        left join pay_pay_received reced on reced.receivable_id=re.id
-        where  re.feetype !=1  and a.`year`*12+a.`month` >= #{minPeriod} and a.`year`*12+a.`month` &lt;= #{maxPeriod} and  a.account_id=#{accountId}
-        group by  a.account_id,re.feetypename
+            accountId ,
+            feetypename,
+            ladderlevel,
+            ladderlevelname,
+            feetypename+ladderlevelname as "itemname",
+            payamount,
+            waterbasicprice,
+            receivedamount,
+            autoReceivedamount
+        from (
+            select
+            a.account_id as "accountId",
+            re.feetype,
+            re.feetypename,
+            re.ladderlevel,
+            (case when re.ladderlevel = 1 then '一阶'
+            when re.ladderlevel = 2 then '二阶'
+            when re.ladderlevel = 3 then '三阶'
+            when re.ladderlevel = 4 then '四阶'
+            else '' end) as "ladderlevelname",
+            re.payamount,
+            re.waterbasicprice,
+            sum(case when payway != 5 then reced.receivedamount else 0 end ) receivedamount,
+            sum(case when payway = 5 then reced.receivedamount else 0 end ) autoReceivedamount
+            from pay_amount_waterusedamount a
+            left join pay_pay_receivable re on a.id=re.usedamount_id
+            left join pay_pay_received reced on reced.receivable_id=re.id
+            where  re.feetype=1   and a.`year`*12+a.`month` >= #{minPeriod} and a.`year`*12+a.`month` &lt;= #{maxPeriod} and  a.account_id=#{accountId}
+            group by a.account_id, re.feetypename,re.ladderlevel,re.payamount,re.waterbasicprice
+            union all
+            select
+            a.account_id,
+            re.feetype,
+            re.feetypename,
+            '' as "ladderlevel",
+            '' as "ladderlevelname",
+            sum(re.payamount) as "payamount",
+            max(re.waterbasicprice) as "waterbasicprice",
+            sum(case when payway != 5 then reced.receivedamount else 0 end ) receivedamount,
+            sum(case when payway = 5 then reced.receivedamount else 0 end ) autoReceivedamount
+            from pay_amount_waterusedamount a
+            left join pay_pay_receivable re on a.id=re.usedamount_id
+            left join pay_pay_received reced on reced.receivable_id=re.id
+            where  re.feetype !=1  and a.`year`*12+a.`month` >= #{minPeriod} and a.`year`*12+a.`month` &lt;= #{maxPeriod} and  a.account_id=#{accountId}
+            group by  a.account_id,re.feetypename
         )s
-        order by s.accountId,s.feetypename,s.ladderlevel
+        order by s.accountId,s.feetype,s.ladderlevel
     </select>
     
     <select id="getPayfeeRemainingPrint"  resultType="com.bz.smart_city.dto.pay.payfee.PrintInvoiceData">