diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/ErpTechniqueMeritsController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/ErpTechniqueMeritsController.java index 873efb32..b273e6b1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/ErpTechniqueMeritsController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/ErpTechniqueMeritsController.java @@ -5,11 +5,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.*; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.system.domain.ErpTechniqueMerits; @@ -152,6 +148,10 @@ public class ErpTechniqueMeritsController extends BaseController { return toAjax(erpTechniqueMeritsService.restoreErpTechniqueMeritsById(id)); } - - + @GetMapping("/getTechnicalMerits") + @ResponseBody + public AjaxResult getTechnicalMerits(@RequestParam("id") Long id) + { + return AjaxResult.success(erpTechniqueMeritsService.selectErpTechniqueMeritsById(id)); + } } 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 de8448f2..a8963d89 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 @@ -104,6 +104,10 @@ public class SysCustomerController extends BaseController SysUser curUser = ShiroUtils.getSysUser(); Long userId = curUser.getUserId(); // 业务员角色只能看到自己创建的数据 + SysRole role = roleService.selectRoleById(curUser.getRoleId()); + if (role.getRoleKey().equals("ywyRole")){ + sysCustomerVo.setCreateBy(curUser.getUserName()); + } startPage(); List list = sysCustomerService.selectSysCustomerList(sysCustomerVo); return getDataTable(list); 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 60900492..fd3692fb 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 @@ -46,6 +46,7 @@ import javax.servlet.http.HttpSession; import java.io.IOException; import java.net.URLEncoder; import java.util.*; +import java.util.stream.Collectors; import static com.ruoyi.common.config.datasource.DynamicDataSourceContextHolder.log; @@ -100,16 +101,63 @@ public class SysSalesOrderController extends BaseController @ResponseBody public TableDataInfo list(SysSalesOrderVo sysSalesOrderVo) { - SysUser curUser = ShiroUtils.getSysUser(); - Long userId = curUser.getUserId(); - Set roleKeys = roleService.selectRoleKeys(userId); - // 业务员角色只能看到自己创建的数据 - if(roleKeys.contains("ywyRole")){ - sysSalesOrderVo.setApplyUser(curUser.getLoginName()); - } - startPage(); List list = sysSalesOrderService.selectSysSalesOrderList(sysSalesOrderVo); + try { + SysUser curUser = ShiroUtils.getSysUser(); + Long userId = curUser.getUserId(); + Set roleKeys = roleService.selectRoleKeys(userId); + List sysUserlist = sysUserService.selectRoleToUserList("ywy"); + if(roleKeys.contains("ywjlRole")){ + sysUserlist = sysUserlist.stream().filter(item -> { + return item.getDept().getDeptId() == curUser.getDeptId(); + }).collect(Collectors.toList()); + List finalSysUserlist = sysUserlist; + finalSysUserlist.add(curUser); + startPage(); + list = list.stream().filter(item -> { + for (SysUser sysUser : finalSysUserlist) { + if (sysUser.getLoginName().equals(item.getApplyUser())) { + return true; + } + } + return false; + }).collect(Collectors.toList()); + + return getDataTable(list); + } + if(roleKeys.contains("ywzgRole")){ + sysUserlist = sysUserlist.stream().filter(item -> { + return item.getDept().getDeptId() == curUser.getDeptId(); + }).collect(Collectors.toList()); + List finalSysUserlist = sysUserlist; + finalSysUserlist.add(curUser); + startPage(); + list = list.stream().filter(item -> { + for (SysUser sysUser : finalSysUserlist) { + if (sysUser.getLoginName().equals(item.getApplyUser())) { + return true; + } + } + return false; + }).collect(Collectors.toList()); + return getDataTable(list); + } + // 业务员角色只能看到自己创建的数据 + if(roleKeys.contains("ywyRole")){ + sysSalesOrderVo.setApplyUser(curUser.getLoginName()); + startPage(); + list = sysSalesOrderService.selectSysSalesOrderList(sysSalesOrderVo); + return getDataTable(list); + } + if(!roleKeys.contains("ywzjRole") && !roleKeys.contains("ywzjRole") && !roleKeys.contains("ywzjRole")){ + sysSalesOrderVo.setApplyUser(curUser.getLoginName()); + startPage(); + list = sysSalesOrderService.selectSysSalesOrderList(sysSalesOrderVo); + } + }catch (NullPointerException e){ + throw new NullPointerException("当前用户没有申请客户资料"); + } return getDataTable(list); } @@ -398,7 +446,7 @@ public class SysSalesOrderController extends BaseController public AjaxResult complete(@PathVariable("taskId") String taskId,@RequestParam(value = "saveEntity", required = false) String saveEntity, @RequestParam(value = "salesOrderChildList", required = false) String salesOrderChildList, @ModelAttribute("preloadObj") SysSalesOrderVo sysSalesOrderVo,HttpServletRequest request){ - System.out.println("taskId = " + taskId + ", saveEntity = " + saveEntity + ", salesOrderChildList = " + salesOrderChildList + ", sysSalesOrderVo = " + sysSalesOrderVo + ", request = " + request); +// System.out.println("taskId = " + taskId + ", saveEntity = " + saveEntity + ", salesOrderChildList = " + salesOrderChildList + ", sysSalesOrderVo = " + sysSalesOrderVo + ", request = " + request); sysSalesOrderVo.setSysSalesOrderChildList(JSON.parseArray(salesOrderChildList, SysSalesOrderChild.class)); boolean saveEntityBoolean = BooleanUtils.toBoolean(saveEntity); if (saveEntityBoolean) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/ErpTechniqueMerits.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/ErpTechniqueMerits.java index 86ad82ad..214fb8fb 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/ErpTechniqueMerits.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/ErpTechniqueMerits.java @@ -5,6 +5,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; +import org.apache.poi.hpsf.Decimal; /** * 技术绩效列表对象 erp_technique_merits @@ -55,6 +56,9 @@ public class ErpTechniqueMerits extends BaseEntity @Excel(name = "已发放绩效") private Long grantNum; + //本次发放绩效 + private Decimal benGrantNum; + public void setId(Long id) { this.id = id; @@ -146,6 +150,15 @@ public class ErpTechniqueMerits extends BaseEntity return grantNum; } + + public Decimal getBenGrantNum() { + return benGrantNum; + } + + public void setBenGrantNum(Decimal benGrantNum) { + this.benGrantNum = benGrantNum; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) 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 c593c869..5e1ec458 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 @@ -92,19 +92,19 @@ public class SysCustomerServiceImpl implements ISysCustomerService PageDomain pageDomain = TableSupport.buildPageRequest(); Integer pageNum = pageDomain.getPageNum(); Integer pageSize = pageDomain.getPageSize(); + Page list = (Page) sysCustomerMapper.selectSysCustomerList(sysCustomerVo1); Page returnList = new Page<>(); //PageHelper 仅对第一List分页有效 - Page list = (Page) sysCustomerMapper.selectSysCustomerList(sysCustomerVo1); - for(SysCustomerVo sysCustomerVo : list){ - SysUser sysUser = userMapper.selectUserByLoginName(sysCustomerVo.getCreateBy()); + for(SysCustomerVo sysCustomer : list){ + SysUser sysUser = userMapper.selectUserByLoginName(sysCustomer.getCreateBy()); if (sysUser != null) { - sysCustomerVo.setCreateBy(sysUser.getUserName()); + sysCustomer.setCreateBy(sysUser.getUserName()); } - SysUser sysUser2 = userMapper.selectUserByLoginName(sysCustomerVo.getApplyUser()); + SysUser sysUser2 = userMapper.selectUserByLoginName(sysCustomer.getApplyUser()); if (sysUser2!=null){ - sysCustomerVo.setApplyUserName(sysUser2.getUserName()); + sysCustomer.setApplyUserName(sysUser2.getUserName()); } - String instanceId = sysCustomerVo.getInstanceId(); + String instanceId = sysCustomer.getInstanceId(); // 当前环节 if (StringUtils.isNotBlank(instanceId)) { List taskList = taskService.createTaskQuery() @@ -114,28 +114,27 @@ public class SysCustomerServiceImpl implements ISysCustomerService if (!CollectionUtils.isEmpty(taskList)) { TaskEntityImpl task = (TaskEntityImpl) taskList.get(0); String taskId = task.getId(); - sysCustomerVo.setTaskId(taskId); + sysCustomer.setTaskId(taskId); // 设置待办用户 List todoUserList = todoItemMapper.selectUndealTodoUserList(taskId); if(!CollectionUtils.isEmpty(taskList)){ - sysCustomerVo.setTodoUserId(String.join(",",todoUserList)); + sysCustomer.setTodoUserId(String.join(",",todoUserList)); } if (task.getSuspensionState() == 2) { - sysCustomerVo.setTaskName("已挂起"); - sysCustomerVo.setSuspendState("2"); + sysCustomer.setTaskName("已挂起"); + sysCustomer.setSuspendState("2"); } else { - sysCustomerVo.setTaskName(task.getName()); - sysCustomerVo.setSuspendState("1"); + sysCustomer.setTaskName(task.getName()); + sysCustomer.setSuspendState("1"); } } else { // 已办结或者已撤销 - sysCustomerVo.setTaskName("已结束"); + sysCustomer.setTaskName("已结束"); } + } else { + sysCustomer.setTaskName("未启动"); } - else { - sysCustomerVo.setTaskName("未启动"); - } - returnList.add(sysCustomerVo); + returnList.add(sysCustomer); } returnList.setTotal(CollectionUtils.isEmpty(list) ? 0 : list.getTotal()); returnList.setPageNum(pageNum); 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 fbbe249b..a7493023 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customer/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/customer/add.html @@ -10,14 +10,14 @@