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

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

@@ -67,6 +67,12 @@ public class InsuranceRefundCheck implements Serializable {
 	@Schema(description = "保单结束日期")
 	private String policyEnd;
 
+	/**
+	 * 购买标准
+	 */
+	@Schema(description = "购买标准")
+	private String buyStandard;
+
 	/**
 	 * 减员状态 1待减员 2减员中3减员退回
 	 */

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

@@ -578,7 +578,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				return R.failed(InsurancesConstants.EMP_IDCARD_NO_NOT_LEGITIMATE);
 			}
 			//校验身份合法
-			TCheckIdCard checkIdCard = new TCheckIdCard();
+			/*TCheckIdCard checkIdCard = new TCheckIdCard();
 			checkIdCard.setName(param.getEmpName());
 			checkIdCard.setIdCard(param.getEmpIdcardNo());
 			R<TCheckIdCard> tCheckIdCardR = checkDaprUtil.checkIdCardSingle(checkIdCard);
@@ -587,7 +587,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				if (CommonConstants.ONE_INT != data.getIsTrue()){
 					return R.failed(InsurancesConstants.EMP_ID_CARD_NO_NOT_FIT);
 				}
-			}
+			}*/
 
 			if(!LocalDateUtil.isDate(param.getPolicyStart(),LocalDateUtil.NORM_DATE_PATTERN)){
 				return R.failed(InsurancesConstants.POLICY_START_PARSE_ERROR);
@@ -717,7 +717,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				return R.failed(InsurancesConstants.EMP_IDCARD_NO_NOT_LEGITIMATE);
 			}
 			//校验身份合法
-			TCheckIdCard checkIdCard = new TCheckIdCard();
+			/*TCheckIdCard checkIdCard = new TCheckIdCard();
 			checkIdCard.setName(param.getEmpName());
 			checkIdCard.setIdCard(param.getEmpIdcardNo());
 			R<TCheckIdCard> tCheckIdCardR = checkDaprUtil.checkIdCardSingle(checkIdCard);
@@ -726,7 +726,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				if (CommonConstants.ONE_INT != data.getIsTrue()){
 					return R.failed(InsurancesConstants.EMP_ID_CARD_NO_NOT_FIT);
 				}
-			}
+			}*/
 
 			TInsuranceReplace one = tInsuranceReplaceService.getOne(Wrappers.<TInsuranceReplace>query().lambda()
 					.eq(TInsuranceReplace::getToInsuranceDetailId, byId.getId())
@@ -920,17 +920,13 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			param.setAuthSql(param.getAuthSql().replace("1=2 CONCAT", "CONCAT"));
 		}
 		List<InsuranceExportListVO> insuranceExportList;
+		//如果是待投保状态，sql中HANDLED_BY过滤条件不需要，这里强制变为null
+		if(param.getBuyHandleStatus() == CommonConstants.ONE_INT){
+			param.setCreateBy(null);
+		}
 		//如勾选项不为空，则导出勾选记录；否则导出当前筛选条件下 && 「待投保」的结果集
 		if (CollectionUtils.isNotEmpty(param.getIdList())){
 			insuranceExportList =  baseMapper.getInsuranceExportListBySelect(param.getIdList());
-
-			if (CollectionUtils.isNotEmpty(insuranceExportList)){
-				for (InsuranceExportListVO exportListVO : insuranceExportList) {
-					if (exportListVO.getBuyHandleStatus() != CommonConstants.ONE_INT){
-						return R.failed(InsurancesConstants.CHANGE_ERROR);
-					}
-				}
-			}
 		}else {
 			insuranceExportList = baseMapper.getInsuranceExportList(param);
 		}
@@ -1984,7 +1980,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			}
 
 			//校验身份合法
-			TCheckIdCard checkIdCard = new TCheckIdCard();
+			/*TCheckIdCard checkIdCard = new TCheckIdCard();
 			checkIdCard.setName(param.getEmpName());
 			checkIdCard.setIdCard(param.getEmpIdcardNo());
 			R<TCheckIdCard> tCheckIdCardR = checkDaprUtil.checkIdCardSingle(checkIdCard);
@@ -1995,7 +1991,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 					listResult.add(param);
 					continue;
 				}
-			}
+			}*/
 
 			//根据项目编码查询项目是否存在
 			try{
@@ -2304,7 +2300,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			}
 
 			//校验身份合法
-			TCheckIdCard checkIdCard = new TCheckIdCard();
+			/*TCheckIdCard checkIdCard = new TCheckIdCard();
 			checkIdCard.setName(param.getEmpName());
 			checkIdCard.setIdCard(param.getEmpIdcardNo());
 			R<TCheckIdCard> tCheckIdCardR = checkDaprUtil.checkIdCardSingle(checkIdCard);
@@ -2315,7 +2311,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 					listResult.add(param);
 					continue;
 				}
-			}
+			}*/
 
 			//根据项目编码查询项目是否存在
 			try{
@@ -2686,7 +2682,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			}
 
 			//校验身份合法
-			TCheckIdCard checkIdCard = new TCheckIdCard();
+			/*TCheckIdCard checkIdCard = new TCheckIdCard();
 			checkIdCard.setName(param.getReplaceEmpName());
 			checkIdCard.setIdCard(param.getReplaceEmpIdcardNo());
 			R<TCheckIdCard> tCheckIdCardR = checkDaprUtil.checkIdCardSingle(checkIdCard);
@@ -2697,7 +2693,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 					listResult.add(param);
 					continue;
 				}
-			}
+			}*/
 
 			if (param.getEmpName().equals(param.getReplaceEmpName()) && param.getEmpIdcardNo().equals(param.getReplaceEmpIdcardNo())){
 				param.setErrorMessage(InsurancesConstants.REPLACE_EMP_INFO_SAME);
@@ -3536,6 +3532,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			param.setAuthSql(param.getAuthSql().replace("1=2 CONCAT", "CONCAT"));
 		}
 		List<RefundExportListVo> refundExportList;
+		//如果是待减员状态，sql中UPDATE_BY过滤条件不需要，这里强制变为null
+		if(param.getReduceHandleStatus() == CommonConstants.ONE_INT){
+			param.setCreateBy(null);
+		}
 		//如勾选项不为空，则导出勾选记录；否则导出当前筛选条件下 && 「待减员」的结果集
 		if (CollectionUtils.isNotEmpty(param.getIdList())){
 			refundExportList =  baseMapper.getRefundExportListBySelect(param.getIdList());
@@ -4741,6 +4741,13 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				errorList.add(param);
 				continue;
 			}
+			//购买标准
+			String buyStandard = param.getBuyStandard();
+			if (StringUtils.isBlank(buyStandard)){
+				param.setErrorMessage(InsurancesConstants.BUY_STANDARD_NOT_EMPTY);
+				errorList.add(param);
+				continue;
+			}
 			// 身份证号位数校验（18 位合法）
 			if (!ValidityUtil.validateIDCard(param.getEmpIdcardNo())){
 				param.setErrorMessage(InsurancesConstants.EMP_IDCARD_NO_NOT_LEGITIMATE);
@@ -4768,12 +4775,13 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			}
 			LambdaQueryWrapper<TInsuranceDetail> queryWrapper = new LambdaQueryWrapper<>();
 			queryWrapper.eq(TInsuranceDetail :: getDeleteFlag,CommonConstants.ZERO_INT)
-					.eq(TInsuranceDetail ::getEmpName,empName )
-					.eq(TInsuranceDetail ::getEmpIdcardNo,empIdCardNo )
-					.eq(TInsuranceDetail :: getInsuranceCompanyName,insuranceCompanyName )
-					.eq(TInsuranceDetail :: getInsuranceTypeName,insuranceTypeName)
-					.eq(TInsuranceDetail :: getPolicyStart,LocalDateUtil.parseLocalDate(policyStart))
-					.eq(TInsuranceDetail :: getPolicyEnd,LocalDateUtil.parseLocalDate(policyEnd))
+					.eq(TInsuranceDetail::getEmpName,empName )
+					.eq(TInsuranceDetail::getEmpIdcardNo,empIdCardNo )
+					.eq(TInsuranceDetail::getInsuranceCompanyName,insuranceCompanyName )
+					.eq(TInsuranceDetail::getInsuranceTypeName,insuranceTypeName)
+					.eq(TInsuranceDetail::getPolicyStart,LocalDateUtil.parseLocalDate(policyStart))
+					.eq(TInsuranceDetail::getPolicyEnd,LocalDateUtil.parseLocalDate(policyEnd))
+					.eq(TInsuranceDetail::getBuyStandard,buyStandard)
 					.orderByDesc(TInsuranceDetail::getUpdateTime)
 					.last(CommonConstants.LAST_ONE_SQL);
 			List<TInsuranceDetail> list = list(queryWrapper);

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

@@ -407,6 +407,9 @@
 		<if test="param.startDate != null and param.startDate.trim() != '' and param.endDate != null and param.endDate.trim() != ''">
 			and a.CREATE_TIME <![CDATA[ >= ]]>  concat(#{param.startDate}, ' 00:00:00') and a.CREATE_TIME <![CDATA[ <= ]]> concat(#{param.endDate}, ' 23:59:59')
 		</if>
+		<if test="param.createBy != null and param.createBy.trim() != ''">
+			and a.HANDLED_BY = #{param.createBy}
+		</if>
 		<if test="param.authSql != null and param.authSql.trim() != ''">
 			${param.authSql}
 		</if>
@@ -946,6 +949,9 @@
 		<if test="param.insuranceCompanyName != null and param.insuranceCompanyName.trim() != ''">
 			and a.INSURANCE_COMPANY_NAME = #{param.insuranceCompanyName}
 		</if>
+		<if test="param.createBy != null and param.createBy.trim() != ''">
+			and  refund.UPDATE_BY = #{param.createBy}
+		</if>
 		<if test="param.authSql != null and param.authSql.trim() != ''">
 			${param.authSql}
 		</if>

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TPaymentInfo.java

@@ -16,9 +16,11 @@
  */
 package com.yifu.cloud.plus.v1.yifu.social.entity;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.HeadFontStyle;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
@@ -630,4 +632,42 @@ public class TPaymentInfo extends BaseEntity {
 	@ExcelProperty("工资公积金结算状态")
 	private String salaryFundFlag;
 
+	/**
+	 * 是否导入重复标识
+	 */
+	@TableField(exist = false)
+	@ExcelIgnore
+	private String ylSameFlg;
+	/**
+	 * 是否导入重复标识
+	 */
+	@TableField(exist = false)
+	@ExcelIgnore
+	private String dbSameFlg;
+	/**
+	 * 是否导入重复标识
+	 */
+	@TableField(exist = false)
+	@ExcelIgnore
+	private String sySameFlg;
+	/**
+	 * 是否导入重复标识
+	 */
+	@TableField(exist = false)
+	@ExcelIgnore
+	private String brSameFlg;
+	/**
+	 * 是否导入重复标识
+	 */
+	@TableField(exist = false)
+	@ExcelIgnore
+	private String gsSameFlg;
+	/**
+	 * 是否导入重复标识
+	 */
+	@TableField(exist = false)
+	@ExcelIgnore
+	private String ybSameFlg;
+
+
 }