Merge remote-tracking branch 'origin/test'

src/main/java/com/ydtech/modules/ins/model/guoren/CarPriceReq.java

@@ -153,9 +153,9 @@ public class CarPriceReq {
             TrafficManagementVehicleType trafficManagementVehicleType = Enum.valueOf(TrafficManagementVehicleType.class, carInfo.getCartype());
             // 货车修改
             if (trafficManagementVehicleType.getDesc().contains("罐式")) {
-                prpTitemCar.setCarKindCode(CarKindCode.H3.getCode());
-            } else {
                 prpTitemCar.setCarKindCode(CarKindCode.T11.getCode());
+            } else {
+                prpTitemCar.setCarKindCode(CarKindCode.H3.getCode());
             }
         }
 

src/main/java/com/ydtech/modules/inv/controller/InvReceivableController.java

@@ -1,25 +1,19 @@
 package com.ydtech.modules.inv.controller;
 
-import com.alibaba.excel.EasyExcel;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.core.page.PageResult;
 import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.esm.model.EsmInsCompany;
-import com.ydtech.modules.inv.model.po.InvChannelAccount;
 import com.ydtech.modules.inv.model.po.InvSettlementSource;
 import com.ydtech.modules.inv.model.po.InvSource;
-import com.ydtech.modules.inv.model.po.QueryInvChannelAccount;
 import com.ydtech.modules.inv.model.vo.*;
-import com.ydtech.modules.inv.service.InvChannelAccountService;
 import com.ydtech.modules.inv.service.InvReceivableService;
 import com.ydtech.modules.inv.utils.EasyExcelUtils;
 import com.ydtech.modules.order.entity.BasePageResult;
-import com.ydtech.utils.excel.ExcelUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
@@ -28,15 +22,12 @@ import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.time.YearMonth;
 import java.time.format.DateTimeFormatter;
 import java.util.List;
 
 
 /**
- *
  * @author jianlong
  * @date 2024-01-05 09:31
  */
@@ -57,7 +48,7 @@ public class InvReceivableController extends BaseController {
 
     @ApiOperation("应收导入数据分页查询")
     @PostMapping("receivablePage")
-    public HttpResult<PageResult> receivablePage(@RequestBody InvSourceQueryVo invSourceQueryVo){
+    public HttpResult<PageResult> receivablePage(@RequestBody InvSourceQueryVo invSourceQueryVo) {
 
         IPage<InvSource> recivablePage = invReceivableService.getRecivablePage(invSourceQueryVo);
         PageResult pageResult = buildPageResponse(recivablePage);
@@ -66,14 +57,14 @@ public class InvReceivableController extends BaseController {
 
     @ApiOperation("应收导入数据修改")
     @PostMapping("receivableUpdates")
-    public HttpResult updateRecivable(@RequestBody InvSource invSource){
+    public HttpResult updateRecivable(@RequestBody InvSource invSource) {
         Boolean b = invReceivableService.updateRecivable(invSource);
         return b ? HttpResult.ok("修改成功") : HttpResult.error("修改失败");
     }
 
     @ApiOperation("应收导入批量数据修改")
     @PostMapping("receivableUpdateBatch")
-    public HttpResult updateRecivableBatch(@RequestBody InvSource invSource){
+    public HttpResult updateRecivableBatch(@RequestBody InvSource invSource) {
         Boolean b = invReceivableService.updateRecivableBatch(invSource);
         return b ? HttpResult.ok("修改成功") : HttpResult.error("修改失败");
     }
@@ -84,23 +75,23 @@ public class InvReceivableController extends BaseController {
         List<InvSource> recivablePage = invReceivableService.getRecivableList(invSourceQueryVo);
         String uploadPath = this.uploadPath + "/excel/";
         Path path = Paths.get(uploadPath);
-        if(!Files.exists(path)){
+        if (!Files.exists(path)) {
             Files.createDirectories(path);
         }
         String fileName = EasyExcelUtils.downExcel(uploadPath, "应收表", InvSource.class, recivablePage);
-        return HttpResult.ok(uploadUrl + "excel/" +fileName);
+        return HttpResult.ok(uploadUrl + "excel/" + fileName);
     }
 
     @ApiOperation("应收导入新增")
     @PostMapping("addReceivable")
-    public HttpResult addReceivable(@RequestBody InvSource invSource){
+    public HttpResult addReceivable(@RequestBody InvSource invSource) {
         Boolean b = invReceivableService.addReceivable(invSource);
         return b ? HttpResult.ok("新增成功") : HttpResult.error("新增失败");
     }
 
     @ApiOperation("应收导入删除")
     @PostMapping("deleteReceivable")
-    public HttpResult deleteReceivable(@RequestBody String[] ids){
+    public HttpResult deleteReceivable(@RequestBody String[] ids) {
         Boolean b = invReceivableService.deleteReceivable(ids);
         return b ? HttpResult.ok("删除成功") : HttpResult.error("删除失败");
     }
@@ -108,7 +99,7 @@ public class InvReceivableController extends BaseController {
 
     @ApiOperation("结算导入数据分页查询")
     @PostMapping("settlementPage")
-    public HttpResult<PageResult> settlementPage(@RequestBody InvSettlementSourceQueryVo invSettlementSourceQueryVo){
+    public HttpResult<PageResult> settlementPage(@RequestBody InvSettlementSourceQueryVo invSettlementSourceQueryVo) {
 
         IPage<InvSettlementSource> recivablePage = invReceivableService.getSettlementPage(invSettlementSourceQueryVo);
         PageResult pageResult = buildPageResponse(recivablePage);
@@ -117,14 +108,14 @@ public class InvReceivableController extends BaseController {
 
     @ApiOperation("结算导入数据修改")
     @PostMapping("updateSettlement")
-    public HttpResult updateSettlement(@RequestBody InvSettlementSource invSettlementSource){
+    public HttpResult updateSettlement(@RequestBody InvSettlementSource invSettlementSource) {
         Boolean b = invReceivableService.updateSettlement(invSettlementSource);
         return b ? HttpResult.ok("修改成功") : HttpResult.error("修改失败");
     }
 
     @ApiOperation("结算导入数据批量修改")
     @PostMapping("updateSettlementBatch")
-    public HttpResult updateSettlementBatch(@RequestBody InvSettlementSource invSettlementSource){
+    public HttpResult updateSettlementBatch(@RequestBody InvSettlementSource invSettlementSource) {
         Boolean b = invReceivableService.updateSettlementBatch(invSettlementSource);
         return b ? HttpResult.ok("修改成功") : HttpResult.error("修改失败");
     }
@@ -135,65 +126,75 @@ public class InvReceivableController extends BaseController {
         List<InvSettlementSource> recivableList = invReceivableService.getSettlementList(invSettlementSourceQueryVo);
         String uploadPath = this.uploadPath + "/excel/";
         Path path = Paths.get(uploadPath);
-        if(!Files.exists(path)){
+        if (!Files.exists(path)) {
             Files.createDirectories(path);
         }
         String fileName = EasyExcelUtils.downExcel(uploadPath, "结算表", InvSettlementSource.class, recivableList);
-        return HttpResult.ok(uploadUrl + "excel/" +fileName);
+        return HttpResult.ok(uploadUrl + "excel/" + fileName);
+    }
+
+    @ApiOperation("结算导入删除")
+    @PostMapping("deleteSettlement")
+    public HttpResult deleteSettlement(@RequestBody String[] ids) {
+        Boolean b = invReceivableService.deleteSettlement(ids);
+        return b ? HttpResult.ok("删除成功") : HttpResult.error("删除失败");
     }
 
 
     @ApiOperation("应收结果")
     @GetMapping("receivableResult")
-    public HttpResult<BasePageResult<ReceivableResultVo>> receivableResult(String yearMonthStr,String insuranceId){
+    public HttpResult<BasePageResult<ReceivableResultVo>> receivableResult(String yearMonthStr, String insuranceId) {
         // 获取当前年月
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM");
         YearMonth yearMonth = YearMonth.parse(yearMonthStr, formatter);
         // 获取当前月份的最大天数
         int maxDaysInMonth = yearMonth.lengthOfMonth();
-        List<ReceivableResultVo> invChannelAccountList = invReceivableService.getReceivableList(yearMonth.toString() + "-01",yearMonth.toString() + "-" + String.valueOf(maxDaysInMonth),insuranceId);
+        List<ReceivableResultVo> invChannelAccountList = invReceivableService.getReceivableList(yearMonth + "-01",
+                yearMonth + "-" + maxDaysInMonth, insuranceId);
         BasePageResult<ReceivableResultVo> invChannelAccountBasePageResult = new BasePageResult<>(0, 0, 0, 0, invChannelAccountList);
         return HttpResult.ok(invChannelAccountBasePageResult);
     }
 
     @ApiOperation("签单日期结算来源表")
     @GetMapping("signingSourceResult")
-    public HttpResult<BasePageResult<SigningSourceResultVo>> signingSourceResult(String yearMonthStr){
+    public HttpResult<BasePageResult<SigningSourceResultVo>> signingSourceResult(String yearMonthStr, String insuranceId) {
         // 获取当前年月
         String startMonth = yearMonthStr + "-01-01";
         String endMonth = yearMonthStr + "-12-31";
-        List<SigningSourceResultVo> invChannelAccountList = invReceivableService.getSigningSourceResult(yearMonthStr,startMonth,endMonth);
+        List<SigningSourceResultVo> invChannelAccountList = invReceivableService.getSigningSourceResult(yearMonthStr, insuranceId,
+                startMonth, endMonth);
         BasePageResult<SigningSourceResultVo> invChannelAccountBasePageResult = new BasePageResult<>(0, 0, 0, 0, invChannelAccountList);
         return HttpResult.ok(invChannelAccountBasePageResult);
     }
 
     @ApiOperation("结算日期结算来源表")
     @GetMapping("settlementSourceResult")
-    public HttpResult<BasePageResult<SettlementSourceResultVo>> settlementSourceResult(String yearMonthStr,String insuranceId){
+    public HttpResult<BasePageResult<SettlementSourceResultVo>> settlementSourceResult(String yearMonthStr, String insuranceId) {
         // 获取当前年月
-        List<SettlementSourceResultVo> invChannelAccountList = invReceivableService.getSettlementSourceResult(yearMonthStr,insuranceId);
+        List<SettlementSourceResultVo> invChannelAccountList = invReceivableService.getSettlementSourceResult(yearMonthStr, insuranceId);
         BasePageResult<SettlementSourceResultVo> invChannelAccountBasePageResult = new BasePageResult<>(0, 0, 0, 0, invChannelAccountList);
         return HttpResult.ok(invChannelAccountBasePageResult);
     }
 
     @ApiOperation("同步应收表与结算表的状态")
     @GetMapping("syncStatus")
-    public HttpResult syncStatus(){
+    public HttpResult syncStatus() {
         Integer i = invReceivableService.syncStatus();
         return HttpResult.ok("同步成功,共同步" + i + "条数据");
     }
 
     @ApiOperation("获取保险公司")
     @GetMapping("getInsureCompany")
-    public HttpResult getInsureCompany(){
+    public HttpResult getInsureCompany() {
         List<EsmInsCompany> insureCompany = invReceivableService.getInsureCompany();
         return HttpResult.ok(insureCompany);
     }
 
     @ApiOperation("应收应付表")
     @PostMapping("receivableAndSettlement")
-    public HttpResult<PageResult> receivableAndSettlement(@RequestBody ReceivableAndSettlementQueryVo receivableAndSettlementQueryVo){
-        Page<ReceivableAndSettlementVo> invChannelAccountList = invReceivableService.getReceivableAndSettlementPage(receivableAndSettlementQueryVo);
+    public HttpResult<PageResult> receivableAndSettlement(@RequestBody ReceivableAndSettlementQueryVo receivableAndSettlementQueryVo) {
+        Page<ReceivableAndSettlementVo> invChannelAccountList =
+                invReceivableService.getReceivableAndSettlementPage(receivableAndSettlementQueryVo);
         PageResult pageResult = buildPageResponse(invChannelAccountList);
         return HttpResult.ok(pageResult);
     }
@@ -203,28 +204,28 @@ public class InvReceivableController extends BaseController {
     public HttpResult excelReceivableAndSettlement(@RequestBody ReceivableAndSettlementQueryVo receivableAndSettlementQueryVo) throws IOException {
         String uploadPath = this.uploadPath + "/excel/";
         Path path = Paths.get(uploadPath);
-        if(!Files.exists(path)){
+        if (!Files.exists(path)) {
             Files.createDirectories(path);
         }
-        List<ReceivableAndSettlementVo> invChannelAccountList = invReceivableService.getReceivableAndSettlementList(receivableAndSettlementQueryVo);
+        List<ReceivableAndSettlementVo> invChannelAccountList =
+                invReceivableService.getReceivableAndSettlementList(receivableAndSettlementQueryVo);
         String fileName = EasyExcelUtils.downExcel(uploadPath, "应收应付表", ReceivableAndSettlementVo.class, invChannelAccountList);
-        return HttpResult.ok(uploadUrl + "excel/" +fileName);
+        return HttpResult.ok(uploadUrl + "excel/" + fileName);
     }
 
     @ApiOperation("数据匹配")
     @GetMapping("dataMatching")
-    public HttpResult dataMatching(){
+    public HttpResult dataMatching() {
         List<String> licensenos = invReceivableService.dataMatching();
-        if(licensenos.size() > 0)
-        {
-            String msg = "";
-            for(int i=0;i<licensenos.size();i++){
-                msg += licensenos.get(i) + ",";
+        if (!licensenos.isEmpty()) {
+            StringBuilder msg = new StringBuilder();
+            for (String licenseno : licensenos) {
+                msg.append(licenseno).append(",");
             }
-            msg = msg.substring(0,msg.length()-1);
-            return HttpResult.ok("有"+licensenos.size()+"条数据与应收表数据无法匹配,其中包括:" + msg,true);
+            msg = new StringBuilder(msg.substring(0, msg.length() - 1));
+            return HttpResult.ok("有" + licensenos.size() + "条数据与应收表数据无法匹配,其中包括:" + msg, true);
         }
-        return HttpResult.ok("",false);
+        return HttpResult.ok("", false);
     }
 
 }

src/main/java/com/ydtech/modules/inv/dao/InvReceivableMapper.java

@@ -20,7 +20,7 @@ import java.util.List;
 public interface InvReceivableMapper extends BaseMapper<InvChannelAccount> {
     List<ReceivableResultVo> getReceivableList(String startTime, String endTime,String insuranceId);
 
-    List<SigningSourceResultVo> getSigningSourceResult(String startTime, String endTime);
+    List<SigningSourceResultVo> getSigningSourceResult(String startTime, String endTime, String insuranceId);
 
     List<SigningSourceResultVo> getSigningSourceDayResult(String startTime, String endTime,String insuranceId);
 

src/main/java/com/ydtech/modules/inv/service/InvReceivableService.java

@@ -2,32 +2,27 @@ package com.ydtech.modules.inv.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.esm.model.EsmInsCompany;
-import com.ydtech.modules.inv.model.InvAccount;
 import com.ydtech.modules.inv.model.po.InvSettlementSource;
 import com.ydtech.modules.inv.model.po.InvSource;
-import com.ydtech.modules.inv.model.po.QueryInvChannelAccount;
 import com.ydtech.modules.inv.model.vo.*;
 
-import java.util.HashMap;
 import java.util.List;
 
 /**
-* @author Administrator
-* @description 针对表【ins_account(账户信息表)】的数据库操作Service
-* @createDate 2024-01-04 18:29:20
-*/
+ * @author Administrator
+ * @description 针对表【ins_account(账户信息表)】的数据库操作Service
+ * @createDate 2024-01-04 18:29:20
+ */
 public interface InvReceivableService {
 
-    List<ReceivableResultVo> getReceivableList(String startTime,String endTime,String insuranceId);
+    List<ReceivableResultVo> getReceivableList(String startTime, String endTime, String insuranceId);
 
-    List<SigningSourceResultVo> getSigningSourceResult(String yearMonthStr,String startTime, String endTime);
+    List<SigningSourceResultVo> getSigningSourceResult(String yearMonthStr, String insuranceId, String startTime, String endTime);
 
-    List<SigningSourceResultVo> getSigningSourceDayResult(String yearMonthStr,String startTime, String endTime,String insuranceId);
+    List<SigningSourceResultVo> getSigningSourceDayResult(String yearMonthStr, String startTime, String endTime, String insuranceId);
 
-    List<SettlementSourceResultVo> getSettlementSourceResult(String yearMonthStr,String insuranceId);
+    List<SettlementSourceResultVo> getSettlementSourceResult(String yearMonthStr, String insuranceId);
 
 
     IPage<InvSource> getRecivablePage(InvSourceQueryVo invSourceQueryVo);
@@ -59,4 +54,6 @@ public interface InvReceivableService {
     Boolean addReceivable(InvSource invSource);
 
     List<String> dataMatching();
+
+    Boolean deleteSettlement(String[] ids);
 }

src/main/java/com/ydtech/modules/inv/service/impl/InvReceivableServiceImpl.java

@@ -3,21 +3,14 @@ package com.ydtech.modules.inv.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ydtech.core.page.HttpResult;
 import com.ydtech.core.page.PageRequest;
 import com.ydtech.modules.esm.model.EsmInsCompany;
-import com.ydtech.modules.inv.dao.InvChannelAccountMapper;
 import com.ydtech.modules.inv.dao.InvReceivableMapper;
 import com.ydtech.modules.inv.dao.InvSettlementSourceMapper;
 import com.ydtech.modules.inv.dao.InvSourceMapper;
-import com.ydtech.modules.inv.model.InvAccount;
-import com.ydtech.modules.inv.model.po.InvChannelAccount;
 import com.ydtech.modules.inv.model.po.InvSettlementSource;
 import com.ydtech.modules.inv.model.po.InvSource;
-import com.ydtech.modules.inv.model.po.QueryInvChannelAccount;
 import com.ydtech.modules.inv.model.vo.*;
-import com.ydtech.modules.inv.service.InvChannelAccountService;
 import com.ydtech.modules.inv.service.InvReceivableService;
 import com.ydtech.modules.inv.service.InvSourceService;
 import com.ydtech.utils.idgen.IdGenerate;
@@ -26,7 +19,6 @@ import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.time.MonthDay;
 import java.time.YearMonth;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
@@ -36,10 +28,10 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 /**
-* @author Administrator
-* @description 针对表【inv_channel_account(渠道账户表)】的数据库操作Service实现
-* @createDate 2024-01-20 10:29:30
-*/
+ * @author Administrator
+ * @description 针对表【inv_channel_account(渠道账户表)】的数据库操作Service实现
+ * @createDate 2024-01-20 10:29:30
+ */
 @Service
 public class InvReceivableServiceImpl implements InvReceivableService {
     @Autowired
@@ -55,13 +47,13 @@ public class InvReceivableServiceImpl implements InvReceivableService {
     InvSettlementSourceMapper invSettlementSourceMapper;
 
     @Override
-    public List<ReceivableResultVo> getReceivableList(String startTime, String endTime,String insuranceId) {
-        return invReceivableMapper.getReceivableList(startTime,endTime,insuranceId);
+    public List<ReceivableResultVo> getReceivableList(String startTime, String endTime, String insuranceId) {
+        return invReceivableMapper.getReceivableList(startTime, endTime, insuranceId);
     }
 
     @Override
-    public List<SigningSourceResultVo> getSigningSourceResult(String yearMonthStr,String startTime, String endTime) {
-        List<SigningSourceResultVo> signingSources = invReceivableMapper.getSigningSourceResult(startTime, endTime);
+    public List<SigningSourceResultVo> getSigningSourceResult(String yearMonthStr, String insuranceId, String startTime, String endTime) {
+        List<SigningSourceResultVo> signingSources = invReceivableMapper.getSigningSourceResult(startTime, endTime, insuranceId);
         List<SigningSourceResultVo> signingSourceResult = new ArrayList<>();
 
         Float jqPremiumTax = 0f;
@@ -70,14 +62,13 @@ public class InvReceivableServiceImpl implements InvReceivableService {
         Float writtenPremium = 0f;
         Float settlementAmount = 0f;
 
-        for(int i=1;i<=12;i++){
+        for (int i = 1; i <= 12; i++) {
             //查找day是否有数据
             String finalI = i < 10 ? "0" + String.valueOf(i) : String.valueOf(i);
             boolean countBol = signingSources.stream().filter(x -> finalI.equals(x.getDay())).count() > 0 ? true : false;
-            if(countBol)
-            {
+            if (countBol) {
                 signingSourceResult.add(signingSources.stream().filter(x -> String.valueOf(finalI).equals(x.getDay())).findFirst().get());
-            }else{
+            } else {
                 SigningSourceResultVo signingSourceResultVo = new SigningSourceResultVo();
                 signingSourceResultVo.setDay(finalI);
                 signingSourceResultVo.setYearmonth(yearMonthStr + "-" + finalI);
@@ -87,7 +78,7 @@ public class InvReceivableServiceImpl implements InvReceivableService {
 
 
         //处理合计
-        for(SigningSourceResultVo vo : signingSourceResult){
+        for (SigningSourceResultVo vo : signingSourceResult) {
             jqPremiumTax = Float.parseFloat(vo.getJqPremiumTax()) + jqPremiumTax;
             syPremiumTax = Float.parseFloat(vo.getSyPremiumTax()) + syPremiumTax;
             nonCarPremiumTax = Float.parseFloat(vo.getNonCarPremiumTax()) + nonCarPremiumTax;
@@ -106,8 +97,9 @@ public class InvReceivableServiceImpl implements InvReceivableService {
     }
 
     @Override
-    public List<SigningSourceResultVo> getSigningSourceDayResult(String yearMonthStr, String startTime, String endTime,String insuranceId) {
-        List<SigningSourceResultVo> signingSources = invReceivableMapper.getSigningSourceDayResult(startTime, endTime,insuranceId);
+    public List<SigningSourceResultVo> getSigningSourceDayResult(String yearMonthStr, String startTime, String endTime,
+                                                                 String insuranceId) {
+        List<SigningSourceResultVo> signingSources = invReceivableMapper.getSigningSourceDayResult(startTime, endTime, insuranceId);
         List<SigningSourceResultVo> signingSourceResult = new ArrayList<>();
         // 定义日期时间格式
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM");
@@ -120,14 +112,13 @@ public class InvReceivableServiceImpl implements InvReceivableService {
         Float writtenPremium = 0f;
         Float settlementAmount = 0f;
 
-        for(int i=1;i<=maxDays;i++){
+        for (int i = 1; i <= maxDays; i++) {
             //查找day是否有数据
             String finalI = i < 10 ? "0" + String.valueOf(i) : String.valueOf(i);
             boolean countBol = signingSources.stream().filter(x -> finalI.equals(x.getDay())).count() > 0 ? true : false;
-            if(countBol)
-            {
+            if (countBol) {
                 signingSourceResult.add(signingSources.stream().filter(x -> String.valueOf(finalI).equals(x.getDay())).findFirst().get());
-            }else{
+            } else {
                 SigningSourceResultVo signingSourceResultVo = new SigningSourceResultVo();
                 signingSourceResultVo.setDay(finalI);
                 signingSourceResultVo.setYearmonth(yearMonthStr + "-" + finalI);
@@ -137,7 +128,7 @@ public class InvReceivableServiceImpl implements InvReceivableService {
 
 
         //处理合计
-        for(SigningSourceResultVo vo : signingSourceResult){
+        for (SigningSourceResultVo vo : signingSourceResult) {
             jqPremiumTax = Float.parseFloat(vo.getJqPremiumTax()) + jqPremiumTax;
             syPremiumTax = Float.parseFloat(vo.getSyPremiumTax()) + syPremiumTax;
             nonCarPremiumTax = Float.parseFloat(vo.getNonCarPremiumTax()) + nonCarPremiumTax;
@@ -174,11 +165,12 @@ public class InvReceivableServiceImpl implements InvReceivableService {
         String[] next12MonthsDates = getNext12MonthsDates(yearMonth);
         int maxDays = yearMonth.lengthOfMonth();
         //获取签单数据
-        List<SigningSourceResultVo> signingSources = invReceivableMapper.getSigningSourceDayResult(yearMonthStr + "-01", yearMonthStr + "-" + maxDays,insuranceId);
+        List<SigningSourceResultVo> signingSources = invReceivableMapper.getSigningSourceDayResult(yearMonthStr + "-01", yearMonthStr +
+                "-" + maxDays, insuranceId);
         //转换类型
         List<SettlementSourceResultVo> settlementSourcesTmp = new ArrayList<>();
         List<SettlementSourceResultVo> settlementSources = new ArrayList<>();
-        signingSources.forEach(signing->{
+        signingSources.forEach(signing -> {
             SettlementSourceResultVo settlementSourceResultVo = new SettlementSourceResultVo();
             settlementSourceResultVo.setDay(signing.getDay());
             settlementSourceResultVo.setSignDate(signing.getYearmonth());
@@ -188,47 +180,44 @@ public class InvReceivableServiceImpl implements InvReceivableService {
             settlementSourcesTmp.add(settlementSourceResultVo);
         });
 
-        for(int i=1;i<=maxDays;i++)
-        {
+        for (int i = 1; i <= maxDays; i++) {
             //查找day是否有数据
             String finalI = i < 10 ? "0" + String.valueOf(i) : String.valueOf(i);
             boolean countBol = settlementSourcesTmp.stream().filter(x -> finalI.equals(x.getDay())).count() > 0 ? true : false;
-            if(!countBol)
-            {
+            if (!countBol) {
                 SettlementSourceResultVo settlementSourceResultVo = new SettlementSourceResultVo();
                 settlementSourceResultVo.setDay(finalI);
                 settlementSourceResultVo.setSignDate(yearMonthStr + "-" + finalI);
                 settlementSources.add(settlementSourceResultVo);
-            }else{
+            } else {
                 settlementSources.add(settlementSourcesTmp.stream().filter(x -> finalI.equals(x.getDay())).findFirst().get());
             }
         }
 
         int year = yearMonth.getYear();
         //遍历结算数据
-        settlementSources.forEach(signing->{
+        settlementSources.forEach(signing -> {
 //            String startTime = String.valueOf(year) + "-01-01";
 //            String endTime = String.valueOf(year) + "-12-31";
             String startTime = next12MonthsDates[0] + "-01";
             int day = YearMonth.parse(next12MonthsDates[11], formatter).lengthOfMonth();
             String endTime = next12MonthsDates[11] + "-" + day;
             List<SettlementSourceDataVo> settlementSourceResultTmp =
-                    invReceivableMapper.getSettlementSourceResult(signing.getSignDate(),startTime, endTime, insuranceId);
+                    invReceivableMapper.getSettlementSourceResult(signing.getSignDate(), startTime, endTime, insuranceId);
             List<SettlementSourceDataVo> settlementSourceResult = new ArrayList<>();
             System.out.printf("1");
             //补齐数据
-            for(int i=0;i<12;i++)
-            {
+            for (int i = 0; i < 12; i++) {
                 //查找day是否有数据
                 String month = next12MonthsDates[i];
-                boolean countBol = settlementSourceResultTmp.stream().filter(x -> month.equals(x.getSettlementDate())).count() > 0 ? true : false;
-                if(!countBol)
-                {
+                boolean countBol = settlementSourceResultTmp.stream().filter(x -> month.equals(x.getSettlementDate())).count() > 0 ?
+                        true : false;
+                if (!countBol) {
                     SettlementSourceDataVo settlementSourceData = new SettlementSourceDataVo();
                     settlementSourceData.setDay(month);
                     settlementSourceData.setSettlementDate(next12MonthsDates[i]);
                     settlementSourceResult.add(settlementSourceData);
-                }else{
+                } else {
                     settlementSourceResult.add(settlementSourceResultTmp.stream().filter(x -> month.equals(x.getSettlementDate())).findFirst().get());
                 }
             }
@@ -237,12 +226,12 @@ public class InvReceivableServiceImpl implements InvReceivableService {
 
 
         //计算每个日期的签单保费 和代理人佣金
-        settlementSources.forEach(settlementSource->{
+        settlementSources.forEach(settlementSource -> {
             int length = settlementSource.getSettlementData().size();
             BigDecimal settlementPremium = new BigDecimal(0);
             BigDecimal agentCommission = new BigDecimal(0);
             //横向计算
-            for(int i=0;i<length;i++){
+            for (int i = 0; i < length; i++) {
                 SettlementSourceDataVo settlementSourceData = settlementSource.getSettlementData().get(i);
                 settlementPremium = settlementPremium.add(settlementSourceData.getSettlementPremium());
                 agentCommission = agentCommission.add(settlementSourceData.getAgentCommission());
@@ -260,7 +249,7 @@ public class InvReceivableServiceImpl implements InvReceivableService {
         // 计算每个日期的签单保费 和代理人佣金 竖向计算
         List<SettlementSourceDataVo> settlementSourceDataSum = new ArrayList<>();
 
-        for(int i=0;i<12;i++){
+        for (int i = 0; i < 12; i++) {
             //提取每个月的数据
 //            String finalI = i < 10 ? "0" + String.valueOf(i) : String.valueOf(i);
             String month = next12MonthsDates[i];
@@ -269,11 +258,11 @@ public class InvReceivableServiceImpl implements InvReceivableService {
             BigDecimal settlementPremium = new BigDecimal(0);
             BigDecimal agentCommission = new BigDecimal(0);
 
-            for(int j=0;j<settlementSources.size();j++){
+            for (int j = 0; j < settlementSources.size(); j++) {
 
-                List<SettlementSourceDataVo> collect = settlementSources.get(j).getSettlementData().stream().filter(x -> x.getSettlementDate() != null && x.getSettlementDate().equals(month)).collect(Collectors.toList());
-                for(int k=0;k<collect.size();k++)
-                {
+                List<SettlementSourceDataVo> collect =
+                        settlementSources.get(j).getSettlementData().stream().filter(x -> x.getSettlementDate() != null && x.getSettlementDate().equals(month)).collect(Collectors.toList());
+                for (int k = 0; k < collect.size(); k++) {
                     settlementPremium = settlementPremium.add(collect.get(k).getAgentCommission());
                     agentCommission = agentCommission.add(collect.get(k).getAgentCommission());
                 }
@@ -287,7 +276,8 @@ public class InvReceivableServiceImpl implements InvReceivableService {
 
         //未结算签单保费 与 已结算利润计算
         settlementSources.forEach(settlementSource -> {
-            SettlementSourceDataVo settlementSourceDataVo = settlementSource.getSettlementData().stream().filter(x -> !"合计".equals(x.getSettlementDate())).findFirst().get();
+            SettlementSourceDataVo settlementSourceDataVo =
+                    settlementSource.getSettlementData().stream().filter(x -> !"合计".equals(x.getSettlementDate())).findFirst().get();
             settlementSource.setUnCalculatedAmount(settlementSource.getSignPremium().subtract(settlementSourceDataVo.getSettlementPremium()));
             settlementSource.setSettledProfit(settlementSource.getSignReceivableAmount().subtract(settlementSourceDataVo.getAgentCommission()));
         });
@@ -295,25 +285,29 @@ public class InvReceivableServiceImpl implements InvReceivableService {
         //计算代理人佣金
         List<HashMap> maxReceivable = invReceivableMapper.getMaxReceivable(yearMonthStr + "-01", yearMonthStr + "-" + maxDays);
         settlementSources.forEach(settlementSource -> {
-            Boolean b = maxReceivable.stream().filter(x -> settlementSource.getSignDate().equals(x.get("yeatmonth"))).findFirst().isPresent();
-            if(!b)
-            {
+            Boolean b =
+                    maxReceivable.stream().filter(x -> settlementSource.getSignDate().equals(x.get("yeatmonth"))).findFirst().isPresent();
+            if (!b) {
                 settlementSource.setAgentAmount(new BigDecimal(0));
-            }else{
-                HashMap max = maxReceivable.stream().filter(x -> settlementSource.getSignDate().equals(x.get("yeatmonth"))).findFirst().get();
-                SettlementSourceDataVo settlementSourceDataVo = settlementSource.getSettlementData().get(settlementSource.getSettlementData().size() - 1);
+            } else {
+                HashMap max =
+                        maxReceivable.stream().filter(x -> settlementSource.getSignDate().equals(x.get("yeatmonth"))).findFirst().get();
+                SettlementSourceDataVo settlementSourceDataVo =
+                        settlementSource.getSettlementData().get(settlementSource.getSettlementData().size() - 1);
                 settlementSource.setAgentAmount(new BigDecimal(max.get("receivable").toString()).subtract(settlementSourceDataVo.getAgentCommission()));
             }
         });
         //计算未结算利润测算
-        List<HashMap> unsettledProfitCalculation = invReceivableMapper.getUnsettledProfitCalculation(yearMonthStr + "-01", yearMonthStr + "-" + maxDays);
+        List<HashMap> unsettledProfitCalculation = invReceivableMapper.getUnsettledProfitCalculation(yearMonthStr + "-01",
+                yearMonthStr + "-" + maxDays);
         settlementSources.forEach(settlementSource -> {
-            Boolean b = unsettledProfitCalculation.stream().filter(x -> settlementSource.getSignDate().equals(x.get("yeatmonth"))).findFirst().isPresent();
-            if(!b)
-            {
+            Boolean b =
+                    unsettledProfitCalculation.stream().filter(x -> settlementSource.getSignDate().equals(x.get("yeatmonth"))).findFirst().isPresent();
+            if (!b) {
                 settlementSource.setUnsettledProfitCalculation(new BigDecimal(0));
-            }else{
-                HashMap max = unsettledProfitCalculation.stream().filter(x -> settlementSource.getSignDate().equals(x.get("yeatmonth"))).findFirst().get();
+            } else {
+                HashMap max =
+                        unsettledProfitCalculation.stream().filter(x -> settlementSource.getSignDate().equals(x.get("yeatmonth"))).findFirst().get();
                 settlementSource.setUnsettledProfitCalculation(new BigDecimal(max.get("unsettled_profit_calculation").toString()));
             }
         });
@@ -338,7 +332,6 @@ public class InvReceivableServiceImpl implements InvReceivableService {
         }
 
 
-
         //合计
         SettlementSourceResultVo settlementSourceResultVo = new SettlementSourceResultVo();
         settlementSourceResultVo.setSignDate("合计");
@@ -359,14 +352,12 @@ public class InvReceivableServiceImpl implements InvReceivableService {
         pageRequest.setPageNum(invSourceQueryVo.getPageNum());
         pageRequest.setPageSize(invSourceQueryVo.getPageSize());
         Page page = PageRequest.buildPageRequest(pageRequest);
-        if(invSourceQueryVo.getSigningTime() != null && !"".equals(invSourceQueryVo.getSigningTime()))
-        {
+        if (invSourceQueryVo.getSigningTime() != null && !"".equals(invSourceQueryVo.getSigningTime())) {
             String[] split = invSourceQueryVo.getSigningTime().split(",");
             invSourceQueryVo.setSigningTimeStartTime(split[0]);
             invSourceQueryVo.setSigningTimeEndTime(split[1]);
         }
-        if(invSourceQueryVo.getClearingTime() != null && !"".equals(invSourceQueryVo.getClearingTime()))
-        {
+        if (invSourceQueryVo.getClearingTime() != null && !"".equals(invSourceQueryVo.getClearingTime())) {
             String[] split1 = invSourceQueryVo.getClearingTime().split(",");
             invSourceQueryVo.setClearingTimeStartTime(split1[0]);
             invSourceQueryVo.setClearingTimeEndTime(split1[1]);
@@ -375,7 +366,7 @@ public class InvReceivableServiceImpl implements InvReceivableService {
 
         Page<InvSource> pageData = invSourceMapper.getRecivablePage(page, invSourceQueryVo);
         List<InvSource> records = pageData.getRecords();
-        records.forEach(x->{
+        records.forEach(x -> {
             x.setClearingState("0".equals(x.getClearingState()) ? "未结算" : "1".equals(x.getClearingState()) ? "已结算" :
                     "2".equals(x.getClearingState()) ? "孤儿单" : x.getClearingState());
             x.setInsuranceClearingState("0".equals(x.getInsuranceClearingState()) ? "未结算" :
@@ -387,16 +378,19 @@ public class InvReceivableServiceImpl implements InvReceivableService {
 
     @Override
     public List<InvSource> getRecivableList(InvSourceQueryVo invSourceQueryVo) {
-        String[] split = invSourceQueryVo.getSigningTime().split(",");
-        invSourceQueryVo.setSigningTimeStartTime(split[0]);
-        invSourceQueryVo.setSigningTimeEndTime(split[1]);
-
-        String[] split1 = invSourceQueryVo.getClearingTime().split(",");
-        invSourceQueryVo.setClearingTimeStartTime(split1[0]);
-        invSourceQueryVo.setClearingTimeEndTime(split1[1]);
+        if (invSourceQueryVo.getSigningTime() != null && !"".equals(invSourceQueryVo.getSigningTime())) {
+            String[] split = invSourceQueryVo.getSigningTime().split(",");
+            invSourceQueryVo.setSigningTimeStartTime(split[0]);
+            invSourceQueryVo.setSigningTimeEndTime(split[1]);
+        }
+        if (invSourceQueryVo.getClearingTime() != null && !"".equals(invSourceQueryVo.getClearingTime())) {
+            String[] split1 = invSourceQueryVo.getClearingTime().split(",");
+            invSourceQueryVo.setClearingTimeStartTime(split1[0]);
+            invSourceQueryVo.setClearingTimeEndTime(split1[1]);
+        }
 
         List<InvSource> pageData = invSourceMapper.getRecivableList(invSourceQueryVo);
-        pageData.forEach(x->{
+        pageData.forEach(x -> {
             x.setClearingState("0".equals(x.getClearingState()) ? "未结算" : "1".equals(x.getClearingState()) ? "已结算" :
                     "2".equals(x.getClearingState()) ? "孤儿单" : x.getClearingState());
             x.setInsuranceClearingState("0".equals(x.getInsuranceClearingState()) ? "未结算" :
@@ -407,13 +401,13 @@ public class InvReceivableServiceImpl implements InvReceivableService {
 
     @Override
     public Boolean updateRecivable(InvSource invSource) {
-        BigDecimal tax = new BigDecimal(1.06);
+        BigDecimal tax = BigDecimal.valueOf(1.06);
         //处理交强不含税
-        invSource.setJqPremium(invSource.getJqPremiumTax().divide(tax,2, RoundingMode.HALF_UP));
+        invSource.setJqPremium(invSource.getJqPremiumTax().divide(tax, 2, RoundingMode.HALF_UP));
         //处理商业不含税
-        invSource.setSyPremium(invSource.getSyPremiumTax().divide(tax,2, RoundingMode.HALF_UP));
+        invSource.setSyPremium(invSource.getSyPremiumTax().divide(tax, 2, RoundingMode.HALF_UP));
         //处理非车不含税
-        invSource.setNonCarPremium(invSource.getNonCarPremiumTax().divide(tax,2, RoundingMode.HALF_UP));
+        invSource.setNonCarPremium(invSource.getNonCarPremiumTax().divide(tax, 2, RoundingMode.HALF_UP));
 
         //处理非跟单比例
         invSource.setJqNonCopyingRatio(invSource.getJqReceivableRatio().subtract(invSource.getJqPremiumRatio()));
@@ -452,7 +446,7 @@ public class InvReceivableServiceImpl implements InvReceivableService {
                 "已结算".equals(invSource.getClearingState()) ? "1" : invSource.getClearingState());
         invSource.setInsuranceClearingState("未结算".equals(invSource.getInsuranceClearingState()) ? "0" :
                 "已结算".equals(invSource.getInsuranceClearingState()) ? "1" : invSource.getInsuranceClearingState());
-        return invSourceMapper.updateById(invSource) > 0 ? true : false;
+        return invSourceMapper.updateById(invSource) > 0;
     }
 
     @Override
@@ -462,44 +456,40 @@ public class InvReceivableServiceImpl implements InvReceivableService {
         pageRequest.setPageSize(invSettlementSourceQueryVo.getPageSize());
         Page page = PageRequest.buildPageRequest(pageRequest);
         LambdaQueryWrapper<InvSettlementSource> queryWrapper = new LambdaQueryWrapper<>();
-        if(invSettlementSourceQueryVo.getLicenseno() != null && !"".equals(invSettlementSourceQueryVo.getLicenseno())){
-            queryWrapper.eq(InvSettlementSource::getLicenseno,invSettlementSourceQueryVo.getLicenseno());
+        if (invSettlementSourceQueryVo.getLicenseno() != null && !"".equals(invSettlementSourceQueryVo.getLicenseno())) {
+            queryWrapper.eq(InvSettlementSource::getLicenseno, invSettlementSourceQueryVo.getLicenseno());
         }
-        if(invSettlementSourceQueryVo.getJqPolicyId() != null && !"".equals(invSettlementSourceQueryVo.getJqPolicyId())){
-            queryWrapper.eq(InvSettlementSource::getJqPolicyId,invSettlementSourceQueryVo.getJqPolicyId());
+        if (invSettlementSourceQueryVo.getJqPolicyId() != null && !"".equals(invSettlementSourceQueryVo.getJqPolicyId())) {
+            queryWrapper.eq(InvSettlementSource::getJqPolicyId, invSettlementSourceQueryVo.getJqPolicyId());
         }
-        if(invSettlementSourceQueryVo.getSyPolicyId() != null && !"".equals(invSettlementSourceQueryVo.getSyPolicyId())){
-            queryWrapper.eq(InvSettlementSource::getSyPolicyId,invSettlementSourceQueryVo.getSyPolicyId());
+        if (invSettlementSourceQueryVo.getSyPolicyId() != null && !"".equals(invSettlementSourceQueryVo.getSyPolicyId())) {
+            queryWrapper.eq(InvSettlementSource::getSyPolicyId, invSettlementSourceQueryVo.getSyPolicyId());
         }
-        if(invSettlementSourceQueryVo.getNonCarPolicyId() != null && !"".equals(invSettlementSourceQueryVo.getNonCarPolicyId())){
-            queryWrapper.eq(InvSettlementSource::getNonCarPolicyId,invSettlementSourceQueryVo.getNonCarPolicyId());
+        if (invSettlementSourceQueryVo.getNonCarPolicyId() != null && !"".equals(invSettlementSourceQueryVo.getNonCarPolicyId())) {
+            queryWrapper.eq(InvSettlementSource::getNonCarPolicyId, invSettlementSourceQueryVo.getNonCarPolicyId());
         }
-        if(invSettlementSourceQueryVo.getInsuranceId() != null && !"".equals(invSettlementSourceQueryVo.getInsuranceId())){
-            queryWrapper.in(InvSettlementSource::getInsuranceId,invSettlementSourceQueryVo.getInsuranceId());
+        if (invSettlementSourceQueryVo.getInsuranceId() != null && !"".equals(invSettlementSourceQueryVo.getInsuranceId())) {
+            queryWrapper.in(InvSettlementSource::getInsuranceId, invSettlementSourceQueryVo.getInsuranceId());
         }
-        if(invSettlementSourceQueryVo.getInsuranceType() != null && !"".equals(invSettlementSourceQueryVo.getInsuranceType())){
-            queryWrapper.eq(InvSettlementSource::getInsuranceType,invSettlementSourceQueryVo.getInsuranceType());
+        if (invSettlementSourceQueryVo.getInsuranceType() != null && !"".equals(invSettlementSourceQueryVo.getInsuranceType())) {
+            queryWrapper.eq(InvSettlementSource::getInsuranceType, invSettlementSourceQueryVo.getInsuranceType());
         }
-        if(invSettlementSourceQueryVo.getSignDate() != null && !"".equals(invSettlementSourceQueryVo.getSignDate()))
-        {
+        if (invSettlementSourceQueryVo.getSignDate() != null && !"".equals(invSettlementSourceQueryVo.getSignDate())) {
             String[] split = invSettlementSourceQueryVo.getSignDate().split(",");
-            queryWrapper.between(InvSettlementSource::getSignDate,split[0],split[1]);
+            queryWrapper.between(InvSettlementSource::getSignDate, split[0], split[1]);
         }
-        if(invSettlementSourceQueryVo.getAgencySettlementTime() != null && !"".equals(invSettlementSourceQueryVo.getAgencySettlementTime()))
-        {
+        if (invSettlementSourceQueryVo.getAgencySettlementTime() != null && !"".equals(invSettlementSourceQueryVo.getAgencySettlementTime())) {
             String[] split = invSettlementSourceQueryVo.getAgencySettlementTime().split(",");
-            queryWrapper.between(InvSettlementSource::getAgencySettlementTime,split[0],split[1]);
+            queryWrapper.between(InvSettlementSource::getAgencySettlementTime, split[0], split[1]);
         }
-        if(invSettlementSourceQueryVo.getChannel() != null && !"".equals(invSettlementSourceQueryVo.getChannel()))
-        {
-            queryWrapper.eq(InvSettlementSource::getChannel,invSettlementSourceQueryVo.getChannel());
+        if (invSettlementSourceQueryVo.getChannel() != null && !"".equals(invSettlementSourceQueryVo.getChannel())) {
+            queryWrapper.eq(InvSettlementSource::getChannel, invSettlementSourceQueryVo.getChannel());
         }
-        if(invSettlementSourceQueryVo.getChannelClassification() != null && !"".equals(invSettlementSourceQueryVo.getChannelClassification()))
-        {
-            queryWrapper.eq(InvSettlementSource::getChannelClassification,invSettlementSourceQueryVo.getChannelClassification());
+        if (invSettlementSourceQueryVo.getChannelClassification() != null && !"".equals(invSettlementSourceQueryVo.getChannelClassification())) {
+            queryWrapper.eq(InvSettlementSource::getChannelClassification, invSettlementSourceQueryVo.getChannelClassification());
         }
-        if(invSettlementSourceQueryVo.getInsuredName() != null && !"".equals(invSettlementSourceQueryVo.getInsuredName())){
-            queryWrapper.like(InvSettlementSource::getInsuredName,invSettlementSourceQueryVo.getInsuredName());
+        if (invSettlementSourceQueryVo.getInsuredName() != null && !"".equals(invSettlementSourceQueryVo.getInsuredName())) {
+            queryWrapper.like(InvSettlementSource::getInsuredName, invSettlementSourceQueryVo.getInsuredName());
         }
         Page pageData = invSettlementSourceMapper.selectPage(page, queryWrapper);
 
@@ -509,28 +499,27 @@ public class InvReceivableServiceImpl implements InvReceivableService {
     @Override
     public List<InvSettlementSource> getSettlementList(InvSettlementSourceQueryVo invSettlementSourceQueryVo) {
         LambdaQueryWrapper<InvSettlementSource> queryWrapper = new LambdaQueryWrapper<>();
-        if(invSettlementSourceQueryVo.getLicenseno() != null && !"".equals(invSettlementSourceQueryVo.getLicenseno())){
-            queryWrapper.eq(InvSettlementSource::getLicenseno,invSettlementSourceQueryVo.getLicenseno());
+        if (invSettlementSourceQueryVo.getLicenseno() != null && !"".equals(invSettlementSourceQueryVo.getLicenseno())) {
+            queryWrapper.eq(InvSettlementSource::getLicenseno, invSettlementSourceQueryVo.getLicenseno());
         }
-        if(invSettlementSourceQueryVo.getJqPolicyId() != null && !"".equals(invSettlementSourceQueryVo.getJqPolicyId())){
-            queryWrapper.eq(InvSettlementSource::getJqPolicyId,invSettlementSourceQueryVo.getJqPolicyId());
+        if (invSettlementSourceQueryVo.getJqPolicyId() != null && !"".equals(invSettlementSourceQueryVo.getJqPolicyId())) {
+            queryWrapper.eq(InvSettlementSource::getJqPolicyId, invSettlementSourceQueryVo.getJqPolicyId());
         }
-        if(invSettlementSourceQueryVo.getSyPolicyId() != null && !"".equals(invSettlementSourceQueryVo.getSyPolicyId())){
-            queryWrapper.eq(InvSettlementSource::getSyPolicyId,invSettlementSourceQueryVo.getSyPolicyId());
+        if (invSettlementSourceQueryVo.getSyPolicyId() != null && !"".equals(invSettlementSourceQueryVo.getSyPolicyId())) {
+            queryWrapper.eq(InvSettlementSource::getSyPolicyId, invSettlementSourceQueryVo.getSyPolicyId());
         }
-        if(invSettlementSourceQueryVo.getNonCarPolicyId() != null && !"".equals(invSettlementSourceQueryVo.getNonCarPolicyId())){
-            queryWrapper.eq(InvSettlementSource::getNonCarPolicyId,invSettlementSourceQueryVo.getNonCarPolicyId());
+        if (invSettlementSourceQueryVo.getNonCarPolicyId() != null && !"".equals(invSettlementSourceQueryVo.getNonCarPolicyId())) {
+            queryWrapper.eq(InvSettlementSource::getNonCarPolicyId, invSettlementSourceQueryVo.getNonCarPolicyId());
         }
-        if(invSettlementSourceQueryVo.getInsuranceId() != null && !"".equals(invSettlementSourceQueryVo.getInsuranceId())){
-            queryWrapper.in(InvSettlementSource::getInsuranceId,invSettlementSourceQueryVo.getInsuranceId());
+        if (invSettlementSourceQueryVo.getInsuranceId() != null && !"".equals(invSettlementSourceQueryVo.getInsuranceId())) {
+            queryWrapper.in(InvSettlementSource::getInsuranceId, invSettlementSourceQueryVo.getInsuranceId());
         }
-        if(invSettlementSourceQueryVo.getInsuranceType() != null && !"".equals(invSettlementSourceQueryVo.getInsuranceType())){
-            queryWrapper.eq(InvSettlementSource::getInsuranceType,invSettlementSourceQueryVo.getInsuranceType());
+        if (invSettlementSourceQueryVo.getInsuranceType() != null && !"".equals(invSettlementSourceQueryVo.getInsuranceType())) {
+            queryWrapper.eq(InvSettlementSource::getInsuranceType, invSettlementSourceQueryVo.getInsuranceType());
         }
-        if(invSettlementSourceQueryVo.getSignDate() != null && !"".equals(invSettlementSourceQueryVo.getSignDate()))
-        {
+        if (invSettlementSourceQueryVo.getSignDate() != null && !"".equals(invSettlementSourceQueryVo.getSignDate())) {
             String[] split = invSettlementSourceQueryVo.getSignDate().split(",");
-            queryWrapper.between(InvSettlementSource::getSignDate,split[0],split[1]);
+            queryWrapper.between(InvSettlementSource::getSignDate, split[0], split[1]);
         }
         List<InvSettlementSource> pageData = invSettlementSourceMapper.selectList(queryWrapper);
 
@@ -564,19 +553,21 @@ public class InvReceivableServiceImpl implements InvReceivableService {
         Page page = new Page();
         page.setCurrent(receivableAndSettlementQueryVo.getPageNum());
         page.setSize(receivableAndSettlementQueryVo.getPageSize());
-        Page<ReceivableAndSettlementVo> receivableAndSettlementPage = invReceivableMapper.getReceivableAndSettlementPage(page, receivableAndSettlementQueryVo);
+        Page<ReceivableAndSettlementVo> receivableAndSettlementPage = invReceivableMapper.getReceivableAndSettlementPage(page,
+                receivableAndSettlementQueryVo);
         return receivableAndSettlementPage;
     }
 
     @Override
     public List<ReceivableAndSettlementVo> getReceivableAndSettlementList(ReceivableAndSettlementQueryVo receivableAndSettlementQueryVo) {
-        List<ReceivableAndSettlementVo> receivableAndSettlementVoList = invReceivableMapper.getReceivableAndSettlementPage(receivableAndSettlementQueryVo);
+        List<ReceivableAndSettlementVo> receivableAndSettlementVoList =
+                invReceivableMapper.getReceivableAndSettlementPage(receivableAndSettlementQueryVo);
         return receivableAndSettlementVoList;
     }
 
     @Override
     public Boolean deleteReceivable(String[] ids) {
-        return invReceivableMapper.deleteReceivable(String.join(",",ids));
+        return invReceivableMapper.deleteReceivable(String.join(",", ids));
     }
 
     @Override
@@ -611,11 +602,11 @@ public class InvReceivableServiceImpl implements InvReceivableService {
         invSource.builder();
         BigDecimal tax = new BigDecimal(1.06);
         //处理交强不含税
-        invSource.setJqPremium(invSource.getJqPremiumTax().divide(tax,2, RoundingMode.HALF_UP));
+        invSource.setJqPremium(invSource.getJqPremiumTax().divide(tax, 2, RoundingMode.HALF_UP));
         //处理商业不含税
-        invSource.setSyPremium(invSource.getSyPremiumTax().divide(tax,2, RoundingMode.HALF_UP));
+        invSource.setSyPremium(invSource.getSyPremiumTax().divide(tax, 2, RoundingMode.HALF_UP));
         //处理非车不含税
-        invSource.setNonCarPremium(invSource.getNonCarPremiumTax().divide(tax,2, RoundingMode.HALF_UP));
+        invSource.setNonCarPremium(invSource.getNonCarPremiumTax().divide(tax, 2, RoundingMode.HALF_UP));
 
         //处理非跟单比例
         invSource.setJqNonCopyingRatio(invSource.getJqReceivableRatio().subtract(invSource.getJqPremiumRatio()));
@@ -650,7 +641,7 @@ public class InvReceivableServiceImpl implements InvReceivableService {
                 invSource.getJqPremiumTax().multiply(invSource.getMaxJqReceivableRatio())
                         .add(invSource.getSyPremiumTax().multiply(invSource.getMaxSyReceivableRatio()))
                         .add(invSource.getNonCarPremiumTax().multiply(invSource.getMaxNonCarReceivableRatio())));
-        boolean save = invSourceMapper.insert (invSource) > 0 ? true : false;
+        boolean save = invSourceMapper.insert(invSource) > 0 ? true : false;
         return save;
     }
 
@@ -660,6 +651,13 @@ public class InvReceivableServiceImpl implements InvReceivableService {
         return data;
     }
 
+    @Override
+    public Boolean deleteSettlement(String[] ids) {
+        List<String> list = Arrays.asList(ids);
+        int i = invSettlementSourceMapper.deleteBatchIds(list);
+        return i > 0 ? true : false;
+    }
+
 }
 
 

src/main/resources/mapper/modules/inv/InvReceivableMapper.xml

@@ -47,7 +47,9 @@
         SELECT
         DATE_FORMAT( signing_time, '%m') as day,
         DATE_FORMAT( signing_time, '%Y-%m' ) as yearmonth,
-        insurance_name,
+        <if test="insuranceId != null and insuranceId != ''">
+            insurance_name,
+        </if>
         sum( jq_premium_tax ) as jq_premium_tax,
         sum(jq_premium) as jq_premium,
         sum(sy_premium_tax) as sy_premium_tax,
@@ -66,9 +68,16 @@
         signing_time BETWEEN #{startTime}
         AND #{endTime}
         <!--and insurance_id = '123'-->
+
+        <if test="insuranceId != null and insuranceId != ''">
+            and insurance_id = #{insuranceId}
+        </if>
+
         GROUP BY
-        insurance_id,
-        insurance_name,
+        <if test="insuranceId != null and insuranceId != ''">
+            insurance_id,
+            insurance_name,
+        </if>
         DATE_FORMAT(
         signing_time,
         '%Y-%m'),

src/main/resources/mapper/modules/inv/InvSourceMapper.xml

@@ -136,22 +136,22 @@
             and a.licenseno = #{param.licenseno}
         </if>
         <if test="param.jqPolicyId != null and param.jqPolicyId != ''">
-            and a.jq_policy_id = #{jqPolicyId}
+            and a.jq_policy_id = #{param.jqPolicyId}
         </if>
         <if test="param.syPolicyId != null and param.syPolicyId != ''">
-            and a.sy_policy_id = #{syPolicyId}
+            and a.sy_policy_id = #{param.syPolicyId}
         </if>
         <if test="param.nonCarPolicyId != null and param.nonCarPolicyId != ''">
-            and a.non_car_policy_id = #{nonCarPolicyId}
+            and a.non_car_policy_id = #{param.nonCarPolicyId}
         </if>
         <if test="param.insuranceId != null and param.insuranceId != ''">
-            and a.insurance_id = #{insuranceId}
+            and a.insurance_id = #{param.insuranceId}
         </if>
         <if test="param.risk != null and param.risk != ''">
-            and a.risk = #{risk}
+            and a.risk = #{param.risk}
         </if>
         <if test="param.insuranceName != null and param.insuranceName != ''">
-            and a.insurance_name = #{insuranceName}
+            and a.insurance_name = #{param.insuranceName}
         </if>
         <if test="param.clearingTimeStartTime != null and param.clearingTimeStartTime != ''">
             and a.clearing_time between #{param.clearingTimeStartTime} and #{param.clearingTimeEndTime]}