1首页-水量概况

smart-city-platform/src/main/java/com/bz/smart_city/controller/pay/PayChargeSurveyController.java

@@ -5,10 +5,7 @@ import com.bz.smart_city.commom.model.Pagination;
 import com.bz.smart_city.commom.model.ResultStatus;
 import com.bz.smart_city.commom.util.UserUtil;
 import com.bz.smart_city.dto.LoginUser;
-import com.bz.smart_city.dto.pay.BaseClosingAccountInfoDto;
-import com.bz.smart_city.dto.pay.PayChargeSurveyDto;
-import com.bz.smart_city.dto.pay.PayFeeSueveyDto;
-import com.bz.smart_city.dto.pay.PayTransactionSurveyDto;
+import com.bz.smart_city.dto.pay.*;
 import com.bz.smart_city.entity.pay.PayTransactionSurvey;
 import com.bz.smart_city.entity.pay.archives.CustomerListInfo;
 import com.bz.smart_city.service.pay.PayChargeSurveyService;
@@ -56,4 +53,11 @@ public class PayChargeSurveyController {
         PayFeeSueveyDto payFeeSueveyDto = payChargeSurveyService.feeSurvey();
         return new AjaxMessage<PayFeeSueveyDto>(ResultStatus.OK, payFeeSueveyDto);
     }
+
+    @PostMapping("/amountSurvey")
+    @ApiOperation(value = "计费系统-水量概况")
+    public AjaxMessage<PayAmountSurveyDto> amountSurvey(){
+        PayAmountSurveyDto payAmountSurveyDto = payChargeSurveyService.amountSurver();
+        return new AjaxMessage<PayAmountSurveyDto>(ResultStatus.OK, payAmountSurveyDto);
+    }
 }

smart-city-platform/src/main/java/com/bz/smart_city/dao/pay/PayChargeSurveyMapper.java

@@ -1,10 +1,8 @@
 package com.bz.smart_city.dao.pay;
 
+import com.bz.smart_city.dto.pay.PayAmountSurveyListDto;
 import com.bz.smart_city.dto.pay.PayChangePeriodDto;
-import com.bz.smart_city.entity.pay.PayAccountSurvey;
-import com.bz.smart_city.entity.pay.PayChargeSurvey;
-import com.bz.smart_city.entity.pay.PayFeeSuevey;
-import com.bz.smart_city.entity.pay.PayTransactionSurvey;
+import com.bz.smart_city.entity.pay.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -64,4 +62,15 @@ public interface PayChargeSurveyMapper {
 
     public List<PayFeeSuevey> getFeeGroup(@Param("year")Integer year,@Param("month")Integer month,
                                           @Param("siteId")BigInteger siteId, @Param("customerId")BigInteger customerId);
+
+    public BigDecimal getAmountMonth(@Param("year")Integer year,@Param("month")Integer month,
+                                     @Param("siteId")BigInteger siteId, @Param("customerId")BigInteger customerId);
+
+    public void insertAmount(PayAmountSurvey payAmountSurvey);
+
+    public BigDecimal getAmountInfo(@Param("startDate")String startDate,@Param("endDate")String endDate,
+                                    @Param("siteId")BigInteger siteId, @Param("customerId")BigInteger customerId);
+
+    public List<PayAmountSurveyListDto> getAmountGroupList(@Param("year")Integer year,@Param("month")Integer month,
+                                                           @Param("siteId")BigInteger siteId, @Param("customerId")BigInteger customerId);
 }

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

@@ -0,0 +1,30 @@
+package com.bz.smart_city.dto.pay;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+@ApiModel("最近一年统计DTO")
+public class PayAmountSurveyDto {
+    @ApiModelProperty(value = "累计年度用水量")
+    private BigDecimal sumYearAmount;
+    @ApiModelProperty(value = "较上年比率")
+    private String lastYearRate;
+    @ApiModelProperty(value = "年比较 0下降  1上升")
+    private Integer lastYearIsUp;
+    @ApiModelProperty(value = "累计月度用水量")
+    private BigDecimal sumMonthAmount;
+    @ApiModelProperty(value = "较上月比率")
+    private String lastMonthRate;
+    @ApiModelProperty(value = "月比较 0下降  1上升")
+    private Integer lastMontIsUp;
+
+    //按月list
+    @ApiModelProperty(value = "月度list")
+    private List<PayAmountSurveyListDto> list;
+
+}

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

@@ -0,0 +1,21 @@
+package com.bz.smart_city.dto.pay;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+@ApiModel("最近一年统计DTO")
+public class PayAmountSurveyListDto {
+    @ApiModelProperty(value = "月用水量")
+    private BigDecimal sumAmount;
+    @ApiModelProperty(value = "年")
+    private Integer year;
+    @ApiModelProperty(value = "月")
+    private Integer month;
+    @ApiModelProperty(value = "2020-07")
+    private String periodDate;
+
+}

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

@@ -14,14 +14,20 @@ public class PayChargeSurveyDto {
     private Integer accountNumber;
     @ApiModelProperty(value = "较上月")
     private String lastAccountRate;
+    @ApiModelProperty(value = "客户较上月 0下降 1上升")
+    private Integer lastAccountIsUp;
     @ApiModelProperty(value = "水表总数")
     private Integer meterNumber;
     @ApiModelProperty(value = "较上月")
     private String lastMeterRate;
+    @ApiModelProperty(value = "水表较上月 0下降 1上升")
+    private Integer lastMeterIsUp;
     @ApiModelProperty(value = "开户总数")
     private Integer customerNumber;
     @ApiModelProperty(value = "较上月")
     private String lastCustomerRate;
+    @ApiModelProperty(value = "开户较上月 0下降 1上升")
+    private Integer lastCustomerIsUp;
 
     //饼状图
     @ApiModelProperty(value = "开户率")

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

@@ -14,22 +14,33 @@ public class PayTransactionSurveyDto {
     private BigDecimal incomeNumber;
     @ApiModelProperty(value = "较上月比率")
     private String lastIncomeRate;
+    @ApiModelProperty(value = "收入较上月 0下降 1新增")
+    private Integer lastIncomeIsUp;
+
     @ApiModelProperty(value = "现金")
     private BigDecimal cashIncome;
     @ApiModelProperty(value = "较上月比率")
     private String lastCashRate;
+    @ApiModelProperty(value = "现金较上月 0下降 1新增")
+    private Integer lastCashIsUp;
     @ApiModelProperty(value = "微信支付")
     private BigDecimal wechatIncome;
     @ApiModelProperty(value = "较上月比率")
     private String lastWechatRate;
+    @ApiModelProperty(value = "微信较上月 0下降 1新增")
+    private Integer lastWechatIsUp;
     @ApiModelProperty(value = "支付宝支付")
     private BigDecimal alipayIncome;
     @ApiModelProperty(value = "较上月比率")
     private String lastAlipayRate;
+    @ApiModelProperty(value = "支付宝较上月 0下降 1新增")
+    private Integer lastAlipayIsUp;
     @ApiModelProperty(value = "银行收入")
     private BigDecimal bankIncome;
     @ApiModelProperty(value = "较上月比率")
     private String lastBankRate;
+    @ApiModelProperty(value = "银行较上月 0下降 1新增")
+    private Integer lastBankIsUp;
     @ApiModelProperty(value = "账期年")
     private Integer year;
     @ApiModelProperty(value = "账期月")

smart-city-platform/src/main/java/com/bz/smart_city/entity/pay/PayAmountSurvey.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.time.LocalDateTime;
 
@@ -12,17 +13,20 @@ import java.time.LocalDateTime;
 @ApiModel("用水量统计表")
 public class PayAmountSurvey {
     @ApiModelProperty(value = "id", position = 1)
-    private BigInteger id;
+    private String id;
     @ApiModelProperty(value = "水量统计", position = 2)
-    private BigInteger amountNumber;
+    private BigDecimal amountNumber;
+    @ApiModelProperty(value = "水量统计", position = 2)
+    private BigDecimal lastAmountNumber;
     @ApiModelProperty(value = "账期年", position = 3)
-    private String year;
+    private Integer year;
     @ApiModelProperty(value = "账期月", position = 4)
-    private String month;
+    private Integer month;
+    private LocalDateTime periodDate;
     @ApiModelProperty(value = "创建者", hidden = true)
-    private BigInteger createBy;
+    private String createBy;
     @ApiModelProperty(value = "修改者", hidden = true)
-    private BigInteger updateBy;
+    private String updateBy;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "创建时间", hidden = true)
     private LocalDateTime createDate = LocalDateTime.now();

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

@@ -12,6 +12,7 @@ import com.bz.smart_city.dto.LoginUser;
 import com.bz.smart_city.dto.pay.BaseClosingAccountInfoDto;
 import com.bz.smart_city.dto.pay.PayBaseConfigDto;
 import com.bz.smart_city.entity.pay.PayAccountSurvey;
+import com.bz.smart_city.entity.pay.PayAmountSurvey;
 import com.bz.smart_city.entity.pay.PayChargeSurvey;
 import com.bz.smart_city.entity.pay.PayTransactionSurvey;
 import com.bz.smart_city.service.pay.BaseClosingAccountInfoService;
@@ -126,26 +127,30 @@ public class BaseClosingAccountInfoServiceImpl implements BaseClosingAccountInfo
                         BigInteger.valueOf(loginUser.getSiteId()),BigInteger.valueOf(loginUser.getCustomerId()),null);
                 for (int i=0; i<list.size(); i++){
                     int state = list.get(i).getState();
-                    if(state == 1){
+                    /*if(state == 1){*/
                         //把历史结账数据存进去，但不包含本期未结账的
-                        //this.insertAccountNumber(list.get(i).getYear(),list.get(i).getMonth());
+                        this.insertAccountNumber(list.get(i).getYear(),list.get(i).getMonth());
                         //历史交易数据
-                        //this.insertTransaction(list.get(i).getYear(),list.get(i).getMonth());
+                        this.insertTransaction(list.get(i).getYear(),list.get(i).getMonth());
                         //历史交易数据
                         this.insertFeeSummary(list.get(i).getYear(),list.get(i).getMonth());
-                    }
+                        //历史水量
+                        this.insetAmountInfo(list.get(i).getYear(),list.get(i).getMonth());
+                    /*}*/
                 }
             }else if(count > 0){
                 //存储本期未结账数据
-                //this.insertAccountNumber(year,month);
+                this.insertAccountNumber(year,month);
                 //本期交易未结账数据
-                //this.insertTransaction(year,month);
+                this.insertTransaction(year,month);
                 //本期交易数据
                 this.insertFeeSummary(year,month);
+                //本期水量
+                this.insetAmountInfo(year,month);
             }
 
             // 更新本账期
-            /*String msg2 = year + "年" + String.format("%02d", month) + "月已经结账";
+            String msg2 = year + "年" + String.format("%02d", month) + "月已经结账";
             baseClosingAccountInfoDto.setEndTime(new Date());
             baseClosingAccountInfoDto.setRemarks(msg2);
             baseClosingAccountInfoDto.setState(1);
@@ -169,7 +174,7 @@ public class BaseClosingAccountInfoServiceImpl implements BaseClosingAccountInfo
                 baseClosingAccountInfoDto.setMonth(1);
             }
             baseClosingAccountInfoDto.setName(baseClosingAccountInfoDto.getYear()+"年"+String.format("%02d", baseClosingAccountInfoDto.getMonth())+"月");
-            this.add(baseClosingAccountInfoDto);*/
+            this.add(baseClosingAccountInfoDto);
         }else{
             message.setStatus(-707);
             message.setMsg(msg);
@@ -408,6 +413,55 @@ public class BaseClosingAccountInfoServiceImpl implements BaseClosingAccountInfo
 
     }
 
+    /**
+     * 添加水量汇总
+     * @param year
+     * @param month
+     */
+    public void insetAmountInfo(Integer year,Integer month){
+        LoginUser loginUser = UserUtil.getCurrentUser();
+        BigInteger siteId = BigInteger.valueOf(loginUser.getSiteId());
+        BigInteger customerId = BigInteger.valueOf(loginUser.getCustomerId());
+        String start = year+"-"+(String.format("%02d",month))+"-01";
+        PayAmountSurvey payAmountSurvey = new PayAmountSurvey();
+        //查询上月总数
+        Integer lastYear = null;
+        Integer lastMonth = null;
+        try {
+            if(month == 1){
+                lastYear = year-1;
+                lastMonth = 12;
+            }else{
+                lastYear = year;
+                lastMonth = month -1;
+            }
+            //获取本账期
+            BigDecimal payamount = payChargeSurveyMapper.getAmountMonth(year,month,siteId,customerId);
+            //获取上一账期
+            BigDecimal lastPayamount = payChargeSurveyMapper.getAmountMonth(lastYear,lastMonth,siteId,customerId);
+            payAmountSurvey.setAmountNumber(payamount);
+            payAmountSurvey.setLastAmountNumber(lastPayamount);
+            payAmountSurvey.setYear(year);
+            payAmountSurvey.setMonth(month);
+            DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+            LocalDateTime ldt = LocalDateTime.parse(start+" 00:00:00",df);
+            payAmountSurvey.setPeriodDate(ldt);
+            payAmountSurvey.setId(Util.createUUIDId());
+            payAmountSurvey.setDelFlag("0");
+            payAmountSurvey.setRemarks("");
+            payAmountSurvey.setCreateBy(loginUser.getCreateBy());
+            payAmountSurvey.setCreateDate(LocalDateTime.now());
+            payAmountSurvey.setUpdateBy(loginUser.getCreateBy());
+            payAmountSurvey.setUpdateDate(LocalDateTime.now());
+            payAmountSurvey.setSiteId(BigInteger.valueOf(loginUser.getSiteId()));
+            payAmountSurvey.setCustomerId(BigInteger.valueOf(loginUser.getCustomerId()));
+
+            payChargeSurveyMapper.insertAmount(payAmountSurvey);
+        }catch(Exception e){
+            e.printStackTrace();
+        }
+    }
+
     @Override
     public List<BaseClosingAccountInfoDto> getList(Integer year, Integer month) {
         LoginUser loginUser = UserUtil.getCurrentUser();

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

@@ -47,12 +47,19 @@ public class PayChargeSurveyServiceImpl implements PayChargeSurveyService {
           Date lastStartMonth = startDate.getTime(); //结果
           String lastStart = sdf.format(lastStartMonth);
           System.out.println("时间："+lastStart);*/
-          DecimalFormat df = new DecimalFormat("0.0");
+          /*DecimalFormat df = new DecimalFormat("0.0");
           BigDecimal currentIncome = new BigDecimal("100");
           BigDecimal lastIncome = new BigDecimal("80");
           BigDecimal income = currentIncome.subtract(lastIncome).divide(lastIncome).multiply(new BigDecimal("100"));
           String a = df.format(income);
-          System.out.println("收入费率："+a);
+          System.out.println("收入费率："+a);*/
+
+          String a = "-90.89";
+          String b = "90.89";
+
+          String a1 = a.split("-")[1];
+          String b1 = b.split("-")[1];
+          System.out.println("带负数转换："+a1+";不带负数转换："+b1);
       }catch (Exception e) {
           e.printStackTrace();
       }
@@ -106,7 +113,13 @@ public class PayChargeSurveyServiceImpl implements PayChargeSurveyService {
             String lastAccountRate = "";
             float num =(float)((sumCurrentAccount - sumLastAccount)/(sumLastAccount != null && sumLastAccount != 0 ? sumLastAccount : 1)*100);
             lastAccountRate = df.format(num);
+
+            Integer lastAccountIsUp = num > 0  ? 1 : 0;
+            //截取字符串
+            lastAccountRate = lastAccountRate.contains("-") ? lastAccountRate.split("-")[1] : lastAccountRate;
+
             //赋值客户总数跟上月比率
+            payChargeSurveyDto.setLastAccountIsUp(lastAccountIsUp);
             payChargeSurveyDto.setAccountNumber(sumAccount);
             payChargeSurveyDto.setLastAccountRate(lastAccountRate);
 
@@ -122,7 +135,11 @@ public class PayChargeSurveyServiceImpl implements PayChargeSurveyService {
             String lastMeterRate = "";
             num =(float)((sumCurrentMeter - sumLastMeter)/(sumLastMeter != null && sumLastMeter != 0 ? sumLastMeter : 1)*100);
             lastMeterRate = df.format(num);
+            Integer lastMeterIsUp = num > 0  ? 1 : 0;
+            //截取字符串
+            lastMeterRate = lastMeterRate.contains("-") ? lastMeterRate.split("-")[1] : lastMeterRate;
             //赋值水表总数跟上月比率
+            payChargeSurveyDto.setLastMeterIsUp(lastMeterIsUp);
             payChargeSurveyDto.setMeterNumber(sumMeter);
             payChargeSurveyDto.setLastMeterRate(lastMeterRate);
 
@@ -137,7 +154,11 @@ public class PayChargeSurveyServiceImpl implements PayChargeSurveyService {
             String lastCusstomerRate = "";
             num =(float)((sumCurrentCustomer - sumLastCustomer)/(sumLastCustomer != null && sumLastCustomer != 0 ? sumLastCustomer : 1)*100);
             lastCusstomerRate = df.format(num);
+            Integer lastCustomerIsUp = num > 0  ? 1 : 0;
+            //截取字符串
+            lastCusstomerRate = lastCusstomerRate.contains("-") ? lastCusstomerRate.split("-")[1] : lastCusstomerRate;
             //赋值开户总数跟上月比率
+            payChargeSurveyDto.setLastCustomerIsUp(lastCustomerIsUp);
             payChargeSurveyDto.setCustomerNumber(sumCustomer);
             payChargeSurveyDto.setLastCustomerRate(lastCusstomerRate);
 
@@ -146,6 +167,7 @@ public class PayChargeSurveyServiceImpl implements PayChargeSurveyService {
             String customerRate = "";
             num =(float)(sumCurrentCustomer/(sumCurrentMeter != null && sumCurrentMeter != 0 ? sumCurrentMeter : 1)*100);
             customerRate = df.format(num);
+            customerRate = customerRate.contains("-") ? customerRate.split("-")[1] : customerRate;
             payChargeSurveyDto.setCustomerRate(customerRate);
 
 
@@ -318,6 +340,9 @@ public class PayChargeSurveyServiceImpl implements PayChargeSurveyService {
             BigDecimal income = currentIncome.subtract(lastIncome).divide((lastIncome != null && lastIncome.compareTo(BigDecimal.ZERO)==1 ? lastIncome : defb),2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
             String lastIncomeRate = "";
             lastIncomeRate = df.format(income);
+            Integer lastIncomeIsUp = income.compareTo(BigDecimal.ZERO) == 1 ? 1 : 0;
+            //截取字符串
+            lastIncomeRate = lastIncomeRate.contains("-") ? lastIncomeRate.split("-")[1] : lastIncomeRate;
 
             //按支付方式
             cashIncome = transactionSurver.getCashIncome();//本账期现金收入
@@ -331,18 +356,30 @@ public class PayChargeSurveyServiceImpl implements PayChargeSurveyService {
             //现金
             income = cashIncome.subtract(lastcashIncome).divide((lastcashIncome != null && lastcashIncome.compareTo(BigDecimal.ZERO)==1 ? lastcashIncome : defb),2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
             lastCashRate = df.format(income);
+            Integer lastCashIsUp = income.compareTo(BigDecimal.ZERO) == 1 ? 1 : 0;
+            //截取字符串
+            lastCashRate = lastCashRate.contains("-") ? lastCashRate.split("-")[1] : lastCashRate;
 
             //微信
             income = wechatIncome.subtract(lastwechatIncome).divide((lastwechatIncome != null && lastwechatIncome.compareTo(BigDecimal.ZERO)==1 ? lastwechatIncome : defb),2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
             lastWechatRate = df.format(income);
+            Integer lastWechatIsUp = income.compareTo(BigDecimal.ZERO) == 1 ? 1 : 0;
+            //截取字符串
+            lastWechatRate = lastWechatRate.contains("-") ? lastWechatRate.split("-")[1] : lastWechatRate;
 
             //支付宝
             income = alipayIncome.subtract(lastalipayIncome).divide((lastalipayIncome != null && lastalipayIncome.compareTo(BigDecimal.ZERO)==1 ? lastalipayIncome : defb), 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
             lastAlipayRate = df.format(income);
+            Integer lastAlipayIsUp = income.compareTo(BigDecimal.ZERO) == 1 ? 1 : 0;
+            //截取字符串
+            lastAlipayRate = lastAlipayRate.contains("-") ? lastAlipayRate.split("-")[1] : lastAlipayRate;
 
             //银行
             income = bankIncome.subtract(lastbankIncome).divide((lastbankIncome != null && lastbankIncome.compareTo(BigDecimal.ZERO)==1 ? lastbankIncome : defb),2,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
             lastBankRate = df.format(income);
+            Integer lastBankIsUp = income.compareTo(BigDecimal.ZERO) == 1 ? 1 : 0;
+            //截取字符串
+            lastBankRate = lastBankRate.contains("-") ? lastBankRate.split("-")[1] : lastBankRate;
 
             //饼状态占比率
             BigDecimal current = alipayIncome.add(wechatIncome).add(bankIncome).add(cashIncome);
@@ -363,17 +400,22 @@ public class PayChargeSurveyServiceImpl implements PayChargeSurveyService {
             bankRate = df.format(income);
 
             //收入总数
+            payTransactionSurveyDto.setLastIncomeIsUp(lastIncomeIsUp);
             payTransactionSurveyDto.setIncomeNumber(currentIncome);
             payTransactionSurveyDto.setLastIncomeRate(lastIncomeRate);
             //按支付方式
             payTransactionSurveyDto.setCashIncome(cashIncome);
             payTransactionSurveyDto.setLastCashRate(lastCashRate);
+            payTransactionSurveyDto.setLastCashIsUp(lastCashIsUp);
             payTransactionSurveyDto.setWechatIncome(wechatIncome);
             payTransactionSurveyDto.setLastWechatRate(lastWechatRate);
+            payTransactionSurveyDto.setLastWechatIsUp(lastWechatIsUp);
             payTransactionSurveyDto.setAlipayIncome(alipayIncome);
             payTransactionSurveyDto.setLastAlipayRate(lastAlipayRate);
+            payTransactionSurveyDto.setLastAlipayIsUp(lastAlipayIsUp);
             payTransactionSurveyDto.setBankIncome(bankIncome);
             payTransactionSurveyDto.setLastBankRate(lastBankRate);
+            payTransactionSurveyDto.setLastBankIsUp(lastBankIsUp);
             //饼状图
             payTransactionSurveyDto.setCashRate(CashRate);
             payTransactionSurveyDto.setAlipayRate(alipayRate);
@@ -390,6 +432,10 @@ public class PayChargeSurveyServiceImpl implements PayChargeSurveyService {
     }
 
 
+    /**
+     * 收费概况
+     * @return
+     */
     public PayFeeSueveyDto feeSurvey(){
         PayFeeSueveyDto payFeeSveveyDto = new PayFeeSueveyDto();
         LoginUser loginUser = UserUtil.getCurrentUser();
@@ -461,5 +507,119 @@ public class PayChargeSurveyServiceImpl implements PayChargeSurveyService {
         return payFeeSveveyDto;
     }
 
+    /**
+     * 水量概况
+     * @return
+     */
+    public PayAmountSurveyDto amountSurver(){
+        PayAmountSurveyDto payAmountSurveyDto = new PayAmountSurveyDto();
+        LoginUser loginUser = UserUtil.getCurrentUser();
+        BigInteger siteId = BigInteger.valueOf(loginUser.getSiteId());
+        BigInteger customerId = BigInteger.valueOf(loginUser.getCustomerId());
+        BigDecimal defb = new BigDecimal("1.0");
+        BigDecimal defc = new BigDecimal("0.0");
+        DecimalFormat df = new DecimalFormat("0.0");
+        try {
+            List<BaseClosingAccountInfoDto> closinList = baseClosingAccountInfoMapper.getList(null,null,
+                    siteId,customerId,null);
+            Integer year = closinList.get(0).getYear();
+            Integer month = closinList.get(0).getMonth();
+            //上一账期
+            Integer lastYear = null;
+            Integer lastMonth = null;
+            if(Integer.valueOf(month) == 1){
+                lastYear = year-1;
+                lastMonth = 12;
+            }else{
+                lastYear = year;
+                lastMonth = month -1;
+            }
+
+            //先获取本年度结算水量(按自然年)
+            Calendar date = Calendar.getInstance();
+            //当前年
+            Integer currentYear = Integer.valueOf(date.get(Calendar.YEAR));
+            //当前月
+            Integer currentMont = Integer.valueOf(date.get(Calendar.MONTH));
+            String startDate = currentYear+"-"+"01";
+            String endDate = currentYear+"-"+String.format("%02d",month);
+            //当前年月累计用水量
+            BigDecimal currentAmount = payChargeSurveyMapper.getAmountInfo(startDate,endDate,siteId,customerId);
+            //去年同一时间累计用水量
+            startDate = (currentYear - 1)+"-"+"01";
+            endDate = (currentYear - 1)+"-"+String.format("%02d",month);
+            BigDecimal lastAmount = payChargeSurveyMapper.getAmountInfo(startDate,endDate,siteId,customerId);
+            //计算年同比 = 当前总数-去年同期总数│/去年同期总数
+            String lastYearRate = "";
+            BigDecimal number  = currentAmount.subtract(lastAmount).divide((lastAmount != null && lastAmount.compareTo(BigDecimal.ZERO)==1 ? lastAmount : defb),2,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+            //0下降  1商社
+            Integer lastYearIsUp = number.compareTo(BigDecimal.ZERO) == 1 ? 1 : 0;
+            //保留一位小数
+            lastYearRate = df.format(number);
+            //截取字符串
+            lastYearRate = lastYearRate.contains("-") ? lastYearRate.split("-")[1] : lastYearRate;
+
+            //计算月
+            //当前月
+            BigDecimal currentMAmount = payChargeSurveyMapper.getAmountMonth(year,month,siteId,customerId);
+            //去年同月
+            BigDecimal lastMAmount = payChargeSurveyMapper.getAmountMonth((year-1),month,siteId,customerId);
+            //计算月同比 = 当前总数-上月同期总数│/去年同期总数
+            number  = currentMAmount.subtract(lastMAmount).divide((lastMAmount != null && lastMAmount.compareTo(BigDecimal.ZERO)==1 ? lastMAmount : defb),2,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+            //0下降  1商社
+            Integer lastMonthIsUp = number.compareTo(BigDecimal.ZERO) == 1 ? 1 : 0;
+            //保留一位小数
+            String lastMonthRate = "";
+            lastMonthRate = df.format(number);
+            //截取字符串
+            lastMonthRate = lastMonthRate.contains("-") ? lastMonthRate.split("-")[1] : lastMonthRate;
+
+            //最近一年数据
+            List<PayAmountSurveyListDto> cList = new ArrayList<PayAmountSurveyListDto>();
+            PayAmountSurveyListDto dto = new PayAmountSurveyListDto();
+            dto.setPeriodDate(currentYear+"-"+String.format("%02d",month));
+            dto.setYear(currentYear);
+            dto.setMonth(month);
+            dto.setSumAmount(currentMAmount);
+            cList.add(dto);
+            List<PayAmountSurveyListDto> list = payChargeSurveyMapper.getAmountGroupList(null,null,siteId,customerId);
+            cList.addAll(list);
+            PayAmountSurveyListDto a = cList.get(cList.size() - 1);
+            Integer num = a.getMonth();
+            lastYear = a.getYear();
+            lastMonth = a.getMonth();
+            for(int i=cList.size(); i<=11; i++ ){
+                num--;
+                if(num == 0){
+                    lastYear = lastYear-1;
+                    lastMonth = 12;
+                    num = 12;
+                }else{
+                    lastYear = lastYear;
+                    lastMonth = num;
+                }
+                PayAmountSurveyListDto adto = new PayAmountSurveyListDto();
+                adto.setPeriodDate(lastYear+"-"+String.format("%02d",lastMonth));
+                adto.setYear(lastYear);
+                adto.setMonth(lastMonth);
+                adto.setSumAmount(defc);
+                cList.add(adto);
+            }
+            payAmountSurveyDto .setList(cList);
+            payAmountSurveyDto.setSumYearAmount(currentAmount);
+            payAmountSurveyDto.setLastYearIsUp(lastYearIsUp);
+            payAmountSurveyDto.setLastYearRate(lastYearRate);
+            payAmountSurveyDto.setSumMonthAmount(currentMAmount);
+            payAmountSurveyDto.setLastMonthRate(lastMonthRate);
+            payAmountSurveyDto.setLastMontIsUp(lastMonthIsUp);
+        }catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return payAmountSurveyDto;
+    }
+
+
+
 
 }

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

@@ -1,5 +1,6 @@
 package com.bz.smart_city.service.pay;
 
+import com.bz.smart_city.dto.pay.PayAmountSurveyDto;
 import com.bz.smart_city.dto.pay.PayChargeSurveyDto;
 import com.bz.smart_city.dto.pay.PayFeeSueveyDto;
 import com.bz.smart_city.dto.pay.PayTransactionSurveyDto;
@@ -13,4 +14,6 @@ public interface PayChargeSurveyService {
 
     public PayFeeSueveyDto feeSurvey();
 
+    public PayAmountSurveyDto amountSurver();
+
 }

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

@@ -472,7 +472,102 @@
                 and a.customer_id =#{customerId}
             </if>
         </where>
-        ORDER BY a.period_date desc LIMIT 12
+        ORDER BY a.period_date desc LIMIT 11
     </select>
 
+    <select id="getAmountInfo" resultType="java.math.BigDecimal">
+        select
+            IFNULL(sum(payamount),0)
+        from pay_amount_waterusedamount a
+        <where>
+            <if test="startDate != null">
+                and concat(a.year,'-',LPAD(a.month, 2, 0)) &gt;=#{startDate}
+            </if>
+            <if test="endDate != null">
+                and concat(a.year,'-',LPAD(a.month, 2, 0)) &lt;=#{endDate}
+            </if>
+            <if test="siteId != null">
+                and a.site_id =#{siteId}
+            </if>
+            <if test="customerId != null">
+                and a.customer_id =#{customerId}
+            </if>
+        </where>
+    </select>
+
+    <select id="getAmountMonth" resultType="java.math.BigDecimal">
+        select
+            IFNULL(sum(payamount),0)
+        from pay_amount_waterusedamount a
+        <where>
+            <if test="siteId != null">
+                and a.site_id =#{siteId}
+            </if>
+            <if test="customerId != null">
+                and a.customer_id =#{customerId}
+            </if>
+            <if test="year != null">
+                and a.year =#{year}
+            </if>
+            <if test="month != null">
+                and a.month =#{month}
+            </if>
+        </where>
+    </select>
+
+    <select id="getAmountGroupList" resultType="com.bz.smart_city.dto.pay.PayAmountSurveyListDto">
+        select
+            IFNULL(a.amount_number,0) as "sumAmount",
+            a.year as "year",
+            a.month as "month",
+            concat(a.year,'-',LPAD(a.month, 2, 0)) as "periodDate"
+        from pay_amount_survey a
+        <where>
+            <if test="siteId != null">
+                and a.site_id =#{siteId}
+            </if>
+            <if test="customerId != null">
+                and a.customer_id =#{customerId}
+            </if>
+        </where>
+        ORDER BY a.period_date desc LIMIT 11
+    </select>
+
+    <insert id="insertAmount">
+        insert into pay_amount_survey
+        (
+            id,
+            amount_number,
+            last_amount_number,
+            year,
+            month,
+            period_date,
+            site_id,
+            customer_id,
+            create_by,
+            create_date,
+            update_by,
+            update_date,
+            remarks,
+            del_flag
+        )
+        values
+        (
+            #{id},
+            #{amountNumber},
+            #{lastAmountNumber},
+            #{year},
+            #{month},
+            #{periodDate},
+            #{siteId},
+            #{customerId},
+            #{createBy},
+            #{createDate},
+            #{updateBy},
+            #{updateDate},
+            #{remarks},
+            #{delFlag}
+        )
+    </insert>
+
 </mapper>