应收管理、应付管理9

yd-csf-api/src/main/java/com/yd/csf/api/controller/ApiCommissionController.java

@@ -69,9 +69,16 @@ public class ApiCommissionController {
 
 
 
 
     @PostMapping("/upload/excel")
     @PostMapping("/upload/excel")
-    @Operation(summary = "上传保单来佣Excel文件")
+    @Operation(summary = "上传入账Excel文件")
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
-    public Result<Boolean> uploadExcel(@RequestParam("file") MultipartFile file) throws IOException {
+    public Result<Boolean> uploadExcel(@RequestParam("file") MultipartFile file,
+                                       @RequestParam("reconciliationYearMonth") String reconciliationYearMonth) throws IOException {
+
+        // 校验来佣检核年月是否为空
+        if (Objects.isNull(reconciliationYearMonth)) {
+            throw new BusinessException(ResultCode.PARAMS_ERROR.getCode(), "来佣检核年月不能为空");
+        }
+
         List<CommissionExcelDTO> dataList = new ArrayList<>();
         List<CommissionExcelDTO> dataList = new ArrayList<>();
         try {
         try {
             dataList = EasyExcel.read(file.getInputStream())
             dataList = EasyExcel.read(file.getInputStream())
@@ -84,7 +91,7 @@ public class ApiCommissionController {
         }
         }
         // 根据来佣检核年月查询是否已存在来佣记录
         // 根据来佣检核年月查询是否已存在来佣记录
         List<Commission> existingCommissions = commissionService.list(new QueryWrapper<Commission>()
         List<Commission> existingCommissions = commissionService.list(new QueryWrapper<Commission>()
-                .eq("reconciliation_year_month", dataList.get(0).getReconciliationYearMonth()));
+                .eq("reconciliation_year_month", reconciliationYearMonth));
         boolean isAllCompareSuccess = existingCommissions.stream()
         boolean isAllCompareSuccess = existingCommissions.stream()
                 .allMatch(commission -> commission.getStatus().equals(CommissionStatusEnum.COMPARE_SUCCESS.getItemValue()));
                 .allMatch(commission -> commission.getStatus().equals(CommissionStatusEnum.COMPARE_SUCCESS.getItemValue()));
         if (isAllCompareSuccess) {
         if (isAllCompareSuccess) {
@@ -101,7 +108,7 @@ public class ApiCommissionController {
 
 
         // 先删除已存在的来佣记录
         // 先删除已存在的来佣记录
         commissionService.remove(new LambdaQueryWrapper<Commission>()
         commissionService.remove(new LambdaQueryWrapper<Commission>()
-                .eq(Commission::getReconciliationYearMonth, dataList.get(0).getReconciliationYearMonth()));
+                .eq(Commission::getReconciliationYearMonth, reconciliationYearMonth));
 
 
         // 数据处理
         // 数据处理
         List<Commission> entities = processData(dataList, loginUserId);
         List<Commission> entities = processData(dataList, loginUserId);
@@ -135,10 +142,6 @@ public class ApiCommissionController {
         }
         }
         StringBuilder errorMsg = new StringBuilder();
         StringBuilder errorMsg = new StringBuilder();
         for (CommissionExcelDTO excelDTO : dataList) {
         for (CommissionExcelDTO excelDTO : dataList) {
-            // 校验入账检核年月是否为空
-            if (StringUtils.isBlank(excelDTO.getReconciliationYearMonth())) {
-                errorMsg.append("第").append(dataList.indexOf(excelDTO) + 1).append("行入账检核年月不能为空");
-            }
             // 校验必填字段是否为空
             // 校验必填字段是否为空
             if (StringUtils.isBlank(excelDTO.getPolicyNo()) ||
             if (StringUtils.isBlank(excelDTO.getPolicyNo()) ||
                     StringUtils.isBlank(excelDTO.getReconciliationCompany()) ||
                     StringUtils.isBlank(excelDTO.getReconciliationCompany()) ||
@@ -187,7 +190,7 @@ public class ApiCommissionController {
      * @return
      * @return
      */
      */
     @PostMapping("/generate/fortune")
     @PostMapping("/generate/fortune")
-    @Operation(summary = "生成实际出账（发佣）记录，并设置检核日期")
+    @Operation(summary = "生成实际出账（发佣）记录")
     public Result<Boolean> generateFortune(@RequestBody GenerateFortuneRequest generateFortuneRequest,
     public Result<Boolean> generateFortune(@RequestBody GenerateFortuneRequest generateFortuneRequest,
                                                             HttpServletRequest request) {
                                                             HttpServletRequest request) {
         LocalDate payoutYearMonth = generateFortuneRequest.getPayoutYearMonth();
         LocalDate payoutYearMonth = generateFortuneRequest.getPayoutYearMonth();

yd-csf-api/src/main/java/com/yd/csf/api/dto/CommissionExcelDTO.java

@@ -14,9 +14,6 @@ import java.util.Date;
 
 
 @Data
 @Data
 public class CommissionExcelDTO {
 public class CommissionExcelDTO {
-    @ExcelProperty("入账检核年月")
-    private String reconciliationYearMonth;
-
     @ExcelProperty("应收账款编号")
     @ExcelProperty("应收账款编号")
     private String receivableNo;
     private String receivableNo;
 
 
@@ -59,7 +56,6 @@ public class CommissionExcelDTO {
     public static Commission convertToEntity(CommissionExcelDTO data, String loginUserId) {
     public static Commission convertToEntity(CommissionExcelDTO data, String loginUserId) {
         Commission entity = new Commission();
         Commission entity = new Commission();
         // 字段映射
         // 字段映射
-        entity.setReconciliationYearMonth(data.getReconciliationYearMonth());
         entity.setReceivableNo(data.getReceivableNo());
         entity.setReceivableNo(data.getReceivableNo());
         entity.setPolicyNo(data.getPolicyNo());
         entity.setPolicyNo(data.getPolicyNo());
         entity.setPremium(data.getPremium());
         entity.setPremium(data.getPremium());

yd-csf-service/src/main/java/com/yd/csf/service/model/Commission.java

@@ -22,7 +22,7 @@ public class Commission implements Serializable {
     private Long id;
     private Long id;
 
 
      /**
      /**
-     * 应收账款编号
+     * 应收账款编号 （非关联保单号，用应收账款编号比对）
      */
      */
     private String receivableNo;
     private String receivableNo;