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

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

@@ -27,6 +27,10 @@ public class InsurancesConstants {
 	 * 替换
 	 */
 	public static final String REPLACE = "“替换”提交申请";
+	/**
+	 * 被替换成功
+	 */
+	public static final String SOURCE_REPLACE = "被替换成功";
 	/**
 	 * 删除
 	 */
@@ -277,10 +281,6 @@ public class InsurancesConstants {
 	 * 购买标准不存在
 	 */
 	public static final String BUY_STANDARD_NOT_EXIST = "购买标准不存在";
-	/**
-	 * 购买标准格式错误
-	 */
-	public static final String BUY_STANDARD_PARSE_ERROR = "购买标准格式错误";
 	/**
 	 * 商险购买地省名称不能为空
 	 */

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

@@ -12,6 +12,7 @@ import org.checkerframework.common.value.qual.StringVal;
 import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 
 
 /**
@@ -74,24 +75,28 @@ public class TInsuranceCompany extends BaseEntity {
 	 * 商险办理省code
 	 */
 	@Schema(description = "商险办理省code")
+	@NotNull(message = "商险办理省code不能为空")
 	private Integer insuranceHandleProvince;
 
 	/**
 	 * 商险办理省
 	 */
 	@Schema(description = "商险办理省")
+	@NotBlank(message = "商险办理省不能为空")
 	private String insuranceHandleProvinceName;
 
 	/**
 	 * 商险办理城市code
 	 */
 	@Schema(description = "商险办理城市code")
+	@NotNull(message = "商险办理城市code不能为空")
 	private Integer insuranceHandleCity;
 
 	/**
 	 * 商险办理城市
 	 */
 	@Schema(description = "商险办理城市")
+	@NotBlank(message = "商险办理城市不能为空")
 	private String insuranceHandleCityName;
 
 }
\ No newline at end of file

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

@@ -317,26 +317,50 @@ public class InsuranceDetailVO implements Serializable {
 	/**
 	 * 被替换人姓名
 	 */
-	@Schema(description = "被替换人姓名（替换类型专用字段）")
+	@Schema(description = "被替换人姓名")
 	private String coverEmpName;
 
 	/**
 	 * 被替换人身份证号
 	 */
-	@Schema(description = "被替换人身份证号（替换类型专用字段）")
+	@Schema(description = "被替换人身份证号）")
 	private String coverEmpIdcardNo;
 
 	/**
 	 * 被替换人项目名称
 	 */
-	@Schema(description = "被替换人项目名称（替换类型专用字段）")
+	@Schema(description = "被替换人项目名称")
 	private String coverProjectName;
 
 	/**
 	 * 被替换人封面抬头
 	 */
 	@Schema(description = "被替换人封面抬头")
-	private String coveInvoiceTitle;
+	private String coverInvoiceTitle;
+
+	/**
+	 * 替换人姓名
+	 */
+	@Schema(description = "替换人姓名")
+	private String replaceEmpName;
+
+	/**
+	 * 替换人身份证号
+	 */
+	@Schema(description = "替换人身份证号")
+	private String replaceEmpIdcardNo;
+
+	/**
+	 * 替换人项目名称
+	 */
+	@Schema(description = "被替换人项目名称")
+	private String replaceProjectName;
+
+	/**
+	 * 替换人封面抬头
+	 */
+	@Schema(description = "替换人封面抬头")
+	private String replaceInvoiceTitle;
 
 	/**
 	 * 退保金额 todo 数据库暂时没有

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

@@ -3,7 +3,9 @@ package com.yifu.cloud.plus.v1.yifu.insurances.vo;
 import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import org.checkerframework.common.value.qual.IntVal;
 
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.List;
 
@@ -17,6 +19,14 @@ import java.util.List;
 public class InsuranceExportListParam extends BaseEntity implements Serializable {
 	private static final long serialVersionUID = 3623027153213352936L;
 
+	/**
+	 * 投保状态 1待投保 2投保中 3已投保 (4投保退回 5 已减员)不在此列表展示4,5
+	 */
+	@Schema(description = "投保状态 1待投保 2投保中 3已投保")
+	@NotNull(message = "投保状态不能为空")
+	@IntVal({1,2,3})
+	private Integer buyHandleStatus;
+
 	/**
 	 * 员工姓名
 	 */

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

@@ -115,6 +115,13 @@ public class InsuranceExportListVO implements Serializable {
 	@Schema(description = "保单结束时间")
 	private LocalDate policyEnd;
 
+	/**
+	 * 保单生效时间
+	 */
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd")
+	@JsonIgnore
+	private LocalDate policyEffect;
+
 	/**
 	 * 保险公司名称(冗余字段)
 	 */

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

@@ -71,6 +71,12 @@ public class InsuranceRefundListVo implements Serializable {
 	@Schema(description = "保单编号")
 	private String policyNo;
 
+	/**
+	 * 实际保费
+	 */
+	@Schema(description = "实际保费")
+	private String actualPremium;
+
 	/**
 	 * 商险购买地省code
 	 */

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

@@ -64,6 +64,12 @@ public class InsuranceReplaceParam implements Serializable {
 	@Schema(description = "保单结束时间")
 	private String policyEnd;
 
+	/**
+	 * 购买标准
+	 */
+	@Schema(description = "购买标准")
+	private String buyStandard;
+
 	/**
 	 * 替换员工姓名
 	 */

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

@@ -3,6 +3,7 @@ package com.yifu.cloud.plus.v1.yifu.insurances.vo;
 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 io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.util.List;
@@ -18,6 +19,7 @@ public class InsuranceTypeVo extends TInsuranceType {
 	/**
 	 * 所属保险公司名称
 	 */
+	@Schema(description = "所属保险公司名称")
 	private String insuranceCompanyName;
 
 	/**

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

@@ -3,7 +3,10 @@ package com.yifu.cloud.plus.v1.yifu.insurances.vo;
 import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import org.checkerframework.common.value.qual.IntVal;
+import org.checkerframework.common.value.qual.StringVal;
 
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.List;
 
@@ -17,6 +20,14 @@ import java.util.List;
 public class RefundExportListParam extends BaseEntity implements Serializable {
 	private static final long serialVersionUID = 3623027153213352936L;
 
+	/**
+	 * 减员状态 1待减员 2减员中 3减员退回 4减员成功
+	 */
+	@Schema(description = "减员状态 1待减员 2减员中 4减员成功")
+	@NotNull(message = "减员状态不能为空")
+	@IntVal({1,2,4})
+	private Integer reduceHandleStatus;
+
 	/**
 	 * 员工姓名
 	 */

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/RefundExportListVo.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;
+import java.time.LocalDateTime;
 
 /**
  * @author zhaji
@@ -129,6 +131,13 @@ public class RefundExportListVo implements Serializable {
 	@Schema(description = "保单结束时间")
 	private LocalDate policyEnd;
 
+	/**
+	 * 保单生效时间
+	 */
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd")
+	@JsonIgnore
+	private LocalDate policyEffect;
+
 	/**
 	 * 保险公司名称(冗余字段)
 	 */
@@ -193,7 +202,7 @@ public class RefundExportListVo implements Serializable {
 	 * 购买天数
 	 */
 	@Schema(description = "购买天数")
-	private long buyDay;
+	private Long buyDay;
 
 	/**
 	 * 封面抬头
@@ -206,4 +215,11 @@ public class RefundExportListVo implements Serializable {
 	 */
 	@Schema(description = "保单号")
 	private String policyNo;
+
+	/**
+	 * 派单日期
+	 */
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
+	@Schema(description = "派单日期")
+	private LocalDateTime createTime;
 }

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

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

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

 package com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances;
 
 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.TInsuranceCompany;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
 * @author Administrator
@@ -14,4 +17,13 @@ import org.apache.ibatis.annotations.Mapper;
 public interface TInsuranceCompanyMapper extends BaseMapper<TInsuranceCompany> {
 
 
+	/**
+	 * 分页查询保险公司
+	 *
+	 * @author licancan
+	 * @param page
+	 * @param param
+	 * @return {@link IPage<TInsuranceCompany>}
+	 */
+	IPage<TInsuranceCompany> getInsuranceCompanyListPage(Page<TInsuranceCompany> page, @Param("param")  TInsuranceCompany param);
 }

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

@@ -44,9 +44,9 @@ public interface TInsuranceTypeMapper extends BaseMapper<TInsuranceType> {
 	 * @author zhaji
 	 * @param page 分页参数
 	 * @param insuranceType 查询参数
-	 * @return {@link IPage< InsuranceTypeVo>}
+	 * @return {@link IPage<InsuranceTypeVo>}
 	 */
-    IPage<InsuranceTypeVo> selectInsuranceTypePage(Page page, @Param("insuranceType") TInsuranceType insuranceType);
+    IPage<InsuranceTypeVo> selectInsuranceTypePage(Page page, @Param("insuranceType") InsuranceTypeVo insuranceType);
 
 	InsuranceTypeVo getInsuranceTypeDetailById(String id);
 

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

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

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

@@ -48,13 +48,11 @@ public class TInsuranceCompanyServiceImpl extends ServiceImpl<TInsuranceCompanyM
 	 * @author zhaji
 	 * @param page 分页参数
 	 * @param insuranceCompany 查询类
-	 * @return {@link IPage< TInsuranceCompany>}
+	 * @return {@link IPage<TInsuranceCompany>}
 	 */
 	@Override
 	public IPage<TInsuranceCompany> pageDiy(Page page, TInsuranceCompany insuranceCompany) {
-		LambdaQueryWrapper<TInsuranceCompany> wrapper = new LambdaQueryWrapper<>();
-		wrapper.orderByDesc(TInsuranceCompany::getCreateTime);
-		IPage<TInsuranceCompany> list = this.baseMapper.selectPage(page, wrapper);
+		IPage<TInsuranceCompany> list = this.baseMapper.getInsuranceCompanyListPage(page, insuranceCompany);
 		return list;
 	}
 

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

@@ -46,10 +46,10 @@ public class TInsuranceTypeServiceImpl extends ServiceImpl<TInsuranceTypeMapper,
 	 * @author zhaji
 	 * @param page 分页参数
 	 * @param insuranceType 分页查询参数
-	 * @return {@link IPage< TInsuranceType>}
+	 * @return {@link IPage<InsuranceTypeVo>}
 	 */
 	@Override
-	public IPage<InsuranceTypeVo> pageDiy(Page<TInsuranceType> page, TInsuranceType insuranceType) {
+	public IPage<InsuranceTypeVo> pageDiy(Page<InsuranceTypeVo> page, InsuranceTypeVo insuranceType) {
 		return this.baseMapper.selectInsuranceTypePage(page,insuranceType);
 	}
 

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

@@ -28,4 +28,17 @@
         DELETE_FLAG,
 		INSURANCE_HANDLE_PROVINCE,INSURANCE_HANDLE_PROVINCE_NAME,INSURANCE_HANDLE_CITY,INSURANCE_HANDLE_CITY_NAME
     </sql>
+	<select id="getInsuranceCompanyListPage" resultMap="BaseResultMap">
+		SELECT
+		<include refid="Base_Column_List"></include>
+		FROM t_insurance_company
+		where DELETE_FLAG = 0
+		<if test="param.companyName != null and param.companyName.trim() != ''">
+			and COMPANY_NAME = #{param.companyName}
+		</if>
+		<if test="param.insuranceHandleCity != null">
+			and INSURANCE_HANDLE_CITY = #{param.insuranceHandleCity}
+		</if>
+		ORDER BY CREATE_TIME DESC
+	</select>
 </mapper>

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

@@ -226,6 +226,7 @@
 		a.INSURANCE_COMPANY_NAME as insuranceCompanyName,
 		a.INSURANCE_TYPE_NAME as insuranceTypeName,
 		a.BUY_STANDARD as buyStandard,
+	    a.CREATE_TIME as createTime,
 		a.CREATE_NAME as createName,
 		a.BUY_HANDLE_STATUS as buyHandleStatus,
 		a.SETTLE_TYPE as settleType,
@@ -339,6 +340,7 @@
 		a.INSURANCE_HANDLE_CITY_NAME as insuranceHandleCityName,
 		a.POLICY_START as policyStart,
 		a.POLICY_END as policyEnd,
+		a.POLICY_EFFECT as policyEffect,
 		a.INSURANCE_COMPANY_NAME as insuranceCompanyName,
 		a.INSURANCE_TYPE_NAME as insuranceTypeName,
 		a.BUY_STANDARD as buyStandard,
@@ -371,6 +373,7 @@
 			a.INSURANCE_HANDLE_CITY_NAME as insuranceHandleCityName,
 			a.POLICY_START as policyStart,
 			a.POLICY_END as policyEnd,
+			a.POLICY_EFFECT as policyEffect,
 			a.INSURANCE_COMPANY_NAME as insuranceCompanyName,
 			a.INSURANCE_TYPE_NAME as insuranceTypeName,
 			a.BUY_STANDARD as buyStandard,
@@ -382,7 +385,7 @@
 			a.POLICY_NO as policyNo,
 			a.REMARK as remark
 		from t_insurance_detail a
-		where a.DELETE_FLAG = 0 and a.BUY_HANDLE_STATUS = 1
+		where a.DELETE_FLAG = 0 and a.BUY_HANDLE_STATUS = #{param.buyHandleStatus}
 		<if test="param.empName != null and param.empName.trim() != ''">
 			and a.EMP_NAME like concat('%',replace(replace(#{param.empName},'_','\_'),'%','\%'),'%')
 		</if>
@@ -687,6 +690,8 @@
 			a.INSURANCE_HANDLE_CITY_NAME as insuranceHandleCityName,
 			a.POLICY_START as policyStart,
 			a.POLICY_END as policyEnd,
+		    a.POLICY_NO as policyNo,
+		    a.ACTUAL_PREMIUM as actualPremium,
 			a.INSURANCE_COMPANY_NAME as insuranceCompanyName,
 			a.INSURANCE_TYPE_NAME as insuranceTypeName,
 			a.BUY_STANDARD as buyStandard,
@@ -767,6 +772,7 @@
 		a.BUY_STANDARD as buyStandard,
 		a.MEDICAL_QUOTA as medicalQuota,
 		a.DIE_DISABLE_QUOTA as dieDisableQuota,
+		a.CREATE_TIME as createTime,
 		refund.CREATE_NAME as createName,
 		a.REDUCE_HANDLE_STATUS as reduceHandleStatus
 		from
@@ -921,7 +927,7 @@
 			t_insurance_refund refund
 		where
 			a.REFUND_ID = refund.ID and
-		    a.DELETE_FLAG = 0 and a.REDUCE_HANDLE_STATUS = 1
+		    a.DELETE_FLAG = 0 and a.REDUCE_HANDLE_STATUS = #{param.reduceHandleStatus}
 		<if test="param.empName != null and param.empName.trim() != ''">
 			and a.EMP_NAME like concat('%',replace(replace(#{param.empName},'_','\_'),'%','\%'),'%')
 		</if>

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

@@ -71,6 +71,12 @@
 			a.INSURANCE_COMPANY_ID = b.ID
 		  and
 			a.DELETE_FLAG = 0
+		<if test="insuranceType.insuranceCompanyName != null and insuranceType.insuranceCompanyName.trim() != ''">
+			and b.COMPANY_NAME = #{insuranceType.insuranceCompanyName}
+		</if>
+		<if test="insuranceType.name != null and insuranceType.name.trim() != ''">
+			and a.NAME = #{insuranceType.name}
+		</if>
 		ORDER BY a.CREATE_TIME DESC
 	</select>
     <select id="getInsuranceTypeDetailById" resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceTypeVo">