Commit cc09fef7 authored by hongguangwu's avatar hongguangwu

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

parents ae13e1c4 b4d33326
......@@ -534,8 +534,9 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
BeanUtils.copyProperties(newInfo,preVo);
if (null != preVo.getExitSocialInfoList() && !preVo.getExitSocialInfoList().isEmpty()) {
preVo.getExitSocialInfoList().forEach(socialPreDetailVo -> socialPreDetailVo.setRegisterId(empPreId));
} else {
initSocialPreInfo(preVo, preVo.getDispatchInfoPreVo(), user, empPreId);
}
initSocialPreInfo(preVo, preVo.getDispatchInfoPreVo(), user,empPreId);
socialDaprUtils.saveSocialPreInfo(preVo);
}
if (!saveOrUpdateList.isEmpty()) {
......
......@@ -415,6 +415,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'))
a.process_status in ('1','3','5','7','11'))
</select>
</mapper>
......@@ -305,7 +305,6 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap
}
TDispatchInfoPre preExit = baseMapper.selectOne(Wrappers.<TDispatchInfoPre>query().lambda()
.eq(TDispatchInfoPre::getRegisterId, id)
.in(TDispatchInfoPre::getProcessStatus, Arrays.asList("0", "1", "2", "4","8"))
.last(CommonConstants.LAST_ONE_SQL));
if (Common.isNotNull(preExit)) {
TDispatchInfoPreVo pre = new TDispatchInfoPreVo();
......
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