用户配置修改

nngkxxdp/src/main/java/com/example/nngkxxdp/controller/ApiArticleController.java

@@ -422,7 +422,7 @@ public class ApiArticleController {
 	/**
 	 * 根据id查询用户
 	 *
-	 * @param id
+	 * @param userId
 	 * @return
 	 */
 	@GetMapping("/getPersonOne")
@@ -430,6 +430,7 @@ public class ApiArticleController {
 		if (userId == null) {
 			return SendUtil.send(ConstStr.REQUEST_WRONGPARAMS);
 		}
+		System.out.println(userService.selectOne(userId));
 		return userService.selectOne(userId);
 	}
 

nngkxxdp/src/main/java/com/example/nngkxxdp/controller/UserController.java

@@ -3,6 +3,7 @@ package com.example.nngkxxdp.controller;
 import com.example.nngkxxdp.entity.User;
 import com.example.nngkxxdp.service.UserService;
 import com.example.nngkxxdp.util.Blank;
+import com.example.nngkxxdp.util.ConstStr;
 import com.example.nngkxxdp.util.SendUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -111,4 +112,21 @@ public class UserController {
         return userService.selectDept();
     }
 
+    /**
+     * 根据ID修改部门信息
+     * @param deptid
+     * @param mainleader
+     * @param mainLeaderPhone
+     * @param leaderperson
+     * @param leaderphone
+     * @param workperson
+     * @param workphone
+     * @return
+     */
+    @GetMapping("/updatePersoninfo")
+    public Map<String,Object> updatePersoninfo(Integer deptid,String mainLeader,String mainLeaderPhone,String leaderperson,String leaderphone,String workperson,String workphone){
+        System.out.println(userService.updatePersoninfo(deptid,mainLeader,mainLeaderPhone,leaderperson,leaderphone,workperson,workphone));
+        return userService.updatePersoninfo(deptid,mainLeader,mainLeaderPhone,leaderperson,leaderphone,workperson,workphone);
+    }
+
 }

nngkxxdp/src/main/java/com/example/nngkxxdp/controller/WebsiteSmsController.java

@@ -70,12 +70,10 @@ public class WebsiteSmsController {
     @GetMapping("updateWebsiteSms")
     public Boolean updateWebsiteSms(String mainLeader, String mainLeaderPhone, String lperson, String lphone, String wperson, String wphone, HttpServletRequest request){
         int id=Integer.parseInt( request.getParameter("id"));
-        System.out.println(id);
         String leaderperson=request.getParameter("leaderperson");
         String leaderphone=request.getParameter("leaderphone");
         String workperson=request.getParameter("workperson");
         String workphone=request.getParameter("workphone");
-        System.out.println(workperson);
         if(lperson==null) {
             lperson = leaderperson;
         }

nngkxxdp/src/main/java/com/example/nngkxxdp/dao/UserDao.java

@@ -73,6 +73,12 @@ public interface UserDao {
 	int updateUser(@Param("user") User user, @Param("pd") String pd);
 
 	/**
+	 * 修改部门信息
+	 * @return
+	 */
+	int updatePersoninfo(@Param("deptid") Integer deptid,@Param("mainLeader") String mainLeader, @Param("mainLeaderPhone") String mainLeaderPhone,@Param("leaderperson") String leaderperson,@Param("leaderphone") String leaderphone,@Param("workperson") String workperson,@Param("workphone") String workphone);
+
+	/**
 	 * 查询部门
 	 *
 	 * @return

nngkxxdp/src/main/java/com/example/nngkxxdp/service/UserService.java

@@ -58,4 +58,9 @@ public interface UserService {
      * @return
      */
     Map<String, Object> selectDept();
+
+    /**
+     * 修改部门信息
+     */
+    Map<String,Object> updatePersoninfo(Integer deptid,String mainLeader,String mainLeaderPhone,String leaderperson,String leaderphone,String workperson,String workphone );
 }

nngkxxdp/src/main/java/com/example/nngkxxdp/service/impl/UserServiceImpl.java

@@ -112,6 +112,14 @@ public class UserServiceImpl implements UserService {
 		return SendUtil.send(true, ConstStr.RESULT_SUCCESS, depts);
 	}
 
+	@Override
+	public Map<String, Object> updatePersoninfo(Integer deptid, String mainLeader, String mainLeaderPhone, String leaderperson, String leaderphone, String workperson, String workphone) {
+		if(userDao.updatePersoninfo(deptid,mainLeader,mainLeaderPhone,leaderperson,leaderphone,workperson,workphone)<=0){
+			return SendUtil.send(false, ConstStr.UPDATEUSER_FAILED, "");
+		}
+		return SendUtil.send(true, ConstStr.UPDATEUSER_SUCCESS, "");
+	}
+
 	/**
 	 * 判断原密码是否输入正确
 	 *

nngkxxdp/src/main/resources/mapper/UserDao.xml

@@ -129,7 +129,7 @@
     <!--    根据id查询用户-->
     <select id="selectOne" resultType="java.util.Map">
         SELECT id,
-               deptid,
+               tu.deptid,
                nickname,
                username,
                user_role,
@@ -137,11 +137,14 @@
                last_login_time,
                n_dept,
                telephone,
-               leaderperson,
-               leaderphone,
-               workperson,
-               workphone
-        FROM t_user
+               td.leaderperson,
+               td.leaderphone,
+               td.workperson,
+               td.workphone,
+               td.main_leader,
+               td.main_leader_phone
+        FROM t_user tu
+                 left join t_dept  td on tu.deptid=td.deptid
         where id = #{id}
     </select>
 <!--    查询部门-->
@@ -185,4 +188,18 @@
             t_dept
     </select>
 
+
+    <update id="updatePersoninfo">
+        UPDATE t_dept
+        SET
+            main_leader = #{mainLeader},
+            main_leader_phone = #{mainLeaderPhone},
+            workperson = #{workperson},
+            workphone = #{workphone},
+            leaderperson = #{leaderperson},
+            leaderphone = #{leaderphone}
+        WHERE
+            deptid = #{deptid}
+    </update>
+
 </mapper>

nngkxxdp/src/main/resources/static/page/js/base/fbtx.item.js

@@ -650,7 +650,7 @@ function initSmsTable() {
 			{width:80, title: '序号', type: 'numbers'},
 			{field:'sendContent', title: '部门名称'},
 			{title: '提醒人员', templet: function(d) {
-					return d.sendName;
+					return (d.sendName && d.sendName) ? d.sendName + "" + d.sendName : '暂无';
 				}},
 			{title: '提醒号码', templet: function(d) {
 					return d.leadPhone;
@@ -764,7 +764,7 @@ function reloadSmsTable() {
 	    ]]
 	});
 
-	//网站短信记录
+	// //网站短信记录
 	table.reload('w-sms-website-table', {
 		url: '/websitesms/getWebsiteSms',
 		page: false,
@@ -772,7 +772,7 @@ function reloadSmsTable() {
 			{width:80, title: '序号', type: 'numbers'},
 			{field:'sendContent', title: '部门名称'},
 			{title: '提醒人员', templet: function(d) {
-					return d.sendName;
+					return (d.sendName && d.sendName) ? d.sendName + "" + d.sendName : '暂无';
 				}},
 			{title: '提醒号码', templet: function(d) {
 					return d.leadPhone;

nngkxxdp/src/main/resources/static/page/js/base/welcome.js

@@ -279,24 +279,25 @@ layui.use(['element', 'layer', 'util', 'table', 'laydate', 'form'], function() {
     	data.field.actionType = 1;
     	updatePerson(data.field,form);
     })
-    
+
+
     form.on('submit(telephone_filter)', function (data) {
-    	data.field.id = sessionStorage.USERID;
-    	data.field.actionType = 2;
-    	updatePerson(data.field,form);
+		data.field.deptId = sessionStorage.DEPTNID;
+		updatePersoninfo(data.field.deptId);
     })
-    
+
     form.on('submit(leader_filter)', function (data) {
-    	data.field.id = sessionStorage.USERID;
-    	data.field.actionType = 3;
-    	updatePerson(data.field,form);
+		data.field.deptId = sessionStorage.DEPTNID;
+		updatePersoninfo(data.field.deptId);
     })
-    
     form.on('submit(workpeson_filter)', function (data) {
-    	data.field.id = sessionStorage.USERID;
-    	data.field.actionType = 4;
-    	updatePerson(data.field,form);
+		data.field.deptId = sessionStorage.DEPTNID;
+		updatePersoninfo(data.field.deptId);
     })
+	form.on('submit(main_filter)', function (data) {
+		data.field.deptId = sessionStorage.DEPTNID;
+		updatePersoninfo(data.field.deptId);
+	})
 
 });
 
@@ -379,7 +380,6 @@ function addAccountconfig(data){
 }
 
 
-
 function initPerson(userId, form){
 	form.val("personform", {
 	  "nickName": ""
@@ -392,10 +392,11 @@ function initPerson(userId, form){
 	  "leaderperson": ""
 	  ,"leaderphone": ""
 	});
-	form.val("personform", {
-	  "workperson": ""
-	  ,"workphone": ""
+	form.val("mainpersonform", {
+	  "mainleader": ""
+	  ,"mainleaderphone": ""
 	});
+	form.val("")
 	get("/api/article/getPersonOne", true, {
 		"userId" : userId
 	}, function(res){
@@ -415,6 +416,10 @@ function initPerson(userId, form){
 			  "workperson": res.data.workperson
 			  ,"workphone": res.data.workphone
 			});
+			form.val("mainpersonform", {
+				"mainleader": res.data.mainLeader
+				,"mainleaderphone": res.data.mainLeaderPhone
+			});
 		}
 	},function(err){
 	})
@@ -437,6 +442,42 @@ function updatePerson(data,form){
 	})
 }
 
+function updatePersoninfo(deptid){
+	var mainleader=$('#mainleader').val();
+	var mainleaderphone=$('#mainleaderphone').val();
+	var leaderperson=$('#leaderperson').val();
+	var leaderphone=$('#leaderphone').val();
+	var workperson=$('#workperson').val();
+	var workphone=$('#workphone').val();
+	console.log(mainleader);
+	console.log(mainleaderphone);
+	$.ajax({
+		url:  PATH + "/user/updatePersoninfo",
+		type: 'get',
+		beforeSend: function(request) {
+			if(sessionStorage.LOGIN_TOKEN){
+				request.setRequestHeader("token", sessionStorage.LOGIN_TOKEN);
+			}
+		},
+		data: {
+			"deptid":deptid,
+			'mainLeader': mainleader,
+			'mainLeaderPhone': mainleaderphone,
+			"leaderperson":leaderperson,
+			"leaderphone":leaderphone,
+			"workperson":workperson,
+			"workphone":workphone,
+		},
+		success: function (suc) {
+			if (suc.result) {
+				layer.msg("配置成功", {icon: 1});
+			}else {
+				layer.msg("配置失败", {icon: 5});
+			}
+		}
+	});
+}
+
 function initErrorPage(deptId){
 	get("/excel/getExcelDataById", true, {
 		'deptId': deptId

nngkxxdp/src/main/resources/static/page/welcome.html

@@ -221,13 +221,40 @@
 								</div>
 								<div class="formbox">
 									<fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
+										<legend>主要领导</legend>
+									</fieldset>
+									<form class="layui-form" lay-filter="mainpersonform" action="">
+										<div class="layui-form-item">
+											<label class="layui-form-label"><span style="color: red">*</span>姓名：</label>
+											<div class="layui-input-block">
+												<input type="text" id="mainleader" name="mainleader"
+													   lay-verify="name" autocomplete="off"
+													   placeholder="请输入姓名" class="layui-input">
+											</div>
+										</div>
+										<div class="layui-form-item">
+											<label class="layui-form-label"><span style="color: red">*</span>联系电话：</label>
+											<div class="layui-input-block">
+												<input type="text" id="mainleaderphone" name="mainleaderphone"
+													   lay-verify="telephone" autocomplete="off"
+													   placeholder="请输入联系电话" class="layui-input">
+											</div>
+										</div>
+										<div class="layui-block">
+											<button type="button" class="layui-btn layui-btn-normal search-btn layui-btn-sm"
+													lay-submit  lay-filter="main_filter">提交</button>
+										</div>
+									</form>
+								</div>
+								<div class="formbox">
+									<fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
 										<legend>分管领导</legend>
 									</fieldset>
-									<form class="layui-form" lay-filter="leaderform" action="">
+									<form class="layui-form" lay-filter="leaderform" action="" id="from">
 										<div class="layui-form-item">
 											<label class="layui-form-label"><span style="color: red">*</span>姓名：</label>
 											<div class="layui-input-block">
-												<input type="text" name="leaderperson"
+												<input type="text" id="leaderperson" name="leaderperson"
 													   lay-verify="name" autocomplete="off"
 													   placeholder="请输入姓名" class="layui-input">
 											</div>
@@ -235,7 +262,7 @@
 										<div class="layui-form-item">
 											<label class="layui-form-label"><span style="color: red">*</span>联系电话：</label>
 											<div class="layui-input-block">
-												<input type="text" name="leaderphone"
+												<input type="text" id="leaderphone" name="leaderphone"
 													   lay-verify="telephone" autocomplete="off"
 													   placeholder="请输入联系电话" class="layui-input">
 											</div>
@@ -254,7 +281,7 @@
 										<div class="layui-form-item">
 											<label class="layui-form-label"><span style="color: red">*</span>姓名：</label>
 											<div class="layui-input-block">
-												<input type="text" name="workperson"
+												<input type="text" id="workperson" name="workperson"
 													   lay-verify="name" autocomplete="off"
 													   placeholder="请输入姓名" class="layui-input">
 											</div>
@@ -262,7 +289,7 @@
 										<div class="layui-form-item">
 											<label class="layui-form-label"><span style="color: red">*</span>联系电话：</label>
 											<div class="layui-input-block">
-												<input type="text" name="workphone"
+												<input type="text" id="workphone" name="workphone"
 													   lay-verify="telephone" autocomplete="off"
 													   placeholder="请输入联系电话" class="layui-input">
 											</div>
@@ -273,7 +300,6 @@
 										</div>
 									</form>
 								</div>
-
 							</div>
 
 						</div>