"feature-zhaJi:新增减员办理查询，导出，办理接口"

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

 package com.yifu.cloud.plus.v1.yifu.insurances.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -26,24 +28,29 @@ public class TInsuranceCompany extends BaseEntity {
     /**
      * 保险公司id
      */
+	@Schema(description = "保险公司id")
+	@TableId(type = IdType.ASSIGN_ID)
     private String id;
 
     /**
      * 保险公司名称
      */
 	@NotBlank(message = "保险公司名称不能为空")
+	@Schema(description = "保险公司名称")
     private String companyName;
 
     /**
      * 保险公司地址
      */
 	@NotBlank(message = "保险公司地址不能为空")
+	@Schema(description = "保险公司地址")
     private String companyAddress;
 
     /**
      * 对接人
      */
 	@NotBlank(message = "对接人不能为空")
+	@Schema(description = "对接人")
     private String companyDocking;
 
 	/**
@@ -51,6 +58,7 @@ public class TInsuranceCompany extends BaseEntity {
 	 */
 	@NotBlank(message = "计费方式不能为空")
 	@StringVal({"0","1"})
+	@Schema(description = "计费方式")
 	private String billingType;
 
     /**

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

 package com.yifu.cloud.plus.v1.yifu.insurances.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -23,36 +25,43 @@ public class TInsuranceType extends BaseEntity {
     /**
      * 险种id
      */
+	@Schema(description = "险种id")
+	@TableId(type = IdType.ASSIGN_ID)
     private Long id;
 
     /**
      * 险种名称
      */
 	@NotBlank(message = "险种名称不能为空")
+	@Schema(description = "险种名称")
     private String name;
 
     /**
      * 保险公司主键ID
      */
 	@NotBlank(message = "所属保险公司不能为空")
+	@Schema(description = "保险公司主键ID")
     private String insuranceCompanyId;
 
     /**
      * 收款单位名称
      */
 	@NotBlank(message = "收款单位名称不能为空")
+	@Schema(description = "收款单位名称")
     private String receiptUnitName;
 
     /**
      * 收款银行名称
      */
 	@NotBlank(message = "收款银行名称不能为空")
+	@Schema(description = "收款银行名称")
     private String bankName;
 
     /**
      * 收款银行账号
      */
 	@NotBlank(message = "收款银行账号不能为空")
+	@Schema(description = "收款银行账号")
     private String bankNo;
 
     /**

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

 package com.yifu.cloud.plus.v1.yifu.insurances.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -22,24 +24,29 @@ public class TInsuranceTypeRate extends BaseEntity {
     /**
      * 费率id
      */
+	@Schema(description = "费率id")
+	@TableId(type = IdType.ASSIGN_ID)
     private String id;
 
     /**
      * 险种ID
      */
 	@NotBlank(message = "所属险种不能为空")
+	@Schema(description = "险种ID")
     private String insuranceTypeId;
 
     /**
      * 月数
      */
 	@NotBlank(message = "月不能为空")
+	@Schema(description = "月数")
     private String month;
 
     /**
      * 费率
      */
 	@NotBlank(message = "费率不能为空")
+	@Schema(description = "费率")
     private String rate;
 
 	/**

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

 package com.yifu.cloud.plus.v1.yifu.insurances.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -7,6 +9,8 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import javax.validation.constraints.NotBlank;
+
 
 /**
  * 购买标准表
@@ -17,29 +21,40 @@ import lombok.EqualsAndHashCode;
 @TableName("t_insurance_type_standard")
 @Tag(name = "购买标准表")
 public class TInsuranceTypeStandard extends BaseEntity {
+
     /**
-     * 
+     * 购买标准id
      */
+	@Schema(description = "保险公司id")
+	@TableId(type = IdType.ASSIGN_ID)
     private String id;
 
     /**
      * 险种主键ID
      */
+	@Schema(description = "险种主键ID")
+	@NotBlank(message = "险种主键ID不能为空")
     private Long insuranceTypeId;
 
     /**
      * 购买标准
      */
+	@Schema(description = "购买标准")
+	@NotBlank(message = "购买标准不能为空")
     private String buyStandard;
 
     /**
      * 医疗额度
      */
+	@Schema(description = "医疗额度")
+	@NotBlank(message = "医疗额度不能为空")
     private String medicalQuota;
 
     /**
      * 身故或残疾额度
      */
+	@Schema(description = "身故或残疾额度")
+	@NotBlank(message = "身故或残疾额度不能为空")
     private String dieDisableQuota;
 
 	/**

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/InsuranceRefundCheck.java → yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceRefundCheck.java

-package com.yifu.cloud.plus.v1.yifu.insurances.entity;
+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;

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

+package com.yifu.cloud.plus.v1.yifu.insurances.vo;
+
+import java.io.Serializable;
+
+/**
+ * @author zhaji
+ * @description 减员办理返回类
+ * @date 2022-07-21 11:47:16
+ */
+public class InsuranceRefundHandlingListVo implements Serializable {
+
+	private static final long serialVersionUID = -2689686777914935788L;
+}

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceRefundHandlingParam.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 zhaji
+ * @description 减员办理查询条件
+ * @date 2022-07-21 11:40:47
+ */
+@Data
+@Tag(name = "减员办理查询条件")
+public class InsuranceRefundHandlingParam implements Serializable {
+
+	private static final long serialVersionUID = -2689686777914935788L;
+
+	/**
+	 * 员工姓名
+	 */
+	@Schema(description = "员工姓名")
+	private String empName;
+
+	/**
+	 * 员工身份证号
+	 */
+	@Schema(description = "员工身份证号")
+	private String empIdcardNo;
+
+	/**
+	 * 项目编码
+	 */
+	@Schema(description = "项目编码")
+	private String deptNo;
+
+	/**
+	 * 减员状态 1待减员 2减员中3减员退回
+	 */
+	@Schema(description = "减员状态 1待减员 2减员中3减员退回")
+	private Integer reduceHandleStatus;
+}

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

+package com.yifu.cloud.plus.v1.yifu.insurances.vo;
+
+import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceDetail;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author zhaji
+ * @description 减员办理类
+ * @date 2022-07-21 11:56:40
+ */
+@Data
+@Tag(name = "减员办理类")
+public class InsuranceRefundListParam implements Serializable {
+	private static final long serialVersionUID = -2689686777914935788L;
+
+	@Schema(name = "办理类型")
+	@NotBlank(message = "办理类型不能为空")
+	private String refundType;
+
+	@Schema(name = "办理列表")
+	@NotBlank(message = "办理列表不能为空")
+	private List<TInsuranceDetail> insuranceRefundList;
+
+
+}

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

+package com.yifu.cloud.plus.v1.yifu.insurances.vo;
+
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author zhaji
+ * @description 已投保列表
+ * @date 2022-07-21 11:31:30
+ */
+@Data
+@Tag(name = "已投保列表")
+public class InsuranceRefundListVo implements Serializable {
+	private static final long serialVersionUID = -2689686777914935788L;
+
+
+}

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceRefundParam.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 zhaji
+ * @description 已减员查询列表参数
+ * @date 2022-07-21 11:24:03
+ */
+@Data
+@Tag(name = "已减员查询列表参数")
+public class InsuranceRefundParam 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 policyNo;
+
+	/**
+	 * 保险公司ID
+	 */
+	@Schema(description = "保险公司ID")
+	private String insuranceCompanyId;
+
+	/**
+	 * 保险公司名称
+	 */
+	@Schema(description = "保险公司名称")
+	private String insuranceCompanyName;
+
+	/**
+	 * 保单开始时间
+	 */
+	@Schema(description = "保单开始时间")
+	private String policyStart;
+
+	/**
+	 * 保单结束时间
+	 */
+	@Schema(description = "保单结束时间")
+	private String policyEnd;
+
+	/**
+	 * 投保办理状态 1待投保 2投保中 3已投保 4投保退回 5 已减员
+	 */
+	@Schema(description = "投保办理状态 1待投保 2投保中 3已投保 4投保退回 5 已减员")
+	private Integer buyHandleStatus;
+}

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

+package com.yifu.cloud.plus.v1.yifu.insurances.vo;
+
+import java.io.Serializable;
+
+/**
+ * @author zhaji
+ * @description 减员办理返回类
+ * @date 2022-07-21 12:30:37
+ */
+public class InsuranceRefundResultVo implements Serializable {
+	private static final long serialVersionUID = -2689686777914935788L;
+}

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

@@ -15,6 +15,11 @@ import java.util.List;
 @Data
 public class InsuranceTypeVo extends TInsuranceType {
 
+	/**
+	 * 所属保险公司名称
+	 */
+	private String insuranceCompanyName;
+
 	/**
 	 * 费率信息
 	 */

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuredListVo.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 zhaji
+ * @description 已投保查询返回类
+ * @date 2022-07-21 09:46:09
+ */
+@Data
+@Tag(name = "已投保查询返回类")
+public class InsuredListVo 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/InsuredParam.java

+package com.yifu.cloud.plus.v1.yifu.insurances.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+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 zhaji
+ * @description 已投保列表查询条件
+ * @date 2022-07-21 09:25:34
+ */
+@Data
+@Tag(name = "已投保列表查询条件")
+public class InsuredParam 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 policyNo;
+
+	/**
+	 * 保险公司ID
+	 */
+	@Schema(description = "保险公司ID")
+	private String insuranceCompanyId;
+
+	/**
+	 * 保单开始时间
+	 */
+	@Schema(description = "保单开始时间")
+	private String policyStart;
+
+	/**
+	 * 保单结束时间
+	 */
+	@Schema(description = "保单结束时间")
+	private String policyEnd;
+
+	/**
+	 * 发票号
+	 */
+	@Schema(description = "发票号")
+	private String invoiceNo;
+
+	/**
+	 * 投保办理状态 1待投保 2投保中 3已投保 4投保退回 5 已减员
+	 */
+	@Schema(description = "投保办理状态 1待投保 2投保中 3已投保 4投保退回 5 已减员")
+	private Integer buyHandleStatus;
+
+	/**
+	 * 是否出险 0未出险 1已出险
+	 */
+	@Schema(description = "是否出险 0未出险 1已出险")
+	private Integer isUse;
+
+	/**
+	 * 是否有效 0有效 1无效
+	 */
+	@Schema(description = "是否有效 0有效 1无效")
+	private Integer isEffect;
+
+	/**
+	 * 是否过期 0未过期 1已过期
+	 */
+	@Schema(description = "是否过期 0未过期 1已过期")
+	private Integer isOverdue;
+
+	/**
+	 * 派单日期
+	 */
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
+	@Schema(description = "派单日期")
+	@ExcelProperty("派单日期")
+	private LocalDateTime createTime;
+
+}

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

@@ -3,7 +3,6 @@ package com.yifu.cloud.plus.v1.yifu.insurances.controller;
 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.*;
 import io.swagger.v3.oas.annotations.Operation;
@@ -11,7 +10,6 @@ import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpHeaders;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -156,4 +154,97 @@ public class TInsuranceDetailController {
 
 		return tInsuranceDetailService.checkInsuranceRefundList(insuranceRefundCheckList);
 	}
+
+	/**
+	 * 已投保列表分页查询
+	 *
+	 * @author zhaji
+	 * @param page 分页参数
+	 * @param param 查询条件
+	 * @return {@link R<IPage<InsuredListVo>>}
+	 */
+	@Operation(summary = "已投保列表分页查询", description = "已投保列表分页查询")
+	@PostMapping("/getInsuredListPage")
+	public R<IPage<InsuredListVo>> getInsuredListPage(Page<InsuredListVo> page, @RequestBody InsuredParam param) {
+		return R.ok(tInsuranceDetailService.getInsuredListPage(page, param));
+	}
+
+	/**
+	 * 已投保列表不分页查询
+	 *
+	 * @author zhaji
+	 * @param param 查询条件
+	 * @return {@link R<List<InsuredListVo>>}
+	 */
+	@Operation(summary = "已投保列表不分页查询", description = "已投保列表不分页查询")
+	@PostMapping("/getInsuredList")
+	public R<List<InsuredListVo>> getInsuredList(@RequestBody InsuredParam param) {
+		return R.ok(tInsuranceDetailService.getInsuredList(param));
+	}
+
+	/**
+	 * 已减员列表分页查询
+	 *
+	 * @author zhaji
+	 * @param param 查询条件
+	 * @return {@link R<IPage< InsuranceRefundListVo >>}
+	 */
+	@Operation(summary = "已减员列表分页查询", description = "已减员列表分页查询")
+	@PostMapping("/getInsuranceRefundPageList")
+	public R<IPage<InsuranceRefundListVo>> getInsuranceRefundPageList(Page<InsuranceRefundParam> page, @RequestBody InsuranceRefundParam param) {
+		return R.ok(tInsuranceDetailService.getInsuranceRefundPageList(page,param));
+	}
+
+	/**
+	 * 已减员列表不分页查询
+	 *
+	 * @author zhaji
+	 * @param param 查询条件
+	 * @return {@link R<List< InsuranceRefundListVo >>}
+	 */
+	@Operation(summary = "已减员列表不分页查询", description = "已减员列表不分页查询")
+	@PostMapping("/getInsuranceRefundList")
+	public R<List<InsuranceRefundListVo>> getInsuranceRefundList(@RequestBody InsuranceRefundParam param) {
+		return R.ok(tInsuranceDetailService.getInsuranceRefundList(param));
+	}
+
+
+	/**
+	 * 减员办理列表分页查询
+	 *
+	 * @author zhaji
+	 * @param param 查询条件
+	 * @return {@link R<IPage< InsuranceRefundHandlingListVo >>}
+	 */
+	@Operation(summary = "减员办理列表分页查询", description = "减员办理列表分页查询")
+	@PostMapping("/getInsuranceRefundHandlingPageList")
+	public R<IPage<InsuranceRefundHandlingListVo>> getInsuranceRefundHandlingPageList(Page<InsuranceRefundHandlingParam> page, @RequestBody InsuranceRefundHandlingParam param) {
+		return R.ok(tInsuranceDetailService.getInsuranceRefundHandlingPageList(page,param));
+	}
+
+	/**
+	 * 减员办理列表不分页查询
+	 *
+	 * @author zhaji
+	 * @param param 查询条件
+	 * @return {@link R<List< InsuranceRefundHandlingListVo >>}
+	 */
+	@Operation(summary = "减员办理列表不分页查询", description = "减员办理列表不分页查询")
+	@PostMapping("/getInsuranceRefundHandlingList")
+	public R<List<InsuranceRefundHandlingListVo>> getInsuranceRefundHandlingList(@RequestBody InsuranceRefundHandlingParam param) {
+		return R.ok(tInsuranceDetailService.getInsuranceRefundHandlingList(param));
+	}
+
+	/**
+	 * 减员办理
+	 *
+	 * @author zhaji
+	 * @param insuranceDetail 减员信息
+	 * @return {@link R<List< InsuranceRefundHandlingListVo >>}
+	 */
+	@Operation(summary = "减员办理", description = "减员办理")
+	@PostMapping("/updateInsuranceRefund")
+	public R updateInsuranceRefund(@RequestBody InsuranceRefundListParam insuranceDetail) {
+		return tInsuranceDetailService.updateInsuranceRefund(insuranceDetail);
+	}
 }

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

@@ -40,7 +40,7 @@ public class TInsuranceTypeController {
 	 */
 	@Operation(summary = "分页查询", description = "分页查询")
 	@GetMapping("/page" )
-	public R<IPage<TInsuranceType>> getTCertRecordPage(Page page, TInsuranceType insuranceType) {
+	public R<IPage<InsuranceTypeVo>> getInsuranceTypePage(Page page, @RequestBody TInsuranceType insuranceType) {
 		return R.ok(insuranceTypeService.pageDiy(page, insuranceType));
 	}
 

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

@@ -4,9 +4,7 @@ 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.InsuranceDetailVO;
-import com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceListParam;
-import com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceListVO;
+import com.yifu.cloud.plus.v1.yifu.insurances.vo.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -49,4 +47,23 @@ public interface TInsuranceDetailMapper extends BaseMapper<TInsuranceDetail> {
 	InsuranceDetailVO getInsuranceDetailById(@Param("id") String id);
 
 	/***********************减员办理********************************/
+
+	/**
+	 * 已投保列表分页查询
+	 *
+	 * @author zhaji
+	 * @param page
+	 * @param param
+	 * @return {@link IPage< InsuredListVo>}
+	 */
+	IPage<InsuredListVo> getInsuredListPage(Page<InsuredListVo> page, @Param("param") InsuredParam param);
+
+	/**
+	 * 已投保列表不分页查询
+	 *
+	 * @author zhaji
+	 * @param param
+	 * @return {@link List<InsuredListVo>}
+	 */
+	List<InsuredListVo> getInsuredList(@Param("param") InsuredParam param);
 }

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

 package com.yifu.cloud.plus.v1.yifu.insurances.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.TInsuranceType;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceTypeRate;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceTypeStandard;
+import com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceTypeVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -34,4 +38,14 @@ public interface TInsuranceTypeMapper extends BaseMapper<TInsuranceType> {
 	 * @return {@link List< TInsuranceTypeStandard>}
 	 */
 	List<TInsuranceTypeStandard> selectInsuranceTypeStandardList(String id);
+
+	/**
+	 * 险种分页查询
+	 *
+	 * @author zhaji
+	 * @param page 分页参数
+	 * @param insuranceType 查询参数
+	 * @return {@link IPage< InsuranceTypeVo>}
+	 */
+    IPage<InsuranceTypeVo> selectInsuranceTypePage(Page page, @Param("insuranceType") TInsuranceType insuranceType);
 }

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

@@ -5,7 +5,6 @@ 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.insurances.entity.InsuranceRefundCheck;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceDetail;
 import com.yifu.cloud.plus.v1.yifu.insurances.vo.*;
 
@@ -101,4 +100,69 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
 	 */
 	R checkInsuranceRefundList(List<InsuranceRefundCheck> insuranceRefundCheckList);
 
+	/**
+	 * 已投保列表分页查询
+	 *
+	 * @author zhaji
+	 * @param page 分页参数
+	 * @param param 查询参数
+	 * @return {@link IPage< InsuredListVo>}
+	 */
+	IPage<InsuredListVo> getInsuredListPage(Page<InsuredListVo> page, InsuredParam param);
+
+	/**
+	 * 已投保列表不分页查询
+	 *
+	 * @author zhaji
+	 * @param param 查询参数
+	 * @return {@link List< InsuredListVo>}
+	 */
+	List<InsuredListVo> getInsuredList(InsuredParam param);
+
+	/**
+	 * 已减员列表分页查询
+	 *
+	 * @author zhaji
+	 * @param page 分页数据
+	 * @param param 查询参数
+	 * @return {@link IPage<  InsuranceRefundListVo >}
+	 */
+	IPage<InsuranceRefundListVo>  getInsuranceRefundPageList(Page<InsuranceRefundParam> page, InsuranceRefundParam param);
+
+	/**
+	 * 已减员列表不分页查询
+	 *
+	 * @author zhaji
+	 * @param param 查询参数
+	 * @return {@link List<  InsuranceRefundListVo >}
+	 */
+	List<InsuranceRefundListVo> getInsuranceRefundList(InsuranceRefundParam param);
+
+	/**
+	 * 减员办理列表分页查询
+	 *
+	 * @author zhaji
+	 * @param page 分页数据
+	 * @param param 查询参数
+	 * @return {@link IPage< InsuranceRefundHandlingListVo>}
+	 */
+	IPage<InsuranceRefundHandlingListVo> getInsuranceRefundHandlingPageList(Page<InsuranceRefundHandlingParam> page, InsuranceRefundHandlingParam param);
+
+	/**
+	 * 减员办理列表不分页查询
+	 *
+	 * @author zhaji
+	 * @param param 查询参数
+	 * @return {@link List< InsuranceRefundHandlingListVo>}
+	 */
+	List<InsuranceRefundHandlingListVo> getInsuranceRefundHandlingList(InsuranceRefundHandlingParam param);
+
+	/**
+	 * 减员办理
+	 *
+	 * @author zhaji
+	 * @param insuranceDetail 办理类
+	 * @return {@link R}
+	 */
+	R updateInsuranceRefund(InsuranceRefundListParam insuranceDetail);
 }

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

@@ -23,7 +23,7 @@ public interface TInsuranceTypeService extends IService<TInsuranceType> {
 	 * @param insuranceType 分页查询参数
 	 * @return {@link IPage< TInsuranceType>}
 	 */
-	IPage<TInsuranceType> pageDiy(Page page, TInsuranceType insuranceType);
+	IPage<InsuranceTypeVo> pageDiy(Page page,TInsuranceType insuranceType);
 
 	/**
 	 * 新增险种信息

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

@@ -1011,5 +1011,93 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		}
 		return null;
 	}
+	/**
+	 * 已投保列表分页查询
+	 *
+	 * @author zhaji
+	 * @param page 分页参数
+	 * @param param 查询参数
+	 * @return {@link IPage< InsuredListVo>}
+	 */
+	@Override
+	public IPage<InsuredListVo> getInsuredListPage(Page<InsuredListVo> page, InsuredParam param) {
+
+		return null;
+	}
+
+	/**
+	 * 已投保列表不分页查询
+	 *
+	 * @author zhaji
+	 * @param param 查询参数
+	 * @return {@link List< InsuredListVo>}
+	 */
+	@Override
+	public List<InsuredListVo> getInsuredList(InsuredParam param) {
+
+		return null;
+	}
+
+	/**
+	 * 已减员列表分页查询
+	 *
+	 * @author zhaji
+	 * @param page 分页数据
+	 * @param param 查询参数
+	 * @return {@link IPage<  InsuranceRefundListVo >}
+	 */
+	@Override
+	public IPage<InsuranceRefundListVo> getInsuranceRefundPageList(Page<InsuranceRefundParam> page, InsuranceRefundParam param) {
+		return null;
+	}
+
+	/**
+	 * 已减员列表不分页查询
+	 *
+	 * @author zhaji
+	 * @param param 查询参数
+	 * @return {@link List<  InsuranceRefundListVo >}
+	 */
 
+	@Override
+	public List<InsuranceRefundListVo> getInsuranceRefundList(InsuranceRefundParam param) {
+		return null;
+	}
+
+	/**
+	 * 减员办理列表分页查询
+	 *
+	 * @author zhaji
+	 * @param page 分页数据
+	 * @param param 查询参数
+	 * @return {@link IPage< InsuranceRefundHandlingListVo>}
+	 */
+	@Override
+	public IPage<InsuranceRefundHandlingListVo> getInsuranceRefundHandlingPageList(Page<InsuranceRefundHandlingParam> page, InsuranceRefundHandlingParam param) {
+		return null;
+	}
+
+	/**
+	 * 减员办理列表不分页查询
+	 *
+	 * @author zhaji
+	 * @param param 查询参数
+	 * @return {@link List< InsuranceRefundHandlingListVo>}
+	 */
+	@Override
+	public List<InsuranceRefundHandlingListVo> getInsuranceRefundHandlingList(InsuranceRefundHandlingParam param) {
+		return null;
+	}
+
+	/**
+	 * 减员办理
+	 *
+	 * @author zhaji
+	 * @param insuranceDetail 办理类
+	 * @return {@link R}
+	 */
+	@Override
+	public R updateInsuranceRefund(InsuranceRefundListParam insuranceDetail) {
+		return null;
+	}
 }

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

@@ -98,7 +98,15 @@ public class TInsuranceTypeRateServiceImpl extends ServiceImpl<TInsuranceTypeRat
 		if (!Common.isNumber(rate)){
 			return R.failed("当前费率格式不正确");
 		}
+		LambdaQueryWrapper<TInsuranceTypeRate> queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.eq(TInsuranceTypeRate::getDeleteFlag, CommonConstants.ZERO_INT).eq(TInsuranceTypeRate::getInsuranceTypeId,insuranceTypeId)
+				.eq(TInsuranceTypeRate :: getRate,insuranceTypeRate.getRate()).eq(TInsuranceTypeRate:: getMonth ,insuranceTypeRate.getMonth());
+		List<TInsuranceTypeRate> list = this.list(queryWrapper);
+		if (list.isEmpty()){
 			return R.ok(this.baseMapper.insert(insuranceTypeRate));
+		}else{
+			return R.failed("当前险种已存在相同的费率");
+		}
 	}
 
 }

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

@@ -45,10 +45,8 @@ public class TInsuranceTypeServiceImpl extends ServiceImpl<TInsuranceTypeMapper,
 	 * @return {@link IPage< TInsuranceType>}
 	 */
 	@Override
-	public IPage<TInsuranceType> pageDiy(Page page, TInsuranceType insuranceType) {
-		LambdaQueryWrapper<TInsuranceType> wrapper = new LambdaQueryWrapper<>();
-		wrapper.orderByDesc(TInsuranceType::getCreateTime);
-		return this.baseMapper.selectPage(page,wrapper);
+	public IPage<InsuranceTypeVo> pageDiy(Page page, TInsuranceType insuranceType) {
+		return this.baseMapper.selectInsuranceTypePage(page,insuranceType);
 	}
 
 	/**

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

@@ -111,6 +111,16 @@ public class TInsuranceTypeStandardServiceImpl extends ServiceImpl<TInsuranceTyp
 		if (!Common.isNumber(dieDisableQuota)){
 			return R.failed("当前身故或残疾额度格式不正确");
 		}
+		LambdaQueryWrapper<TInsuranceTypeStandard> queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.eq(TInsuranceTypeStandard::getInsuranceTypeId,insuranceTypeStandard.getInsuranceTypeId())
+				.eq(TInsuranceTypeStandard::getBuyStandard,insuranceTypeStandard.getBuyStandard())
+				.eq(TInsuranceTypeStandard::getDeleteFlag,CommonConstants.ZERO_INT);
+		List<TInsuranceTypeStandard> list = list(queryWrapper);
+		if(list.isEmpty()){
 			return R.ok(this.baseMapper.insert(insuranceTypeStandard));
+		}else{
+			return R.failed("当前险种下的购买标准已存在");
+		}
+
 	}
 }

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

@@ -182,4 +182,78 @@
 		left join t_insurance_settle tis on detail.DEFAULT_SETTLE_ID = tis.ID
 		where detail.ID = #{id}
 	</select>
+
+	<select id="getInsuredListPage" resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuredListVo">
+		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="getInsuredList" resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuredListVo">
+		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/TInsuranceTypeMapper.xml

@@ -54,5 +54,23 @@
 		  and
 			DELETE_FLAG = 0
 	</select>
+	<select id="selectInsuranceTypePage" resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceTypeVo">
+		select
+			a.ID  as id,
+			a.NAME  as name ,
+			b.COMPANY_NAME as insuranceCompanyName,
+			a.INSURANCE_COMPANY_ID as insuranceCompanyId,
+			a.RECEIPT_UNIT_NAME as receiptUnitName,
+			a.BANK_NAME as bankName,
+			a.BANK_NO as bankNo
+		from
+			t_insurance_type a,
+			t_insurance_company b
+		where
+			a.INSURANCE_COMPANY_ID = b.ID
+		  and
+			a.DELETE_FLAG = 0
+
+	</select>
 
 </mapper>