Commit 494069d7 authored by fangxinjiang's avatar fangxinjiang

社保自动化配置-fxj

parent 08c886d2
...@@ -783,8 +783,9 @@ public class TAutoMainRelServiceImpl extends ServiceImpl<TAutoMainRelMapper, TAu ...@@ -783,8 +783,9 @@ public class TAutoMainRelServiceImpl extends ServiceImpl<TAutoMainRelMapper, TAu
schemesOld = contractSchemeMapper.selectList(Wrappers schemesOld = contractSchemeMapper.selectList(Wrappers
.<TAutoContractScheme>query().lambda().eq(TAutoContractScheme::getMainId,autoContractRuleNew.getId())); .<TAutoContractScheme>query().lambda().eq(TAutoContractScheme::getMainId,autoContractRuleNew.getId()));
//先删除后面再批增 //先删除后面再批增
//contractSchemeMapper.delete(Wrappers.<TAutoContractScheme>query().lambda().eq(TAutoContractScheme::getMainId,autoContractRuleNew.getId())); contractSchemeMapper.delete(Wrappers.<TAutoContractScheme>query().lambda().eq(TAutoContractScheme::getMainId,autoContractRuleNew.getId()));
//保存员工合同标准 //保存员工合同标准
TAutoContractScheme schemeTemp = null;
if (Common.isNotNull(schemes)){ if (Common.isNotNull(schemes)){
for (TAutoContractScheme scheme:schemes){ for (TAutoContractScheme scheme:schemes){
if (!Common.isNotNull(scheme.getId())){ if (!Common.isNotNull(scheme.getId())){
...@@ -794,9 +795,16 @@ public class TAutoMainRelServiceImpl extends ServiceImpl<TAutoMainRelMapper, TAu ...@@ -794,9 +795,16 @@ public class TAutoMainRelServiceImpl extends ServiceImpl<TAutoMainRelMapper, TAu
scheme.setDeptId(autoMainRel.getDeptId()); scheme.setDeptId(autoMainRel.getDeptId());
scheme.setMainId(autoContractRuleNew.getId()); scheme.setMainId(autoContractRuleNew.getId());
if (Common.isNotNull(scheme.getId())){ if (Common.isNotNull(scheme.getId())){
scheme.setUpdateBy(user.getId()); schemeTemp = contractSchemeMapper.selectOne(Wrappers.<TAutoContractScheme>query().lambda()
scheme.setUpdateTime(LocalDateTime.now()); .eq(TAutoContractScheme::getId,scheme.getId()).last(CommonConstants.LAST_ONE_SQL));
contractSchemeMapper.updateById(scheme); if (null != schemeTemp){
scheme.setUpdateBy(user.getId());
scheme.setUpdateTime(LocalDateTime.now());
contractSchemeMapper.updateById(scheme);
}else {
contractSchemeMapper.insert(scheme);
}
}else { }else {
contractSchemeMapper.insert(scheme); contractSchemeMapper.insert(scheme);
} }
......
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