Просмотр исходного кода

人事开发

Signed-off-by: anderx <312518615@qq.com>
anderx лет назад: 5
Родитель
Сommit
c59acb67c6

+ 2 - 1
src/main/java/com/goafanti/personnel/bo/OutPersonnelListBo.java

@@ -364,7 +364,8 @@ public class OutPersonnelListBo {
 	}
 	public Integer getWorkingYear() {
 		if (this.workingYear==null&& this.entryTime!=null) {
-			return getAgeByBirth(this.entryTime);
+			int wy=getAgeByBirth(this.entryTime);
+			return 0<wy?0:wy;
 		}
 		return workingYear;
 	}

+ 10 - 6
src/main/java/com/goafanti/personnel/service/impl/PersonnelServiceImpl.java

@@ -451,13 +451,17 @@ public class PersonnelServiceImpl  extends BaseMybatisDao<PersonnelDossierMapper
 		m.setWelfareAnnexUrl(i.getAnnexUrl());
 		m.setWelfareAnnexName(i.getAnnexName());
 		m.setWelfareRemarks(i.getRemarks());
-		PersonnelMid pm=personnelMidMapper.selectByPrimaryKey(i.getPdId());
-		if (pm==null||pm.getId()==null) {
-			personnelMidMapper.insertSelective(m);
-		}else {
-			personnelMidMapper.updateByPrimaryKeySelective(m);
-			
+		if (m.getInsuranceStartTime()!=null||m.getFundStartTime()!=null||m.getEmployerStartTime()!=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);
+				
+			}
 		}
+		
 		return 1;
 	}
 }