Merge remote-tracking branch 'origin/MVP1.5.1' into MVP1.5.1

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

@@ -611,6 +611,9 @@
 		    a.DELETE_FLAG = 0
 		and
 			a.BUY_HANDLE_STATUS = 3
+		<if test="param.isEffect != null">
+			and a.IS_EFFECT = #{param.isEffect}
+		</if>
 		<if test="param.unitName != null and param.unitName.trim() != ''">
 			and a.UNIT_NAME like concat(replace(replace(#{param.unitName},'_','\_'),'%','\%'),'%')
 		</if>
@@ -688,6 +691,9 @@
 		a.DELETE_FLAG = 0
 		and
 		a.BUY_HANDLE_STATUS = 3
+		<if test="param.isEffect != null">
+			and a.IS_EFFECT = #{param.isEffect}
+		</if>
 		<if test="param.createName != null and param.createName.trim() != ''">
 			and a.CREATE_NAME like concat('%',replace(replace(#{param.createName},'_','\_'),'%','\%'),'%')
 		</if>

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

@@ -3771,7 +3771,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 						//  2.派减办理成功  处理预估 (不管社保还是公积金办理失败)
 						if (CommonConstants.ONE_STRING.equals(dis.getType())
 								&& CommonConstants.ZERO_INT == flag
-								&& CommonConstants.EIGHT_STRING.equals(sf.getSocialStatus())){
+								&& (CommonConstants.EIGHT_STRING.equals(sf.getSocialStatus())
+								|| CommonConstants.SEVEN_STRING.equals(sf.getFundStatus()))){
 							// 同步预估库数据
 							socialTask.asynchronousDisPatchHandle(sf, forecastFlag,null,null,CommonConstants.ZERO_INT);
 						}

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

@@ -989,6 +989,7 @@
 		d.CONTRACT_TERM,
 		d.EDUCATION_NAME,
 		a.RECORD_BASE,
+		<!--"社保状态：派增（0待审核、1待办理、2办理中 3办理成功、4部分办理失败 5 办理失败 10 审核不通过）、派减（6待审核 7待办理 8办理成功 9 办理失败  11 派减办理中 12 派减部分办理失败）" ) -->
 		case when a.SOCIAL_STATUS = 0 then "派增待审核"
 		when a.SOCIAL_STATUS = 1 then "派增待办理"
 		when a.SOCIAL_STATUS = 2 then "派增办理中"
@@ -1000,6 +1001,8 @@
 		when a.SOCIAL_STATUS = 8 then "派减办理成功"
 		when a.SOCIAL_STATUS = 9 then "派减办理失败"
 		when a.SOCIAL_STATUS = 10 then "派增审核不通过"
+		WHEN a.SOCIAL_STATUS = 11 THEN "派减办理中"
+		WHEN a.SOCIAL_STATUS = 12 THEN "派减部分办理失败"
 		else null  end  as  "SOCIAL_STATUS" ,
 		case when a.FUND_STATUS = 0 then "派增待审核"
 		when a.FUND_STATUS = 1 then "派增待办理"