Explorar o código

社保修改

Signed-off-by: anderx <312518615@qq.com>
anderx %!s(int64=5) %!d(string=hai) anos
pai
achega
ca288a1667

+ 2 - 1
src/main/java/com/goafanti/common/task/ReleaseUserTask.java

@@ -9,6 +9,7 @@ import java.util.UUID;
 import javax.annotation.Resource;
 import javax.mail.MessagingException;
 
+import org.apache.log4j.LogSF;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
@@ -95,7 +96,7 @@ public class ReleaseUserTask {
 			if(lockBusinessList.size()>0) customerServiceImpl.updateReleaseLock(lockBusinessList,releaseTime);
 			if(lockUserList.size()>0) userServiceImpl.updateReleaseLock(lockUserList);*/
 
-		} catch (InterruptedException e) {
+		} catch (Exception e) {
 			Notice n =new Notice(UUID.randomUUID().toString(),new Date(),0,"1",NoticeStatus.TASK_PATENT_ERROR.getCode(),"==============客户释放失败================");
 			 noticeMapper.insert(n);
 			EmailBo emailBo = new EmailBo( "释放客户失败",  AFTConstants.ADMIN_EMAIL,  "超管", "平台",  "系统", "释放客户失败");

+ 4 - 2
src/main/java/com/goafanti/personnel/service/impl/PersonnelServiceImpl.java

@@ -451,8 +451,10 @@ public class PersonnelServiceImpl  extends BaseMybatisDao<PersonnelDossierMapper
 		m.setWelfareAnnexUrl(i.getAnnexUrl());
 		m.setWelfareAnnexName(i.getAnnexName());
 		m.setWelfareRemarks(i.getRemarks());
-		if (m.getInsuranceStartTime()!=null||m.getFundStartTime()!=null||m.getEmployerStartTime()!=null||
-				m.getWelfareAnnexUrl()!=null||m.getWelfareRemarks()!=null) {
+		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);