新单跟进8

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

@@ -393,21 +393,40 @@ public class ApiPolicyFollowController {
     }
 
     /**
-     * 新单跟进附件列表查询
+     * 新单跟进附件列表分页查询
      *
-     * @param policyBizId
+     * @param queryRequest
      * @return
      */
-    @PostMapping("/attachment/list")
-    @Operation(summary = "新单跟进附件列表查询")
-    public Result<List<PolicyFollowFile>> attachmentList(@RequestParam("policyBizId") String policyBizId) {
-        if (StringUtils.isBlank(policyBizId)) {
+    @PostMapping("/attachment/list/page")
+    @Operation(summary = "新单跟进附件列表分页查询")
+    public Result<Page<PolicyFollowFile>> attachmentListPage(@RequestBody PolicyFollowFileQueryRequest queryRequest) {
+        if (StringUtils.isBlank(queryRequest.getPolicyBizId())) {
             return Result.fail(ErrorCode.PARAMS_ERROR.getCode(), "policyBizId不能为空");
         }
+        long current = queryRequest.getPageNo();
+        long size = queryRequest.getPageSize();
+
         QueryWrapper<PolicyFollowFile> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("policy_biz_id", policyBizId);
+        queryWrapper.eq("policy_biz_id", queryRequest.getPolicyBizId());
         queryWrapper.eq("is_deleted", 0);
-        return Result.success(policyFollowFileService.list(queryWrapper));
+        Page<PolicyFollowFile> policyFollowFilePage = policyFollowFileService.page(new Page<>(current, size), queryWrapper);
+        return Result.success(policyFollowFilePage);
+    }
+
+    /**
+     * 删除新单跟进附件
+     *
+     * @param fileId
+     * @return
+     */
+    @DeleteMapping("/attachment/delete")
+    @Operation(summary = "删除新单跟进附件")
+    public Result<Boolean> deletePolicyFollowAttachment(@RequestParam("fileId") Long fileId) {
+        if (fileId == null) {
+            return Result.fail(ErrorCode.PARAMS_ERROR.getCode(), "fileId不能为空");
+        }
+        return Result.success(policyFollowFileService.removeById(fileId));
     }
 
     /**

yd-csf-service/src/main/java/com/yd/csf/service/dto/PolicyFollowFileQueryRequest.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 PolicyFollowFileQueryRequest extends PageDto implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 新单跟进唯一业务ID
+     */
+     @Schema(description = "新单跟进唯一业务ID", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String policyBizId;
+}

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

@@ -95,7 +95,7 @@ public class PolicyFollowServiceImpl extends ServiceImpl<PolicyFollowMapper, Pol
         List<PolicyFollowVO> policyFollowVOList = policyFollowList.stream().map(PolicyFollowVO::objToVo).collect(Collectors.toList());
 
         // 关联查询转介人
-        List<String> policyBizIdList = policyFollowVOList.stream().map(PolicyFollowVO::getPolicyBizId).collect(Collectors.toList());
+        List<String> policyBizIdList = policyFollowList.stream().map(PolicyFollow::getPolicyBizId).collect(Collectors.toList());
         if (CollUtil.isNotEmpty(policyBizIdList)) {
             // 转介人业务id列表 => 转介人列表
             List<PolicyBroker> policyBrokerList = policyBrokerService.list(new QueryWrapper<PolicyBroker>().in("policy_biz_id", policyBizIdList));

yd-csf-service/src/main/java/com/yd/csf/service/vo/PolicyFollowVO.java

 package com.yd.csf.service.vo;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yd.csf.service.dto.PolicyFollowUpdateDto;
 import com.yd.csf.service.dto.PolicyMailing;
 import com.yd.csf.service.dto.VerifyPolicyInfo;
-import com.yd.csf.service.model.Policy;
 import com.yd.csf.service.model.PolicyBroker;
 import com.yd.csf.service.model.PolicyFollow;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -11,9 +10,7 @@ import lombok.Data;
 import org.springframework.beans.BeanUtils;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
 import java.util.Arrays;
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -23,6 +20,8 @@ import java.util.List;
 @Data
 public class PolicyFollowVO implements Serializable {
 
+    private static final long serialVersionUID = 1L;
+
     /**
      * 新单跟进唯一业务ID
      */
@@ -30,176 +29,16 @@ public class PolicyFollowVO implements Serializable {
     private String policyBizId;
 
      /**
-     * 预约业务id
-     */
-    @Schema(description = "预约业务id")
-    private String appointmentBizId;
-
-    /**
-     * 预约单号
-     */
-    @Schema(description = "预约单号")
-    private String appointmentNo;
-
-    /**
-     * 保单号
-     */
-    @Schema(description = "保单号")
-    private String policyNo;
-
-    /**
-     * 用户业务id
-     */
-    @Schema(description = "用户业务id")
-    private String userBizId;
-
-    /**
-     * 客户业务id
-     */
-    @Schema(description = "客户业务id")
-    private String customerBizId;
-
-    /**
-     * 客户名称
-     */
-    @Schema(description = "客户名称")
-    private String customerName;
-
-    /**
-     * 签单日期
-     */
-    @Schema(description = "签单日期")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date signDate;
-
-    /**
-     * 签单人
-     */
-    @Schema(description = "签单人")
-    private String signer;
-
-    /**
-     * 缮发日期
-     */
-    private Date issueDate;
-
-    /**
-     * 生效日期
-     */
-    private Date effectiveDate;
-
-    /**
-     * 续保日期
-     */
-    private Date renewalDate;
-
-    /**
-     * 供款年期
-     */
-    @Schema(description = "供款年期")
-    private Integer paymentTerm;
-
-    /**
-     * 期交保费
-     */
-    @Schema(description = "期交保费")
-    private BigDecimal paymentPremium;
-
-    /**
-     * 是否预缴: 0-否, 1-是
-     */
-    private Integer isPrepaid;
-
-    /**
-     * 预缴年期
-     */
-    private Integer prepaidTerm;
-
-    /**
-     * 预付额
-     */
-    private String prepaidAmount;
-
-    /**
-     * 折扣后预付额
-     */
-    private String prepaidAmountAfterDiscount;
-
-    /**
-     * 保单截止日期
-     */
-    private Date policyExpirationDate;
-
-    /**
-     * 缴费编号
-     */
-    private String paymentNumber;
-
-    /**
-     * 产品名称
-     */
-    @Schema(description = "产品名称")
-    private String productName;
-
-    /**
-     * 保险公司
-     */
-    @Schema(description = "保险公司")
-    private String insurer;
-
-    /**
-     * 保险公司业务id
-     */
-    @Schema(description = "保险公司业务id")
-    private String insurerBizId;
-
-    /**
-     * 对账公司
-     */
-    @Schema(description = "对账公司")
-    private String reconciliationCompany;
-
-    /**
-     * 对账公司业务id
-     */
-    @Schema(description = "对账公司业务id")
-    private String reconciliationCompanyBizId;
-
-    /**
-     * 新单跟进状态
-     */
-    @Schema(description = "新单跟进状态 字典值: policy_follow_status")
-    private String status;
-
-     /**
      * 下一步跟进状态列表
      */
     @Schema(description = "下一步跟进状态列表, 下拉框")
     private List<String> nextStatusList;
 
     /**
-     * 保單持有人
-     */
-    @Schema(description = "保單持有人")
-    private String policyHolder;
-
-    /**
-     * 受保人
-     */
-    @Schema(description = "受保人")
-    private String insured;
-
-    /**
-     * 币种
+     * 新单跟进Dto
      */
-    @Schema(description = "币种")
-    private String currency;
-
-    /**
-     * 首期保费（不含徽费，预缴保费）
-     */
-    @Schema(description = "首期保费（不含徽费，预缴保费）")
-    private Object initialPremium;
+    @Schema(description = "新单跟进Dto")
+    private PolicyFollowUpdateDto policyFollowUpdateDto;
 
     /**
      * 转介人
@@ -236,10 +75,17 @@ public class PolicyFollowVO implements Serializable {
             return null;
         }
         PolicyFollowVO policyFollowVO = new PolicyFollowVO();
-        BeanUtils.copyProperties(policyFollow, policyFollowVO);
+        policyFollowVO.setPolicyBizId(policyFollow.getPolicyBizId());
+
+        // 转换PolicyFollowUpdateDto
+        PolicyFollowUpdateDto policyFollowUpdateDto = new PolicyFollowUpdateDto();
+        BeanUtils.copyProperties(policyFollow, policyFollowUpdateDto);
+        policyFollowVO.setPolicyFollowUpdateDto(policyFollowUpdateDto);
+
         if (policyFollow.getNextStatusList() != null) {
             policyFollowVO.setNextStatusList(Arrays.asList(policyFollow.getNextStatusList().split(",")));
         }
+
         VerifyPolicyInfo verifyPolicyInfo = new VerifyPolicyInfo();
         BeanUtils.copyProperties(policyFollow, verifyPolicyInfo);
         policyFollowVO.setVerifyPolicyInfo(verifyPolicyInfo);