新增应付10

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

@@ -542,24 +542,25 @@ public class ApiCommissionController {
     /**
      * 入账记录
      *
-     * @param commissionQueryRequest
+     * @param pageByCommissionexpectedBizIdRequest
      * @param request
      * @return
      */
     @PostMapping("/pageByCommissionexpectedBizId")
     @Operation(summary = "入账记录")
-    public Result<Page<CommissionVO>> pageByCommissionexpectedBizId(@RequestBody CommissionQueryRequest commissionQueryRequest,
+    public Result<Page<CommissionVO>> pageByCommissionexpectedBizId(@RequestBody PageByCommissionexpectedBizIdRequest pageByCommissionexpectedBizIdRequest,
                                                                     HttpServletRequest request) {
-        if (ObjectUtils.isEmpty(commissionQueryRequest.getCommissionExpectedBizId()) && ObjectUtils.isEmpty(commissionQueryRequest.getReconciliationYearMonth())) {
+        if (ObjectUtils.isEmpty(pageByCommissionexpectedBizIdRequest.getCommissionExpectedBizId()) && ObjectUtils.isEmpty(pageByCommissionexpectedBizIdRequest.getReconciliationYearMonth())) {
             return Result.fail(ResultCode.PARAMS_ERROR.getCode(), "commissionExpectedBizId、 reconciliationYearMonth 不能全部为空");
         }
 
-        long current = commissionQueryRequest.getPageNo();
-        long size = commissionQueryRequest.getPageSize();
+        long current = pageByCommissionexpectedBizIdRequest.getPageNo();
+        long size = pageByCommissionexpectedBizIdRequest.getPageSize();
         // 查询列表数据
         QueryWrapper<Commission> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq(ObjectUtils.isNotEmpty(commissionQueryRequest.getCommissionExpectedBizId()),"commission_expected_biz_id", commissionQueryRequest.getCommissionExpectedBizId());
-        queryWrapper.eq(ObjectUtils.isNotEmpty(commissionQueryRequest.getReconciliationYearMonth()),"reconciliation_year_month", commissionQueryRequest.getReconciliationYearMonth());
+        queryWrapper.eq(ObjectUtils.isNotEmpty(pageByCommissionexpectedBizIdRequest.getCommissionExpectedBizId()),"commission_expected_biz_id", pageByCommissionexpectedBizIdRequest.getCommissionExpectedBizId());
+        queryWrapper.eq(ObjectUtils.isNotEmpty(pageByCommissionexpectedBizIdRequest.getReconciliationYearMonth()),"reconciliation_year_month", pageByCommissionexpectedBizIdRequest.getReconciliationYearMonth());
+        queryWrapper.like(StringUtils.isNotBlank(pageByCommissionexpectedBizIdRequest.getPolicyNo()), "policy_no", pageByCommissionexpectedBizIdRequest.getPolicyNo());
         Page<Commission> commissionPage = commissionService.page(new Page<>(current, size),
                 queryWrapper);
         // 组装返回值

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

@@ -113,6 +113,21 @@ public class ApiCommissionExpectedController {
     }
 
     /**
+     * 预计入账-修改状态
+     *
+     * @param commissionExpectedChangeStatusRequest
+     * @return
+     */
+    @PostMapping("/change_status")
+    @Operation(summary = "预计入账-修改状态")
+    public Result<Boolean> changeStatus(@RequestBody CommissionExpectedChangeStatusRequest commissionExpectedChangeStatusRequest) {
+        if (commissionExpectedChangeStatusRequest == null || StringUtils.isBlank(commissionExpectedChangeStatusRequest.getCommissionExpectedBizId())) {
+            return Result.fail(ResultCode.PARAMS_ERROR.getCode(), "commissionExpectedBizId不能为空");
+        }
+        return Result.success(commissionExpectedService.changeStatus(commissionExpectedChangeStatusRequest));
+    }
+
+    /**
      * 根据 CommissionExpectedBizId 获取CommissionExpected（封装类）
      *
      * @param commissionExpectedBizId 预计入账业务id

yd-csf-service/src/main/java/com/yd/csf/service/dto/CommissionExpectedChangeStatusRequest.java

+package com.yd.csf.service.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class CommissionExpectedChangeStatusRequest  implements Serializable {
+    /**
+     * 预计入账业务id
+     */
+    @Schema(description = "预计入账业务id", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String commissionExpectedBizId;
+
+    /**
+     * 入账状态
+     */
+    @Schema(description = "入账状态 字典值: csf_expected_commission_status", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String status;
+
+    /**
+     * 设置入账状态-修改理由
+     */
+    @Schema(description = "设置入账状态-修改理由")
+    private String statusDesc;
+
+
+    private static final long serialVersionUID = 1L;
+}

yd-csf-service/src/main/java/com/yd/csf/service/dto/PageByCommissionexpectedBizIdRequest.java

+package com.yd.csf.service.dto;
+
+import com.yd.common.dto.PageDto;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class PageByCommissionexpectedBizIdRequest extends PageDto implements Serializable {
+
+    /**
+     * 预计入账 id
+     */
+    @Schema(description = "预计入账 id")
+    private String commissionExpectedBizId;
+
+    /**
+     * 检核年月
+     */
+    @Schema(description = "检核年月 格式: yyyy-MM")
+    private String reconciliationYearMonth;
+
+    /**
+     * 保单号
+     */
+    @Schema(description = "保单号")
+    private String policyNo;
+
+    private static final long serialVersionUID = 1L;
+}

yd-csf-service/src/main/java/com/yd/csf/service/service/CommissionExpectedService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yd.csf.service.dto.CommissionExpectedAddRequest;
+import com.yd.csf.service.dto.CommissionExpectedChangeStatusRequest;
 import com.yd.csf.service.dto.CommissionExpectedQueryRequest;
 import com.yd.csf.service.dto.CommissionExpectedUpdateRequest;
 import com.yd.csf.service.model.CommissionExpected;
@@ -81,4 +82,6 @@ public interface CommissionExpectedService extends IService<CommissionExpected>
     IPage<ReceivableReportVO> receivableReportPage(Page<ReceivableReportVO> page, List<Long> expectedIds);
 
     void testExpectedCommission(String policyNo,String effectiveDate,String coolingOffEndDate) throws IOException;
+
+    Boolean changeStatus(CommissionExpectedChangeStatusRequest commissionExpectedChangeStatusRequest);
 }

yd-csf-service/src/main/java/com/yd/csf/service/service/impl/CommissionExpectedServiceImpl.java

@@ -1053,6 +1053,27 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
         }
     }
 
+    @Override
+    public Boolean changeStatus(CommissionExpectedChangeStatusRequest commissionExpectedChangeStatusRequest) {
+        // 校验预计入账是否存在
+        CommissionExpected commissionExpected = getByBizId(commissionExpectedChangeStatusRequest.getCommissionExpectedBizId());
+        if (commissionExpected == null) {
+            throw new BusinessException(ResultCode.NULL_ERROR.getCode(), "预计入账不存在");
+        }
+
+        // 校验数据
+        if (StringUtils.isBlank(commissionExpectedChangeStatusRequest.getStatus())) {
+            throw new BusinessException(ResultCode.PARAMS_ERROR.getCode(), "状态不能为空");
+        }
+        // 转换为实体类
+        CommissionExpected updateObj = new CommissionExpected();
+        BeanUtil.copyProperties(commissionExpectedChangeStatusRequest, updateObj);
+        updateObj.setId(commissionExpected.getId());
+
+        // 更新
+        return this.updateById(updateObj);
+    }
+
     private Policy convertPolicy(PolicyFollow policyFollow,String effectiveDate,String coolingOffEndDate) {
         Policy policy = new Policy();
         BeanUtil.copyProperties(policyFollow, policy);