Commit ca4e5237 authored by fangxinjiang's avatar fangxinjiang

拒绝入职优化-fxj

parent 34ce1e3c
......@@ -258,6 +258,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
@Override
public R updateRegistById(EmployeeRegistrationPre employeeRegistrationPre) {
EmployeeRegistrationPre updatePre = baseMapper.selectById(employeeRegistrationPre.getId());
//状态:0短信待发送,1信息待填写,2信息待审核,3拒绝入职,4已完成
if (Common.isEmpty(updatePre) || (updatePre.getProcessStatus().equals(CommonConstants.THREE_STRING)
|| updatePre.getProcessStatus().equals(CommonConstants.FOUR_STRING))) {
return R.failed(CommonConstants.NO_DATA_TO_HANDLE);
......@@ -1346,6 +1347,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
updatePre = baseMapper.selectOne(Wrappers.<EmployeeRegistrationPre>query()
.lambda().eq(EmployeeRegistrationPre::getId, updateVo.getId())
.in(EmployeeRegistrationPre::getProcessStatus, CommonConstants.processStatus)
.eq(EmployeeRegistrationPre::getIsRefuse,CommonConstants.ONE_STRING)
.last(CommonConstants.LAST_ONE_SQL));
if (Common.isNotNull(updatePre)) {
if (CommonConstants.ZERO_STRING.equals(updatePre.getProcessStatus())) {
......@@ -1397,6 +1399,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
.eq(EmployeeRegistrationPre::getEmpIdcard, info.getEmpIdcard())
.eq(EmployeeRegistrationPre::getDeptId, updateVo.getDeptId())
.eq(EmployeeRegistrationPre::getProcessStatus, CommonConstants.ZERO_STRING)
.eq(EmployeeRegistrationPre::getIsRefuse,CommonConstants.ONE_STRING)
.last(CommonConstants.LAST_ONE_SQL));
if (Common.isNotNull(updatePre)) {
updatePre.setProcessStatus(CommonConstants.ONE_STRING);
......
......@@ -308,7 +308,7 @@
<include refid="Base_Column_List"/>
FROM t_employee_contract_pre a
<where>
1=1
1=1 and a.IS_REFUSE ='1'
<include refid="tEmployeeContractPre_where"/>
</where>
order by a.create_time desc
......@@ -420,7 +420,7 @@
if(#{type} = '1',concat('自动化手动-',a.customer_username),concat('自动化自动-',a.customer_username)) preName
FROM t_employee_contract_pre a,(select @i:=0) as itable
<where>
1=1
1=1 and a.IS_REFUSE ='1'
AND a.id in
<foreach item="idStr" index="index" collection="idList" open="(" separator="," close=")">
#{idStr}
......@@ -436,7 +436,7 @@
SELECT
<include refid="Base_Column_List"/>
FROM t_employee_contract_pre a
where a.process_status = '0' and a.expected_confirm_time is not null
where a.process_status = '0' and a.expected_confirm_time is not null and a.IS_REFUSE ='1'
and DATE_FORMAT(a.expected_confirm_time,"%Y-%m-%d") <![CDATA[ <= ]]> CURDATE()
group by a.customer_user_loginname
</select>
......@@ -449,6 +449,6 @@
a.expected_collection_time is not null
and DATE_FORMAT(a.expected_collection_time,"%Y-%m-%d") <![CDATA[ <= ]]> CURDATE()
and ((a.timeout_elec_sign = '0' and a.process_status = '0' and a.sign_type = '0') or
a.process_status in ('1','3','5','7','11'))
a.process_status in ('1','3','5','7','11')) and a.IS_REFUSE ='1'
</select>
</mapper>
......@@ -246,7 +246,7 @@
<include refid="Base_Column_List"/>
FROM t_employee_insurance_pre a
<where>
1=1
1=1 and a.IS_REFUSE ='1'
<include refid="tEmployeeInsurancePre_where"/>
</where>
order by a.create_time desc
......@@ -312,7 +312,7 @@
if(a.is_address = '0','是',if(a.is_address = '1','否','')) as is_address
FROM t_employee_insurance_pre a
<where>
1=1
1=1 and a.IS_REFUSE = '1'
<include refid="tEmployeeInsurancePre_where"/>
</where>
order by a.create_time desc
......@@ -325,7 +325,7 @@
SELECT
<include refid="Base_Column_List"/>
FROM t_employee_insurance_pre a
where a.process_status = '0' and DATE_FORMAT(a.expected_collection_time,"%Y-%m-%d") = CURDATE()
where a.process_status = '0' and a.IS_REFUSE = '1' and DATE_FORMAT(a.expected_collection_time,"%Y-%m-%d") = CURDATE()
group by a.customer_user_loginname
</select>
......@@ -333,6 +333,6 @@
SELECT
id
FROM t_employee_insurance_pre a
where a.process_status in ('0','1','2','5') and DATE_FORMAT(a.expected_collection_time,"%Y-%m-%d") <![CDATA[ <= ]]> CURDATE()
where a.process_status in ('0','1','2','5') and a.IS_REFUSE = '1' and DATE_FORMAT(a.expected_collection_time,"%Y-%m-%d") <![CDATA[ <= ]]> CURDATE()
</select>
</mapper>
......@@ -602,7 +602,7 @@
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
<where>
a.DELETE_FLAG = '0'
a.DELETE_FLAG = '0' and a.IS_REFUSE ='1'
<include refid="tDispatchInfoPre_other_where"/>
</where>
GROUP BY a.id
......@@ -617,7 +617,7 @@
,a.FUND_START_DATE
FROM t_dispatch_info_pre a
<where>
a.DELETE_FLAG = '0'
a.DELETE_FLAG = '0' and a.IS_REFUSE ='1'
<include refid="tDispatchInfoPre_other_where"/>
</where>
order by a.create_time desc
......@@ -652,7 +652,7 @@
if(#{type} = '1',concat('自动化手动-',a.customer_username),concat('自动化自动-',a.customer_username)) preName
FROM t_dispatch_info_pre a,(select @i:=0) as itable
<where>
1=1
1=1 and a.IS_REFUSE='1'
AND a.id in
<foreach item="idStr" index="index" collection="idList" open="(" separator="," close=")">
#{idStr}
......@@ -689,7 +689,7 @@
) c on c.DEPART_NAME = a.PROVIDENT_HOUSEHOLD_NAME
,(select @i:=0) as itable
<where>
1=1
1=1 and a.IS_REFUSE='1'
AND a.id in
<foreach item="idStr" index="index" collection="idList" open="(" separator="," close=")">
#{idStr}
......@@ -708,7 +708,7 @@
where
a.expected_collection_time is not null and type_sub = '0'
and DATE_FORMAT(a.expected_collection_time,"%Y-%m-%d") <![CDATA[ <= ]]> CURDATE()
and a.process_status = '0'
and a.process_status = '0' and a.IS_REFUSE='1'
group by a.customer_user_login_name
</select>
......@@ -719,7 +719,7 @@
where
a.expected_collection_time is not null and type_sub = '1'
and DATE_FORMAT(a.expected_collection_time,"%Y-%m-%d") <![CDATA[ <= ]]> CURDATE()
and a.process_status = '0'
and a.process_status = '0' and a.IS_REFUSE='1'
group by a.customer_user_login_name
</select>
......@@ -731,7 +731,7 @@
a.expected_collection_time is not null
and DATE_FORMAT(a.expected_collection_time,"%Y-%m-%d") <![CDATA[ <= ]]> CURDATE()
and a.process_status in ('1','2','4','8','9')
and a.type_sub = '0'
and a.type_sub = '0' and a.IS_REFUSE='1'
</select>
<select id="getAllUnDisDataIdFundList" resultType="java.lang.String">
......@@ -742,6 +742,6 @@
a.expected_collection_time is not null
and DATE_FORMAT(a.expected_collection_time,"%Y-%m-%d") <![CDATA[ <= ]]> CURDATE()
and a.process_status in ('1','2','4','8','9')
and a.type_sub = '1'
and a.type_sub = '1' and a.IS_REFUSE='1'
</select>
</mapper>
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