Pārlūkot izejas kodu

我的信息-员工直接修改档案信息,同步到basic_info

user4 5 gadi atpakaļ
vecāks
revīzija
ce3a292e39

+ 3 - 5
src/main/java/com/jeeplus/modules/workstaff/service/WorkStaffBasicInfoService.java

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

+ 16 - 1
src/main/resources/mappings/modules/workstaff/WorkStaffBasicInfoDao.xml

@@ -517,7 +517,22 @@
 				phone = #{phone},
 			</if>
 			<if test="remarks != null and remarks != ''">
-				remarks = #{remarks}
+				remarks = #{remarks},
+			</if>
+			<if test="address != null and address != ''">
+				address = #{address},
+			</if>
+			<if test="household != null and household != ''">
+				household = #{household},
+			</if>
+			<if test="politics != null and politics != ''">
+				politics = #{politics},
+			</if>
+			<if test="marriage != null and marriage != ''">
+				marriage = #{marriage},
+			</if>
+			<if test="ts != null and ts != ''">
+				ts = #{ts}
 			</if>
 		</set>
 		where user_id = #{userId}