1首页概况-收费

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

@@ -7,6 +7,7 @@ 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.entity.pay.PayTransactionSurvey;
 import com.bz.smart_city.entity.pay.archives.CustomerListInfo;
@@ -16,10 +17,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
 import java.math.BigInteger;
 import java.text.SimpleDateFormat;
@@ -44,10 +42,18 @@ public class PayChargeSurveyController {
         return new AjaxMessage<PayChargeSurveyDto>(ResultStatus.OK, payChargeSurveyDto);
     }
 
-    @PostMapping("/tranSurvey")
+    @ResponseBody
+    @GetMapping("/tranSurvey")
     @ApiOperation(value = "计费系统-交易概况")
     public AjaxMessage<PayTransactionSurveyDto> tranSurvey(@ApiParam(value = "账期", required = true,defaultValue = "2020-07") @RequestParam(required = true) String periodDate){
         PayTransactionSurveyDto payTransactionSurvey = payChargeSurveyService.tranSurvey(periodDate);
         return new AjaxMessage<PayTransactionSurveyDto>(ResultStatus.OK, payTransactionSurvey);
     }
+
+    @PostMapping("/feeSurvey")
+    @ApiOperation(value = "计费系统-收费概况")
+    public AjaxMessage<PayFeeSueveyDto> feeSurvey(){
+        PayFeeSueveyDto payFeeSueveyDto = payChargeSurveyService.feeSurvey();
+        return new AjaxMessage<PayFeeSueveyDto>(ResultStatus.OK, payFeeSueveyDto);
+    }
 }

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

@@ -2,6 +2,8 @@ package com.bz.smart_city.dao.pay;
 
 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 org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -48,4 +50,18 @@ public interface PayChargeSurveyMapper {
 
     public PayTransactionSurvey getLastTranRocord(@Param("year")Integer year,@Param("month")Integer month,
                                                   @Param("siteId")BigInteger siteId, @Param("customerId")BigInteger customerId);
+
+    public PayChargeSurvey getSumReceivable (@Param("year")Integer year,@Param("month")Integer month,
+                                             @Param("siteId")BigInteger siteId, @Param("customerId")BigInteger customerId);
+
+    public BigDecimal getSumReceived(@Param("year")Integer year,@Param("month")Integer month,
+                                     @Param("siteId")BigInteger siteId, @Param("customerId")BigInteger customerId);
+
+    public BigDecimal getSumPrestore(@Param("year")Integer year,@Param("month")Integer month,
+                                     @Param("siteId")BigInteger siteId, @Param("customerId")BigInteger customerId);
+
+    public void insertFeeSummary(PayChargeSurvey payChargeSurvey);
+
+    public List<PayFeeSuevey> getFeeGroup(@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/PayFeeSueveyDto.java

@@ -0,0 +1,16 @@
+package com.bz.smart_city.dto.pay;
+
+import com.bz.smart_city.entity.pay.PayFeeSuevey;
+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 PayFeeSueveyDto {
+    @ApiModelProperty(value = "收费列表-按月", position = 1)
+    public List<PayFeeSuevey> list;
+}

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

@@ -35,8 +35,9 @@ public class PayTransactionSurveyDto {
     @ApiModelProperty(value = "账期月")
     private Integer month;
     @ApiModelProperty(value = "账期")
-    private LocalDateTime periodDate;
     private String periodDates;
+    private LocalDateTime periodDate;
+    //饼状图
     @ApiModelProperty(value = "现金占比率")
     private String CashRate;
     @ApiModelProperty(value = "支付宝占比率")

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

@@ -13,7 +13,7 @@ import java.time.LocalDateTime;
 @ApiModel("收费统计表")
 public class PayChargeSurvey {
     @ApiModelProperty(value = "id", position = 1)
-    private BigInteger id;
+    private String id;
     @ApiModelProperty(value = "应收总额", position = 2)
     private BigDecimal receivableNumber;
     @ApiModelProperty(value = "实收总额", position = 3)
@@ -23,13 +23,14 @@ public class PayChargeSurvey {
     @ApiModelProperty(value = "欠费总额", position = 5)
     private BigDecimal debtNumber;
     @ApiModelProperty(value = "账期年", position = 6)
-    private String year;
+    private Integer year;
     @ApiModelProperty(value = "账期月", position = 7)
-    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/entity/pay/PayFeeSuevey.java

@@ -0,0 +1,26 @@
+package com.bz.smart_city.entity.pay;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+@ApiModel("收费概况")
+public class PayFeeSuevey {
+    @ApiModelProperty(value = "应收总额", position = 2)
+    private BigDecimal sumReceivable;
+    @ApiModelProperty(value = "实收总额", position = 3)
+    private BigDecimal sumReceived;
+    @ApiModelProperty(value = "预存总额", position = 4)
+    private BigDecimal sumRecharge;
+    @ApiModelProperty(value = "欠费总额", position = 5)
+    private BigDecimal sumDebt;
+    @ApiModelProperty(value = "账期年", position = 6)
+    private Integer year;
+    @ApiModelProperty(value = "账期月", position = 7)
+    private Integer month;
+    @ApiModelProperty(value = "2020-07", position = 8)
+    private String periodDate;
+}

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.PayChargeSurvey;
 import com.bz.smart_city.entity.pay.PayTransactionSurvey;
 import com.bz.smart_city.service.pay.BaseClosingAccountInfoService;
 import com.github.pagehelper.PageHelper;
@@ -129,14 +130,18 @@ public class BaseClosingAccountInfoServiceImpl implements BaseClosingAccountInfo
                         //把历史结账数据存进去，但不包含本期未结账的
                         //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());
                     }
                 }
             }else if(count > 0){
                 //存储本期未结账数据
                 //this.insertAccountNumber(year,month);
                 //本期交易未结账数据
-                this.insertTransaction(year,month);
+                //this.insertTransaction(year,month);
+                //本期交易数据
+                this.insertFeeSummary(year,month);
             }
 
             // 更新本账期
@@ -169,8 +174,6 @@ public class BaseClosingAccountInfoServiceImpl implements BaseClosingAccountInfo
             message.setStatus(-707);
             message.setMsg(msg);
         }
-
-
         return message;
     }
 
@@ -278,8 +281,6 @@ public class BaseClosingAccountInfoServiceImpl implements BaseClosingAccountInfo
             //上一账期按支付方式划分
             List<PayTransactionSurvey> lasttranList = payChargeSurveyMapper.getPayAmountList(lastYear,lastMonth,siteId,customerId);
 
-            transactionSurver.setIncomeNumber(cuttentAmount);
-            transactionSurver.setLastIncomeNumber(lastAmount);
             BigDecimal cashIncome = bigDecimalStr;//现金
             BigDecimal wechatIncome = bigDecimalStr;//微信
             BigDecimal alipayIncome = bigDecimalStr;//支付宝
@@ -301,6 +302,8 @@ public class BaseClosingAccountInfoServiceImpl implements BaseClosingAccountInfo
                     cashIncome = tranList.get(i).getIncomeNumber();
                 }
             }
+            transactionSurver.setIncomeNumber(cuttentAmount);
+            transactionSurver.setLastIncomeNumber(lastAmount);
             transactionSurver.setAlipayIncome(alipayIncome);
             transactionSurver.setWechatIncome(wechatIncome);
             transactionSurver.setBankIncome(bankIncome);
@@ -353,6 +356,58 @@ public class BaseClosingAccountInfoServiceImpl implements BaseClosingAccountInfo
         }
     }
 
+    /**
+     * 添加收费汇总
+     * @param year
+     * @param month
+     */
+    public void insertFeeSummary(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";
+        PayChargeSurvey payChargeSurvey = new PayChargeSurvey();
+        try {
+            //查找当前账期应收
+            PayChargeSurvey chargeSurvey = payChargeSurveyMapper.getSumReceivable(year,month,siteId,customerId);
+            BigDecimal sumReceivable = chargeSurvey.getReceivableNumber();//应收总额
+            //查找当前账期实收
+            BigDecimal sumReceived = payChargeSurveyMapper.getSumReceived(year,month,siteId,customerId);
+            //查找当前账期预存
+            BigDecimal sumPrestore = payChargeSurveyMapper.getSumPrestore(year,month,siteId,customerId);
+            //查找当前账期欠费
+            BigDecimal sumDebt = chargeSurvey.getDebtNumber();//欠费总额
+
+            payChargeSurvey.setReceivableNumber(sumReceivable);
+            payChargeSurvey.setReceivedNumber(sumReceived);
+            payChargeSurvey.setRechargeNumber(sumPrestore);
+            payChargeSurvey.setDebtNumber(sumDebt);
+            payChargeSurvey.setYear(year);
+            payChargeSurvey.setMonth(month);
+            DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+            LocalDateTime ldt = LocalDateTime.parse(start+" 00:00:00",df);
+            payChargeSurvey.setPeriodDate(ldt);
+            payChargeSurvey.setId(Util.createUUIDId());
+            payChargeSurvey.setYear(year);
+            payChargeSurvey.setMonth(month);
+            payChargeSurvey.setDelFlag("0");
+            payChargeSurvey.setRemarks("");
+            payChargeSurvey.setCreateBy(loginUser.getCreateBy());
+            payChargeSurvey.setCreateDate(LocalDateTime.now());
+            payChargeSurvey.setUpdateBy(loginUser.getCreateBy());
+            payChargeSurvey.setUpdateDate(LocalDateTime.now());
+            payChargeSurvey.setSiteId(BigInteger.valueOf(loginUser.getSiteId()));
+            payChargeSurvey.setCustomerId(BigInteger.valueOf(loginUser.getCustomerId()));
+
+            payChargeSurveyMapper.insertFeeSummary(payChargeSurvey);
+
+        }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

@@ -4,11 +4,10 @@ import com.bz.smart_city.commom.util.UserUtil;
 import com.bz.smart_city.dao.pay.BaseClosingAccountInfoMapper;
 import com.bz.smart_city.dao.pay.PayChargeSurveyMapper;
 import com.bz.smart_city.dto.LoginUser;
-import com.bz.smart_city.dto.pay.BaseClosingAccountInfoDto;
-import com.bz.smart_city.dto.pay.PayChangePeriodDto;
-import com.bz.smart_city.dto.pay.PayChargeSurveyDto;
-import com.bz.smart_city.dto.pay.PayTransactionSurveyDto;
+import com.bz.smart_city.dto.pay.*;
 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.service.pay.PayChargeSurveyService;
 import lombok.extern.slf4j.Slf4j;
@@ -167,6 +166,31 @@ public class PayChargeSurveyServiceImpl implements PayChargeSurveyService {
             periodDto.setMeterNumber(sumCurrentMeter);
             accountList2.add(periodDto);
             accountList2.addAll(accoutList);
+            //填补缺失月
+            PayChangePeriodDto dto = accountList2.get(accountList2.size() - 1);
+            Integer number = dto.getMonth();
+            Integer lastYear = Integer.valueOf(dto.getYear());
+            Integer lastMonth = dto.getMonth();
+            List<PayChangePeriodDto> pList = new ArrayList<PayChangePeriodDto> ();
+            for(int i=accountList2.size(); i<=11; i++){
+                number --;
+                if(number == 0){
+                    lastYear = lastYear-1;
+                    lastMonth = 12;
+                    number = 12;
+                }else{
+                    lastYear = lastYear;
+                    lastMonth = number;
+                }
+                PayChangePeriodDto info = new PayChangePeriodDto();
+                info.setYear(lastYear+"");
+                info.setMonth(lastMonth);
+                info.setMeterNumber(0);
+                info.setCustomerNumber(0);
+                info.setAccountNumber(0);
+                pList.add(info);
+            }
+            accountList2.addAll(pList);
             payChargeSurveyDto.setList(accountList2);
             //System.out.println("时间："+latelyDate);
         }catch (Exception e) {
@@ -176,6 +200,11 @@ public class PayChargeSurveyServiceImpl implements PayChargeSurveyService {
     }
 
 
+    /**
+     * 交易概况
+     * @param periodDate
+     * @return
+     */
     public PayTransactionSurveyDto tranSurvey(String periodDate){
         PayTransactionSurveyDto payTransactionSurveyDto = new PayTransactionSurveyDto();
         LoginUser loginUser = UserUtil.getCurrentUser();
@@ -207,6 +236,7 @@ public class PayChargeSurveyServiceImpl implements PayChargeSurveyService {
 
             List<BaseClosingAccountInfoDto> list = baseClosingAccountInfoMapper.getList(null,null,
                     siteId,customerId,null);
+            //判断是否为当前账期，当前账期需要查询实时数据，历史账期查询记录表中的数据
             if((year.equals(list.get(0).getYear())) && (month.equals(list.get(0).getMonth()))){
                 //当前账期查询交易明细表
                 List<PayTransactionSurvey> tranList = payChargeSurveyMapper.getCurrentTranRocord(year,month,siteId,customerId);
@@ -250,7 +280,6 @@ public class PayChargeSurveyServiceImpl implements PayChargeSurveyService {
                 transactionSurver.setYear(year);
                 transactionSurver.setMonth(month);
                 payTransactionSurveyDto = this.tranCompute(transactionSurver);
-
             }
         }catch (Exception e) {
             e.printStackTrace();
@@ -259,20 +288,15 @@ public class PayChargeSurveyServiceImpl implements PayChargeSurveyService {
     }
 
 
+    //计算交易比率
     public PayTransactionSurveyDto tranCompute(PayTransactionSurvey transactionSurver){
         PayTransactionSurveyDto payTransactionSurveyDto = new PayTransactionSurveyDto();
-        Integer year = transactionSurver.getYear();
-        Integer month = transactionSurver.getMonth();
+        Integer year = transactionSurver.getYear();//年
+        Integer month = transactionSurver.getMonth();//月
+        //保留一位小数
         DecimalFormat df = new DecimalFormat("0.0");
         BigDecimal defc = new BigDecimal("0.0");
         BigDecimal defb = new BigDecimal("1.0");
-
-        //计算较上月比率
-        String lastCashRate = "";//现金比率
-        String lastWechatRate = "";//微信比率
-        String lastAlipayRate = "";//支付宝比率
-        String lastBankRate = "";//银行比率
-
         //本月
         BigDecimal cashIncome = defc;//现金
         BigDecimal wechatIncome = defc;//微信支付
@@ -283,6 +307,11 @@ public class PayChargeSurveyServiceImpl implements PayChargeSurveyService {
         BigDecimal lastwechatIncome = defc;//微信支付
         BigDecimal lastalipayIncome = defc; //支付宝
         BigDecimal lastbankIncome = defc;//银行
+        //计算较上月比率
+        String lastCashRate = "";//现金比率
+        String lastWechatRate = "";//微信比率
+        String lastAlipayRate = "";//支付宝比率
+        String lastBankRate = "";//银行比率
         try {
             BigDecimal currentIncome = transactionSurver.getIncomeNumber();//本月收入总数
             BigDecimal lastIncome = transactionSurver.getLastIncomeNumber();//上月收入总数
@@ -291,12 +320,12 @@ public class PayChargeSurveyServiceImpl implements PayChargeSurveyService {
             lastIncomeRate = df.format(income);
 
             //按支付方式
-            cashIncome = transactionSurver.getCashIncome();//本月现金收入
-            lastcashIncome = transactionSurver.getLastCashIncome();//上月现金收入
-            wechatIncome = transactionSurver.getWechatIncome();//本月微信
-            lastwechatIncome = transactionSurver.getLastWechatIncome();//上月微信
-            alipayIncome = transactionSurver.getAlipayIncome();//本月支付宝
-            lastalipayIncome = transactionSurver.getLastAlipayIncome();//上月支付宝
+            cashIncome = transactionSurver.getCashIncome();//本账期现金收入
+            lastcashIncome = transactionSurver.getLastCashIncome();//上期现金收入
+            wechatIncome = transactionSurver.getWechatIncome();//本账期微信
+            lastwechatIncome = transactionSurver.getLastWechatIncome();//上期微信
+            alipayIncome = transactionSurver.getAlipayIncome();//本账期支付宝
+            lastalipayIncome = transactionSurver.getLastAlipayIncome();//上期支付宝
             bankIncome = transactionSurver.getBankIncome();//本账期银行
             lastbankIncome = transactionSurver.getLastBankIncome();//上期银行
             //现金
@@ -316,21 +345,21 @@ public class PayChargeSurveyServiceImpl implements PayChargeSurveyService {
             lastBankRate = df.format(income);
 
             //饼状态占比率
-            currentIncome = alipayIncome.add(wechatIncome).add(bankIncome).add(cashIncome);
+            BigDecimal current = alipayIncome.add(wechatIncome).add(bankIncome).add(cashIncome);
             String CashRate = "";
             String alipayRate = "";
             String wechatRate = "";
             String bankRate = "";
-            income = cashIncome.divide(currentIncome,2, BigDecimal.ROUND_HALF_UP);
+            income = cashIncome.divide(current,2, BigDecimal.ROUND_HALF_UP);
             CashRate = df.format(income);
 
-            income = alipayIncome.divide(currentIncome,2, BigDecimal.ROUND_HALF_UP);
+            income = alipayIncome.divide(current,2, BigDecimal.ROUND_HALF_UP);
             alipayRate = df.format(income);
 
-            income = wechatIncome.divide(currentIncome,2, BigDecimal.ROUND_HALF_UP);
+            income = wechatIncome.divide(current,2, BigDecimal.ROUND_HALF_UP);
             wechatRate = df.format(income);
 
-            income = bankIncome.divide(currentIncome,2, BigDecimal.ROUND_HALF_UP);
+            income = bankIncome.divide(current,2, BigDecimal.ROUND_HALF_UP);
             bankRate = df.format(income);
 
             //收入总数
@@ -345,10 +374,12 @@ public class PayChargeSurveyServiceImpl implements PayChargeSurveyService {
             payTransactionSurveyDto.setLastAlipayRate(lastAlipayRate);
             payTransactionSurveyDto.setBankIncome(bankIncome);
             payTransactionSurveyDto.setLastBankRate(lastBankRate);
+            //饼状图
             payTransactionSurveyDto.setCashRate(CashRate);
             payTransactionSurveyDto.setAlipayRate(alipayRate);
             payTransactionSurveyDto.setWechatRate(wechatRate);
             payTransactionSurveyDto.setBankRate(bankRate);
+            //年月
             payTransactionSurveyDto.setYear(year);
             payTransactionSurveyDto.setMonth(month);
             payTransactionSurveyDto.setPeriodDates(year+"-"+String.format("%02d",month));
@@ -357,4 +388,78 @@ public class PayChargeSurveyServiceImpl implements PayChargeSurveyService {
         }
         return payTransactionSurveyDto;
     }
+
+
+    public PayFeeSueveyDto feeSurvey(){
+        PayFeeSueveyDto payFeeSveveyDto = new PayFeeSueveyDto();
+        LoginUser loginUser = UserUtil.getCurrentUser();
+        BigInteger siteId = BigInteger.valueOf(loginUser.getSiteId());
+        BigInteger customerId = BigInteger.valueOf(loginUser.getCustomerId());
+        BigDecimal defc = new BigDecimal("0.0");
+        try {
+            List<BaseClosingAccountInfoDto> closinList = baseClosingAccountInfoMapper.getList(null,null,
+                    siteId,customerId,null);
+            List<PayFeeSuevey> feeList = new ArrayList<PayFeeSuevey>();
+            PayFeeSuevey feeSuevey = new PayFeeSuevey();
+            //查找当前账期应收
+            Integer year = closinList.get(0).getYear();
+            Integer month = closinList.get(0).getMonth();
+            PayChargeSurvey chargeSurvey = payChargeSurveyMapper.getSumReceivable(year,month,siteId,customerId);
+            BigDecimal sumReceivable = chargeSurvey.getReceivableNumber();//应收总额
+            //查找当前账期实收
+            BigDecimal sumReceived = payChargeSurveyMapper.getSumReceived(year,month,siteId,customerId);
+            //查找当前账期预存
+            BigDecimal sumPrestore = payChargeSurveyMapper.getSumPrestore(year,month,siteId,customerId);
+            //查找当前账期欠费
+            BigDecimal sumDebt = chargeSurvey.getDebtNumber();//欠费总额
+            feeSuevey.setSumReceivable(sumReceivable);
+            feeSuevey.setSumReceived(sumReceived);
+            feeSuevey.setSumRecharge(sumPrestore);
+            feeSuevey.setSumDebt(sumDebt);
+            feeSuevey.setYear(year);
+            feeSuevey.setMonth(month);
+            feeSuevey.setPeriodDate(year+"-"+String.format("%02d",month));
+            feeList.add(feeSuevey);
+            //查找历史数据
+            List<PayFeeSuevey> list = payChargeSurveyMapper.getFeeGroup(null,null,siteId,customerId);
+            feeList.addAll(list);
+
+            Integer lastYear = 0;
+            Integer lastMonth = 0;
+            Integer num =0;
+            PayFeeSuevey fee = feeList.get(feeList.size()-1);
+            num = fee.getMonth();
+            lastYear = fee.getYear();
+            lastMonth = fee.getMonth();
+            List<PayFeeSuevey> sList = new ArrayList<PayFeeSuevey>();
+            for(int i=feeList.size(); i<=11; i++ ){
+                num--;
+                if(num == 0){
+                    lastYear = lastYear-1;
+                    lastMonth = 12;
+                    num = 12;
+                }else{
+                    lastYear = lastYear;
+                    lastMonth = num;
+                }
+                PayFeeSuevey suevey = new PayFeeSuevey();
+                suevey.setSumReceivable(defc);
+                suevey.setSumReceived(defc);
+                suevey.setSumRecharge(defc);
+                suevey.setSumDebt(defc);
+                suevey.setYear(lastYear);
+                suevey.setMonth(lastMonth);
+                suevey.setPeriodDate(lastYear+"-"+String.format("%02d",lastMonth));
+                sList.add(suevey);
+            }
+            feeList.addAll(sList);
+
+            payFeeSveveyDto.list = feeList;
+        }catch (Exception e) {
+            e.printStackTrace();
+        }
+        return payFeeSveveyDto;
+    }
+
+
 }

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

@@ -1,8 +1,8 @@
 package com.bz.smart_city.service.pay;
 
 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.entity.pay.PayTransactionSurvey;
 
 public interface PayChargeSurveyService {
     public Integer getAccountCount();
@@ -10,4 +10,7 @@ public interface PayChargeSurveyService {
     public PayChargeSurveyDto accountSurvey();
 
     public PayTransactionSurveyDto tranSurvey(String periodDate);
+
+    public PayFeeSueveyDto feeSurvey();
+
 }

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

@@ -347,4 +347,132 @@
             </if>
         </where>
     </select>
+    
+    <select id="getSumReceivable" resultType="com.bz.smart_city.entity.pay.PayChargeSurvey">
+        select
+            IFNULL(sum(receivablefee),0) as "receivableNumber",
+            IFNULL(sum(debt),0) as "debtNumber"
+        from pay_pay_receivable a
+        <where>
+            <if test="year != null">
+                and a.year =#{year}
+            </if>
+            <if test="month != null">
+                and a.month =#{month}
+            </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="getSumReceived" resultType="java.math.BigDecimal">
+        select IFNULL(sum(payamount),0) from pay_pay_received a
+        <where>
+            <if test="year != null">
+                and a.year =#{year}
+            </if>
+            <if test="month != null">
+                and a.month =#{month}
+            </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="getSumPrestore" resultType="java.math.BigDecimal">
+        select IFNULL(sum(transamount),0) from pay_pay_transactiondetails a
+        <where>
+            transtype = '4'
+            <if test="year != null">
+                and a.year =#{year}
+            </if>
+            <if test="month != null">
+                and a.month =#{month}
+            </if>
+            <if test="siteId != null">
+                and a.site_id =#{siteId}
+            </if>
+            <if test="customerId != null">
+                and a.customer_id =#{customerId}
+            </if>
+        </where>
+    </select>
+
+    <insert id="insertFeeSummary">
+        insert into pay_charge_survey
+        (
+            id,
+            receivable_number,
+            received_number,
+            recharge_number,
+            debt_number,
+            year,
+            month,
+            period_date,
+            site_id,
+            customer_id,
+            create_by,
+            create_date,
+            update_by,
+            update_date,
+            remarks,
+            del_flag
+        )
+        values
+        (
+            #{id},
+            #{receivableNumber},
+            #{receivedNumber},
+            #{rechargeNumber},
+            #{debtNumber},
+            #{year},
+            #{month},
+            #{periodDate},
+            #{siteId},
+            #{customerId},
+            #{createBy},
+            #{createDate},
+            #{updateBy},
+            #{updateDate},
+            #{remarks},
+            #{delFlag}
+        )
+    </insert>
+
+
+    <select id="getFeeGroup" resultType="com.bz.smart_city.entity.pay.PayFeeSuevey">
+        select
+            a.receivable_number as "sumReceivable",
+            a.received_number as "sumReceived",
+            a.recharge_number as "sumRecharge",
+            a.debt_number as "sumDebt",
+            a.year as "year",
+            a.month as "month",
+            concat(a.year,'-',LPAD(a.month, 2, 0)) as "periodDate"
+        from pay_charge_survey a
+        <where>
+            <if test="year != null">
+                and a.year =#{year}
+            </if>
+            <if test="month != null">
+                and a.month =#{month}
+            </if>
+            <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 12
+    </select>
+
 </mapper>