From 204206bf2447193fec6178753267d972e1e1aecf Mon Sep 17 00:00:00 2001 From: zhangsiqi <2825463979@qq.com> Date: Fri, 26 Apr 2024 17:45:49 +0800 Subject: [PATCH] =?UTF-8?q?[update]=E5=AE=A2=E6=88=B7=E8=B5=84=E6=96=99:?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=91=98=E5=9B=9E=E6=98=BE,=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E4=B8=9A=E5=8A=A1=E5=91=98=E5=AD=97=E6=AE=B5=E4=B8=8D?= =?UTF-8?q?=E5=8F=AF=E9=80=89=EF=BC=8C=E4=B8=94=E5=BD=93=E5=89=8D=E4=BB=A5?= =?UTF-8?q?=E5=BD=93=E5=89=8D=E7=94=A8=E6=88=B7=E5=81=9A=E5=8C=B9=E9=85=8D?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=BB=84=E5=AF=B9=E8=B1=A1=EF=BC=8C=E5=8C=85?= =?UTF-8?q?=E5=90=AB=E4=B8=9A=E5=8A=A1=E7=BB=8F=E7=90=86=EF=BC=8C=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E4=B8=BB=E7=AE=A1=EF=BC=8C=E4=B8=9A=E5=8A=A1=E5=91=98?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SysCustomerController.java | 18 ++++---- .../controller/SysSalesOrderController.java | 2 +- .../service/impl/SysCustomerServiceImpl.java | 41 +++++++++---------- .../templates/system/customer/add.html | 9 ++-- .../templates/system/customer/detail.html | 2 +- .../templates/system/customer/edit.html | 3 +- .../system/customer/taskModifyApply.html | 2 + .../system/customer/taskYwjlVerify.html | 2 + .../system/customer/taskYwzgVerify.html | 2 + .../system/customer/taskZozjVerify.html | 3 +- 10 files changed, 47 insertions(+), 37 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerController.java index a8963d89..c68589ab 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerController.java @@ -103,11 +103,12 @@ public class SysCustomerController extends BaseController { SysUser curUser = ShiroUtils.getSysUser(); Long userId = curUser.getUserId(); + Set roleKeys = roleService.selectRoleKeys(userId); // 业务员角色只能看到自己创建的数据 - SysRole role = roleService.selectRoleById(curUser.getRoleId()); - if (role.getRoleKey().equals("ywyRole")){ - sysCustomerVo.setCreateBy(curUser.getUserName()); + if (roleKeys.contains("ywyRole")) { + sysCustomerVo.setApplyUser(curUser.getLoginName()); } + startPage(); List list = sysCustomerService.selectSysCustomerList(sysCustomerVo); return getDataTable(list); @@ -148,9 +149,11 @@ public class SysCustomerController extends BaseController public AjaxResult addSave(SysCustomer sysCustomer) { //判断是否客户对象增加重复 + SysUser sysUser = ShiroUtils.getSysUser(); SysCustomerVo sysCustomer1 = new SysCustomerVo(); sysCustomer1.setEnterpriseName(sysCustomer.getEnterpriseName()); sysCustomer1.setCustomerPurser(sysCustomer.getCustomerPurser()); + List sysPostsList = sysPostService.selectPostsByUserId(sysUser.getUserId()); SysCustomerVo sysCustomerVo2 = sysCustomerService.selectSysCustomerByCustomer(sysCustomer1); if(ObjectUtil.isNotNull(sysCustomerVo2)){ return AjaxResult.error("该客户已被其他业务员添加,"+" 客户名称 :" + @@ -158,9 +161,8 @@ public class SysCustomerController extends BaseController "事业部 : "+ sysCustomerVo2.getCustomerPurser() + " 业务员 : " + sysCustomerVo2.getBusinessMembers()); } - SysUser sysUser = ShiroUtils.getSysUser(); - List sysPostsList = sysPostService.selectPostsByUserId(sysUser.getUserId()); - sysPostsList.get(0).getPostName(); + + String operPeople = sysUser.getDept().getDeptName() + "/" + sysPostsList.get(0).getPostName()+"/" + sysUser.getUserName(); //通过用户获取部门信息 // 使用状态-否 @@ -233,7 +235,7 @@ public class SysCustomerController extends BaseController sysCustomerOper.setOperPeople(operPeople); sysCustomerOper.setOperStatus(sysCustomer.getAuditStatus()); ProcessInstance processInstance = sysCustomerService.updateSysCustomerVo(sysCustomer); - if(processInstance != null){ + if(processInstance.getId() != null){ sysCustomerOper.setOperStatus("0"); }else{ sysCustomerOper.setOperStatus("1"); @@ -479,7 +481,7 @@ public class SysCustomerController extends BaseController } @RequestMapping("/getCustomerSelList") @ResponseBody - public AjaxResult ggetCustomerQuoteSelList(@RequestParam(required = false,value = "keyword")String keyword){ + public AjaxResult getCustomerQuoteSelList(@RequestParam(required = false,value = "keyword")String keyword){ SysCustomerVo sysCustomerVo = new SysCustomerVo(); sysCustomerVo.setKeyword(keyword); return success(sysCustomerService.selectSysCustomerList(sysCustomerVo)); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesOrderController.java index 22a121da..ecf36799 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesOrderController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesOrderController.java @@ -494,7 +494,7 @@ public class SysSalesOrderController extends BaseController @ResponseBody public TableDataInfo getBinessMembers(){ startPage(); - List list = sysUserService.selectRoleToUserList("ywyRole"); + List list = sysUserService.selectRoleToUserList("ywyRole,ywjlRole,ywzgRole"); return getDataTable(list); } } \ No newline at end of file diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerServiceImpl.java index 5e1ec458..6d6ef4b1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerServiceImpl.java @@ -83,28 +83,28 @@ public class SysCustomerServiceImpl implements ISysCustomerService /** * 查询客户基本信息列表 * - * @param sysCustomerVo1 + * @param sysCustomer * @return 客户基本信息 */ @Override - public List selectSysCustomerList(SysCustomerVo sysCustomerVo1) + public List selectSysCustomerList(SysCustomerVo sysCustomer) { PageDomain pageDomain = TableSupport.buildPageRequest(); Integer pageNum = pageDomain.getPageNum(); Integer pageSize = pageDomain.getPageSize(); - Page list = (Page) sysCustomerMapper.selectSysCustomerList(sysCustomerVo1); + Page list = (Page) sysCustomerMapper.selectSysCustomerList(sysCustomer); Page returnList = new Page<>(); //PageHelper 仅对第一List分页有效 - for(SysCustomerVo sysCustomer : list){ - SysUser sysUser = userMapper.selectUserByLoginName(sysCustomer.getCreateBy()); + for(SysCustomerVo sysCustomerVo : list){ + SysUser sysUser = userMapper.selectUserByLoginName(sysCustomerVo.getCreateBy()); if (sysUser != null) { - sysCustomer.setCreateBy(sysUser.getUserName()); + sysCustomerVo.setCreateBy(sysUser.getUserName()); } - SysUser sysUser2 = userMapper.selectUserByLoginName(sysCustomer.getApplyUser()); + SysUser sysUser2 = userMapper.selectUserByLoginName(sysCustomerVo.getApplyUser()); if (sysUser2!=null){ - sysCustomer.setApplyUserName(sysUser2.getUserName()); + sysCustomerVo.setApplyUserName(sysUser2.getUserName()); } - String instanceId = sysCustomer.getInstanceId(); + String instanceId = sysCustomerVo.getInstanceId(); // 当前环节 if (StringUtils.isNotBlank(instanceId)) { List taskList = taskService.createTaskQuery() @@ -114,27 +114,27 @@ public class SysCustomerServiceImpl implements ISysCustomerService if (!CollectionUtils.isEmpty(taskList)) { TaskEntityImpl task = (TaskEntityImpl) taskList.get(0); String taskId = task.getId(); - sysCustomer.setTaskId(taskId); + sysCustomerVo.setTaskId(taskId); // 设置待办用户 List todoUserList = todoItemMapper.selectUndealTodoUserList(taskId); if(!CollectionUtils.isEmpty(taskList)){ - sysCustomer.setTodoUserId(String.join(",",todoUserList)); + sysCustomerVo.setTodoUserId(String.join(",",todoUserList)); } if (task.getSuspensionState() == 2) { - sysCustomer.setTaskName("已挂起"); - sysCustomer.setSuspendState("2"); + sysCustomerVo.setTaskName("已挂起"); + sysCustomerVo.setSuspendState("2"); } else { - sysCustomer.setTaskName(task.getName()); - sysCustomer.setSuspendState("1"); + sysCustomerVo.setTaskName(task.getName()); + sysCustomerVo.setSuspendState("1"); } } else { // 已办结或者已撤销 - sysCustomer.setTaskName("已结束"); + sysCustomerVo.setTaskName("已结束"); } } else { - sysCustomer.setTaskName("未启动"); + sysCustomerVo.setTaskName("未启动"); } - returnList.add(sysCustomer); + returnList.add(sysCustomerVo); } returnList.setTotal(CollectionUtils.isEmpty(list) ? 0 : list.getTotal()); returnList.setPageNum(pageNum); @@ -281,7 +281,6 @@ public class SysCustomerServiceImpl implements ISysCustomerService @Override public int add(SysCustomer sysCustomer) { - return sysCustomerMapper.insertSysCustomer(sysCustomer); } @@ -387,8 +386,8 @@ public class SysCustomerServiceImpl implements ISysCustomerService private ProcessInstance startProcessInstance(String applyTitle, String instanceType, SysCustomer sysCustomer, SysUser user) { - Long materialId = sysCustomer.getId(); - String businessKey = materialId.toString(); // 实体类 ID，作为流程的业务 key + Long customerId = sysCustomer.getId(); + String businessKey = customerId.toString(); // 实体类 ID，作为流程的业务 key String key = "customer"; Map variables = new HashMap<>(); // 构造authority传参 diff --git a/ruoyi-admin/src/main/resources/templates/system/customer/add.html b/ruoyi-admin/src/main/resources/templates/system/customer/add.html index a7493023..6c182828 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customer/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/customer/add.html @@ -76,7 +76,7 @@
- +
@@ -91,7 +91,7 @@
- +
@@ -242,7 +242,7 @@
-
@@ -261,6 +261,7 @@