Commit bada5431 authored by fangxinjiang's avatar fangxinjiang

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

parents c234183d fd522d4d
...@@ -751,13 +751,13 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi ...@@ -751,13 +751,13 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
.eq(TEmployeeContractInfo::getDeleteFlag, CommonConstants.ZERO_INT) .eq(TEmployeeContractInfo::getDeleteFlag, CommonConstants.ZERO_INT)
.last(CommonConstants.LAST_ONE_SQL)) > 0; .last(CommonConstants.LAST_ONE_SQL)) > 0;
if (employeeRegistrationPre.getServerItem().contains("合同")
&& Common.isNotNull(employeeRegistrationPre.getContractUpdateFlag())
&& employeeRegistrationPre.getContractUpdateFlag()) {
//查询老的合同明细 //查询老的合同明细
contractOld = contractPreMapper.selectOne(Wrappers.<TEmployeeContractPre>query().lambda() contractOld = contractPreMapper.selectOne(Wrappers.<TEmployeeContractPre>query().lambda()
.eq(TEmployeeContractPre::getRegisterId, employeeRegistrationPre.getId()) .eq(TEmployeeContractPre::getRegisterId, employeeRegistrationPre.getId())
.last(CommonConstants.LAST_ONE_SQL)); .last(CommonConstants.LAST_ONE_SQL));
if (employeeRegistrationPre.getServerItem().contains("合同")
&& Common.isNotNull(employeeRegistrationPre.getContractUpdateFlag())
&& employeeRegistrationPre.getContractUpdateFlag()) {
if (Common.isEmpty(employeeRegistrationPre.getEmployeeContractPre()) && !flag) { if (Common.isEmpty(employeeRegistrationPre.getEmployeeContractPre()) && !flag) {
errorTemp.append("未找到流程中或者在用的合同;"); errorTemp.append("未找到流程中或者在用的合同;");
......
...@@ -215,6 +215,7 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe ...@@ -215,6 +215,7 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
CONTRACT_IGNORE_FIELD.add("internshipPeriodNum"); CONTRACT_IGNORE_FIELD.add("internshipPeriodNum");
CONTRACT_IGNORE_FIELD.add("tryPeriodNum"); CONTRACT_IGNORE_FIELD.add("tryPeriodNum");
CONTRACT_IGNORE_FIELD.add("fundUpdateFlag"); CONTRACT_IGNORE_FIELD.add("fundUpdateFlag");
CONTRACT_IGNORE_FIELD.add("processStatus");
} }
private static final List<String> SOCIAL_IGNORE_FIELD = new ArrayList<>(); private static final List<String> SOCIAL_IGNORE_FIELD = new ArrayList<>();
...@@ -248,6 +249,7 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe ...@@ -248,6 +249,7 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
SOCIAL_IGNORE_FIELD.add("upperLimit"); SOCIAL_IGNORE_FIELD.add("upperLimit");
SOCIAL_IGNORE_FIELD.add("lowerLimit"); SOCIAL_IGNORE_FIELD.add("lowerLimit");
SOCIAL_IGNORE_FIELD.add("fundUpdateFlag"); SOCIAL_IGNORE_FIELD.add("fundUpdateFlag");
SOCIAL_IGNORE_FIELD.add("processStatus");
} }
...@@ -449,7 +451,8 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe ...@@ -449,7 +451,8 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
.in(TEmployeeContractPre::getProcessStatus, Arrays.asList("0","1","3","5","7","10","11")) .in(TEmployeeContractPre::getProcessStatus, Arrays.asList("0","1","3","5","7","10","11"))
.eq(TEmployeeContractPre::getId,contractOld.getId())); .eq(TEmployeeContractPre::getId,contractOld.getId()));
} }
if (newInfo.getServerItem().contains("合同") && contractOld != null && employeeContractPre != null) { if (newInfo.getServerItem().contains("合同") && contractOld != null && employeeContractPre != null
&& null != newInfo.getContractUpdateFlag() && newInfo.getContractUpdateFlag()) {
//1.9.11 huych 附件类型不比较差异 //1.9.11 huych 附件类型不比较差异
contractOld.setAttaList(null); contractOld.setAttaList(null);
employeeContractPre.setAttaList(null); employeeContractPre.setAttaList(null);
...@@ -628,7 +631,8 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe ...@@ -628,7 +631,8 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
} }
} }
//保存合同待签订数据 //保存合同待签订数据
if (newInfo.getServerItem().contains("合同") && employeeContractPre != null) { if (newInfo.getServerItem().contains("合同") && employeeContractPre != null
&& null != newInfo.getContractUpdateFlag() && newInfo.getContractUpdateFlag()) {
TEmployeeContractPreVo preVo = new TEmployeeContractPreVo(); TEmployeeContractPreVo preVo = new TEmployeeContractPreVo();
BeanUtils.copyProperties(employeeContractPre,preVo); BeanUtils.copyProperties(employeeContractPre,preVo);
if (Common.isNotNull(employeeContractPre.getExpectedCollectionTime()) ) { if (Common.isNotNull(employeeContractPre.getExpectedCollectionTime()) ) {
......
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>
FROM t_electronic_archive_detail a FROM t_electronic_archive_detail a
<where> <where>
a.DELETE_FLAG = '0' a.DELETE_FLAG = '0' and a.STATUS = '1'
<include refid="tElectronicArchiveDetail_where"/> <include refid="tElectronicArchiveDetail_where"/>
</where> </where>
ORDER BY a.CREATE_TIME DESC ORDER BY a.CREATE_TIME DESC
......
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