MVP1.6.4-过期变为终止

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

@@ -1734,33 +1734,8 @@
 	<sql id="where_getSocialSoldier">
 		<where>
 			s.DELETE_FLAG = 0
-			/** 社保办理状态：0待办理/1已办理2办理失败3已派减4 办理中 5 部分办理失败 派单社保办理状态 0 未办理 1 全部办理成功(原-已办理) 2 全部办理失败（原-办理失败）  3 部分办理成功 4 办理中  **/
-			/*社保代办理 1.派单审核通过 2.派增(type=0)：待办理(social_handle_status='0')  or 派减(type=1)：已办理完成或部分办理失败 且已派减*/
 			AND a.social_id is not null
-			AND a.STATUS = "2"
-			and (( a.type = '0' AND (s.HANDLE_STATUS = "0" or s.HANDLE_STATUS = "4") ) or ( a.type ='1'  AND (if(ifnull(h.id,0) != '0',h.HANDLE_STATUS,s.HANDLE_STATUS) in ('1','5','6','3','7') or (s.HANDLE_STATUS in ('1','5','6','3','7') and s.REDUCE_CAN = '1'))  ))
-			and a.SOCIAL_HANDLE_STATUS in ('0','4')
 			and a.AUTO_FLAG = '0'
-			<!--<if test="tDispatchInfo.status != null and tDispatchInfo.status.trim() != ''">
-				/*待办理组合判断*/
-				<if test="'2'.toString() == tDispatchInfo.status.trim() and tDispatchInfo.typeSub != null ">
-					/*社保代办理*/
-					<if test=" '0'.toString()==tDispatchInfo.typeSub.trim() ">
-						<if test="tDispatchInfo.socialHandleStatus != null and tDispatchInfo.socialHandleStatus != ''">
-
-						</if>
-						<if test="tDispatchInfo.socialHandleStatus == null or tDispatchInfo.socialHandleStatus == ''">
-							and (( a.type = '0' AND b.HANDLE_STATUS in ('0','4')) or ( a.type ='1'  AND b.HANDLE_STATUS in ('1','5')  and b.REDUCE_CAN = '1'))
-							and a.SOCIAL_HANDLE_STATUS in ('0','4')
-						</if>
-					</if>
-					/* 公积金办理*/
-					<if test=" '1'.toString()==tDispatchInfo.typeSub.trim() ">
-						and (( a.type = '0' AND c.HANDLE_STATUS = '0') or ( a.type ='1'  AND c.HANDLE_STATUS = '1' and c.REDUCE_CAN = '1'))
-						and a.FUND_HANDLE_STATUS='0'
-					</if>
-				</if>
-			</if>-->
 			<include refid="where_getSocialRecordRoster_base"/>
 
 			<if test="tDispatchInfo != null">