|
|
@@ -432,10 +432,14 @@ public class PersonnelServiceImpl extends BaseMybatisDao<PersonnelDossierMapper
|
|
|
personnelWelfareMapper.insertSelective(i);
|
|
|
}
|
|
|
}else {
|
|
|
- personnelWelfareMapper.updateByPrimaryKeySelective(i);
|
|
|
+ personnelWelfareMapper.updateByPrimaryKey(i);
|
|
|
}
|
|
|
PersonnelMid m=new PersonnelMid();
|
|
|
m.setId(i.getPdId());
|
|
|
+ m.setWelfareAnnexUrl(i.getAnnexUrl());
|
|
|
+ m.setWelfareAnnexName(i.getAnnexName());
|
|
|
+ m.setWelfareRemarks(i.getRemarks());
|
|
|
+ PersonnelMid pm=personnelMidMapper.selectByPrimaryKey(i.getPdId());
|
|
|
if (i.getType()!=null) {
|
|
|
if (i.getType()==0) {
|
|
|
m.setInsuranceStartTime(i.getStartTime());
|
|
|
@@ -448,22 +452,12 @@ public class PersonnelServiceImpl extends BaseMybatisDao<PersonnelDossierMapper
|
|
|
m.setEmployerEndTime(i.getEndTime());
|
|
|
}
|
|
|
}
|
|
|
- m.setWelfareAnnexUrl(i.getAnnexUrl());
|
|
|
- m.setWelfareAnnexName(i.getAnnexName());
|
|
|
- m.setWelfareRemarks(i.getRemarks());
|
|
|
- if (m.getInsuranceStartTime()!=null||m.getInsuranceEndTime()!=null||
|
|
|
- m.getFundStartTime()!=null||m.getFundEndTime()!=null||
|
|
|
- m.getEmployerStartTime()!=null||m.getEmployerEndTime()!=null||
|
|
|
- m.getWelfareAnnexUrl()!=null|| m.getWelfareRemarks()!=null) {
|
|
|
- PersonnelMid pm=personnelMidMapper.selectByPrimaryKey(i.getPdId());
|
|
|
- if (pm==null||pm.getId()==null) {
|
|
|
- personnelMidMapper.insertSelective(m);
|
|
|
- }else {
|
|
|
- personnelMidMapper.updateByPrimaryKeySelective(m);
|
|
|
-
|
|
|
- }
|
|
|
+ if (pm==null||pm.getId()==null) {
|
|
|
+ personnelMidMapper.insertSelective(m);
|
|
|
+ }else {
|
|
|
+ personnelMidMapper.updateByidTime(m,i.getType());
|
|
|
+
|
|
|
}
|
|
|
-
|
|
|
return 1;
|
|
|
}
|
|
|
}
|