From 1b60f6609a4b9b14b26076ff537f8312f998aee8 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Thu, 24 Apr 2025 17:39:07 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/OrganizationalController.java | 14 ++- .../evaluate/dao/OrganizationalDao.java | 3 + .../service/OrganizationalService.java | 2 + .../service/OrganizationalServiceImpl.java | 13 +++ .../gs/sub/evaluate/manager/dao/UserDao.java | 3 + .../evaluate/manager/service/UserService.java | 2 + .../service/impl/UserDetailsServiceImpl.java | 2 +- .../manager/service/impl/UserServiceImpl.java | 14 +++ .../mappers/evaluate/OrganizationalMapper.xml | 5 ++ .../static/js/evaluate/org/editForm.js | 87 ++++++++++++++++++ .../static/js/evaluate/org/orgList.js | 51 ++++++++--- .../static/pages/evaluate/org/editForm.html | 90 +++++++++++++++++++ .../outsourcerEvaluation/evaluationForm.html | 2 +- 13 files changed, 272 insertions(+), 16 deletions(-) create mode 100644 src/main/resources/static/js/evaluate/org/editForm.js create mode 100644 src/main/resources/static/pages/evaluate/org/editForm.html diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/OrganizationalController.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/OrganizationalController.java index b0f722c..1c0ae48 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/OrganizationalController.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/OrganizationalController.java @@ -246,7 +246,17 @@ public class OrganizationalController extends BaseController { } return ar; } - - + @RequestMapping(value = "updateName", method = RequestMethod.POST) + @ResponseBody + public AjaxRes updateName(@RequestBody OrganizationalBean bean) { + AjaxRes ar = getAjaxRes(); + try { + ar = service.updateName(bean); + } catch (Exception e) { + logger.error(e.toString(), e); + ar.setFailMsg(GlobalConst.DATA_FAIL); + } + return ar; + } } diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/dao/OrganizationalDao.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/dao/OrganizationalDao.java index 2cf28bf..0b42fc6 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/dao/OrganizationalDao.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/dao/OrganizationalDao.java @@ -4,6 +4,7 @@ package com.bonus.gs.sub.evaluate.evaluate.dao; import com.bonus.gs.sub.evaluate.evaluate.beans.EvaluatePersonBean; import com.bonus.gs.sub.evaluate.evaluate.beans.OrganizationalBean; import com.bonus.gs.sub.evaluate.evaluate.beans.TeamEvaluateBean; +import com.bonus.gs.sub.evaluate.manager.utils.AjaxRes; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -166,4 +167,6 @@ public interface OrganizationalDao{ void deleteUserOutData(OrganizationalBean bean); int getConsIsExistByPro(OrganizationalBean bean); + + int updateName(OrganizationalBean bean); } diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/OrganizationalService.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/OrganizationalService.java index b1556c8..a9532df 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/OrganizationalService.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/OrganizationalService.java @@ -66,4 +66,6 @@ public interface OrganizationalService{ AjaxRes addDept(OrganizationalBean bean); AjaxRes userOutDataFail(OrganizationalBean bean); + + AjaxRes updateName(OrganizationalBean bean); } diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/OrganizationalServiceImpl.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/OrganizationalServiceImpl.java index 101f3cc..5159a6c 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/OrganizationalServiceImpl.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/OrganizationalServiceImpl.java @@ -316,6 +316,19 @@ public class OrganizationalServiceImpl implements OrganizationalService { return ar; } + @Override + public AjaxRes updateName(OrganizationalBean bean) { + AjaxRes ar = new AjaxRes(); + try { + mapper.updateName(bean); + ar.setSucceed("修改成功"); + } catch (Exception e) { + ar.setResMsg("修改失败"); + TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); + } + return ar; + } + public static List buildTree(List nodes) { // 根节点是没有父节点的节点 List rootNodes = nodes.stream() diff --git a/src/main/java/com/bonus/gs/sub/evaluate/manager/dao/UserDao.java b/src/main/java/com/bonus/gs/sub/evaluate/manager/dao/UserDao.java index 4e59d87..f3c3355 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/manager/dao/UserDao.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/manager/dao/UserDao.java @@ -49,4 +49,7 @@ public interface UserDao { String getIsBusinessDivision(Long id); void changOldTablePassword(String phone, String password); + + @Select("select t.*,t.org_id as deptId,sr.`name` as roleName,ifnull(poi.org_type,'0') as orgType from sys_user t LEFT JOIN pm_org_info poi on poi.id = t.org_id LEFT JOIN sys_role_user sru on sru.userId = t.id LEFT JOIN sys_role sr on sr.id = sru.roleId where t.phone = #{phone}") + SysUser findByPhone(String phone); } diff --git a/src/main/java/com/bonus/gs/sub/evaluate/manager/service/UserService.java b/src/main/java/com/bonus/gs/sub/evaluate/manager/service/UserService.java index 2646248..d6afef9 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/manager/service/UserService.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/manager/service/UserService.java @@ -17,4 +17,6 @@ public interface UserService { int getUserCount(String username); AjaxRes changePassWord(UserDto userDto); + + SysUser findByPhone(String phone); } diff --git a/src/main/java/com/bonus/gs/sub/evaluate/manager/service/impl/UserDetailsServiceImpl.java b/src/main/java/com/bonus/gs/sub/evaluate/manager/service/impl/UserDetailsServiceImpl.java index a1aacd0..98be529 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/manager/service/impl/UserDetailsServiceImpl.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/manager/service/impl/UserDetailsServiceImpl.java @@ -36,7 +36,7 @@ public class UserDetailsServiceImpl implements UserDetailsService { @Override public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { - SysUser sysUser = userService.getUser(username); + SysUser sysUser = userService.findByPhone(username); if (sysUser == null) { throw new AuthenticationCredentialsNotFoundException("用户名不存在"); } else if (sysUser.getStatus() == Status.LOCKED) { diff --git a/src/main/java/com/bonus/gs/sub/evaluate/manager/service/impl/UserServiceImpl.java b/src/main/java/com/bonus/gs/sub/evaluate/manager/service/impl/UserServiceImpl.java index 0a2984e..d0eeff7 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/manager/service/impl/UserServiceImpl.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/manager/service/impl/UserServiceImpl.java @@ -96,6 +96,20 @@ public class UserServiceImpl implements UserService { return ar; } + @Override + public SysUser findByPhone(String phone) { + SysUser user = userDao.findByPhone(phone); + if(user !=null){ + String roleIds = userDao.getUserRoles(user.getId()); + user.setRoleId(roleIds); + if (StringUtils.isNotBlank(user.getDeptId())) { + String isBusinessDivision = userDao.getIsBusinessDivision(user.getId()); + user.setIsBusinessDivision(isBusinessDivision); + } + } + return user; + } + @Override @Transactional public SysUser updateUser(UserDto userDto) { diff --git a/src/main/resources/mappers/evaluate/OrganizationalMapper.xml b/src/main/resources/mappers/evaluate/OrganizationalMapper.xml index 6756aaf..5835b55 100644 --- a/src/main/resources/mappers/evaluate/OrganizationalMapper.xml +++ b/src/main/resources/mappers/evaluate/OrganizationalMapper.xml @@ -89,6 +89,11 @@ set status = 1 where id = (select team_id from pt_team_exit where id = #{id}) + + update pm_org_info + set name=#{name} + where id = #{id} + delete diff --git a/src/main/resources/static/js/evaluate/org/editForm.js b/src/main/resources/static/js/evaluate/org/editForm.js new file mode 100644 index 0000000..9d30ee4 --- /dev/null +++ b/src/main/resources/static/js/evaluate/org/editForm.js @@ -0,0 +1,87 @@ +let form, layer, dtree; +let objParam; + +function setParams(obj) { + objParam = JSON.parse(obj); + $("#name").val(objParam.name); + $("#orgId").val(objParam.id); + layui + .use(["form", "layer"], function () { + form = layui.form; + layer = layui.layer; + form.on("submit(formData)", function (obj) { + updateName(obj); + }); + form.render(); + }); +} + +function saveData2() { + $("#formSubmit").trigger("click"); +} + +// 提交 +function updateName(data) { + let loadingMsg = layer.msg("正在提交保存,请稍等...", { + icon: 16, + shade: 0.01, + time: "0", + }); + let url = `${ctxPath}` + "/organizational/updateName"; + let item = { + id: data.field.orgId, + name: data.field.name, + }; + // console.log(JSON.stringify(data)+"data") + $.ajax({ + url: url, + type: "POST", + data: JSON.stringify(item), + dataType: "json", + contentType: "application/json", + beforeSend: function () { + $(".save").addClass("layui-btn-disabled").attr("disabled", true); + $(".cancel").addClass("layui-btn-disabled").attr("disabled", true); + }, + success: function (result) { + layer.close(loadingMsg); // 关闭提示层 + $(".save") + .removeClass("layui-btn-disabled") + .attr("disabled", false); + $(".cancel") + .removeClass("layui-btn-disabled") + .attr("disabled", false); + console.error(result); + if (result.res === 1) { + parent.layer.msg(result.obj, {icon: 1}); + closePage(1); + } else { + layer.msg(result.resMsg, {icon: 2}); + } + }, + error: function (result) { + layer.close(loadingMsg); // 关闭提示层 + layer.msg("服务异常，请稍后重试", { + icon: 16, + scrollbar: false, + time: 2000, + }); + $(".save") + .removeClass("layui-btn-disabled") + .attr("disabled", false); + $(".cancel") + .removeClass("layui-btn-disabled") + .attr("disabled", false); + }, + }); +} + +// 关闭页面 +function closePage(type) { + let index = parent.layer.getFrameIndex(window.name); // 先得到当前 iframe层的索引 + if (type === 1) { + window.parent.reloadTreeTable(); + } + parent.layer.close(index); // 再执行关闭 +} + diff --git a/src/main/resources/static/js/evaluate/org/orgList.js b/src/main/resources/static/js/evaluate/org/orgList.js index 2c32df5..92f8c4a 100644 --- a/src/main/resources/static/js/evaluate/org/orgList.js +++ b/src/main/resources/static/js/evaluate/org/orgList.js @@ -14,21 +14,21 @@ layui.use(['layer', 'treeTable', 'table'], function () { var layEvent = obj.event; //当前点击的事件名 if (layEvent === 'add') { if (Number(data.level) === 1) { // 新增事业部/职能部门 - if(roleName == "项目经理"){ + if (roleName == "项目经理") { layer.msg("您没有权限新增事业部/职能部门", {icon: 2}); return; } addForm(4, data); } if (Number(data.level) === 2) { // 新增项目 - if(roleName == "项目经理"){ + if (roleName == "项目经理") { layer.msg("您没有权限新增项目", {icon: 2}); return; } addForm(0, data); } if (Number(data.level) === 3) { // 新增外包商 - if(roleName == "项目经理"){ + if (roleName == "项目经理") { layer.msg("您没有权限新增外包商", {icon: 2}); return; } @@ -38,6 +38,9 @@ layui.use(['layer', 'treeTable', 'table'], function () { addForm(2, data); } } + if (layEvent === 'edit') { + editForm(data); + } if (layEvent === 'changeTheTeamLeader') { addForm(3, data); } @@ -118,22 +121,26 @@ function initTreeTable() { let html = ""; if ([1, 2, 3, 4].includes(d.level)) { - if(user.roleId == 6 || user.roleId == 5){ + if (user.roleId == 6 || user.roleId == 5) { html += '新增'; + html += '    '; + html += '修改名称'; } - if(user.roleId == 7 && d.level == 4 &&(d.userName == user.nickname || d.parentUserName==user.nickname) ){ + if (user.roleId == 7 && d.level == 4 && (d.userName == user.nickname || d.parentUserName == user.nickname)) { html += '新增'; + html += '    '; + html += '修改名称'; } - if(user.roleId == 7 && d.level == 3 && d.userName == user.nickname){ + if (user.roleId == 7 && d.level == 3 && d.userName == user.nickname) { html += '新增'; + html += '    '; + html += '修改名称'; } - - } if (d.level === 5) { - if(user.roleId == 6 || user.roleId == 5){ + if (user.roleId == 6 || user.roleId == 5) { html += '更换班长'; } if (user.roleId == 7 && d.userName == user.nickname) { @@ -143,7 +150,7 @@ function initTreeTable() { let parentNode = getParentNode(d, tableData); parentNode = getParentNode(parentNode, tableData); if (parentNode && parentNode.userName === user.nickname) { - if(user.roleId == 7){ + if (user.roleId == 7) { html += '退场'; } } @@ -181,9 +188,9 @@ function addForm(type, obj) { area = ['70%', '80%']; } else if (type === 1) { area = ['50%', '50%']; - } else if (type === 2){ + } else if (type === 2) { area = ['98%', '98%']; - }else if (type === 3) { + } else if (type === 3) { area = ['98%', '98%']; } else if (type === 4) { area = ['50%', '50%']; @@ -206,6 +213,26 @@ function addForm(type, obj) { }, }); } +function editForm(obj) { + console.log(JSON.stringify(obj)+"lc") + let area = ['50%', '40%']; + let layerIndex = layer.open({ + type: 2, + title: '修改名称', + shade: [0], + area: area, + scrollbar: true, + move: false, + anim: 2, + yes: function (index, layero) { + }, + content: './editForm.html', + success: function (layero, index) { + let iframeWin = window["layui-layer-iframe" + layerIndex]; + iframeWin.setParams(JSON.stringify(obj)); + }, + }); +} // 退场 1.外包商退场 2.班组退场 function back(type, obj) { diff --git a/src/main/resources/static/pages/evaluate/org/editForm.html b/src/main/resources/static/pages/evaluate/org/editForm.html new file mode 100644 index 0000000..ad15f34 --- /dev/null +++ b/src/main/resources/static/pages/evaluate/org/editForm.html @@ -0,0 +1,90 @@ + + + + + + + + 修改名称 + + + + + +
+
+
+
+ +
+ +
+ +
+
+
+ +
+
+
+ + +
+
+ + + + + + + + + + diff --git a/src/main/resources/static/pages/evaluate/outsourcerEvaluation/evaluationForm.html b/src/main/resources/static/pages/evaluate/outsourcerEvaluation/evaluationForm.html index 321d2a6..55ca931 100644 --- a/src/main/resources/static/pages/evaluate/outsourcerEvaluation/evaluationForm.html +++ b/src/main/resources/static/pages/evaluate/outsourcerEvaluation/evaluationForm.html @@ -261,7 +261,7 @@ uploadDom.push('#uploadBtn' + index) innerHtml += `
${e.title}
- +