Merge remote-tracking branch 'origin/test' into test

src/main/java/com/ydtech/modules/admin/model/po/SysAmountAuditingEntity.java

@@ -3,6 +3,7 @@ package com.ydtech.modules.admin.model.po;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -52,6 +53,7 @@ public class SysAmountAuditingEntity implements Serializable {
     /**
      * 创建时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @TableField(value = "create_time")
     private Date createTime;
 

src/main/java/com/ydtech/modules/admin/model/vo/SysAmountAuditingVo.java

@@ -1,19 +1,14 @@
 package com.ydtech.modules.admin.model.vo;
 
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.util.Date;
 
 @Data
@@ -87,12 +82,12 @@ public class SysAmountAuditingVo {
     private int pageNum;
 
     @ApiModelProperty("开始时间")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    private LocalDate startTime;
+    //@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private String startTime;
 
     @ApiModelProperty("结束时间")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    private LocalDate endTime;
+    //@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private String endTime;
 
     @ApiModelProperty("审批时间")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM")

src/main/java/com/ydtech/modules/admin/service/impl/SysAmountAuditingServiceImpl.java

@@ -106,7 +106,7 @@ public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingM
             sysAmountAuditingVo.setAuditingUserId(BaseController.getUser().getId());
             sysAmountAuditingVo.setAuditingTime(new Date());
             BeanUtils.copyProperties(sysAmountAuditingVo, sysAmountAuditingEntity);
-            sysAmountAuditingVo.setCreateTime(new Date());
+            sysAmountAuditingEntity.setCreateTime(null);
             baseMapper.updateById(sysAmountAuditingEntity);
             //通过审核表id查询历史记录表
             LambdaQueryWrapper<SysUserAccountHistory> lqw = new LambdaQueryWrapper<>();
@@ -134,10 +134,10 @@ public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingM
             params.put("pageNum",sysAmountAuditingVo.getPageNum());
             params.put("pageSize",sysAmountAuditingVo.getPageSize());
             if(ObjectUtils.isNotEmpty(sysAmountAuditingVo.getStartTime())){
-                params.put("startDate",sysAmountAuditingVo.getStartTime().toString());
+                params.put("startDate",sysAmountAuditingVo.getStartTime());
             }
             if(ObjectUtils.isNotEmpty(sysAmountAuditingVo.getEndTime())){
-                params.put("endDate",sysAmountAuditingVo.getEndTime().toString());
+                params.put("endDate",sysAmountAuditingVo.getEndTime());
             }
             if(StringUtils.isNotEmpty(sysAmountAuditingVo.getAuditingStatus())){
                 params.put("auditingStatus",sysAmountAuditingVo.getAuditingStatus());
@@ -269,7 +269,7 @@ public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingM
             //将收入支出状态台改为收入  2插入历史表中历史表
             sysUserAccountHistory.setId(null);
             sysUserAccountHistory.setDocumentary(2);
-            sysUserAccountHistory.setProperty(4);
+            sysUserAccountHistory.setProperty(5);
             sysUserAccountHistory.setBusinessSegmentsType(2); //赋值退款
             sysUserAccountHistory.setCreateTime(new Date());
             sysUserAccountHistoryMapper.insert(sysUserAccountHistory);

src/main/java/com/ydtech/modules/admin/service/impl/SysUserAccountServiceImpl.java

@@ -868,20 +868,20 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
             myCollectInAdvanceQueryDto.setTransactionType("1");
         }
         Page<MyCollectInAdvanceDto> page = new Page<>(myCollectInAdvanceQueryDto.getPageNum(), myCollectInAdvanceQueryDto.getPageSize());
-        page.setSearchCount(false).setOptimizeCountSql(false);//关闭count查询
+       // page.setSearchCount(false).setOptimizeCountSql(false);//关闭count查询
         Page<MyCollectInAdvanceDto> orderVoPage = new Page<>();
         // 1为车险板块
         if ("1".equals(myCollectInAdvanceQueryDto.getBusinessSegmentsType())) {
             //金额类型 1. 手续费金额 +跟单金额  2. 推广金额
             if("2".equals(myCollectInAdvanceQueryDto.getTransactionType())){
                 orderVoPage = insFeeOrderNewService.findMyCollectInAdvanceWillAmountByUserId(page,myCollectInAdvanceQueryDto);
-                Long total=insFeeOrderNewService.findMyCollectInAdvanceWillAmountByUserIdCount(myCollectInAdvanceQueryDto);
-                orderVoPage.setTotal(total);
+               // Long total=insFeeOrderNewService.findMyCollectInAdvanceWillAmountByUserIdCount(myCollectInAdvanceQueryDto);
+              //  orderVoPage.setTotal(total);
                 sumAmount = insFeeOrderNewService.findSumWillAmount(myCollectInAdvanceQueryDto);
             }else{
                 orderVoPage = insFeeOrderNewService.findMyCollectInAdvanceSumByUserId(page,myCollectInAdvanceQueryDto);
-                Long total=insFeeOrderNewService.findMyCollectInAdvanceSumByUserIdCount(myCollectInAdvanceQueryDto);
-                orderVoPage.setTotal(total);
+               // Long total=insFeeOrderNewService.findMyCollectInAdvanceSumByUserIdCount(myCollectInAdvanceQueryDto);
+               // orderVoPage.setTotal(total);
                 sumAmount = insFeeOrderNewService.findSumAmount(myCollectInAdvanceQueryDto);
             }
         } else {
@@ -972,7 +972,7 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
         myIncomeAndExpensesQueryDto.setEndDate(dateMap.get("endDate"));
 
         Page<MyCollectInAdvanceDto> page = new Page<>(myIncomeAndExpensesQueryDto.getPageNum(), myIncomeAndExpensesQueryDto.getPageSize());
-        page.setSearchCount(false).setOptimizeCountSql(false);//关闭count查询
+        //page.setSearchCount(false).setOptimizeCountSql(false);//关闭count查询
         Page<MyCollectInAdvanceDto> orderVoPage = new Page<>();
         if (myIncomeAndExpensesQueryDto.getBusinessSegmentsType() != null && "0".equals(myIncomeAndExpensesQueryDto.getBusinessSegmentsType())) {
             myIncomeAndExpensesQueryDto.setBusinessSegmentsType(null);
@@ -991,8 +991,7 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
             }
         }
         if (StringUtils.isNotBlank(myIncomeAndExpensesQueryDto.getIncomeAndExpensesType()) &&"2".equals(myIncomeAndExpensesQueryDto.getIncomeAndExpensesType())) {
-            //判断收入类型  1 收入  查询账号的历史记录表
-            //金额类型 1. 手续费金额 +跟单金额  2. 推广金额
+            //判断支出类型
             if(StringUtils.isNotBlank(myIncomeAndExpensesQueryDto.getTransactionType())  && !"3".equals(myIncomeAndExpensesQueryDto.getTransactionType())){
                 throw new SystemException("支出类型不能选择（手续+跟单）或者手续费、退款类型");
             }
@@ -1000,21 +999,20 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
         if ( (StringUtils.isNotBlank(myIncomeAndExpensesQueryDto.getBusinessSegmentsType()) && StringUtils.isNotBlank(myIncomeAndExpensesQueryDto.getIncomeAndExpensesType()) && "2".equals(myIncomeAndExpensesQueryDto.getBusinessSegmentsType()) &&"1".equals(myIncomeAndExpensesQueryDto.getIncomeAndExpensesType()))
                 ||
                 (StringUtils.isNotBlank(myIncomeAndExpensesQueryDto.getIncomeAndExpensesType()) && ("2".equals(myIncomeAndExpensesQueryDto.getBusinessSegmentsType())))){
-            //判断收入类型  1 收入  查询账号的历史记录表
-            //金额类型 1. 手续费金额 +跟单金额  2. 推广金额
+            //判断退款类型
             if(StringUtils.isNotBlank(myIncomeAndExpensesQueryDto.getTransactionType())  &&!"4".equals(myIncomeAndExpensesQueryDto.getTransactionType())){
                 throw new SystemException("退款板块只能选择退款类型");
             }
         }
-        if ( StringUtils.isNotBlank(myIncomeAndExpensesQueryDto.getBusinessSegmentsType()) &&   StringUtils.isNotBlank(myIncomeAndExpensesQueryDto.getIncomeAndExpensesType()) &&"1".equals(myIncomeAndExpensesQueryDto.getBusinessSegmentsType()) &&"1".equals(myIncomeAndExpensesQueryDto.getIncomeAndExpensesType())) {
-            //判断收入类型  1 收入  查询账号的历史记录表
-            //金额类型 1. 手续费金额 +跟单金额  2. 推广金额
-            if (StringUtils.isNotBlank(myIncomeAndExpensesQueryDto.getTransactionType())  && "2".equals(myIncomeAndExpensesQueryDto.getTransactionType())) {
-                myIncomeAndExpensesQueryDto.setTransactionType("3");
-            } else if (StringUtils.isNotBlank(myIncomeAndExpensesQueryDto.getTransactionType())  &&"1".equals(myIncomeAndExpensesQueryDto.getTransactionType())) {
-                myIncomeAndExpensesQueryDto.setTransactionType("4");
-            }
+        //处理 手续费+跟单、推广费类型转换
+        if (StringUtils.isNotBlank(myIncomeAndExpensesQueryDto.getTransactionType())  && "2".equals(myIncomeAndExpensesQueryDto.getTransactionType())) {
+            myIncomeAndExpensesQueryDto.setTransactionType("3");
+        } else if (StringUtils.isNotBlank(myIncomeAndExpensesQueryDto.getTransactionType())  &&"1".equals(myIncomeAndExpensesQueryDto.getTransactionType())) {
+            myIncomeAndExpensesQueryDto.setTransactionType("4");
+        } else if (StringUtils.isNotBlank(myIncomeAndExpensesQueryDto.getTransactionType())  &&"4".equals(myIncomeAndExpensesQueryDto.getTransactionType())) {
+            myIncomeAndExpensesQueryDto.setTransactionType("5");
         }
+        //处理收入和支出类型转换
         if (myIncomeAndExpensesQueryDto.getIncomeAndExpensesType() != null && "0".equals(myIncomeAndExpensesQueryDto.getIncomeAndExpensesType())) {
             myIncomeAndExpensesQueryDto.setIncomeAndExpensesType(null);
         } else if (myIncomeAndExpensesQueryDto.getIncomeAndExpensesType() != null && "1".equals(myIncomeAndExpensesQueryDto.getIncomeAndExpensesType())) {
@@ -1023,8 +1021,8 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
             myIncomeAndExpensesQueryDto.setIncomeAndExpensesType("1");
         }
         orderVoPage = sysUserAccountHistoryService.findMyIncomeAndExpensesAmountByUserId(page,myIncomeAndExpensesQueryDto);
-        Long total=sysUserAccountHistoryService.findMyIncomeAndExpensesAmountByUserIdCount(myIncomeAndExpensesQueryDto);
-        orderVoPage.setTotal(total);
+       // Long total=sysUserAccountHistoryService.findMyIncomeAndExpensesAmountByUserIdCount(myIncomeAndExpensesQueryDto);
+       // orderVoPage.setTotal(total);
         List<MyCollectInAdvanceDto> recordsNew =new ArrayList<>();
         if(orderVoPage.getRecords()!=null && orderVoPage.getRecords().size()>0){
             for(MyCollectInAdvanceDto dto :orderVoPage.getRecords()) {
@@ -1039,6 +1037,7 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
                     //退款 且退款
                 } else if ("2".equals(dto.getBusinessSegmentsType()) && "2".equals(dto.getIncomeAndExpensesType())){
                     dto.setIncomeAndExpensesType("1");
+                    dto.setTransactionType("4");
                     //提现
                 }else if("3".equals(dto.getTransactionType()) && "1".equals(dto.getIncomeAndExpensesType())){
                     dto.setIncomeAndExpensesType("2");

src/main/java/com/ydtech/modules/fee/service/impl/FeeRuleSchemeServiceImpl.java

@@ -2740,7 +2740,7 @@ insFeeOrderNew.getNoExportOtherCostsProportion(),
      BigDecimal otherCostsProportion, BigDecimal taxRate) {
         FeeOrderNewVo.EntranceFee entranceFee = new FeeOrderNewVo.EntranceFee();
         entranceFee.setPremium(premium);
-        premium = premium.divide(taxRate, 5, RoundingMode.HALF_UP);
+        premium = premium.divide(taxRate, 5, BigDecimal.ROUND_DOWN);
         //手续费
         entranceFee.setSuperviseCostsPremiums(premium.multiply(superviseCostsProportion.divide(new BigDecimal(100))).setScale(5,
 BigDecimal.ROUND_DOWN));

src/main/java/com/ydtech/modules/fnc/controller/InsPlyIncomeController.java

@@ -12,6 +12,7 @@ import com.ydtech.modules.inv.model.dto.InsBxNoPlyIncomeExcelDto;
 import com.ydtech.modules.inv.model.dto.InsBxOtherExcelDto;
 import com.ydtech.modules.inv.model.dto.InsBxPlyIncomeExcelDto;
 import com.ydtech.modules.inv.model.dto.InsNoBxOtherExcelDto;
+import com.ydtech.modules.inv.utils.EasyExcelUtils;
 import com.ydtech.modules.order.entity.BasePageResult;
 import com.ydtech.utils.SnowFlakeUtil;
 import com.ydtech.utils.StringUtils;
@@ -26,6 +27,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
+import java.io.InputStream;
 import java.time.Period;
 import java.util.HashMap;
 import java.util.List;
@@ -201,18 +203,19 @@ public class InsPlyIncomeController extends BaseController {
             @ApiImplicitParam(name = "file", value = "excel文件", required = true, dataType = "__file")
     })
     public HttpResult<String> bxImportData(@RequestParam MultipartFile multipartFile, @RequestParam("isNotCar") String isNotCar) {
+        List<InsBxPlyIncomeExcelDto> dtoList = null;
         try {
-            List<InsBxPlyIncomeExcelDto> dtoList = ExcelEasypoiUtils.importExcel(multipartFile, InsBxPlyIncomeExcelDto.class, 0, 1, 1);
-            if (CollectionUtils.isEmpty(dtoList)) {
+            dtoList = ExcelEasypoiUtils.importExcel(multipartFile, InsBxPlyIncomeExcelDto.class, 0, 1, 1);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        if (CollectionUtils.isEmpty(dtoList)) {
                 return HttpResult.error("导入数据为空");
             }
-            String taskId = String.valueOf(new SnowFlakeUtil().nextId());
+        String taskId = String.valueOf(new SnowFlakeUtil().nextId());
                 importAsyncService.importasync(dtoList, isNotCar, taskId);
-            return HttpResult.ok(taskId);
+        return HttpResult.ok(taskId);
 
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
     }
 
     @PostMapping("/bxImportNoData")
@@ -435,6 +438,7 @@ public class InsPlyIncomeController extends BaseController {
         return HttpResult.ok(insPlyIncomeService.platformSettlementRecord(insPlyIncomeVo));
     }
 
+
     /**
      * @param insPlyIncomeVo
      * @Description:  平台新增

src/main/java/com/ydtech/modules/fnc/entity/InsPlyIncome.java

@@ -1,16 +1,13 @@
 package com.ydtech.modules.fnc.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.Optional;
+import java.time.LocalTime;
 
-import com.ydtech.utils.StringUtils;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
@@ -141,7 +138,7 @@ public class InsPlyIncome implements Serializable {
 
     @ApiModelProperty("结算日期")
     @TableField("settlement_time")
-    private LocalDate settlementTime;
+    private LocalDateTime settlementTime;
 
     @ApiModelProperty("修改日期")
     @TableField("update_time")

src/main/java/com/ydtech/modules/fnc/service/impl/ImportAsyncServiceImpl.java

@@ -36,6 +36,7 @@ import java.nio.file.Paths;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 
 @Service
@@ -73,10 +74,11 @@ public class ImportAsyncServiceImpl extends ServiceImpl<ImportAsyncMapper, Impor
         ImportResult importResult = new ImportResult();
         importResult.setId(taskId);
         importResult.setStatus("ready");
+        importResult.setHandStatus("0");
         importResult.setCreateTime(LocalDateTime.now());
         importResult.setCreatedAt(LocalDateTime.now());
         baseMapper.insert(importResult);
-
+        HashSet<String> hashSet = new HashSet<>();
         if (!CollectionUtils.isEmpty(dtoList)) {
             for (InsBxPlyIncomeExcelDto excelItem : dtoList) {
                 InsImportResult insImportResult = new InsImportResult();
@@ -166,6 +168,14 @@ public class ImportAsyncServiceImpl extends ServiceImpl<ImportAsyncMapper, Impor
                     insImportResult.setSyPolicyno(excelItem.getSyPolicyno());
                     insImportResult.setReason(reason);
                     insImportResultsExcel.add(insImportResult);
+                }else {
+                    if(StringUtils.isNotEmpty(insPlyIncome.getPartnerCompaniesId())){
+                        hashSet.add(insPlyIncome.getPartnerCompaniesId());
+                    }
+                    if(hashSet.size()>1){
+                        insImportResult.setReason("表里有不同保司机构");
+                        insImportResultsExcel.add(insImportResult);
+                    }
                 }
             }
         }
@@ -193,7 +203,6 @@ public class ImportAsyncServiceImpl extends ServiceImpl<ImportAsyncMapper, Impor
         endTask.setCompanyId(companyId);
         endTask.setAgreementId(agreementId);
         endTask.setPartnerCompaniesId(partnerCompaniesId);
-        endTask.setHandStatus("0");
         baseMapper.updateById(endTask);
     }
 
@@ -240,9 +249,11 @@ public class ImportAsyncServiceImpl extends ServiceImpl<ImportAsyncMapper, Impor
         ImportResult importResult = new ImportResult();
         importResult.setId(taskId);
         importResult.setStatus("ready");
+        importResult.setHandStatus("2");
         importResult.setCreateTime(LocalDateTime.now());
         importResult.setCreatedAt(LocalDateTime.now());
         baseMapper.insert(importResult);
+        HashSet<String> hashSet = new HashSet<>();
 
         if (!CollectionUtils.isEmpty(dtoList)) {
             for (InsBxOtherExcelDto excelItem : dtoList) {
@@ -315,8 +326,14 @@ public class ImportAsyncServiceImpl extends ServiceImpl<ImportAsyncMapper, Impor
                     if (StringUtils.isNotEmpty(excelItem.getSyPolicyno())) {
                         insImportResult.setSyPolicyno(excelItem.getSyPolicyno());
                     }
-                    insImportResult.setReason(reason);
-                    insImportResultsExcel.add(insImportResult);
+                }else {
+                    if(StringUtils.isNotEmpty(insPlyIncome.getPartnerCompaniesId())){
+                        hashSet.add(insPlyIncome.getPartnerCompaniesId());
+                    }
+                    if(hashSet.size()>1){
+                        insImportResult.setReason("表里有不同保司机构");
+                        insImportResultsExcel.add(insImportResult);
+                    }
                 }
             }
         }
@@ -345,7 +362,6 @@ public class ImportAsyncServiceImpl extends ServiceImpl<ImportAsyncMapper, Impor
         endTask.setCompanyId(companyId);
         endTask.setAgreementId(agreementId);
         endTask.setPartnerCompaniesId(partnerCompaniesId);
-        endTask.setHandStatus("2");
         baseMapper.updateById(endTask);
     }
 
@@ -367,10 +383,12 @@ public class ImportAsyncServiceImpl extends ServiceImpl<ImportAsyncMapper, Impor
         ImportResult importResult = new ImportResult();
         importResult.setId(taskId);
         importResult.setStatus("ready");
+        importResult.setHandStatus("3");
         importResult.setCreateTime(LocalDateTime.now());
         importResult.setCreatedAt(LocalDateTime.now());
         baseMapper.insert(importResult);
 
+        HashSet<String> hashSet = new HashSet<>();
         if (!CollectionUtils.isEmpty(dtoList)) {
             for (InsNoBxOtherExcelDto excelItem : dtoList) {
                 InsImportResult insImportResult = new InsImportResult();
@@ -423,7 +441,14 @@ public class ImportAsyncServiceImpl extends ServiceImpl<ImportAsyncMapper, Impor
                     if (StringUtils.isNotEmpty(excelItem.getNoPolicyno())) {
                         insImportResult.setPolicyno(excelItem.getNoPolicyno());
                     }
-                    insImportResultsExcel.add(insImportResult);
+                }else {
+                    if(StringUtils.isNotEmpty(insPlyIncome.getPartnerCompaniesId())){
+                        hashSet.add(insPlyIncome.getPartnerCompaniesId());
+                    }
+                    if(hashSet.size()>1){
+                        insImportResult.setReason("表里有不同保司机构");
+                        insImportResultsExcel.add(insImportResult);
+                    }
                 }
             }
         }
@@ -452,7 +477,6 @@ public class ImportAsyncServiceImpl extends ServiceImpl<ImportAsyncMapper, Impor
         endTask.setCompanyId(companyId);
         endTask.setAgreementId(agreementId);
         endTask.setPartnerCompaniesId(partnerCompaniesId);
-        endTask.setHandStatus("3");
         baseMapper.updateById(endTask);
 
     }
@@ -475,9 +499,11 @@ public class ImportAsyncServiceImpl extends ServiceImpl<ImportAsyncMapper, Impor
         ImportResult importResult = new ImportResult();
         importResult.setId(taskId);
         importResult.setStatus("ready");
+        importResult.setHandStatus("1");
         importResult.setCreateTime(LocalDateTime.now());
         importResult.setCreatedAt(LocalDateTime.now());
         baseMapper.insert(importResult);
+        HashSet<String> hashSet = new HashSet<>();
 
         if (!CollectionUtils.isEmpty(dtoList)) {
             for (InsBxNoPlyIncomeExcelDto excelItem : dtoList) {
@@ -529,8 +555,15 @@ public class ImportAsyncServiceImpl extends ServiceImpl<ImportAsyncMapper, Impor
                     if (StringUtils.isNotEmpty(excelItem.getNoPolicyno())) {
                         insImportResult.setPolicyno(excelItem.getNoPolicyno());
                     }
-                    insImportResultsExcel.add(insImportResult);
 
+                }else {
+                    if(StringUtils.isNotEmpty(insPlyIncome.getPartnerCompaniesId())){
+                        hashSet.add(insPlyIncome.getPartnerCompaniesId());
+                    }
+                    if(hashSet.size()>1){
+                        insImportResult.setReason("表里有不同保司机构");
+                        insImportResultsExcel.add(insImportResult);
+                    }
                 }
             }
         }
@@ -559,7 +592,6 @@ public class ImportAsyncServiceImpl extends ServiceImpl<ImportAsyncMapper, Impor
         endTask.setCompanyId(companyId);
         endTask.setAgreementId(agreementId);
         endTask.setPartnerCompaniesId(partnerCompaniesId);
-        endTask.setHandStatus("1");
         baseMapper.updateById(endTask);
     }
 

src/main/java/com/ydtech/modules/fnc/service/impl/InsPlyIncomeServiceImpl.java

@@ -554,13 +554,13 @@ handlingProportion,
     @Override
     @Transactional
     public HttpResult<Object> batchPinBalance(InsPlyIncomeVo insPlyIncomeVo) {
-
+        LocalDateTime now = LocalDateTime.now();
         if (!CollectionUtils.isEmpty(insPlyIncomeVo.getSelectIds())) {
             List<String> selectIds = insPlyIncomeVo.getSelectIds();
             for (String id : selectIds) {
                 InsPlyIncome insPlyIncome = new InsPlyIncome();
                 insPlyIncome.setHandlingFeesStatus("1");
-                insPlyIncome.setSettlementTime(LocalDate.now());
+                insPlyIncome.setSettlementTime(now);
                 insPlyIncome.setSettlementUserId(BaseController.getUser().getId());
                 insPlyIncome.setId(id);
                 baseMapper.updateById(insPlyIncome);
@@ -1221,12 +1221,7 @@ handlingProportion,
         //        根据协议   如果是含增值税结算   用保费 *   如果是  不含税保费
         InsPlyIncome insPlyIncome = baseMapper.getById(insPlyIncomeVo.getId());
 
-        InsPlyIncomeLog insPlyIncomeLog = new InsPlyIncomeLog();
-        insPlyIncomeLog.setIncomeId(insPlyIncome.getId());
-        BeanUtils.copyProperties(insPlyIncome,insPlyIncomeLog);
-        insPlyIncomeLog.setId(null);
-        insPlyIncomeLog.setOperationStatus("2");
-        insPlyIncomeLogService.saveLog(insPlyIncomeLog);  //添加日志
+
 
         BigDecimal bigDecimal = this.getBigDecimal(insPlyIncome.getNoPremium(), insPlyIncomeVo.getNoSuperviseCostsProportion());
         insPlyIncome.setCommissionFeevalue(bigDecimal);
@@ -1237,6 +1232,13 @@ handlingProportion,
         insPlyIncome.setNoSuperviseCostsProportion(insPlyIncomeVo.getNoSuperviseCostsProportion());
         baseMapper.updateById(insPlyIncome);
 
+        InsPlyIncomeLog insPlyIncomeLog = new InsPlyIncomeLog();
+        insPlyIncomeLog.setIncomeId(insPlyIncome.getId());
+        BeanUtils.copyProperties(insPlyIncome,insPlyIncomeLog);
+        insPlyIncomeLog.setId(null);
+        insPlyIncomeLog.setOperationStatus("2");
+        insPlyIncomeLogService.saveLog(insPlyIncomeLog);  //添加日志
+
         insPlyIncomeVo.setOtherFeevalue(insPlyIncomeVo.getNoSuperviseCostsPremiums());
         insPlyIncomeVo.setCrudStatus("2");
         this.saveLog(insPlyIncomeVo);
@@ -1361,14 +1363,14 @@ handlingProportion,
     /**
      * 计算 金额
      *
-     * @param jqNoTaxPremium
+     * @param taxPremium
      * @param proportion
      * @return
      */
-    private static BigDecimal getBigDecimal(BigDecimal jqNoTaxPremium, BigDecimal proportion) {
+    private static BigDecimal getBigDecimal(BigDecimal taxPremium, BigDecimal proportion) {
         BigDecimal divisor = new BigDecimal("1.06"); // 示例除数
         // 先进行除法，保留5位小数，不进行四舍五入（使用RoundingMode.DOWN）
-        BigDecimal dividedAmount = jqNoTaxPremium.divide(divisor, 5, RoundingMode.HALF_UP);
+        BigDecimal dividedAmount = taxPremium.divide(divisor, 5, BigDecimal.ROUND_DOWN);
         // 将比例除以100，假设proportion是一个百分比值
         // 然后进行乘法，并进行舍入到5位小数
         BigDecimal result = dividedAmount.multiply( proportion.divide(new BigDecimal(100))).setScale(5, BigDecimal.ROUND_DOWN);
@@ -1856,8 +1858,7 @@ handlingProportion,
                             return HttpResult.error("该单据已经开票 ");
                         } else {
                             item.setTaskId(importResult.getId());
-                            item.setSettlementTime(LocalDate.now());
-                            item.setSettlementUserId(BaseController.getUser().getName());
+                            item.setSettlementTime(LocalDateTime.now());
                             baseMapper.updateById(item);
                         }
                     }
@@ -1916,6 +1917,16 @@ handlingProportion,
             if (invoicAmount.compareTo(totalAmount) < 0) {
                 return HttpResult.error("结算金额大于开票金额");
             }
+            if(totalAmount.compareTo(invoicAmount) ==0){
+                HashMap<String, Object> incomeParams = new HashMap<>();
+                incomeParams.put("incomeIds", byTaskId);
+                List<InsPlyIncome> insPlyIncomes = baseMapper.queryNew(incomeParams);
+                for (InsPlyIncome item : insPlyIncomes) {
+                    item.setHandlingFeesStatus("1");
+                    item.setSettlementUserId(BaseController.getUser().getId());
+                    baseMapper.updateById(item);
+                }
+            }
         } else {
             if (invoicAmount.compareTo(insPlyIncomeVo.getSettlementAmount()) < 0) {
                 return HttpResult.error("结算金额大于开票金额");
@@ -1925,6 +1936,7 @@ handlingProportion,
                 List<InsPlyIncome> insPlyIncomes = baseMapper.queryNew(incomeParams);
                 for (InsPlyIncome item : insPlyIncomes) {
                     item.setHandlingFeesStatus("1");
+                    item.setSettlementUserId(BaseController.getUser().getId());
                     baseMapper.updateById(item);
                 }
             }
@@ -1954,7 +1966,6 @@ handlingProportion,
 
         BigDecimal subtract = byIdSettlementDocumentaryFeesEntity.getTotalAmount().subtract(add);
         byIdSettlementDocumentaryFeesEntity.setInvoicedNotSettledAmount(subtract);
-
         if (subtract.compareTo(BigDecimal.ZERO) == 0) {
             byIdSettlementDocumentaryFeesEntity.setCompletionStatus("2");
         } else if (subtract.compareTo(BigDecimal.ZERO) != 0) {
@@ -2566,10 +2577,10 @@ handlingProportion,
 
 
                     InsPlyIncomeLog insPlyIncomeLog = new InsPlyIncomeLog();
-                    insPlyIncomeLog.setIncomeId(byBxLicenseno.getId());
-                    byBxLicenseno.setId(null);
                     BeanUtils.copyProperties(byBxLicenseno,insPlyIncomeLog);
                     insPlyIncomeLog.setOperationStatus("2");
+                    insPlyIncomeLog.setId(null);
+                    insPlyIncomeLog.setIncomeId(byBxLicenseno.getId());
                     insPlyIncomeLogService.saveLog(insPlyIncomeLog);  //添加日志
 
 

src/main/java/com/ydtech/modules/fnc/vo/InsPlyIncomeVo.java

@@ -1,5 +1,6 @@
 package com.ydtech.modules.fnc.vo;
 
+import com.alibaba.excel.annotation.format.DateTimeFormat;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -58,7 +59,7 @@ public class InsPlyIncomeVo implements Serializable {
     private LocalDate createTime;
 
     @ApiModelProperty(value = "结算日期")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(value = "yyyy-MM-dd'T'HH:mm:ss")
     private LocalDate settlementTime;
 
 

src/main/java/com/ydtech/modules/ins/model/vo/res/BxOtherDetailsExcel.java

@@ -24,7 +24,7 @@ public class BxOtherDetailsExcel {
 
     @ApiModelProperty("被保险人")
     @ExcelProperty(value = "被保险人",index = 2)
-    private String userName;
+    private String insuredName;
 
 
     @ApiModelProperty("险种")

src/main/java/com/ydtech/modules/ins/model/vo/res/BxOtherDetailsNorExcel.java

@@ -24,7 +24,7 @@ public class BxOtherDetailsNorExcel {
 
     @ApiModelProperty("被保险人")
     @ExcelProperty(value = "被保险人",index = 2)
-    private String userName;
+    private String insuredName;
 
 
     @ApiModelProperty("保险公司名称")

src/main/resources/mapper/modules/admin/SysAmountAuditingMapper.xml

@@ -144,13 +144,10 @@
             </if>
 
             <if test="startDate !=null and startDate != ''  and  endDate !=null  and  endDate!= '' ">
-                and DATE_FORMAT( a.auditing_time, '%Y-%m-%d')  between DATE_FORMAT(#{startDate}, '%Y-%m-%d') and DATE_FORMAT(#{endDate}, '%Y-%m-%d')
-            </if>
-            <if test="timeFiltering !=null and timeFiltering != '' ">
-             AND   DATE_FORMAT(a.auditing_time, '%Y-%m') = #{timeFiltering}
+                and DATE_FORMAT( a.create_time, '%Y-%m-%d')  between DATE_FORMAT(#{startDate}, '%Y-%m-%d') and DATE_FORMAT(#{endDate}, '%Y-%m-%d')
             </if>
         </where>
-        order by a.auditing_time desc
+        order by a.create_time desc
     </select>
 
     <select id="getProgressIng" resultType="com.ydtech.modules.admin.model.po.SysAmountAuditingEntity">

src/main/resources/mapper/modules/fnc/InsPlyIncomeMapper.xml

@@ -149,7 +149,7 @@
                 a.settle_other_status  as  "settleOtherStatus",
                 a.user_id  as  "userId",
                 a.invoicing_method  as  "invoicingMethod",
-                a.settlement_image_id as "settlementUserName",
+                a.settlement_image_id as "settlementImageId",
                 a.task_id as "taskId",
                 a.create_time  as  "createTime"
     </sql>
@@ -1729,7 +1729,7 @@
     <select id="platformSettlementRecord" resultType="com.ydtech.modules.fnc.dto.PlatformSettlementRecordDto">
         SELECT
             DATE_FORMAT(a.settlement_time, '%Y-%m-%d %H:%i:%s') as "settlementTime",
-            ( a.commission_feevalue + a.other_feevalue) AS "settlementAmount"
+            sum(a.commission_feevalue + a.other_feevalue) AS "settlementAmount"
         FROM
             ins_ply_income a
             LEFT  JOIN  ptl_agreement  pa  on  a.agreement_id  = pa.id
@@ -1741,8 +1741,8 @@
             <if test="handlingFeesStatus !=null  and  handlingFeesStatus  !=''">
                 and a.handling_fees_status =#{handlingFeesStatus}
             </if>
-
         </where>
+        group  by  a.settlement_time
     </select>
 
 </mapper>