Commit e784d745 authored by fangxinjiang's avatar fangxinjiang

拒绝入职优化-fxj

parent e30065ef
...@@ -117,8 +117,6 @@ public class TDispatchInfoPreController { ...@@ -117,8 +117,6 @@ public class TDispatchInfoPreController {
//typeSun 0 社保 1 公积金 //typeSun 0 社保 1 公积金
if (Common.isEmpty(tDispatchInfoPre.getTypeSub())){ if (Common.isEmpty(tDispatchInfoPre.getTypeSub())){
tDispatchInfoPre.setTypeSub(CommonConstants.ZERO_STRING); tDispatchInfoPre.setTypeSub(CommonConstants.ZERO_STRING);
}else if (Common.isEmpty(tDispatchInfoPre.getTypeSub())){
tDispatchInfoPre.setTypeSub(tDispatchInfoPre.getTypeSub());
} }
return R.ok(tDispatchInfoPreService.getNoPageList(tDispatchInfoPre)); return R.ok(tDispatchInfoPreService.getNoPageList(tDispatchInfoPre));
} }
...@@ -137,8 +135,6 @@ public class TDispatchInfoPreController { ...@@ -137,8 +135,6 @@ public class TDispatchInfoPreController {
//typeSun 0 社保 1 公积金 //typeSun 0 社保 1 公积金
if (Common.isEmpty(tDispatchInfoPre.getTypeSub())){ if (Common.isEmpty(tDispatchInfoPre.getTypeSub())){
tDispatchInfoPre.setTypeSub(CommonConstants.ZERO_STRING); tDispatchInfoPre.setTypeSub(CommonConstants.ZERO_STRING);
}else if (Common.isEmpty(tDispatchInfoPre.getTypeSub())){
tDispatchInfoPre.setTypeSub(tDispatchInfoPre.getTypeSub());
} }
return R.ok(tDispatchInfoPreService.getNoPageListNew(tDispatchInfoPre)); return R.ok(tDispatchInfoPreService.getNoPageListNew(tDispatchInfoPre));
} }
......
...@@ -673,16 +673,25 @@ ...@@ -673,16 +673,25 @@
a.LOWER_INJURY, a.LOWER_INJURY,
a.LOWER_BIRTH, a.LOWER_BIRTH,
a.LOWER_BIG, a.LOWER_BIG,
a.PROVIDENT_CARDINAL, CASE WHEN a.PAYMENT_TYPE='0' THEN c.LOWER_LIMIT WHEN a.PAYMENT_TYPE='2' THEN c.UPPER_LIMIT ELSE a.PROVIDENT_CARDINAL END as PROVIDENT_CARDINAL,
a.UNIT_PROVIDENT_PER, a.UNIT_PROVIDENT_PER,
a.PERSONAL_PROVIDENT_PER, a.PERSONAL_PROVIDENT_PER,
a.CONFIG_HOUSE_ID a.CONFIG_HOUSE_ID
,if(b.EMP_IDCARD is not null,'0','1') as CONTRACT_STATUS,a.FUND_START_DATE ,if(b.EMP_IDCARD is not null,'0','1') as CONTRACT_STATUS,a.FUND_START_DATE
FROM t_dispatch_info_pre a FROM t_dispatch_info_pre a
left join view_contract b on a.EMP_IDCARD = b.EMP_IDCARD and a.DEPT_NO = b.DEPT_NO left join view_contract b on a.EMP_IDCARD = b.EMP_IDCARD and a.DEPT_NO = b.DEPT_NO
LEFT JOIN (select t.DEPART_NAME,t.LOWER_LIMIT,t.UPPER_LIMIT from sys_base_set_info t where t.BASE_TYPE = '0' and t.STATUS = 0 and t.DELETE_FLAG = '0' and
DATE_FORMAT(t.APPLY_START_DATE,'%Y-%m-%d') <![CDATA[ <= ]]> DATE_FORMAT(CURDATE(),'%Y-%m-%d') and DATE_FORMAT(CURDATE(),'%Y-%m-%d') <![CDATA[ <= ]]> IFNULL(t.APPLY_END_DATE,DATE_FORMAT(CURDATE(),'%Y-%m-%d')) <if test='tDispatchInfoPre.typeSub != null and tDispatchInfoPre.typeSub == "0"'>
) c on c.DEPART_NAME = a.SOCIAL_HOUSEHOLD_NAME LEFT JOIN (select t.DEPART_NAME,t.LOWER_LIMIT,t.UPPER_LIMIT from sys_base_set_info t where t.BASE_TYPE = '0' and t.STATUS = 0 and t.DELETE_FLAG = '0' and
DATE_FORMAT(t.APPLY_START_DATE,'%Y-%m-%d') <![CDATA[ <= ]]> DATE_FORMAT(CURDATE(),'%Y-%m-%d') and DATE_FORMAT(CURDATE(),'%Y-%m-%d') <![CDATA[ <= ]]> IFNULL(t.APPLY_END_DATE,DATE_FORMAT(CURDATE(),'%Y-%m-%d'))
) c on c.DEPART_NAME = a.SOCIAL_HOUSEHOLD_NAME
</if>
<if test='tDispatchInfoPre.typeSub != null and tDispatchInfoPre.typeSub == "1"'>
LEFT JOIN (select t.DEPART_NAME,t.LOWER_LIMIT,t.UPPER_LIMIT from sys_base_set_info t where t.BASE_TYPE = '1' and t.STATUS = 0 and t.DELETE_FLAG = '0' and
DATE_FORMAT(t.APPLY_START_DATE,'%Y-%m-%d') <![CDATA[ <= ]]> DATE_FORMAT(CURDATE(),'%Y-%m-%d') and DATE_FORMAT(CURDATE(),'%Y-%m-%d') <![CDATA[ <= ]]> IFNULL(t.APPLY_END_DATE,DATE_FORMAT(CURDATE(),'%Y-%m-%d'))
) c on c.DEPART_NAME = a.PROVIDENT_HOUSEHOLD_NAME
</if>
<where> <where>
a.DELETE_FLAG = '0' and a.IS_REFUSE ='1' and a.IS_LEAVE ='1' a.DELETE_FLAG = '0' and a.IS_REFUSE ='1' and a.IS_LEAVE ='1'
<include refid="tDispatchInfoPre_other_where"/> <include refid="tDispatchInfoPre_other_where"/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment