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

k8s-bash-test/yifu-insurances-deployment.yaml

@@ -41,9 +41,10 @@ spec:                 # 资源规范字段
     spec:             # 资源规范字段
       nodeSelector:   # node 选择器
         node-type: worker  # node标签
+        kubernetes.io/hostname: yfmaster1
       containers:     # 容器
         - name: yifu-insurances  # 容器的名字
-          image: hub.yifucenter.com:5500/qas-mvp/yifu-insurances-biz:1.0.0  # 容器镜像地址
+          image: 192.168.1.110:5500/qas-mvp/yifu-insurances-biz:1.0.0  # 容器镜像地址
           imagePullPolicy: Always  # 每次Pod启动拉取镜像策略，三个选择 Always、Never、IfNotPresent
                                    # Always，每次都检查；Never，每次都不检查（不管本地是否有）；IfNotPresent，如果本地有就不检查，如果没有就拉取（手动测试时，
                                    # 已经打好镜像存在docker容器中时，使用存在不检查级别，

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeContractInfo.java

@@ -17,10 +17,7 @@
 package com.yifu.cloud.plus.v1.yifu.archives.entity;
 
 import com.alibaba.excel.annotation.format.DateTimeFormat;
-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.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants;
@@ -156,6 +153,7 @@ public class TEmployeeContractInfo extends BaseEntity {
 	@Length(max = 50, message = "合同编码不能超过50个字符")
 	@ExcelAttribute(name = "合同编码", maxLength = 50)
 	@Schema(description = "合同编码", name = "contractNo")
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
 	private String contractNo;
 	/**
 	 * 备注
@@ -230,6 +228,7 @@ public class TEmployeeContractInfo extends BaseEntity {
 	@Length(max = 50, message = "档案柜号不能超过50个字符")
 	@ExcelAttribute(name = "档案柜号", maxLength = 50)
 	@Schema(description = "档案柜号", name = "fileCabinetNo")
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
 	private String fileCabinetNo;
 
 	/**

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

@@ -564,18 +564,25 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 			}
 			returnList.add(errorVo);
 		}
+		boolean isTrue = true;
+		for (ErrorVO message : returnList) {
+			if (CommonConstants.ZERO_INT == message.getResult()) {
+				isTrue = false;
+				break;
+			}
+		}
+		if (isTrue) {
+			return R.ok();
+		} else {
 			return R.ok(returnList);
 		}
+	}
 
 	@Override
 	public R<String> filingContract(TEmployeeContractInfo tEmployeeContractInfo) {
 		if (tEmployeeContractInfo != null) {
-			if (Common.isEmpty(tEmployeeContractInfo.getContractNo())
-					|| Common.isEmpty(tEmployeeContractInfo.getFileCabinetNo())) {
-				return R.failed("合同编号、档案柜号必填！");
-			}
-			if (tEmployeeContractInfo.getContractNo().length() > 50
-					|| tEmployeeContractInfo.getFileCabinetNo().length() > 50) {
+			if ((Common.isNotNull(tEmployeeContractInfo.getContractNo()) && tEmployeeContractInfo.getContractNo().length() > 50)
+					|| (Common.isNotNull(tEmployeeContractInfo.getFileCabinetNo()) && tEmployeeContractInfo.getFileCabinetNo().length() > 50)) {
 				return R.failed("合同编号、档案柜号不可超过50字！");
 			}
 			//档案柜存在就自动归档
@@ -650,8 +657,19 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 			log.error(CommonConstants.IMPORT_DATA_ANALYSIS_ERROR, e);
 			return R.failed(CommonConstants.IMPORT_DATA_ANALYSIS_ERROR);
 		}
+		boolean isTrue = true;
+		for (ErrorMessage message : errorMessageList) {
+			if (!CommonConstants.SAVE_SUCCESS.equals(message.getMessage())) {
+				isTrue = false;
+				break;
+			}
+		}
+		if (isTrue) {
+			return R.ok();
+		} else {
 			return R.ok(errorMessageList);
 		}
+	}
 
 	/**
 	 * @Author hgw
@@ -759,8 +777,19 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 			log.error(CommonConstants.IMPORT_DATA_ANALYSIS_ERROR, e);
 			return R.failed(CommonConstants.IMPORT_DATA_ANALYSIS_ERROR);
 		}
+		boolean isTrue = true;
+		for (ErrorMessage message : errorMessageList) {
+			if (!CommonConstants.SAVE_SUCCESS.equals(message.getMessage())) {
+				isTrue = false;
+				break;
+			}
+		}
+		if (isTrue) {
+			return R.ok();
+		} else {
 			return R.ok(errorMessageList);
 		}
+	}
 
 	/**
 	 * @Author hgw

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

@@ -410,6 +410,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				);
 				BeanCopyUtils.copyProperties(detail,newDetail);
 				detail.setIsEffect(CommonConstants.ONE_INT);
+				detail.setIsOverdue(null);
 				this.updateById(detail);
 				//新数据置为待办理
 				newDetail.setId(null);
@@ -722,6 +723,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 					}
 					//被替换者无效
 					insuranceDetail.setIsEffect(CommonConstants.ONE_INT);
+					insuranceDetail.setIsOverdue(CommonConstants.ONE_INT);
 					insuranceDetail.setUpdateTime(LocalDateTime.now());
 					this.updateById(insuranceDetail);
 					//替换记录成功
@@ -878,7 +880,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 							}
 						}
 					}
-					insuranceExportList.addAll(list);
+					insuranceExportList.removeAll(listVOS);
+					insuranceExportList.addAll(crossMerger(list,listVOS));
 				}
 			}
 
@@ -940,6 +943,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 							if (Optional.ofNullable(byId).isPresent()){
 								//被替换者激活
 								byId.setIsEffect(CommonConstants.ZERO_INT);
+								byId.setIsOverdue(CommonConstants.ZERO_INT);
 								this.updateById(byId);
 							}
 						}
@@ -2577,6 +2581,35 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		}
 	}
 
+	/**
+	 * 将集合交叉合并，list1 是第一个顺序 list2 是第二个顺序
+	 *
+	 * @author licancan
+	 * @param list1
+	 * @param list2
+	 * @return {@link List<InsuranceExportListVO>}
+	 */
+	private List<InsuranceExportListVO> crossMerger (List<InsuranceExportListVO> list1, List<InsuranceExportListVO> list2){
+		//将list放入到链表队列
+		LinkedList<InsuranceExportListVO> st1 = new LinkedList<>(list1);
+		LinkedList<InsuranceExportListVO> st2 = new LinkedList<>(list2);
+		//计算较大的数组长度
+		int max = list1.size() > list2.size() ? list1.size() : list2.size();
+		//新建一个最终结果的list
+		List<InsuranceExportListVO> list = new ArrayList<>(list1.size() + list2.size());
+		for ( int i = 0; i < max;i++){
+			//如果队列没取完，继续取
+			if (!st1.isEmpty()){
+				list.add(st1.poll());
+			}
+			//如果队列没取完，继续取
+			if (!st2.isEmpty()){
+				list.add(st2.poll());
+			}
+		}
+		return list;
+	}
+
 	/***********************减员办理********************************/
 
 	/**

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TSocialFundInfoExportVo.java

@@ -25,6 +25,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.vo.RowIndex;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.Size;
 import java.io.Serializable;
@@ -480,4 +481,47 @@ public class TSocialFundInfoExportVo extends RowIndex implements Serializable {
 	@ExcelProperty("委托备注")
 	private String trustRemark;
 
+	/**
+	 * 养老办理状态：0待办理1办理成功2办理失败3已派减
+	 */
+	@ExcelAttribute(name = "养老办理状态", readConverterExp = "0=待办理,1=办理成功,2=办理失败,3=已派减")
+	@Schema(description = "养老办理状态：0待办理1办理成功2办理失败3已派减" )
+	@ExcelProperty("养老办理状态" )
+	private String pensionHandle;
+	/**
+	 * 医疗办理状态：0待办理1办理成功2办理失败3已派减
+	 */
+	@ExcelAttribute(name = "医疗办理状态", readConverterExp = "0=待办理,1=办理成功,2=办理失败,3=已派减")
+	@Schema(description = "医疗办理状态：0待办理1办理成功2办理失败3已派减" )
+	@ExcelProperty("医疗办理状态" )
+	private String medicalHandle;
+	/**
+	 * 失业办理状态：0待办理1办理成功2办理失败3已派减
+	 */
+	@ExcelAttribute(name = "失业办理状态", readConverterExp = "0=待办理,1=办理成功,2=办理失败,3=已派减")
+	@Schema(description = "失业办理状态：0待办理1办理成功2办理失败3已派减" )
+	@ExcelProperty("失业办理状态" )
+	private String unemployHandle;
+	/**
+	 * 工伤办理状态：0待办理1办理成功2办理失败3已派减
+	 */
+	@ExcelAttribute(name = "工伤办理状态", readConverterExp = "0=待办理,1=办理成功,2=办理失败,3=已派减")
+	@Schema(description = "工伤办理状态：0待办理1办理成功2办理失败3已派减" )
+	@ExcelProperty("工伤办理状态" )
+	private String workInjuryHandle;
+	/**
+	 * 生育办理状态：0待办理1办理成功2办理失败3已派减
+	 */
+	@ExcelAttribute(name = "生育办理状态", readConverterExp = "0=待办理,1=办理成功,2=办理失败,3=已派减")
+	@Schema(description = "生育办理状态：0待办理1办理成功2办理失败3已派减" )
+	@ExcelProperty("生育办理状态" )
+	private String birthHandle;
+	/**
+	 * 大病办理状态：0待办理1办理成功2办理失败3已派减
+	 */
+	@ExcelAttribute(name = "大病办理状态", readConverterExp = "0=待办理,1=办理成功,2=办理失败,3=已派减")
+	@Schema(description = "大病办理状态：0待办理1办理成功2办理失败3已派减" )
+	@ExcelProperty("大病办理状态" )
+	private String bigailmentHandle;
+
 }

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TForecastLibraryServiceImpl.java

@@ -288,12 +288,16 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 			}
 			if (Common.isNotNull(library.getId())) {
 				baseMapper.updateById(library);
+				isSaveAndUpdate = true;
 			} else {
+				if (BigDecimal.ZERO.compareTo(BigDecimalUtils.isNullToZero(library.getUnitSocialSum())) != CommonConstants.ZERO_INT
+						|| BigDecimal.ZERO.compareTo(BigDecimalUtils.isNullToZero(library.getUnitFundSum())) != CommonConstants.ZERO_INT) {
 					library.setCreateTime(LocalDateTime.now());
 					baseMapper.insert(library);
-			}
 					isSaveAndUpdate = true;
 				}
+			}
+		}
 		if (isSaveAndUpdate) {
 			return R.ok(null, "执行成功！");
 		} else {

yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialFundInfoMapper.xml

@@ -551,10 +551,10 @@
 				AND a.SETTLE_DOMAIN = #{tSocialFundInfo.settleDomain}
 			</if>
 			<if test="tSocialFundInfo.settleDomainName != null and tSocialFundInfo.settleDomainName.trim() != ''">
-				AND (a.SETTLE_DOMAIN_NAME = #{tSocialFundInfo.settleDomainName} or a.SETTLE_DOMAIN_NAME_FUND = #{tSocialFundInfo.settleDomainName})
+				AND (a.SETTLE_DOMAIN_NAME like concat('%',#{tSocialFundInfo.settleDomainName},'%') or a.SETTLE_DOMAIN_NAME_FUND like concat('%',#{tSocialFundInfo.settleDomainName},'%'))
 			</if>
 			<if test="tSocialFundInfo.unitName != null and tSocialFundInfo.unitName.trim() != ''">
-				AND (a.UNIT_NAME = #{tSocialFundInfo.unitName} or a.UNIT_NAME_FUND = #{tSocialFundInfo.unitName})
+				AND (a.UNIT_NAME like concat('%',#{tSocialFundInfo.unitName},'%') or a.UNIT_NAME_FUND like concat('%',#{tSocialFundInfo.unitName},'%'))
 			</if>
 			<if test="tSocialFundInfo.unitId != null and tSocialFundInfo.unitId.trim() != ''">
 				AND a.UNIT_ID = #{tSocialFundInfo.unitId}
@@ -563,7 +563,7 @@
 				AND a.SOCIAL_HOUSEHOLD = #{tSocialFundInfo.socialHousehold}
 			</if>
 			<if test="tSocialFundInfo.socialHouseholdName != null and tSocialFundInfo.socialHouseholdName.trim() != ''">
-				AND a.SOCIAL_HOUSEHOLD_NAME = #{tSocialFundInfo.socialHouseholdName}
+				AND a.SOCIAL_HOUSEHOLD_NAME like concat('%',#{tSocialFundInfo.socialHouseholdName},'%')
 			</if>
 			<if test="tSocialFundInfo.socialProvince != null and tSocialFundInfo.socialProvince.trim() != ''">
 				AND a.SOCIAL_PROVINCE = #{tSocialFundInfo.socialProvince}
@@ -578,7 +578,7 @@
 				AND a.PROVIDENT_HOUSEHOLD = #{tSocialFundInfo.providentHousehold}
 			</if>
 			<if test="tSocialFundInfo.providentHouseholdName != null and tSocialFundInfo.providentHouseholdName.trim() != ''">
-				AND a.PROVIDENT_HOUSEHOLD_NAME = #{tSocialFundInfo.providentHouseholdName}
+				AND a.PROVIDENT_HOUSEHOLD_NAME like concat('%',#{tSocialFundInfo.providentHouseholdName},'%')
 			</if>
 			<if test="tSocialFundInfo.fundProvince != null and tSocialFundInfo.fundProvince.trim() != ''">
 				AND a.FUND_PROVINCE = #{tSocialFundInfo.fundProvince}
@@ -865,6 +865,12 @@
 			<if test="tSocialFundInfo.latestCardinalityFund != null and tSocialFundInfo.latestCardinalityFund.trim() != ''">
 				AND a.LATEST_CARDINALITY_FUND = #{tSocialFundInfo.latestCardinalityFund}
 			</if>
+			<if test="tSocialFundInfo.socialStatus != null and tSocialFundInfo.socialStatus.trim() != ''">
+				AND a.SOCIAL_STATUS = #{tSocialFundInfo.socialStatus}
+			</if>
+			<if test="tSocialFundInfo.fundStatus != null and tSocialFundInfo.fundStatus.trim() != ''">
+				AND a.FUND_STATUS = #{tSocialFundInfo.fundStatus}
+			</if>
 		</if>
 	</sql>
 	<!--tSocialFundInfo简单分页查询-->
@@ -1015,7 +1021,13 @@
 			a.UNIT_FUND_SUM UNIT_FUND_SUM2,
 			a.PERSONAL_FUND_SUM PERSONAL_FUND_SUM2,
 			ifnull(a.UNIT_FUND_SUM,0) + ifnull(a.PERSONAL_FUND_SUM,0) FUND_SUM,
-			a.TRUST_REMARK
+			a.TRUST_REMARK,
+			a.PENSION_HANDLE,
+			a.MEDICAL_HANDLE,
+			a.UNEMPLOY_HANDLE,
+			a.WORK_INJURY_HANDLE,
+			a.BIRTH_HANDLE,
+			a.BIGAILMENT_HANDLE
 		from t_social_fund_info a
 		left join t_dispatch_info d on a.DISPATCH_ID=d.ID
 		<where>