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

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

@@ -189,8 +189,8 @@ public interface CommonConstants {
 
 	/**
 	 * 月份（阿里编码规约不允许直接使用‘魔法值’）
-	 * @Author pwang
-	 * @Date 2019-08-02 16:39
+	 * @Author zhaji
+	 * @Date 2022-07-28 16:39
 	 **/
 	String[] MonthStrArray = {"0","1","2","3","4","5","6","7","8","9","10","11","12"};
 
@@ -409,14 +409,14 @@ public interface CommonConstants {
 	String SEVEN_STRING = "7";
 
 	/**
-	 * 工资最小不能小于零
+	 * 工资最大不能超过9999999.99
 	 */
-	public static final String MONEY_MAX = "9999999.99";
+	public static final BigDecimal MONEY_MAX = new BigDecimal("9999999.99");
 
 	/**
 	 * 工资最小不能小于零
 	 */
-	public static final String MONEY_MIN = "0";
+	public static final BigDecimal MONEY_MIN = new BigDecimal(0);
 
 	public static final int TWENTY_INT = 20;
 

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

@@ -100,6 +100,10 @@ public class InsurancesConstants {
 	 * 当前记录是投保中，无法替换
 	 */
 	public static final String TWO_REPLACE_IS_NOT_ALLOW = "当前记录是投保中，无法替换";
+	/**
+	 * 当前记录是投保退回，无法替换
+	 */
+	public static final String FOUR_REPLACE_IS_NOT_ALLOW = "当前记录是投保退回，无法替换";
 	/**
 	 * 当前记录已出险，无法替换
 	 */
@@ -121,9 +125,9 @@ public class InsurancesConstants {
 	 */
 	public static final String REDUCE_REPLACE_IS_NOT_ALLOW = "当前记录在减员流程中，无法替换";
 	/**
-	 * 已减员，无法退回
+	 * 投保状态不是投保中或已投保，无法退回
 	 */
-	public static final String REDUCE_ROLLBACK_IS_NOT_ALLOW = "已减员，无法退回";
+	public static final String REDUCE_ROLLBACK_IS_NOT_ALLOW = "投保状态不是投保中或已投保，无法退回";
 	/**
 	 * 员工姓名不能为空
 	 */
@@ -160,6 +164,10 @@ public class InsurancesConstants {
 	 * 替换员工未通过实名认证
 	 */
 	public static final String REPLACE_EMP_ID_CARD_NO_NOT_FIT = "替换员工未通过实名认证";
+	/**
+	 * 替换信息和被替换信息一致，无法替换
+	 */
+	public static final String REPLACE_EMP_INFO_SAME = "替换信息和被替换信息一致，无法替换";
 	/**
 	 * 替换员工身份证号格式有误
 	 */
@@ -312,10 +320,34 @@ public class InsurancesConstants {
 	 * 商险投保中，无法登记保单保费
 	 */
 	public static final String BUY_HANDLE_TWO_NOT_REGISTERED = "商险投保中，无法登记保单保费";
+	/**
+	 * 非投保中状态，无法标记投保成功
+	 */
+	public static final String INSURANCE_BUY_STATUS_NOT_TWO = "非投保中状态，无法标记投保成功";
+	/**
+	 * 商险投保退回，无法登记保单保费
+	 */
+	public static final String BUY_HANDLE_FOUR_NOT_REGISTERED = "商险投保退回，无法登记保单保费";
+	/**
+	 * 商险结算中，无法登记保单保费
+	 */
+	public static final String SETTLE_HANDLE_TWO_NOT_REGISTERED = "商险结算中，无法登记保单保费";
+	/**
+	 * 商险已结算，无法登记保单保费
+	 */
+	public static final String SETTLE_HANDLE_THREE_NOT_REGISTERED = "商险已结算，无法登记保单保费";
 	/**
 	 * 保单号不存在或已过期
 	 */
 	public static final String POLICY_NO_EXIST = "保单号不存在或已过期";
+	/**
+	 * 保单号不存
+	 */
+	public static final String POLICY_NO_NOT_EXIST = "保单号不存";
+	/**
+	 * 保单号信息错误
+	 */
+	public static final String POLICY_NO_ERROR = "保单号信息错误";
 	/**
 	 * 保险公司错误
 	 */

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

@@ -10,6 +10,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NonNull;
 import org.checkerframework.common.value.qual.StringVal;
+import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotBlank;
 
@@ -37,6 +38,7 @@ public class TInsuranceCompany extends BaseEntity {
      */
 	@NotBlank(message = "保险公司名称不能为空")
 	@Schema(description = "保险公司名称")
+	@Length(max =60,message = "保险公司名称必须小于等于60")
     private String companyName;
 
     /**
@@ -44,6 +46,7 @@ public class TInsuranceCompany extends BaseEntity {
      */
 	@NotBlank(message = "保险公司地址不能为空")
 	@Schema(description = "保险公司地址")
+	@Length(max =50,message = "保险公司地址必须小于等于50")
     private String companyAddress;
 
     /**
@@ -51,6 +54,7 @@ public class TInsuranceCompany extends BaseEntity {
      */
 	@NotBlank(message = "对接人不能为空")
 	@Schema(description = "对接人")
+	@Length(max =20,message = "险种名称必须小于等于20")
     private String companyDocking;
 
 	/**

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

@@ -203,6 +203,12 @@ public class TInsuranceDetail extends BaseEntity {
 	@Schema(description = "预估保费")
     private BigDecimal estimatePremium;
 
+	/**
+	 * 是否标记投保成功标识 0 未标记过 1标记过
+	 */
+	@Schema(description = "是否标记投保成功标识 0 未标记过 1标记过")
+	private Integer signFlag;
+
     /**
      * 投保办理状态 1待投保 2投保中 3已投保 4投保退回 5 已减员
      */

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

@@ -33,7 +33,7 @@ public class TInsuranceSettle implements Serializable {
     private String insDetailId;
 
     /**
-     * 结算状态
+     * 结算状态 1、待结算,2、结算中,3、已结算
      */
 	@Schema(description = "结算状态 1、待结算,2、结算中,3、已结算")
     private String settleHandleStatus;

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

@@ -8,10 +8,10 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.hibernate.validator.constraints.Length;
 
+import javax.validation.constraints.Max;
 import javax.validation.constraints.NotBlank;
-import java.io.Serializable;
-import java.util.Date;
 
 /**
  * 险种表
@@ -34,6 +34,7 @@ public class TInsuranceType extends BaseEntity {
      */
 	@NotBlank(message = "险种名称不能为空")
 	@Schema(description = "险种名称")
+	@Length(max =50,message = "险种名称必须小于等于50")
     private String name;
 
     /**
@@ -48,6 +49,7 @@ public class TInsuranceType extends BaseEntity {
      */
 	@NotBlank(message = "收款单位名称不能为空")
 	@Schema(description = "收款单位名称")
+	@Length(max =50,message = "收款单位名称必须小于等于50")
     private String receiptUnitName;
 
     /**
@@ -55,6 +57,7 @@ public class TInsuranceType extends BaseEntity {
      */
 	@NotBlank(message = "收款银行名称不能为空")
 	@Schema(description = "收款银行名称")
+	@Length(max =50,message = "收款银行名称必须小于等于50")
     private String bankName;
 
     /**
@@ -62,6 +65,7 @@ public class TInsuranceType extends BaseEntity {
      */
 	@NotBlank(message = "收款银行账号不能为空")
 	@Schema(description = "收款银行账号")
+	@Length(max =50,message = "收款银行账号必须小于等于50")
     private String bankNo;
 
     /**

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

@@ -34,7 +34,7 @@ public class TInsuranceTypeStandard extends BaseEntity {
      */
 	@Schema(description = "险种主键ID")
 	@NotBlank(message = "险种主键ID不能为空")
-    private Long insuranceTypeId;
+    private String insuranceTypeId;
 
     /**
      * 购买标准

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/util/ValidityUtil.java

@@ -4,6 +4,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.ValidityConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
 
+import java.math.BigDecimal;
 import java.util.StringTokenizer;
 import java.util.regex.Pattern;
 
@@ -154,22 +155,22 @@ public class ValidityUtil {
 
 	/**
 	 * 判断是否是整数或者是携带一位或者两位的小数
-	 * @param refundMoney 金额
+	 * @param money 金额
 	 * @return boolean
 	 */
-	public static boolean validateMoney(final String refundMoney) {
-		if(Common.isEmpty(refundMoney)){
+	public static boolean validateMoney(final String money) {
+		if(Common.isEmpty(money)){
 			return Boolean.FALSE ;
 		}
-		if(!BigDecimalUtils.isBigDecimal(refundMoney)){
+		if(!BigDecimalUtils.isBigDecimal(money)){
 			return Boolean.FALSE ;
 		}
-		if(!refundMoney.matches(ValidityConstants.POSITIVE_INTEGER_PATTERN_TWO_FLOAT)){
+		if(!money.matches(ValidityConstants.POSITIVE_INTEGER_PATTERN_TWO_FLOAT)){
 			return Boolean.FALSE ;
 		}
-		boolean max = refundMoney.compareTo(CommonConstants.MONEY_MAX) < 0;
-		boolean min = refundMoney.compareTo(CommonConstants.MONEY_MIN) > 0;
-		if (!max || !min){
+		BigDecimal bigDecimalMoney= new BigDecimal(money);
+		boolean max = bigDecimalMoney.compareTo(CommonConstants.MONEY_MAX) >0;
+		if(max){
 			return Boolean.FALSE ;
 		}
 		return Boolean.TRUE;

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

@@ -132,7 +132,7 @@ public class InsuranceAddParam  implements Serializable {
 	 * 险种主键
 	 */
 	@JsonIgnore
-	private Long insuranceTypeId;
+	private String insuranceTypeId;
 
 	/**
 	 * 商险购买地省code

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

@@ -128,7 +128,7 @@ public class InsuranceBatchParam implements Serializable {
 	 * 险种主键
 	 */
 	@JsonIgnore
-	private Long insuranceTypeId;
+	private String insuranceTypeId;
 
 	/**
 	 * 商险购买地省code

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

@@ -155,5 +155,5 @@ public class InsuranceEditParam  implements Serializable {
 	 * 险种主键
 	 */
 	@JsonIgnore
-	private Long insuranceTypeId;
+	private String insuranceTypeId;
 }

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

@@ -48,4 +48,7 @@ public interface TInsuranceTypeMapper extends BaseMapper<TInsuranceType> {
 	 * @return {@link IPage< InsuranceTypeVo>}
 	 */
     IPage<InsuranceTypeVo> selectInsuranceTypePage(Page page, @Param("insuranceType") TInsuranceType insuranceType);
+
+	InsuranceTypeVo getInsuranceTypeDetailById(String id);
+
 }

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

@@ -58,26 +58,38 @@ public class TInsuranceTypeServiceImpl extends ServiceImpl<TInsuranceTypeMapper,
 	 * 新增险种信息
 	 *
 	 * @author zhaji
-	 * @param insuranceType 新增参数
+	 * @param insuranceType 新增险种信息
 	 * @return {@link R}
 	 */
 	@Override
 	public R saveInsuranceType(TInsuranceType insuranceType) {
+		if(Common.isEmpty(insuranceType)){
+			return R.failed("新增的险种信息为空");
+		}
 		YifuUser user = SecurityUtils.getUser();
 		String companyId = insuranceType.getInsuranceCompanyId();
 		String bankNo = insuranceType.getBankNo();
-		if(!Common.isNumber(bankNo)){
+		String bankName = insuranceType.getBankName();
+		String receiptUnitName = insuranceType.getReceiptUnitName();
+		if (!ValidityUtil.validate50(insuranceType.getName())){
+			return R.failed("险种格式不正确");
+		}
+		if(!ValidityUtil.validatePositiveInt(bankNo) || !ValidityUtil.validate50(bankNo)){
 			return R.failed("银行账号格式不正确");
 		}
+		if(!ValidityUtil.validate50(bankName)){
+			return R.failed("收款银行格式不正确");
+		}
+		if(!ValidityUtil.validate50(receiptUnitName)){
+			return R.failed("收款单位名称格式不正确");
+		}
 		LambdaQueryWrapper<TInsuranceCompany> companyWrapper = new LambdaQueryWrapper<>();
 		companyWrapper.eq(TInsuranceCompany::getId,companyId).eq(TInsuranceCompany::getDeleteFlag, CommonConstants.ZERO_INT);
 		TInsuranceCompany insuranceCompany = insuranceCompanyService.getOne(companyWrapper);
 		if(Common.isEmpty(insuranceCompany)){
 			return R.failed("所属保险公司不存在或已被删除");
 		}
-		if (!ValidityUtil.validate50(insuranceType.getName())){
-			return R.failed("险种名称过长");
-		}
+
 		LambdaQueryWrapper<TInsuranceType> typeWrapper = new LambdaQueryWrapper<>();
 		typeWrapper.eq(TInsuranceType :: getInsuranceCompanyId ,companyId).eq(TInsuranceType::getName,insuranceType.getName()).eq(TInsuranceType::getDeleteFlag, CommonConstants.ZERO_INT);
 		TInsuranceType type = getOne(typeWrapper);
@@ -104,12 +116,10 @@ public class TInsuranceTypeServiceImpl extends ServiceImpl<TInsuranceTypeMapper,
 		if (Common.isEmpty(id)){
 			return R.failed("险种ID不能为空");
 		}
-		InsuranceTypeVo insuranceTypeVo = new InsuranceTypeVo();
-		TInsuranceType byId = getById(id);
-		if(Common.isEmpty(byId) || byId.getDeleteFlag() == CommonConstants.ONE_INT){
+		InsuranceTypeVo insuranceTypeVo = this.baseMapper.getInsuranceTypeDetailById(id);
+		if(Common.isEmpty(insuranceTypeVo)){
 			return R.failed("当前险种信息不存在或已被删除");
 		}
-		BeanCopyUtils.copyProperties(byId,insuranceTypeVo);
 		List<TInsuranceTypeRate> tInsuranceTypeRates = this.baseMapper.selectInsuranceTypeRateList(id);
 		List<TInsuranceTypeStandard> tInsuranceTypeStandards = this.baseMapper.selectInsuranceTypeStandardList(id);
 		insuranceTypeVo.setInsuranceTypeRateList(tInsuranceTypeRates);

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

@@ -46,7 +46,7 @@ public class TInsuranceTypeStandardServiceImpl extends ServiceImpl<TInsuranceTyp
 	 * 查询购买标准列表
 	 *
 	 * @author zhaji
-	 * @param id
+	 * @param id 购买标准id
 	 * @return {@link R}
 	 */
 	@Override
@@ -67,7 +67,7 @@ public class TInsuranceTypeStandardServiceImpl extends ServiceImpl<TInsuranceTyp
 	 * 删除购买标准
 	 *
 	 * @author zhaji
-	 * @param id
+	 * @param id 购买标准id
 	 * @return {@link R}
 	 */
 	@Override
@@ -100,7 +100,7 @@ public class TInsuranceTypeStandardServiceImpl extends ServiceImpl<TInsuranceTyp
 	 * 新增购买标准
 	 *
 	 * @author zhaji
-	 * @param insuranceTypeStandard
+	 * @param insuranceTypeStandard 购买标准
 	 * @return {@link R}
 	 */
 	@Override
@@ -110,22 +110,22 @@ public class TInsuranceTypeStandardServiceImpl extends ServiceImpl<TInsuranceTyp
 		if (Common.isEmpty(insuranceTypeStandard)){
 			return R.failed("新增的购买标准信息为空");
 		}
-		Long insuranceTypeId = insuranceTypeStandard.getInsuranceTypeId();
+		String insuranceTypeId = insuranceTypeStandard.getInsuranceTypeId();
 		TInsuranceType byId = tInsuranceTypeService.getById(insuranceTypeId);
 		if ( Common.isEmpty(byId) || CommonConstants.ONE_INT == byId.getDeleteFlag()){
-			return R.failed("当前险种信息不存在或已被删除");
+			return R.failed("险种信息不存在或已被删除");
 		}
 		String buyStandard = insuranceTypeStandard.getBuyStandard();
 		String medicalQuota = insuranceTypeStandard.getMedicalQuota();
 		String dieDisableQuota = insuranceTypeStandard.getDieDisableQuota();
 		if (!ValidityUtil.validateMoney(buyStandard)){
-			return R.failed("当前购买标准格式不正确");
+			return R.failed("购买标准格式不正确");
 		}
 		if (!ValidityUtil.validateMoney(medicalQuota)){
-			return R.failed("当前医疗额度格式不正确");
+			return R.failed("医疗额度格式不正确");
 		}
 		if (!ValidityUtil.validateMoney(dieDisableQuota)){
-			return R.failed("当前身故或残疾额度格式不正确");
+			return R.failed("身故或残疾额度格式不正确");
 		}
 		LambdaQueryWrapper<TInsuranceTypeStandard> queryWrapper = new LambdaQueryWrapper<>();
 		queryWrapper.eq(TInsuranceTypeStandard::getInsuranceTypeId,insuranceTypeStandard.getInsuranceTypeId())
@@ -137,7 +137,6 @@ public class TInsuranceTypeStandardServiceImpl extends ServiceImpl<TInsuranceTyp
 			insuranceTypeStandard.setCreateBy(user.getId());
 			insuranceTypeStandard.setCreateName(user.getNickname());
 			insuranceTypeStandard.setCreateTime(LocalDateTime.now());
-
 			return R.ok(this.baseMapper.insert(insuranceTypeStandard),"新增购买标准成功");
 		}else{
 			return R.failed("当前险种下的购买标准已存在");

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

@@ -35,6 +35,7 @@
             <result property="settleType" column="SETTLE_TYPE" jdbcType="TINYINT"/>
             <result property="actualPremium" column="ACTUAL_PREMIUM" jdbcType="DECIMAL"/>
             <result property="estimatePremium" column="ESTIMATE_PREMIUM" jdbcType="DECIMAL"/>
+            <result property="signFlag" column="SIGN_FLAG" jdbcType="TINYINT"/>
             <result property="buyHandleStatus" column="BUY_HANDLE_STATUS" jdbcType="TINYINT"/>
             <result property="defaultSettleId" column="DEFAULT_SETTLE_ID" jdbcType="VARCHAR"/>
             <result property="reduceHandleStatus" column="REDUCE_HANDLE_STATUS" jdbcType="TINYINT"/>
@@ -58,7 +59,7 @@
         BATCH_DATE,SETTLE_MONTH,INVOICE_NO,
         BUY_TYPE,INSURANCE_PROVINCE,INSURANCE_PROVINCE_NAME,INSURANCE_CITY,INSURANCE_CITY_NAME,
         INSURANCE_HANDLE_PROVINCE,INSURANCE_HANDLE_PROVINCE_NAME,INSURANCE_HANDLE_CITY,INSURANCE_HANDLE_CITY_NAME,SETTLE_TYPE,
-        ACTUAL_PREMIUM,ESTIMATE_PREMIUM,
+        ACTUAL_PREMIUM,ESTIMATE_PREMIUM,SIGN_FLAG,
         BUY_HANDLE_STATUS,DEFAULT_SETTLE_ID,REDUCE_HANDLE_STATUS,
         IS_USE,IS_EFFECT,IS_OVERDUE,REMARK,
         CREATE_BY,CREATE_NAME,CREATE_TIME,

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

@@ -71,5 +71,24 @@
 			a.DELETE_FLAG = 0
 
 	</select>
+    <select id="getInsuranceTypeDetailById" 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.ID = #{id}
+		  and
+			a.DELETE_FLAG = 0
+	</select>
 
 </mapper>