|
@@ -41,6 +41,7 @@ import com.jeeplus.modules.workrelationship.dao.WorkRelationshipDao;
|
|
import com.jeeplus.modules.workrelationship.entity.WorkRelationship;
|
|
import com.jeeplus.modules.workrelationship.entity.WorkRelationship;
|
|
import com.jeeplus.modules.workstaff.dao.WorkStaffAchivesDao;
|
|
import com.jeeplus.modules.workstaff.dao.WorkStaffAchivesDao;
|
|
import com.jeeplus.modules.workstaff.entity.WorkStaffEducation;
|
|
import com.jeeplus.modules.workstaff.entity.WorkStaffEducation;
|
|
|
|
+import com.jeeplus.modules.workstaff.entity.WorkStaffExperience;
|
|
import com.jeeplus.modules.workstaffachiveslog.dao.WorkStaffAchivesLogDao;
|
|
import com.jeeplus.modules.workstaffachiveslog.dao.WorkStaffAchivesLogDao;
|
|
import com.jeeplus.modules.workstaffachiveslog.entity.WorkStaffAchivesLog;
|
|
import com.jeeplus.modules.workstaffachiveslog.entity.WorkStaffAchivesLog;
|
|
import com.jeeplus.modules.workstaffachiveslog.service.WorkStaffAchivesLogService;
|
|
import com.jeeplus.modules.workstaffachiveslog.service.WorkStaffAchivesLogService;
|
|
@@ -191,23 +192,20 @@ public class WorkStaffBasicInfoService extends CrudService<WorkStaffBasicInfoDao
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
- * 我的信息-用户维护教育信息,
|
|
|
|
|
|
+ * 我的信息-用户维护档案信息,
|
|
* @param workStaffBasicInfo
|
|
* @param workStaffBasicInfo
|
|
* @param request
|
|
* @param request
|
|
* @throws IOException
|
|
* @throws IOException
|
|
*/
|
|
*/
|
|
@Transactional(readOnly = false)
|
|
@Transactional(readOnly = false)
|
|
public void updateAchieveDirectly(WorkStaffBasicInfo workStaffBasicInfo,HttpServletRequest request) throws IOException {
|
|
public void updateAchieveDirectly(WorkStaffBasicInfo workStaffBasicInfo,HttpServletRequest request) throws IOException {
|
|
- List<WorkStaffEducation> list = workStaffBasicInfo.getEducationList();
|
|
|
|
- for(int i=0;i<list.size();i = i+2){
|
|
|
|
- list.remove(i);
|
|
|
|
- }
|
|
|
|
String baseId = workStaffBasicInfo.getId();
|
|
String baseId = workStaffBasicInfo.getId();
|
|
workStaffBasicInfo.setId(workStaffBasicInfo.getAchiveId());
|
|
workStaffBasicInfo.setId(workStaffBasicInfo.getAchiveId());
|
|
this.saveAchive(workStaffBasicInfo,request);
|
|
this.saveAchive(workStaffBasicInfo,request);
|
|
workStaffBasicInfo.setAchiveId(workStaffBasicInfo.getId());
|
|
workStaffBasicInfo.setAchiveId(workStaffBasicInfo.getId());
|
|
workStaffBasicInfo.setId(baseId);
|
|
workStaffBasicInfo.setId(baseId);
|
|
super.save(workStaffBasicInfo);
|
|
super.save(workStaffBasicInfo);
|
|
|
|
+ workStaffBasicInfoDao.updateWorkStaffBasicInfo(workStaffBasicInfo);
|
|
this.saveDetails(workStaffBasicInfo,false);
|
|
this.saveDetails(workStaffBasicInfo,false);
|
|
}
|
|
}
|
|
public void preSave(WorkStaffBasicInfo workStaffBasicInfo, HttpServletRequest request) throws IOException {
|
|
public void preSave(WorkStaffBasicInfo workStaffBasicInfo, HttpServletRequest request) throws IOException {
|