MVP1.6.4-优化社保士兵

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

@@ -102,7 +102,7 @@
 	<!-- 社保士兵养工失增加模板-->
 	<select id="getSocialSoldierYgsAddVoList" resultType="com.yifu.cloud.plus.v1.yifu.social.vo.SocialSoldierYgsAddVo">
 		<include refid="getSocialSoldierBase"/>
-		and a.type = '0'
+		and a.type = '0' and a.YGS_HANDLE_STATUS in ('0','1','2','3')
 		and (
 			if(ifnull(h.id,0) != '0',h.PENSION_HANDLE,s.PENSION_HANDLE) = '0' or
 			if(ifnull(h.id,0) != '0',h.WORK_INJURY_HANDLE,s.WORK_INJURY_HANDLE) = '0' or
@@ -134,7 +134,7 @@
 	<!-- 社保士兵养工失减少模板-->
 	<select id="getSocialSoldierYgsReduceVoList" resultType="com.yifu.cloud.plus.v1.yifu.social.vo.SocialSoldierYgsAddVo">
 		<include refid="getSocialSoldierBase"/>
-		and a.type = '1'
+		and a.type = '1' and a.YGS_HANDLE_STATUS in ('0','1','2','3')
 		and (
 			if(ifnull(h.id,0) != '0',h.PENSION_HANDLE,s.PENSION_HANDLE) = '5' or
 			if(ifnull(h.id,0) != '0',h.WORK_INJURY_HANDLE,s.WORK_INJURY_HANDLE) = '5' or
@@ -147,7 +147,7 @@
 	<!-- 社保士兵医生大增加模板-->
 	<select id="getSocialSoldierYsdAddVoList" resultType="com.yifu.cloud.plus.v1.yifu.social.vo.SocialSoldierYgsAddVo">
 		<include refid="getSocialSoldierBase"/>
-		and a.type = '0'
+		and a.type = '0' and a.YSD_HANDLE_STATUS in ('0','1','2','3')
 		and (
 			if(ifnull(h.id,0) != '0',h.MEDICAL_HANDLE,s.MEDICAL_HANDLE) = '0' or
 			if(ifnull(h.id,0) != '0',h.BIRTH_HANDLE,s.BIRTH_HANDLE) = '0' or
@@ -160,7 +160,7 @@
 	<!-- 社保士兵医生大减少模板-->
 	<select id="getSocialSoldierYsdReduceVoList" resultType="com.yifu.cloud.plus.v1.yifu.social.vo.SocialSoldierYgsAddVo">
 		<include refid="getSocialSoldierBase"/>
-		and a.type = '1'
+		and a.type = '1' and a.YSD_HANDLE_STATUS in ('0','1','2','3')
 		and (
 			if(ifnull(h.id,0) != '0',h.MEDICAL_HANDLE,s.MEDICAL_HANDLE) = '5' or
 			if(ifnull(h.id,0) != '0',h.BIRTH_HANDLE,s.BIRTH_HANDLE) = '5' or