Skip to content

L
LuJin-Im
Commit bddb1260 authored by 李博今's avatar 李博今
Browse files
Options

Main方法回显描述与头像

parent 3b912750
Hide whitespace changes
Inline Side-by-side
Showing with 120 additions and 11 deletions
src/main/java/com/qiqiim/webserver/user/controller/ImController.java
View file @ bddb1260
...@@ -615,7 +615,8 @@ public class ImController extends BaseController { ...@@ -615,7 +615,8 @@ public class ImController extends BaseController {
@Param(value = "password")String password, @Param(value = "password")String password,
@Param(value = "phone")String phone, @Param(value = "phone")String phone,
@Param(value = "deptid")Long deptid, @Param(value = "deptid")Long deptid,
@Param(value = "name")String name){ @Param(value = "name")String name,
@Param(value = "remark")String remark){
if(whereToGo == null){ if(whereToGo == null){
whereToGo = ""; whereToGo = "";
} }
...@@ -626,6 +627,7 @@ public class ImController extends BaseController { ...@@ -626,6 +627,7 @@ public class ImController extends BaseController {
userInfoEntity.setDeptid(deptid); userInfoEntity.setDeptid(deptid);
userInfoEntity.setName(name); userInfoEntity.setName(name);
userInfoEntity.setPhone(phone); userInfoEntity.setPhone(phone);
userInfoEntity.setRemark(remark);
userAccountEntity.setUserInfo(userInfoEntity); userAccountEntity.setUserInfo(userInfoEntity);
int flag = userAccountServiceImpl.save(userAccountEntity); int flag = userAccountServiceImpl.save(userAccountEntity);
if(flag == 1){ if(flag == 1){
......
src/main/java/com/qiqiim/webserver/user/dao/UserAccountDao.java
View file @ bddb1260
...@@ -23,6 +23,8 @@ public interface UserAccountDao extends BaseDao<UserAccountEntity> { ...@@ -23,6 +23,8 @@ public interface UserAccountDao extends BaseDao<UserAccountEntity> {
public int updateConsultantPassword(@Param(value = "password") String password, @Param(value = "id") long id); public int updateConsultantPassword(@Param(value = "password") String password, @Param(value = "id") long id);
public int updateConsultantRemark(@Param(value = "remark") String remark, @Param(value = "id") long id);
public int updateConsultantPhone(@Param(value = "phone") String phone, @Param(value = "id") long id); public int updateConsultantPhone(@Param(value = "phone") String phone, @Param(value = "id") long id);
public int updateConsultantName(@Param(value = "name") String name, @Param(value = "id") long id); public int updateConsultantName(@Param(value = "name") String name, @Param(value = "id") long id);
......
src/main/java/com/qiqiim/webserver/user/dao/UserAccountDao.xml
View file @ bddb1260
...@@ -138,11 +138,13 @@ ...@@ -138,11 +138,13 @@
</delete> </delete>
<select id="getAllConsultant" resultMap="consultantMap"> <select id="getAllConsultant" resultMap="consultantMap">
select ua.id, ua.account, ud.name as deptName, ui.name as name, ui.phone as phone, ui.profilephoto as headPic select ua.id, ua.account, ud.name as deptName, ui.name as name, ui.phone as phone, ui.profilephoto as headPic,
ui.remark as remark
from user_account ua from user_account ua
left join user_info ui on ua.id = ui.uid left join user_info ui on ua.id = ui.uid
left join user_department ud on ui.deptid = ud.id left join user_department ud on ui.deptid = ud.id
where ${tiaojian} where ${tiaojian}
ORDER BY ui.deptid,ui.uid
</select> </select>
<update id="updateConsultantName"> <update id="updateConsultantName">
...@@ -161,4 +163,7 @@ ...@@ -161,4 +163,7 @@
<update id="updateConsultantPassword"> <update id="updateConsultantPassword">
update user_account set password = #{password} where id = #{id} update user_account set password = #{password} where id = #{id}
</update> </update>
<update id="updateConsultantRemark">
update user_info set remark = #{remark} where uid = #{id}
</update>
</mapper> </mapper>
\ No newline at end of file
src/main/java/com/qiqiim/webserver/user/dao/UserAdminInfoDao.xml
View file @ bddb1260
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
</resultMap> </resultMap>
<select id="sortOnlineAdmin" resultMap="userAdminInfoMap"> <select id="sortOnlineAdmin" resultMap="userAdminInfoMap">
select user_admin_info.*,user_info.name FROM user_admin_info select user_admin_info.*,user_info.name,user_info.profilephoto,user_info.remark FROM user_admin_info
LEFT JOIN user_info on user_admin_info.uid = user_info.uid LEFT JOIN user_info on user_admin_info.uid = user_info.uid
where user_admin_info.uid in where user_admin_info.uid in
<foreach collection="list" index="index" item="item" <foreach collection="list" index="index" item="item"
......
src/main/java/com/qiqiim/webserver/user/model/ConsultantManagerEntity.java
View file @ bddb1260
...@@ -12,6 +12,7 @@ public class ConsultantManagerEntity { ...@@ -12,6 +12,7 @@ public class ConsultantManagerEntity {
private String whereToGo; private String whereToGo;
private String password; private String password;
private String remark;
public String getPassword() { public String getPassword() {
return password; return password;
...@@ -76,4 +77,12 @@ public class ConsultantManagerEntity { ...@@ -76,4 +77,12 @@ public class ConsultantManagerEntity {
public void setHeadPic(String headPic) { public void setHeadPic(String headPic) {
this.headPic = headPic; this.headPic = headPic;
} }
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
} }
src/main/java/com/qiqiim/webserver/user/model/UserAdminInfoEntity.java
View file @ bddb1260
...@@ -16,6 +16,10 @@ public class UserAdminInfoEntity { ...@@ -16,6 +16,10 @@ public class UserAdminInfoEntity {
private boolean online; private boolean online;
private String profilephoto;
private String remark;
public UserAdminInfoEntity() { public UserAdminInfoEntity() {
} }
...@@ -73,4 +77,20 @@ public class UserAdminInfoEntity { ...@@ -73,4 +77,20 @@ public class UserAdminInfoEntity {
public void setReplyMessageNum(Integer replyMessageNum) { public void setReplyMessageNum(Integer replyMessageNum) {
this.replyMessageNum = replyMessageNum; this.replyMessageNum = replyMessageNum;
} }
public String getProfilephoto() {
return profilephoto;
}
public void setProfilephoto(String profilephoto) {
this.profilephoto = profilephoto;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
} }
src/main/java/com/qiqiim/webserver/user/service/impl/UserAccountServiceImpl.java
View file @ bddb1260
...@@ -110,9 +110,12 @@ public class UserAccountServiceImpl implements UserAccountService { ...@@ -110,9 +110,12 @@ public class UserAccountServiceImpl implements UserAccountService {
if(consultantManagerEntity.getName() != null && !"".equals(consultantManagerEntity.getName())){ if(consultantManagerEntity.getName() != null && !"".equals(consultantManagerEntity.getName())){
i += userAccountDao.updateConsultantName( new String (consultantManagerEntity.getName().getBytes("iso8859-1"),"UTF-8"), Long.parseLong(consultantManagerEntity.getId())); i += userAccountDao.updateConsultantName( new String (consultantManagerEntity.getName().getBytes("iso8859-1"),"UTF-8"), Long.parseLong(consultantManagerEntity.getId()));
} }
if(consultantManagerEntity.getPhone() != null && !"".equals(consultantManagerEntity.getPhone())){ if(consultantManagerEntity.getPhone() != null){
i += userAccountDao.updateConsultantPhone( new String (consultantManagerEntity.getPhone().getBytes("iso8859-1"),"UTF-8"), Long.parseLong(consultantManagerEntity.getId())); i += userAccountDao.updateConsultantPhone( new String (consultantManagerEntity.getPhone().getBytes("iso8859-1"),"UTF-8"), Long.parseLong(consultantManagerEntity.getId()));
} }
if(consultantManagerEntity.getRemark() != null){
i += userAccountDao.updateConsultantRemark( new String (consultantManagerEntity.getRemark().getBytes("iso8859-1"),"UTF-8"), Long.parseLong(consultantManagerEntity.getId()));
}
return i; return i;
} }
......
src/main/webapp/WEB-INF/page/user/conljjlwsultant.jsp
View file @ bddb1260
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
<th>顾问姓名</th> <th>顾问姓名</th>
<th>所属部门</th> <th>所属部门</th>
<th>联系电话</th> <th>联系电话</th>
<th>顾问描述</th>
<th>操作</th> <th>操作</th>
</tr> </tr>
</thead> </thead>
...@@ -41,6 +42,7 @@ ...@@ -41,6 +42,7 @@
<td>${user.name}</td> <td>${user.name}</td>
<td>${user.deptName}</td> <td>${user.deptName}</td>
<td>${user.phone}</td> <td>${user.phone}</td>
<td>${user.remark}</td>
<td> <td>
<a class="layui-btn layui-btn-primary layui-btn-xs sendUserMsg" <a class="layui-btn layui-btn-primary layui-btn-xs sendUserMsg"
onclick="updatePic(this)">上传头像</a> onclick="updatePic(this)">上传头像</a>
...@@ -93,17 +95,24 @@ ...@@ -93,17 +95,24 @@
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">密码</label> <label class="layui-form-label">密码</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" name="password" id="password1" lay-verify="required" autocomplete="off" <input type="text" name="password" id="password1" autocomplete="off"
placeholder="不填写则为不修改" class="layui-input"> placeholder="不填写则为不修改" class="layui-input">
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">联系电话</label> <label class="layui-form-label">联系电话</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" name="phone" id="phone1" lay-verify="required" autocomplete="off" <input type="text" name="phone" id="phone1" autocomplete="off"
placeholder="请输入联系电话" class="layui-input"> placeholder="请输入联系电话" class="layui-input">
</div> </div>
</div> </div>
<div class="layui-form-item">
<label class="layui-form-label">描述</label>
<div class="layui-input-block">
<input type="text" name="remark" id="remark1" autocomplete="off"
placeholder="请输入描述" class="layui-input">
</div>
</div>
<div class="layui-form-item"> <div class="layui-form-item">
<div class="layui-input-block"> <div class="layui-input-block">
<input type="submit" id="updBut" class="layui-btn" lay-submit="" lay-filter="reg" value="修改"/> <input type="submit" id="updBut" class="layui-btn" lay-submit="" lay-filter="reg" value="修改"/>
...@@ -148,6 +157,13 @@ ...@@ -148,6 +157,13 @@
autocomplete="off" class="layui-input"> autocomplete="off" class="layui-input">
</div> </div>
</div> </div>
<div class="layui-form-item">
<label class="layui-form-label">描述</label>
<div class="layui-input-block">
<input type="text" name="remark" id="remark2" placeholder="请输入描述"
autocomplete="off" class="layui-input">
</div>
</div>
<input name="deptid" id="deptid2" value="3" style="display: none"> <input name="deptid" id="deptid2" value="3" style="display: none">
<input type="text" name="whereToGo" value="3" style="display: none"/> <input type="text" name="whereToGo" value="3" style="display: none"/>
<div class="layui-form-item"> <div class="layui-form-item">
...@@ -188,6 +204,7 @@ ...@@ -188,6 +204,7 @@
document.getElementById("account1").value = tr.children[2].innerHTML; document.getElementById("account1").value = tr.children[2].innerHTML;
document.getElementById("name1").value = tr.children[3].innerHTML; document.getElementById("name1").value = tr.children[3].innerHTML;
document.getElementById("phone1").value = tr.children[5].innerHTML; document.getElementById("phone1").value = tr.children[5].innerHTML;
document.getElementById("remark1").value = tr.children[6].innerHTML;
list.style.display = 'none'; list.style.display = 'none';
updateDetailForm.style.display = 'block'; updateDetailForm.style.display = 'block';
} }
......
src/main/webapp/WEB-INF/page/user/conljjyfsultant.jsp
View file @ bddb1260
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
<th>顾问姓名</th> <th>顾问姓名</th>
<th>所属部门</th> <th>所属部门</th>
<th>联系电话</th> <th>联系电话</th>
<th>顾问描述</th>
<th>操作</th> <th>操作</th>
</tr> </tr>
</thead> </thead>
...@@ -41,6 +42,7 @@ ...@@ -41,6 +42,7 @@
<td>${user.name}</td> <td>${user.name}</td>
<td>${user.deptName}</td> <td>${user.deptName}</td>
<td>${user.phone}</td> <td>${user.phone}</td>
<td>${user.remark}</td>
<td> <td>
<a class="layui-btn layui-btn-primary layui-btn-xs sendUserMsg" <a class="layui-btn layui-btn-primary layui-btn-xs sendUserMsg"
onclick="updatePic(this)">上传头像</a> onclick="updatePic(this)">上传头像</a>
...@@ -93,18 +95,24 @@ ...@@ -93,18 +95,24 @@
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">密码</label> <label class="layui-form-label">密码</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" name="password" id="password1" lay-verify="required" autocomplete="off" <input type="text" name="password" id="password1" autocomplete="off"
placeholder="不填写则为不修改" class="layui-input"> placeholder="不填写则为不修改" class="layui-input">
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">联系电话</label> <label class="layui-form-label">联系电话</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" name="phone" id="phone1" lay-verify="required" autocomplete="off" <input type="text" name="phone" id="phone1" autocomplete="off"
placeholder="请输入联系电话" class="layui-input"> placeholder="请输入联系电话" class="layui-input">
</div> </div>
</div> </div>
<div class="layui-form-item">
<label class="layui-form-label">描述</label>
<div class="layui-input-block">
<input type="text" name="remark" id="remark1" autocomplete="off"
placeholder="请输入描述" class="layui-input">
</div>
</div>
<div class="layui-form-item"> <div class="layui-form-item">
<div class="layui-input-block"> <div class="layui-input-block">
<input type="submit" id="updBut" class="layui-btn" lay-submit="" lay-filter="reg" value="修改"/> <input type="submit" id="updBut" class="layui-btn" lay-submit="" lay-filter="reg" value="修改"/>
...@@ -149,6 +157,13 @@ ...@@ -149,6 +157,13 @@
autocomplete="off" class="layui-input"> autocomplete="off" class="layui-input">
</div> </div>
</div> </div>
<div class="layui-form-item">
<label class="layui-form-label">描述</label>
<div class="layui-input-block">
<input type="text" name="remark" id="remark2" placeholder="请输入描述"
autocomplete="off" class="layui-input">
</div>
</div>
<input name="deptid" id="deptid2" value="4" style="display: none"> <input name="deptid" id="deptid2" value="4" style="display: none">
<input type="text" name="whereToGo" value="4" style="display: none"/> <input type="text" name="whereToGo" value="4" style="display: none"/>
<div class="layui-form-item"> <div class="layui-form-item">
...@@ -189,6 +204,7 @@ ...@@ -189,6 +204,7 @@
document.getElementById("account1").value = tr.children[2].innerHTML; document.getElementById("account1").value = tr.children[2].innerHTML;
document.getElementById("name1").value = tr.children[3].innerHTML; document.getElementById("name1").value = tr.children[3].innerHTML;
document.getElementById("phone1").value = tr.children[5].innerHTML; document.getElementById("phone1").value = tr.children[5].innerHTML;
document.getElementById("remark1").value = tr.children[6].innerHTML;
list.style.display = 'none'; list.style.display = 'none';
updateDetailForm.style.display = 'block'; updateDetailForm.style.display = 'block';
} }
......
src/main/webapp/WEB-INF/page/user/conljtycsultant.jsp
View file @ bddb1260
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
<th>顾问姓名</th> <th>顾问姓名</th>
<th>所属部门</th> <th>所属部门</th>
<th>联系电话</th> <th>联系电话</th>
<th>顾问描述</th>
<th>操作</th> <th>操作</th>
</tr> </tr>
</thead> </thead>
...@@ -41,6 +42,7 @@ ...@@ -41,6 +42,7 @@
<td>${user.name}</td> <td>${user.name}</td>
<td>${user.deptName}</td> <td>${user.deptName}</td>
<td>${user.phone}</td> <td>${user.phone}</td>
<td>${user.remark}</td>
<td> <td>
<a class="layui-btn layui-btn-primary layui-btn-xs sendUserMsg" <a class="layui-btn layui-btn-primary layui-btn-xs sendUserMsg"
onclick="updatePic(this)">上传头像</a> onclick="updatePic(this)">上传头像</a>
...@@ -93,17 +95,24 @@ ...@@ -93,17 +95,24 @@
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">密码</label> <label class="layui-form-label">密码</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" name="password" id="password1" lay-verify="required" autocomplete="off" <input type="text" name="password" id="password1" autocomplete="off"
placeholder="不填写则为不修改" class="layui-input"> placeholder="不填写则为不修改" class="layui-input">
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">联系电话</label> <label class="layui-form-label">联系电话</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" name="phone" id="phone1" lay-verify="required" autocomplete="off" <input type="text" name="phone" id="phone1" autocomplete="off"
placeholder="请输入联系电话" class="layui-input"> placeholder="请输入联系电话" class="layui-input">
</div> </div>
</div> </div>
<div class="layui-form-item">
<label class="layui-form-label">描述</label>
<div class="layui-input-block">
<input type="text" name="remark" id="remark1" autocomplete="off"
placeholder="请输入描述" class="layui-input">
</div>
</div>
<div class="layui-form-item"> <div class="layui-form-item">
<div class="layui-input-block"> <div class="layui-input-block">
<input type="submit" id="updBut" class="layui-btn" lay-submit="" lay-filter="reg" value="修改"/> <input type="submit" id="updBut" class="layui-btn" lay-submit="" lay-filter="reg" value="修改"/>
...@@ -148,6 +157,13 @@ ...@@ -148,6 +157,13 @@
autocomplete="off" class="layui-input"> autocomplete="off" class="layui-input">
</div> </div>
</div> </div>
<div class="layui-form-item">
<label class="layui-form-label">描述</label>
<div class="layui-input-block">
<input type="text" name="remark" id="remark2" placeholder="请输入描述"
autocomplete="off" class="layui-input">
</div>
</div>
<input name="deptid" id="deptid2" value="1" style="display: none"> <input name="deptid" id="deptid2" value="1" style="display: none">
<input type="text" name="whereToGo" value="1" style="display: none"/> <input type="text" name="whereToGo" value="1" style="display: none"/>
<div class="layui-form-item"> <div class="layui-form-item">
...@@ -188,6 +204,8 @@ ...@@ -188,6 +204,8 @@
document.getElementById("account1").value = tr.children[2].innerHTML; document.getElementById("account1").value = tr.children[2].innerHTML;
document.getElementById("name1").value = tr.children[3].innerHTML; document.getElementById("name1").value = tr.children[3].innerHTML;
document.getElementById("phone1").value = tr.children[5].innerHTML; document.getElementById("phone1").value = tr.children[5].innerHTML;
document.getElementById("remark1").value = tr.children[6].innerHTML;
list.style.display = 'none'; list.style.display = 'none';
updateDetailForm.style.display = 'block'; updateDetailForm.style.display = 'block';
} }
......
src/main/webapp/WEB-INF/page/user/consultantlist.jsp
View file @ bddb1260
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
<th>顾问姓名</th> <th>顾问姓名</th>
<th>所属部门</th> <th>所属部门</th>
<th>联系电话</th> <th>联系电话</th>
<th>顾问描述</th>
<th>操作</th> <th>操作</th>
</tr> </tr>
</thead> </thead>
...@@ -42,6 +43,7 @@ ...@@ -42,6 +43,7 @@
<td>${user.name}</td> <td>${user.name}</td>
<td>${user.deptName}</td> <td>${user.deptName}</td>
<td>${user.phone}</td> <td>${user.phone}</td>
<td>${user.remark}</td>
<td> <td>
<a class="layui-btn layui-btn-primary layui-btn-xs sendUserMsg" <a class="layui-btn layui-btn-primary layui-btn-xs sendUserMsg"
onclick="updatePic(this)">上传头像</a> onclick="updatePic(this)">上传头像</a>
...@@ -106,6 +108,13 @@ ...@@ -106,6 +108,13 @@
placeholder="请输入联系电话" class="layui-input"> placeholder="请输入联系电话" class="layui-input">
</div> </div>
</div> </div>
<div class="layui-form-item">
<label class="layui-form-label">描述</label>
<div class="layui-input-block">
<input type="text" name="remark" id="remark1" autocomplete="off"
placeholder="请输入描述" class="layui-input">
</div>
</div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">所在部门</label> <label class="layui-form-label">所在部门</label>
<div class="layui-input-block"> <div class="layui-input-block">
...@@ -166,6 +175,13 @@ ...@@ -166,6 +175,13 @@
autocomplete="off" class="layui-input"> autocomplete="off" class="layui-input">
</div> </div>
</div> </div>
<div class="layui-form-item">
<label class="layui-form-label">描述</label>
<div class="layui-input-block">
<input type="text" name="remark" id="remark2" placeholder="请输入描述"
autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">所在部门</label> <label class="layui-form-label">所在部门</label>
<div class="layui-input-block"> <div class="layui-input-block">
...@@ -224,6 +240,7 @@ ...@@ -224,6 +240,7 @@
document.getElementById("id1").value = tr.children[1].innerHTML; document.getElementById("id1").value = tr.children[1].innerHTML;
document.getElementById("account1").value = tr.children[2].innerHTML; document.getElementById("account1").value = tr.children[2].innerHTML;
document.getElementById("name1").value = tr.children[3].innerHTML; document.getElementById("name1").value = tr.children[3].innerHTML;
document.getElementById("remark1").value = tr.children[6].innerHTML;
var options = document.getElementsByClassName("updateoption"); var options = document.getElementsByClassName("updateoption");
console.log(tr.children[4].innerHTML); console.log(tr.children[4].innerHTML);
if (tr.children[4].innerHTML.trim() == "路劲太阳城置业顾问".trim()) { if (tr.children[4].innerHTML.trim() == "路劲太阳城置业顾问".trim()) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment