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

@@ -92,10 +92,18 @@ public class InsurancesConstants {
 	 * 项目编码不存在
 	 */
 	public static final String DEPT_NO_IS_NOT_EXIST = "项目编码不存在";
+	/**
+	 * 替换员工项目不存在
+	 */
+	public static final String REPLACE_DEPT_NO_IS_NOT_EXIST = "替换员工项目不存在";
 	/**
 	 * 未找到项目的结算方式
 	 */
 	public static final String PROJECT_NOT_FIND_SETTLE_TYPE = "未找到项目的结算方式";
+	/**
+	 * 根据替换员工的项目，未找到项目的结算方式
+	 */
+	public static final String REPLACE_PROJECT_NOT_FIND_SETTLE_TYPE = "根据替换员工的项目，未找到项目的结算方式";
 	/**
 	 * 替换员工投保记录已存在
 	 */

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

@@ -248,6 +248,7 @@ public class TInsuranceDetail extends BaseEntity {
      * 是否有效 0有效 1无效
      */
 	@Schema(description = "是否有效 0有效 1无效")
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
     private Integer isEffect;
 
     /**

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

 package com.yifu.cloud.plus.v1.yifu.insurances.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.Data;
 
@@ -15,8 +17,9 @@ import java.util.Date;
 @Tag(name = "结算信息作废记录")
 public class TInsuranceSettleCancel implements Serializable {
     /**
-     * 
+     * id
      */
+	@TableId(type = IdType.ASSIGN_ID)
     private String id;
 
     /**

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

@@ -237,6 +237,23 @@ public class BigDecimalUtils {
             }
             return bigDecimal;
         }
+
+	/**
+	 * null 默认 为 0
+	 * @Author zhaji
+	 * @Date 2022-08-02
+	 * @param bigDecimal
+	 * @return
+	 **/
+	public static Boolean isNullOrZero(BigDecimal bigDecimal){
+		if (null == bigDecimal){
+			return true;
+		}
+		if (bigDecimal.compareTo(BigDecimal.ZERO) == 0){
+			return true;
+		}
+		return false;
+	}
         /**
          * 对象转为BigDecimal 数据 并四舍五入保留两位小数
          * @Author fxj

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

@@ -100,9 +100,15 @@ public class InsuredParam implements Serializable {
 	private Integer isOverdue;
 
 	/**
-	 * 派单日期
+	 * 派单开始日期
 	 */
-	@Schema(description = "派单日期")
-	private String createTime;
+	@Schema(description = "派单开始日期")
+	private String createStartTime;
+
+	/**
+	 * 派单结束日期
+	 */
+	@Schema(description = "派单结束日期")
+	private String createEndTime;
 
 }

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

@@ -334,8 +334,11 @@
 		<if test="param.isOverdue != null">
 			and detail.IS_OVERDUE = #{param.isOverdue}
 		</if>
-		<if test="param.createTime != null and param.createTime.trim() != ''">
-			AND detail.CREATE_TIME = concat(#{param.createTime}, ' 00:00:00')
+		<if test="param.createStartTime != null and param.createStartTime.trim() != ''">
+			AND detail.CREATE_TIME  <![CDATA[ >= ]]>  concat(#{param.createStartTime}, ' 00:00:00')
+		</if>
+		<if test="param.createEndTime != null and param.createEndTime.trim() != ''">
+			AND detail.CREATE_TIME  <![CDATA[ <= ]]> concat(#{param.createEndTime}, ' 23:59:59')
 		</if>
 		ORDER BY detail.CREATE_TIME DESC
 	</select>
@@ -412,8 +415,11 @@
 		<if test="param.isOverdue != null ">
 			and detail.IS_OVERDUE = #{param.isOverdue}
 		</if>
-		<if test="param.createTime != null and param.createTime.trim() != ''">
-			AND detail.CREATE_TIME = concat(#{param.createTime}, ' 00:00:00')
+		<if test="param.createStartTime != null and param.createStartTime.trim() != ''">
+			AND detail.CREATE_TIME  <![CDATA[ >= ]]>  concat(#{param.createStartTime}, ' 00:00:00')
+		</if>
+		<if test="param.createEndTime != null and param.createEndTime.trim() != ''">
+			AND detail.CREATE_TIME  <![CDATA[ <= ]]> concat(#{param.createEndTime}, ' 23:59:59')
 		</if>
 		ORDER BY detail.CREATE_TIME DESC
 	</select>

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

@@ -1143,14 +1143,14 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 			if (socialFund.getUnitProvidengCardinal().compareTo(socialSet.getLowerLimit()) < CommonConstants.ZERO_INT) {
 				socialFund.setUnitProvidengCardinal(socialSet.getLowerLimit());
 				socialFund.setPersonalProvidentCardinal(socialSet.getLowerLimit());
-			} else if (socialFund.getUnitPensionCardinal().compareTo(socialSet.getUpperLimit()) > CommonConstants.ZERO_INT) {
+			} else if (socialFund.getUnitProvidengCardinal().compareTo(socialSet.getUpperLimit()) > CommonConstants.ZERO_INT) {
 				socialFund.setUnitProvidengCardinal(socialSet.getUpperLimit());
 				socialFund.setPersonalProvidentCardinal(socialSet.getUpperLimit());
 			}
 			//单边小数点处理逻辑
 			if (Common.isNotNull(socialSet.getFundPayPoint())) {
-				socialFund.setUnitFundSum(Common.formatMoneyForFund(BigDecimalUtils.safeMultiply(socialFund.getUnitProvidengCardinal(), socialFund.getUnitProvidentPer(), BigDecimal.valueOf(CommonConstants.ONE_OF_PERCENT.doubleValue())), Integer.valueOf(socialFund.getFundPayPoint())));
-				socialFund.setPersonalFundSum(Common.formatMoneyForFund(BigDecimalUtils.safeMultiply(socialFund.getPersonalProvidentCardinal(), socialFund.getPersonalProvidentPer(), BigDecimal.valueOf(CommonConstants.ONE_OF_PERCENT.doubleValue())), Integer.valueOf(socialFund.getFundPayPoint())));
+				socialFund.setUnitFundSum(Common.formatMoneyForFund(BigDecimalUtils.safeMultiply(socialFund.getUnitProvidengCardinal(), socialFund.getUnitProvidentPer(), BigDecimal.valueOf(CommonConstants.ONE_OF_PERCENT.doubleValue())), Integer.parseInt(socialFund.getFundPayPoint())));
+				socialFund.setPersonalFundSum(Common.formatMoneyForFund(BigDecimalUtils.safeMultiply(socialFund.getPersonalProvidentCardinal(), socialFund.getPersonalProvidentPer(), BigDecimal.valueOf(CommonConstants.ONE_OF_PERCENT.doubleValue())), Integer.parseInt(socialFund.getFundPayPoint())));
 			}
 		}
 	}

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

@@ -265,9 +265,9 @@
                 a.EMP_IDCARD,
                 a.EMP_TYPE,
                 a.SETTLE_DOMAIN,
-				a.SETTLE_DOMAIN_CODE,
-                a.SETTLE_DOMAIN_NAME,
-                a.UNIT_NAME,
+                concat(ifnull(a.SETTLE_DOMAIN_CODE,""),if(a.SETTLE_DOMAIN_CODE is null or a.SETTLE_DOMAIN_CODE_FUND is null,"",","),ifnull(a.SETTLE_DOMAIN_CODE_FUND,"")) SETTLE_DOMAIN_CODE,
+				concat(ifnull(a.SETTLE_DOMAIN_NAME,""),if(a.SETTLE_DOMAIN_NAME is null or a.SETTLE_DOMAIN_NAME_FUND is null,"",","),ifnull(a.SETTLE_DOMAIN_NAME_FUND,"")) SETTLE_DOMAIN_NAME,
+				concat(ifnull(a.UNIT_NAME,""),if(a.UNIT_NAME is null or a.UNIT_NAME_FUND is null,"",","),ifnull(a.UNIT_NAME_FUND,"")) UNIT_NAME,
                 a.UNIT_ID,
  				a.SETTLE_DOMAIN_FUND,
 				a.SETTLE_DOMAIN_CODE_FUND,
@@ -418,10 +418,10 @@
 				AND a.SETTLE_DOMAIN = #{tSocialFundInfo.settleDomain}
 			</if>
 			<if test="tSocialFundInfo.settleDomainName != null and tSocialFundInfo.settleDomainName.trim() != ''">
-				AND a.SETTLE_DOMAIN_NAME = #{tSocialFundInfo.settleDomainName}
+				AND (a.SETTLE_DOMAIN_NAME = #{tSocialFundInfo.settleDomainName} or a.SETTLE_DOMAIN_NAME_FUND = #{tSocialFundInfo.settleDomainName})
 			</if>
 			<if test="tSocialFundInfo.unitName != null and tSocialFundInfo.unitName.trim() != ''">
-				AND a.UNIT_NAME = #{tSocialFundInfo.unitName}
+				AND (a.UNIT_NAME = #{tSocialFundInfo.unitName} or a.UNIT_NAME_FUND = #{tSocialFundInfo.unitName})
 			</if>
 			<if test="tSocialFundInfo.unitId != null and tSocialFundInfo.unitId.trim() != ''">
 				AND a.UNIT_ID = #{tSocialFundInfo.unitId}
@@ -790,8 +790,9 @@
 			a.EMP_IDCARD,
 			a.EMP_TYPE,
 			d.EMP_MOBILE,
-			a.UNIT_NAME,
-			a.SETTLE_DOMAIN_NAME,
+		concat(ifnull(a.SETTLE_DOMAIN_CODE,""),if(a.SETTLE_DOMAIN_CODE is null or a.SETTLE_DOMAIN_CODE_FUND is null,"",","),ifnull(a.SETTLE_DOMAIN_CODE_FUND,"")) SETTLE_DOMAIN_CODE,
+		concat(ifnull(a.SETTLE_DOMAIN_NAME,""),if(a.SETTLE_DOMAIN_NAME is null or a.SETTLE_DOMAIN_NAME_FUND is null,"",","),ifnull(a.SETTLE_DOMAIN_NAME_FUND,"")) SETTLE_DOMAIN_NAME,
+		concat(ifnull(a.UNIT_NAME,""),if(a.UNIT_NAME is null or a.UNIT_NAME_FUND is null,"",","),ifnull(a.UNIT_NAME_FUND,"")) UNIT_NAME,
 			d.ID_CARD_PROVINCE,
 			d.ID_CARD_CITY,
 			d.ID_CARD_TOWN,