我的面板-我的信息

src/main/java/com/jeeplus/modules/sys/web/UserController.java

@@ -514,6 +514,9 @@ public class UserController extends BaseController {
     @RequestMapping(value = "infoEdit")
     public String infoEdit(User user, boolean __ajax, HttpServletResponse response, Model model,HttpServletRequest request) {
         User currentUser = UserUtils.getUser();
+        WorkStaffBasicInfo workStaffBasicInfo =  new WorkStaffBasicInfo();
+        workStaffBasicInfo.setUserId(currentUser.getId());
+
         if (StringUtils.isNotBlank(user.getName())){
             if(Global.isDemoMode()){
                 model.addAttribute("message", "演示模式，不允许操作！");
@@ -521,8 +524,11 @@ public class UserController extends BaseController {
             }
 
             String name = user.getName();
+            workStaffBasicInfo.setName(name);
             if(!name.equals(currentUser.getName())){
                 currentUser.setName(user.getName());
+                workStaffBasicInfo.setName(user.getName());
+
                 long time = System.currentTimeMillis();
                 String realPathPhoto = Global.getUserfilesBaseDir() + Global.USERFILES_BASE_URL  +time+ "/img/";
                 FileUtils.createDirectory(realPathPhoto);
@@ -570,16 +576,27 @@ public class UserController extends BaseController {
                 }
             }
 
-            if(user.getEmail() !=null )
+            if (StringUtils.isNotBlank(user.getEmail())) {
                 currentUser.setEmail(user.getEmail());
-            if(user.getPhone() !=null )
+                workStaffBasicInfo.setEmail(user.getEmail());
+            }
+            if (StringUtils.isNotBlank(user.getPhone())) {
                 currentUser.setPhone(user.getPhone());
-            if(user.getMobile() !=null )
+                workStaffBasicInfo.setPhone(user.getPhone());
+            }
+            if (StringUtils.isNotBlank(user.getMobile())) {
                 currentUser.setMobile(user.getMobile());
-            if(user.getRemarks() !=null )
+                workStaffBasicInfo.setMobile(user.getMobile());
+            }
+            if (StringUtils.isNotBlank(user.getRemarks())) {
                 currentUser.setRemarks(user.getRemarks());
+                workStaffBasicInfo.setRemarks(user.getRemarks());
+            }
 
             systemService.updateUserInfo(currentUser);
+            //同步sys_user和work_staff_basic_info表
+            workStaffBasicInfoService.updateWorkStaffBasicInfo(workStaffBasicInfo);
+
             if(__ajax){//手机访问
                 AjaxJson j = new AjaxJson();
                 j.setSuccess(true);
@@ -594,7 +611,7 @@ public class UserController extends BaseController {
         model.addAttribute("user", currentUser);
         model.addAttribute("Global", new Global());
         return "modules/sys/userInfoEdit";
-    }
+}
 
     @ResponseBody
     @RequestMapping(value = "getComName")

src/main/java/com/jeeplus/modules/workstaff/dao/WorkStaffAchivesDao.java

@@ -53,4 +53,6 @@ public interface WorkStaffAchivesDao extends CrudDao<WorkStaffBasicInfo> {
     public WorkStaffBasicInfo getJob(String userId);
 
     void updateStatus(@Param("id") String id, @Param("status") String status);
+
+    void updateWorkStaffAchieves(WorkStaffBasicInfo workStaffBasicInfo);
 }

src/main/java/com/jeeplus/modules/workstaff/dao/WorkStaffBasicInfoDao.java

@@ -43,4 +43,6 @@ public interface WorkStaffBasicInfoDao extends CrudDao<WorkStaffBasicInfo> {
     void updateStatus(@Param("id") String id, @Param("status") String status);
 
     int deleteByLogic(WorkStaffBasicInfo workStaffBasicInfo);
+
+    int updateWorkStaffBasicInfo(WorkStaffBasicInfo workStaffBasicInfo);
 }

src/main/java/com/jeeplus/modules/workstaff/entity/WorkStaffBasicInfo.java

@@ -42,6 +42,7 @@ public class WorkStaffBasicInfo extends DataEntity<WorkStaffBasicInfo> {
 	private String calendar;		// 公历/农历
 	private String email;		// 电子邮箱
 	private String mobile;		// 移动电话
+	private String phone;		// 座机
 	private String marriage;		// 婚姻状况
 	private String politics;		// 政治面貌
 	private String exSoldier;		// 是否退伍军人
@@ -333,7 +334,16 @@ public class WorkStaffBasicInfo extends DataEntity<WorkStaffBasicInfo> {
 	public void setMobile(String mobile) {
 		this.mobile = mobile;
 	}
-	
+
+	@ExcelField(title="座机", align=2, sort=11)
+	public String getPhone() {
+		return phone;
+	}
+
+	public void setPhone(String phone) {
+		this.phone = phone;
+	}
+
 	@ExcelField(title="婚姻状况", align=2, sort=12,valiName = "marriage_status")
 	public String getMarriage() {
 		return marriage;

src/main/java/com/jeeplus/modules/workstaff/service/WorkStaffBasicInfoService.java

@@ -801,6 +801,7 @@ public class WorkStaffBasicInfoService extends CrudService<WorkStaffBasicInfoDao
     /**
      * 修改员工状态
      */
+    @Transactional(readOnly = false)
     public void updateStatus(String id){
         String status = "正式";
         workStaffBasicInfoDao.updateStatus(id,status);
@@ -808,4 +809,9 @@ public class WorkStaffBasicInfoService extends CrudService<WorkStaffBasicInfoDao
 
     }
 
+    @Transactional(readOnly = false)
+    public void updateWorkStaffBasicInfo(WorkStaffBasicInfo workStaffBasicInfo){
+        workStaffBasicInfoDao.updateWorkStaffBasicInfo(workStaffBasicInfo);
+    }
+
 }

src/main/resources/mappings/modules/workstaff/WorkStaffAchivesDao.xml

@@ -785,4 +785,23 @@
 		status = #{status}
 		where user_id = #{id}
 	</update>
+
+	<update id="updateWorkStaffAchieves" parameterType="WorkStaffBasicInfo">
+		update work_staff_achives
+		<set>
+			<if test="name != null and name != ''">
+				name = #{name},
+			</if>
+			<if test="email != null and email != ''">
+				email = #{email},
+			</if>
+			<if test="phone != null and phone != ''">
+				phone = #{phone},
+			</if>
+			<if test="remarks != null and remarks != ''">
+				remarks = #{remarks}
+			</if>
+		</set>
+		where user_id = #{userId}
+	</update>
 </mapper>

src/main/resources/mappings/modules/workstaff/WorkStaffBasicInfoDao.xml

@@ -479,4 +479,23 @@
 		status = #{status}
 		where user_id = #{id}
 	</update>
+
+	<update id="updateWorkStaffBasicInfo" parameterType="WorkStaffBasicInfo">
+		update work_staff_basic_info
+		<set>
+			<if test="name != null and name != ''">
+				name = #{name},
+			</if>
+			<if test="email != null and email != ''">
+				email = #{email},
+			</if>
+			<if test="phone != null and phone != ''">
+				phone = #{phone},
+			</if>
+			<if test="remarks != null and remarks != ''">
+				remarks = #{remarks}
+			</if>
+		</set>
+		where user_id = #{userId}
+	</update>
 </mapper>

src/main/webapp/webpage/modules/sys/userInfoEdit.jsp

@@ -37,7 +37,7 @@
                 </div>
 			</div>
 			<div class="layui-item layui-col-sm12">
-				<label class="layui-form-label">电话：</label>
+				<label class="layui-form-label">座机：</label>
 				<div class="layui-input-block">
 					<form:input path="phone" id="phone"   htmlEscape="false" class="form-control  layui-input " maxlength="50"/>
                     <span class="help-inline"></span>
@@ -49,12 +49,12 @@
 					<form:input path="mobile" readonly="true" class="form-control layui-input required" htmlEscape="false" maxlength="50"/>
 				</div>
 			</div>
-			<div class="layui-item layui-col-sm12 with-textarea">
-				<label class="layui-form-label">备注：</label>
-				<div class="layui-input-block">
-					<form:textarea  placeholder="请输入备注信息" path="remarks" htmlEscape="false" style="resize:none;" rows="4" maxlength="200" class="form-control "/>
-				</div>
-			</div>
+<%--			<div class="layui-item layui-col-sm12 with-textarea">--%>
+<%--				<label class="layui-form-label">备注：</label>--%>
+<%--				<div class="layui-input-block">--%>
+<%--					<form:textarea  placeholder="请输入备注信息" path="remarks" htmlEscape="false" style="resize:none;" rows="4" maxlength="200" class="form-control "/>--%>
+<%--				</div>--%>
+<%--			</div>--%>
 
 		<script type="text/javascript">
             $('#email').blur(function (){