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

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TPaymentInfoMapper.java

@@ -86,12 +86,4 @@ public interface TPaymentInfoMapper extends BaseMapper<TPaymentInfo> {
 	* */
 	List<TPaymentInfo> selectListForPaymentImport(@Param("months")List<String> months, @Param("idcards")List<String> idcards);
 
-	/*
-	 * 已存在社保缴费库数据  非删除状态
-	 * @param months
-	 * @param idcards
-	 * @return
-	 * */
-	List<TPaymentInfoVo> selectPaymentAllInfoByMonthAndIdCard(@Param("months")List<String> months, @Param("idcards")List<String> idcards);
-
 }

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

@@ -1125,12 +1125,12 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
 		if (Common.isEmpty(tPreDispatchInfo.getPensionAddress())
 				&& Common.isEmpty(tPreDispatchInfo.getFundAddress())
 				&& CommonConstants.ZERO_STRING.equals(tPreDispatchInfo.getType())) {
-			return "派增的社保缴纳地与公积金缴纳地不可同时为空！";
+			return "派增的养老数据和公积金数据不能同时为空,请完善！";
 		}
 		if (Common.isEmpty(tPreDispatchInfo.getPensionAddressReduce())
 				&& Common.isEmpty(tPreDispatchInfo.getFundAddressReduce())
 				&& CommonConstants.ONE_STRING.equals(tPreDispatchInfo.getType())) {
-			return "派减的社保缴纳地与公积金缴纳地不可同时为空！";
+			return "派减的养老数据和公积金数据不能同时为空,请完善！";
 		}
 		return null;
 	}
@@ -1190,7 +1190,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
 				return "公积金基数不可为空！";
 			}
 			if (Common.isNullOrZero(tPreDispatchInfo.getFundCompanyPer())) {
-				return "公积金单位比例不可为空！";
+				return "公积金企业比例不可为空！";
 			}
 			if (Common.isNullOrZero(tPreDispatchInfo.getFundPersonalPer())) {
 				return "公积个人比例不可为空！";

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

@@ -958,15 +958,10 @@
 		FROM t_payment_info a
 		where 1=1
 		<if test="months != null and months.size > 0">
-			AND (a.SOCIAL_PAY_MONTH in
+			AND a.SOCIAL_PAY_MONTH in
 			<foreach item="item" index="index" collection="months" open="(" separator="," close=")">
 				#{item}
 			</foreach>
-			or a.PROVIDENT_PAY_MONTH in
-			<foreach item="item" index="index" collection="months" open="(" separator="," close=")">
-				#{item}
-			</foreach>
-			)
 		</if>
 		<if test="idcards != null and idcards.size > 0">
 			AND a.EMP_IDCARD IN
@@ -976,31 +971,6 @@
 		</if>
 	</select>
 
-	<!--tPaymentInfo 按ID查收缴费库包含社保和公积金明细的数据查询-->
-	<select id="selectPaymentAllInfoByMonthAndIdCard" resultMap="tPaymentAllInfoMap">
-		SELECT
-		<include refid="base_column_list_all"/>,
-		FROM t_payment_info a
-		where 1=1
-		<if test="months != null and months.size > 0">
-			AND (a.SOCIAL_PAY_MONTH in
-			<foreach item="item" index="index" collection="months" open="(" separator="," close=")">
-				#{item}
-			</foreach>
-			or a.PROVIDENT_PAY_MONTH in
-			<foreach item="item" index="index" collection="months" open="(" separator="," close=")">
-				#{item}
-			</foreach>
-			)
-		</if>
-		<if test="idcards != null and idcards.size > 0">
-			AND A.EMP_IDCARD IN
-			<foreach item="item" index="index" collection="idcards" open="(" separator="," close=")">
-				#{item}
-			</foreach>
-		</if>
-	</select>
-
 	<!--tPaymentInfo 查询缴费库要删除的数据-->
 	<select id="selectListForDelete" resultType="com.yifu.cloud.plus.v1.yifu.social.entity.TPaymentInfo">
 		select