From 88d3bf1d791282518c0d3e13562860e8c7d53b72 Mon Sep 17 00:00:00 2001 From: zhangsiqi <2825463979@qq.com> Date: Thu, 25 Apr 2024 18:34:04 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[update]=20=E7=BB=A9=E6=95=88=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=96=B0=E5=A2=9E=E5=8F=91=E6=94=BE=E7=BB=A9=E6=95=88?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ErpTechniqueMeritsController.java | 14 +- .../system/domain/ErpTechniqueMerits.java | 13 ++ .../technicalMerits/technicalMerits.html | 189 ++++++++++++------ 3 files changed, 147 insertions(+), 69 deletions(-) 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/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/resources/templates/system/technicalMerits/technicalMerits.html b/ruoyi-admin/src/main/resources/templates/system/technicalMerits/technicalMerits.html index 44c99a72..a4f1cd08 100644 --- a/ruoyi-admin/src/main/resources/templates/system/technicalMerits/technicalMerits.html +++ b/ruoyi-admin/src/main/resources/templates/system/technicalMerits/technicalMerits.html @@ -36,12 +36,11 @@ -
+ 导入已发放绩效 - 导出 @@ -51,6 +50,63 @@
+ \ No newline at end of file From 8cceccdb17b21680c90e668dc237a319579b9f74 Mon Sep 17 00:00:00 2001 From: zhangsiqi <2825463979@qq.com> Date: Thu, 25 Apr 2024 18:35:25 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[update]=E5=AE=A2=E6=88=B7=E8=B5=84?= =?UTF-8?q?=E6=96=99=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=AE=A1=E6=A0=B8=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E4=B8=AD=E6=9C=AA=E7=BB=93=E6=9D=9F=E9=80=89=E9=A1=B9?= =?UTF-8?q?=EF=BC=8C=E5=A1=AB=E5=85=85=E6=95=B0=E6=8D=AE=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SysCustomerController.java | 4 +++ .../service/impl/SysCustomerServiceImpl.java | 35 +++++++++---------- .../templates/system/customer/add.html | 4 +-- .../templates/system/customer/detail.html | 6 ++-- .../templates/system/customer/edit.html | 6 ++-- .../system/customer/taskModifyApply.html | 6 ---- .../system/customer/taskYwjlVerify.html | 6 ---- .../system/customer/taskYwzgVerify.html | 6 ---- .../system/customer/taskZozjVerify.html | 6 ---- 9 files changed, 29 insertions(+), 50 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 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/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 @@