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

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TCertRecordServiceImpl.java

@@ -73,6 +73,7 @@ public class TCertRecordServiceImpl extends ServiceImpl<TCertRecordMapper, TCert
 				.eq(TEmployeeContractInfo::getDeleteFlag,CommonConstants.ZERO_STRING)
 				.eq(TEmployeeContractInfo::getAuditStatus,CommonConstants.TWO_STRING)
 				.eq(TEmployeeContractInfo::getIsObsolete,CommonConstants.ZERO_STRING)
+				.eq(TEmployeeContractInfo::getEmpIdcard,employeeInfo.getEmpIdcard())
 				.orderByDesc(TEmployeeContractInfo::getAuditTimeLast)
 				.last(CommonConstants.LAST_ONE_SQL));
 
@@ -81,6 +82,7 @@ public class TCertRecordServiceImpl extends ServiceImpl<TCertRecordMapper, TCert
 				.eq(TEmployeeContractInfo::getDeleteFlag,CommonConstants.ZERO_STRING)
 				.eq(TEmployeeContractInfo::getAuditStatus,CommonConstants.TWO_STRING)
 				.eq(TEmployeeContractInfo::getIsObsolete,CommonConstants.ZERO_STRING)
+				.eq(TEmployeeContractInfo::getEmpIdcard,employeeInfo.getEmpIdcard())
 				.orderByAsc(TEmployeeContractInfo::getAuditTimeLast)
 				.last(CommonConstants.LAST_ONE_SQL));
 		TCertRecordVo vo = new TCertRecordVo();

yifu-common/yifu-common-core/src/main/java/com/yifu.cloud.plus.v1/yifu/common/core/constant/CommonConstants.java

@@ -227,6 +227,8 @@ public interface CommonConstants {
 	char ADD_CHAR = '+';
 	//int 4
 	int FOUR_INT = 4;
+	//int 5
+	int FIVE_INT = 5;
 	String TEN_STRING = "10";
 
 	public static final String SPOT = ".";

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/constants/InsurancesConstants.java

@@ -11,10 +11,38 @@ public class InsurancesConstants {
 	 * 新增投保成功
 	 */
 	public static final String ADD_SUCCESS = "新增投保成功";
+	/**
+	 * 批增投保成功
+	 */
+	public static final String BATCH_SUCCESS = "批增投保成功";
+	/**
+	 * 替换成功
+	 */
+	public static final String REPLACE_SUCCESS = "替换成功";
 	/**
 	 * 投保信息已存在
 	 */
 	public static final String DATA_IS_EXIST = "投保信息已存在";
+	/**
+	 * 被替换信息不存在
+	 */
+	public static final String REPLACE_IS_NOT_EXIST = "被替换信息不存在";
+	/**
+	 * 项目编码不存在
+	 */
+	public static final String DEPT_NO_IS_NOT_EXIST = "项目编码不存在";
+	/**
+	 * 未找到结算主体的结算方式
+	 */
+	public static final String PROJECT_NOT_FIND_SETTLE_TYPE = "未找到结算主体的结算方式";
+	/**
+	 * 替换者信息已存在
+	 */
+	public static final String REPLACE_IS_EXIST = "替换者信息已存在";
+	/**
+	 * 无效、已过期、已出险、已减员的 不能替换
+	 */
+	public static final String REPLACE_IS_NOT_ALLOW = "无效、已过期、已出险、已减员的 不能替换";
 	/**
 	 * 订单编号不能为空
 	 */
@@ -23,18 +51,34 @@ public class InsurancesConstants {
 	 * 员工姓名不能为空
 	 */
 	public static final String EMP_NAME_NOT_EMPTY = "员工姓名不能为空";
+	/**
+	 * 替换员工姓名不能为空
+	 */
+	public static final String REPLACE_EMP_NAME_NOT_EMPTY = "替换员工姓名不能为空";
 	/**
 	 * 员工身份证号不能为空
 	 */
 	public static final String EMP_IDCARD_NO_NOT_EMPTY = "员工身份证号不能为空";
+	/**
+	 * 替换员工身份证号不能为空
+	 */
+	public static final String REPLACE_EMP_IDCARD_NO_NOT_EMPTY = "替换员工身份证号不能为空";
 	/**
 	 * 员工身份证号格式有误
 	 */
 	public static final String EMP_IDCARD_NO_NOT_LEGITIMATE = "员工身份证号格式有误";
+	/**
+	 * 替换员工身份证号格式有误
+	 */
+	public static final String REPLACE_EMP_IDCARD_NO_NOT_LEGITIMATE = "替换员工身份证号格式有误";
 	/**
 	 * 项目编码不能为空
 	 */
 	public static final String DEPT_NO_NOT_EMPTY = "项目编码不能为空";
+	/**
+	 * 替换项目编码不能为空
+	 */
+	public static final String REPLACE_DEPT_NO_NOT_EMPTY = "替换项目编码不能为空";
 	/**
 	 * 保险公司名称不能为空
 	 */

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceDetail.java

@@ -199,9 +199,9 @@ public class TInsuranceDetail extends BaseEntity {
     private String insuranceHandleCityName;
 
     /**
-     * 结算类型 (1、单独结算 2、合并结算-和工资一起结算)
+     * 结算类型 (0、预估 1、实缴)
      */
-	@Schema(description = "结算类型 (1、单独结算 2、合并结算-和工资一起结算)")
+	@Schema(description = "结算类型 (0、预估 1、实缴)")
     private Integer settleType;
 
     /**

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceReplace.java

+package com.yifu.cloud.plus.v1.yifu.insurances.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * @author licancan
+ * @description 商险替换表 t_insurance_replace
+ * @date 2022-07-20 14:20:16
+ */
+@Data
+@TableName("t_insurance_replace")
+@Tag(name = "商险替换表")
+public class TInsuranceReplace implements Serializable {
+	private static final long serialVersionUID = -8528017421473755436L;
+
+	/**
+	 * 主键
+	 */
+	@TableId(type = IdType.ASSIGN_ID)
+	@Schema(description = "主键")
+    private String id;
+
+    /**
+     * 被替换人明细id
+     */
+	@Schema(description = "被替换人明细id")
+    private String fromInsuranceDetailId;
+
+    /**
+     * 替换人明细ID
+     */
+	@Schema(description = "替换人明细ID")
+    private String toInsuranceDetailId;
+
+    /**
+     * 原始明细id
+     */
+	@Schema(description = "原始明细id")
+    private String originInsuranceDetailId;
+
+    /**
+     * 0失败 1成功
+     */
+	@Schema(description = "0失败 1成功")
+    private Integer replaceStatus;
+
+    /**
+     * 替换成功时间
+     */
+	@Schema(description = "替换成功时间")
+    private LocalDateTime replaceTime;
+
+    /**
+     * 创建人
+     */
+	@Schema(description = "创建人")
+    private String createBy;
+
+    /**
+     * 创建人姓名
+     */
+	@Schema(description = "创建人-姓名")
+    private String createName;
+
+    /**
+     * 创建时间
+     */
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
+	@Schema(description = "创建时间")
+	@TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createTime;
+
+}
\ No newline at end of file

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceAddParam.java

@@ -112,6 +112,7 @@ public class InsuranceAddParam  implements Serializable {
 	/**
 	 * 错误信息
 	 */
+	@Schema(description = "错误信息")
 	private String errorMessage;
 
   	/***********************************以下字段由系统算出，前端不用传，是为了方便入库***********************************/

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceBatchParam.java

@@ -108,6 +108,7 @@ public class InsuranceBatchParam implements Serializable {
 	/**
 	 * 错误信息
 	 */
+	@Schema(description = "错误信息")
 	private String errorMessage;
 
   	/***********************************以下字段由系统算出，前端不用传，是为了方便入库***********************************/

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceListParam.java

+package com.yifu.cloud.plus.v1.yifu.insurances.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author licancan
+ * @description 投保列表请求参数
+ * @date 2022-07-20 16:14:19
+ */
+@Data
+@Tag(name = "投保列表请求参数")
+public class InsuranceListParam implements Serializable {
+	private static final long serialVersionUID = -4692341622141432288L;
+
+	/**
+	 * 项目编码
+	 */
+	@Schema(description = "项目编码")
+	private String deptNo;
+
+	/**
+	 * 投保状态 1待投保 2投保中 3已投保 4投保退回 5 已减员
+	 */
+	@Schema(description = "投保状态 1待投保 2投保中 3已投保 4投保退回 5 已减员")
+	private Integer buyHandleStatus;
+
+	/**
+	 * 员工姓名
+	 */
+	@Schema(description = "员工姓名")
+	private String empName;
+
+	/**
+	 * 员工身份证号
+	 */
+	@Schema(description = "员工身份证号")
+	private String empIdcardNo;
+
+	/**
+	 * 保险公司名称
+	 */
+	@Schema(description = "保险公司名称")
+	private String insuranceCompanyName;
+}

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceListVO.java

+package com.yifu.cloud.plus.v1.yifu.insurances.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * @author licancan
+ * @description 投保列表VO
+ * @date 2022-07-20 16:18:41
+ */
+@Data
+@Tag(name = "投保列表VO")
+public class InsuranceListVO implements Serializable {
+	private static final long serialVersionUID = -6673220061558171816L;
+
+	/**
+	 * 主键
+	 */
+	@Schema(description = "主键")
+	private String id;
+
+	/**
+	 * 订单编号
+	 */
+	@Schema(description = "订单编号")
+	private String orderNo;
+
+	/**
+	 * 员工姓名
+	 */
+	@Schema(description = "员工姓名")
+	private String empName;
+
+	/**
+	 * 员工身份证号
+	 */
+	@Schema(description = "员工身份证号")
+	private String empIdcardNo;
+
+	/**
+	 * 投保类型， 1新增、3批增、4替换
+	 */
+	@Schema(description = " 投保类型， 1新增、3批增、4替换")
+	private Integer buyType;
+
+	/**
+	 * 项目名称
+	 */
+	@Schema(description = "项目名称")
+	private String projectName;
+
+	/**
+	 * 项目编码
+	 */
+	@JsonIgnore
+	private String deptNo;
+
+	/**
+	 * 投保岗位
+	 */
+	@Schema(description = "投保岗位")
+	private String post;
+
+	/**
+	 * 保单开始时间
+	 */
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd")
+	@Schema(description = "保单开始时间")
+	private LocalDate policyStart;
+
+	/**
+	 * 保单结束时间
+	 */
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd")
+	@Schema(description = "保单结束时间")
+	private LocalDate policyEnd;
+
+	/**
+	 * 保险公司名称
+	 */
+	@Schema(description = "保险公司名称")
+	private String insuranceCompanyName;
+
+	/**
+	 * 险种名称
+	 */
+	@Schema(description = "险种名称")
+	private String insuranceTypeName;
+
+	/**
+	 * 购买标准
+	 */
+	@Schema(description = "购买标准")
+	private String buyStandard;
+
+	/**
+	 * 创建人姓名
+	 */
+	@Schema(description = "创建人(派单人)")
+	private String createName;
+
+	/**
+	 * 投保状态 1待投保 2投保中 3已投保 4投保退回 5 已减员
+	 */
+	@Schema(description = "投保状态 1待投保 2投保中 3已投保 4投保退回 5 已减员")
+	private Integer buyHandleStatus;
+
+	/**
+	 * 结算类型 (0、预估 1、实缴)
+	 */
+	@Schema(description = "结算类型 (0、预估 1、实缴)")
+	private Integer settleType;
+
+	/**
+	 * 结算月
+	 */
+	@Schema(description = "结算月")
+	private String settleMonth;
+}

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceReplaceParam.java

+package com.yifu.cloud.plus.v1.yifu.insurances.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * @author licancan
+ * @description 商险办理替换入参
+ * @date 2022-07-20 08:43:31
+ */
+@Data
+@Tag(name = "商险办理替换入参")
+public class InsuranceReplaceParam implements Serializable {
+	private static final long serialVersionUID = -2689686777914935788L;
+
+	/**
+	 * 员工姓名
+	 */
+	@Schema(description = "员工姓名")
+	private String empName;
+
+	/**
+	 * 员工身份证号
+	 */
+	@Schema(description = "员工身份证号")
+	private String empIdcardNo;
+
+	/**
+	 * 项目编码
+	 */
+	@Schema(description = "项目编码")
+	private String deptNo;
+
+	/**
+	 * 保险公司名称
+	 */
+	@Schema(description = "保险公司名称")
+	private String insuranceCompanyName;
+	/**
+	 * 险种名称
+	 */
+	@Schema(description = "险种名称")
+	private String insuranceTypeName;
+
+	/**
+	 * 保单开始时间
+	 */
+	@Schema(description = "保单开始时间")
+	private String policyStart;
+
+	/**
+	 * 保单结束时间
+	 */
+	@Schema(description = "保单结束时间")
+	private String policyEnd;
+
+	/**
+	 * 替换员工姓名
+	 */
+	@Schema(description = "替换员工姓名")
+	private String replaceEmpName;
+
+	/**
+	 * 替换员工身份证号
+	 */
+	@Schema(description = "替换员工身份证号")
+	private String replaceEmpIdcardNo;
+
+	/**
+	 * 替换员工项目编码
+	 */
+	@Schema(description = "替换员工项目编码")
+	private String replaceDeptNo;
+
+	/**
+	 * 订单编号
+	 */
+	@Schema(description = "订单编号")
+	private String orderNo;
+
+	/**
+	 * 岗位
+	 */
+	@Schema(description = "岗位")
+	private String post;
+
+	/**
+	 * 错误信息
+	 */
+	@Schema(description = "错误信息")
+	private String errorMessage;
+
+}

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/controller/TInsuranceDetailController.java

 package com.yifu.cloud.plus.v1.yifu.insurances.controller;
 
-import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.InsuranceRefundCheck;
 import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceDetailService;
-import com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceAddParam;
-import com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceBatchParam;
+import com.yifu.cloud.plus.v1.yifu.insurances.vo.*;
+import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
@@ -13,8 +14,6 @@ import org.springframework.http.HttpHeaders;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -22,7 +21,6 @@ import javax.annotation.Resource;
 import javax.validation.Valid;
 import javax.validation.constraints.Size;
 import java.util.List;
-import java.util.List;
 
 /**
  * @author licancan
@@ -40,6 +38,33 @@ public class TInsuranceDetailController {
 	private TInsuranceDetailService tInsuranceDetailService;
 
 	/***********************商险办理********************************/
+	/**
+	 * 投保办理分页查询
+	 *
+	 * @author licancan
+	 * @param page
+	 * @param param
+	 * @return {@link R<IPage<InsuranceListVO>>}
+	 */
+	@Operation(summary = "投保办理分页查询", description = "投保办理分页查询")
+	@PostMapping("/getInsuranceListPage")
+	public R<IPage<InsuranceListVO>> getInsuranceListPage(Page<InsuranceListVO> page, @RequestBody InsuranceListParam param) {
+		return R.ok(tInsuranceDetailService.getInsuranceListPage(page, param));
+	}
+
+	/**
+	 * 投保办理不分页查询
+	 *
+	 * @author licancan
+	 * @param param
+	 * @return {@link R<List<InsuranceListVO>>}
+	 */
+	@Operation(summary = "投保办理不分页查询", description = "投保办理不分页查询")
+	@PostMapping("/getInsuranceList")
+	public R<List<InsuranceListVO>> getInsuranceList(@RequestBody InsuranceListParam param) {
+		return R.ok(tInsuranceDetailService.getInsuranceList(param));
+	}
+
 	/**
 	 * 商险新增
 	 *
@@ -47,6 +72,7 @@ public class TInsuranceDetailController {
 	 * @param paramList
 	 * @return {@link R<List<InsuranceAddParam>>}
 	 */
+	@Operation(summary = "投保新增", description = "投保新增")
 	@PostMapping("/addInsurance")
 	public R<List<InsuranceAddParam>> addInsurance(@RequestBody @Valid @Size(min = 1,message = "集合不能为空") List<InsuranceAddParam> paramList){
 		return tInsuranceDetailService.addInsurance(paramList);
@@ -59,13 +85,26 @@ public class TInsuranceDetailController {
 	 * @param paramList
 	 * @return {@link R<List<InsuranceBatchParam>>}
 	 */
+	@Operation(summary = "投保批增", description = "投保批增")
 	@PostMapping("/batchInsurance")
 	public R<List<InsuranceBatchParam>> batchInsurance(@RequestBody @Valid @Size(min = 1,message = "集合不能为空") List<InsuranceBatchParam> paramList){
 		return tInsuranceDetailService.batchInsurance(paramList);
 	}
 
-	/***********************减员办理********************************/
+	/**
+	 * 商险替换
+	 *
+	 * @author licancan
+	 * @param paramList
+	 * @return {@link R<List<InsuranceReplaceParam>>}
+	 */
+	@Operation(summary = "投保替换", description = "投保替换")
+	@PostMapping("/replaceInsurance")
+	public R<List<InsuranceReplaceParam>> replaceInsurance(@RequestBody @Valid @Size(min = 1,message = "集合不能为空") List<InsuranceReplaceParam> paramList){
+		return tInsuranceDetailService.replaceInsurance(paramList);
+	}
 
+	/***********************减员办理********************************/
 	/**
 	 * 导入减员校验
 	 * @param insuranceRefundCheckList 导入减员校验

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/mapper/TInsuranceDetailMapper.java

 package com.yifu.cloud.plus.v1.yifu.insurances.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceDetail;
+import com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceListParam;
+import com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceListVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * @author licancan
@@ -11,5 +18,25 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface TInsuranceDetailMapper extends BaseMapper<TInsuranceDetail> {
+	/***********************商险办理********************************/
+	/**
+	 * 投保办理分页查询
+	 *
+	 * @author licancan
+	 * @param page
+	 * @param param
+	 * @return {@link IPage< InsuranceListVO>}
+	 */
+	IPage<InsuranceListVO> getInsuranceListPage(Page<InsuranceListVO> page, @Param("param") InsuranceListParam param);
+
+	/**
+	 * 投保办理不分页查询
+	 *
+	 * @author licancan
+	 * @param param
+	 * @return {@link List<InsuranceListVO>}
+	 */
+    List<InsuranceListVO> getInsuranceList(@Param("param") InsuranceListParam param);
 
+    /***********************减员办理********************************/
 }

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/mapper/TInsuranceReplaceMapper.java

+package com.yifu.cloud.plus.v1.yifu.insurances.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceReplace;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author licancan
+ * @description 针对表【t_insurance_replace(商险替换表)】的数据库操作Mapper
+ * @date 2022-07-20 14:20:16
+ */
+@Mapper
+public interface TInsuranceReplaceMapper extends BaseMapper<TInsuranceReplace> {
+
+
+}

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/TInsuranceDetailService.java

 package com.yifu.cloud.plus.v1.yifu.insurances.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.yifu.cloud.plus.v1.yifu.common.core.util.R;
-import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.InsuranceRefundCheck;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceDetail;
-import com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceAddParam;
-import com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceBatchParam;
-
-import java.util.List;
+import com.yifu.cloud.plus.v1.yifu.insurances.vo.*;
 
 import java.util.List;
 
@@ -21,6 +19,25 @@ import java.util.List;
 public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
 
 	/***********************商险办理********************************/
+	/**
+	 * 投保办理分页查询
+	 *
+	 * @author licancan
+	 * @param page
+	 * @param param
+	 * @return {@link IPage<InsuranceListVO>}
+	 */
+	IPage<InsuranceListVO> getInsuranceListPage(Page<InsuranceListVO> page, InsuranceListParam param);
+
+	/**
+	 * 投保办理不分页查询
+	 *
+	 * @author licancan
+	 * @param param
+	 * @return {@link List<InsuranceListVO>}
+	 */
+	List<InsuranceListVO> getInsuranceList(InsuranceListParam param);
+
 	/**
 	 * 商险新增
 	 *
@@ -38,6 +55,14 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
 	 * @return {@link R<List<InsuranceBatchParam>>}
 	 */
 	R<List<InsuranceBatchParam>> batchInsurance(List<InsuranceBatchParam> paramList);
+	/**
+	 * 商险替换
+	 *
+	 * @author licancan
+	 * @param paramList
+	 * @return {@link R<List<InsuranceReplaceParam>>}
+	 */
+	R<List<InsuranceReplaceParam>> replaceInsurance(List<InsuranceReplaceParam> paramList);
 
 	/***********************减员办理********************************/
 	/**

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/TInsuranceReplaceService.java

+package com.yifu.cloud.plus.v1.yifu.insurances.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceReplace;
+
+/**
+ * @author licancan
+ * @description 针对表【t_insurance_replace(商险替换表)】的数据库操作Service
+ * @date 2022-07-20 14:20:16
+ */
+public interface TInsuranceReplaceService extends IService<TInsuranceReplace> {
+
+}

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/impl/TInsuranceReplaceServiceImpl.java

+package com.yifu.cloud.plus.v1.yifu.insurances.service.impl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceReplace;
+import com.yifu.cloud.plus.v1.yifu.insurances.mapper.TInsuranceReplaceMapper;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceReplaceService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author licancan
+ * @description 针对表【t_insurance_replace(商险替换表)】的数据库操作Service实现
+ * @date 2022-07-20 14:20:16
+ */
+@Service
+public class TInsuranceReplaceServiceImpl extends ServiceImpl<TInsuranceReplaceMapper, TInsuranceReplace> implements TInsuranceReplaceService {
+
+}

yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/TInsuranceDetailMapper.xml

@@ -67,4 +67,77 @@
         CREATE_BY,CREATE_NAME,CREATE_TIME,
         UPDATE_BY,UPDATE_TIME,DELETE_FLAG
     </sql>
+	<select id="getInsuranceListPage" resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceListVO">
+		select detail.id as id,
+		detail.ORDER_NO as orderNo,
+		detail.EMP_NAME as empName,
+		detail.EMP_IDCARD_NO as empIdcardNo,
+		detail.BUY_TYPE as buyType,
+		detail.POST as post,
+		detail.DEPT_NO as deptNo,
+		detail.POLICY_START as policyStart,
+		detail.POLICY_END as policyEnd,
+		detail.INSURANCE_COMPANY_NAME as insuranceCompanyName,
+		detail.INSURANCE_TYPE_NAME as insuranceTypeName,
+	    detail.BUY_STANDARD as buyStandard,
+		detail.CREATE_NAME as createName,
+		detail.BUY_HANDLE_STATUS as buyHandleStatus,
+		detail.SETTLE_TYPE as settleType,
+		detail.SETTLE_MONTH as settleMonth
+		from t_insurance_detail detail
+		where detail.DELETE_FLAG = 0
+		<if test="param.deptNo != null and param.deptNo.trim() != ''">
+			and detail.DEPT_NO like concat('%',replace(replace(#{deptNo},'_','\_'),'%','\%'),'%')
+		</if>
+		<if test="param.buyHandleStatus != null">
+			and detail.BUY_HANDLE_STATUS = #{param.buyHandleStatus}
+		</if>
+		<if test="param.empName != null and param.empName.trim() != ''">
+			and detail.EMP_NAME like concat('%',replace(replace(#{param.empName},'_','\_'),'%','\%'),'%')
+		</if>
+		<if test="param.empIdcardNo != null and param.empIdcardNo.trim() != ''">
+			and detail.EMP_IDCARD_NO like concat('%',replace(replace(#{param.empIdcardNo},'_','\_'),'%','\%'),'%')
+		</if>
+		<if test="param.insuranceCompanyName != null and param.insuranceCompanyName.trim() != ''">
+			and detail.INSURANCE_COMPANY_NAME like concat('%',replace(replace(#{param.insuranceCompanyName},'_','\_'),'%','\%'),'%')
+		</if>
+		ORDER BY detail.CREATE_TIME DESC
+	</select>
+
+	<select id="getInsuranceList" resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceListVO">
+		select detail.id as id,
+		detail.ORDER_NO as orderNo,
+		detail.EMP_NAME as empName,
+		detail.EMP_IDCARD_NO as empIdcardNo,
+		detail.BUY_TYPE as buyType,
+		detail.POST as post,
+		detail.DEPT_NO as deptNo,
+		detail.POLICY_START as policyStart,
+		detail.POLICY_END as policyEnd,
+		detail.INSURANCE_COMPANY_NAME as insuranceCompanyName,
+		detail.INSURANCE_TYPE_NAME as insuranceTypeName,
+		detail.BUY_STANDARD as buyStandard,
+		detail.CREATE_NAME as createName,
+		detail.BUY_HANDLE_STATUS as buyHandleStatus,
+		detail.SETTLE_TYPE as settleType,
+		detail.SETTLE_MONTH as settleMonth
+		from t_insurance_detail detail
+		where detail.DELETE_FLAG = 0
+		<if test="param.deptNo != null and param.deptNo.trim() != ''">
+			and detail.DEPT_NO like concat('%',replace(replace(#{deptNo},'_','\_'),'%','\%'),'%')
+		</if>
+		<if test="param.buyHandleStatus != null">
+			and detail.BUY_HANDLE_STATUS = #{param.buyHandleStatus}
+		</if>
+		<if test="param.empName != null and param.empName.trim() != ''">
+			and detail.EMP_NAME like concat('%',replace(replace(#{param.empName},'_','\_'),'%','\%'),'%')
+		</if>
+		<if test="param.empIdcardNo != null and param.empIdcardNo.trim() != ''">
+			and detail.EMP_IDCARD_NO like concat('%',replace(replace(#{param.empIdcardNo},'_','\_'),'%','\%'),'%')
+		</if>
+		<if test="param.insuranceCompanyName != null and param.insuranceCompanyName.trim() != ''">
+			and detail.INSURANCE_COMPANY_NAME like concat('%',replace(replace(#{param.insuranceCompanyName},'_','\_'),'%','\%'),'%')
+		</if>
+		ORDER BY detail.CREATE_TIME DESC
+	</select>
 </mapper>

yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/TInsuranceReplaceMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yifu.cloud.plus.v1.yifu.insurances.mapper.TInsuranceReplaceMapper">
+
+    <resultMap id="BaseResultMap" type="com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceReplace">
+            <id property="id" column="ID" jdbcType="VARCHAR"/>
+            <result property="fromInsuranceDetailId" column="FROM_INSURANCE_DETAIL_ID" jdbcType="VARCHAR"/>
+            <result property="toInsuranceDetailId" column="TO_INSURANCE_DETAIL_ID" jdbcType="VARCHAR"/>
+            <result property="originInsuranceDetailId" column="ORIGIN_INSURANCE_DETAIL_ID" jdbcType="VARCHAR"/>
+            <result property="replaceStatus" column="REPLACE_STATUS" jdbcType="TINYINT"/>
+            <result property="replaceTime" column="REPLACE_TIME" jdbcType="TIMESTAMP"/>
+            <result property="createBy" column="CREATE_BY" jdbcType="VARCHAR"/>
+            <result property="createName" column="CREATE_NAME" jdbcType="VARCHAR"/>
+            <result property="createTime" column="CREATE_TIME" jdbcType="TIMESTAMP"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        ID,FROM_INSURANCE_DETAIL_ID,TO_INSURANCE_DETAIL_ID,
+        ORIGIN_INSURANCE_DETAIL_ID,REPLACE_STATUS,REPLACE_TIME,
+        CREATE_BY,CREATE_NAME,CREATE_TIME
+    </sql>
+</mapper>