From bd9b6a58beb6b478ad27d645aa1cc0da99c25d7d Mon Sep 17 00:00:00 2001
From: 青城 <1662047068@qq.com>
Date: 星期三, 09 七月 2025 18:02:37 +0800
Subject: [PATCH] 协调审批
---
src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java | 66 +++++++++++++--
src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java | 19 +++-
src/main/java/com/ruoyi/approve/mapper/ApproveProcessMapper.java | 4
src/main/java/com/ruoyi/approve/vo/ApproveGetAndUpdateVo.java | 3
src/main/java/com/ruoyi/approve/vo/ApproveProcessVO.java | 11 +-
src/main/java/com/ruoyi/approve/service/IApproveProcessService.java | 7 +
src/main/java/com/ruoyi/project/system/service/impl/SysUserDeptServiceImpl.java | 10 ++
src/main/java/com/ruoyi/framework/security/service/TokenService.java | 1
src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java | 27 +++++-
src/main/java/com/ruoyi/approve/mapper/ApproveNodeMapper.java | 2
src/main/java/com/ruoyi/approve/utils/DailyRedisCounter.java | 8 +-
src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java | 22 +++--
src/main/java/com/ruoyi/approve/controller/ApproveNodeController.java | 5
src/main/java/com/ruoyi/approve/pojo/ApproveNode.java | 5
src/main/java/com/ruoyi/approve/vo/ApproveNodeVo.java | 19 ++++
src/main/java/com/ruoyi/project/system/service/ISysUserDeptService.java | 3
src/main/resources/application.yml | 4
src/main/java/com/ruoyi/approve/service/IApproveNodeService.java | 3
18 files changed, 169 insertions(+), 50 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/controller/ApproveNodeController.java b/src/main/java/com/ruoyi/approve/controller/ApproveNodeController.java
index a4d815e..41cc7c0 100644
--- a/src/main/java/com/ruoyi/approve/controller/ApproveNodeController.java
+++ b/src/main/java/com/ruoyi/approve/controller/ApproveNodeController.java
@@ -2,6 +2,7 @@
import com.ruoyi.approve.pojo.ApproveNode;
import com.ruoyi.approve.service.IApproveNodeService;
+import com.ruoyi.approve.vo.ApproveNodeVo;
import com.ruoyi.framework.web.domain.AjaxResult;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -23,12 +24,12 @@
}
/**
- * 瀹℃壒鑺傜偣
+ * 鏇存柊瀹℃壒鑺傜偣
* @param approveNode
* @return
*/
@PostMapping("/updateApproveNode")
- public AjaxResult updateApproveNode(@RequestBody ApproveNode approveNode) {
+ public AjaxResult updateApproveNode(@RequestBody ApproveNodeVo approveNode) {
approveNodeService.updateApproveNode(approveNode);
return AjaxResult.success();
}
diff --git a/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java b/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java
index 25fd122..119ed01 100644
--- a/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java
+++ b/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java
@@ -1,5 +1,6 @@
package com.ruoyi.approve.controller;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.approve.service.IApproveProcessService;
import com.ruoyi.approve.vo.ApproveGetAndUpdateVo;
import com.ruoyi.approve.vo.ApproveProcessVO;
@@ -7,6 +8,10 @@
import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.project.system.domain.SysDept;
+import com.ruoyi.project.system.domain.SysUserDept;
+import com.ruoyi.project.system.mapper.SysDeptMapper;
+import com.ruoyi.project.system.mapper.SysUserDeptMapper;
+import com.ruoyi.project.system.service.ISysUserDeptService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -25,6 +30,8 @@
@Autowired
private IApproveProcessService approveProcessService;
+ @Autowired
+ private ISysUserDeptService sysUserDeptService;
/**銆�
* 鑾峰彇閮ㄩ棬鍒楄〃
* @return
@@ -32,9 +39,8 @@
@GetMapping("/getDept")
public AjaxResult getDept() {
Long userId = SecurityUtils.getUserId();
- LoginUser user = SecurityUtils.getLoginUser();
- Long[] deptIds = SecurityUtils.getDeptId();
-
+ List<SysUserDept> userDeptList = sysUserDeptService.getUserDeptList(userId);
+ Long[] deptIds = userDeptList.stream().map(SysUserDept::getDeptId).toArray(Long[]::new);
List<SysDept> sysDeptList = approveProcessService.selectDeptListByDeptIds(deptIds);
return AjaxResult.success(sysDeptList);
}
@@ -60,7 +66,7 @@
* @return
*/
@GetMapping("/get")
- public AjaxResult get(@RequestBody ApproveGetAndUpdateVo approveGetAndUpdateVo){
+ public AjaxResult get(ApproveGetAndUpdateVo approveGetAndUpdateVo){
if (approveGetAndUpdateVo.getId() == null || approveGetAndUpdateVo.getId().isEmpty()) {
return AjaxResult.warn("鍙傛暟涓嶈兘涓虹┖");
}
@@ -81,12 +87,12 @@
return AjaxResult.success("鎿嶄綔鎴愬姛");
}
/**
- * 鑾峰彇瀹℃壒鍒楄〃
+ * 鑾峰彇瀹℃壒鍒楄〃--鍒嗛〉鏌ヨ
* @return
*/
@GetMapping("/list")
- public AjaxResult list() {
- return AjaxResult.success(approveProcessService.listAll());
+ public AjaxResult list(Page page) {
+ return AjaxResult.success(approveProcessService.listAll(page));
}
/**
@@ -94,7 +100,7 @@
* @param ids
* @return
*/
- @PostMapping("/deleteIds")
+ @RequestMapping ("/deleteIds")
public AjaxResult deleteIds(@RequestBody Long[] ids) {
if (ids == null || ids.length == 0) {
return AjaxResult.warn("鍙傛暟涓嶈兘涓虹┖");
diff --git a/src/main/java/com/ruoyi/approve/mapper/ApproveNodeMapper.java b/src/main/java/com/ruoyi/approve/mapper/ApproveNodeMapper.java
index 648d04a..59cf69e 100644
--- a/src/main/java/com/ruoyi/approve/mapper/ApproveNodeMapper.java
+++ b/src/main/java/com/ruoyi/approve/mapper/ApproveNodeMapper.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.approve.pojo.ApproveNode;
+import org.apache.ibatis.annotations.Mapper;
/**
* @author Administrator
@@ -9,6 +10,7 @@
* @createDate 2025-07-08 16:50:15
* @Entity com.ruoyi.approve.pojo.ApproveNode
*/
+@Mapper
public interface ApproveNodeMapper extends BaseMapper<ApproveNode> {
}
diff --git a/src/main/java/com/ruoyi/approve/mapper/ApproveProcessMapper.java b/src/main/java/com/ruoyi/approve/mapper/ApproveProcessMapper.java
index ce1b362..b05a5f1 100644
--- a/src/main/java/com/ruoyi/approve/mapper/ApproveProcessMapper.java
+++ b/src/main/java/com/ruoyi/approve/mapper/ApproveProcessMapper.java
@@ -2,13 +2,15 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.approve.pojo.ApproveProcess;
+import org.apache.ibatis.annotations.Mapper;
/**
* @author Administrator
* @description 閽堝琛ㄣ�恆pprove_process(瀹℃壒娴佺▼琛�)銆戠殑鏁版嵁搴撴搷浣淢apper
-* @createDate 2025-07-08 16:44:05
+* @createDate 2025-07-09 13:52:01
* @Entity com.ruoyi.approve.pojo.ApproveProcess
*/
+@Mapper
public interface ApproveProcessMapper extends BaseMapper<ApproveProcess> {
}
diff --git a/src/main/java/com/ruoyi/approve/pojo/ApproveNode.java b/src/main/java/com/ruoyi/approve/pojo/ApproveNode.java
index de3a255..3aa8e58 100644
--- a/src/main/java/com/ruoyi/approve/pojo/ApproveNode.java
+++ b/src/main/java/com/ruoyi/approve/pojo/ApproveNode.java
@@ -3,8 +3,7 @@
import java.io.Serializable;
import java.util.Date;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
@@ -13,10 +12,12 @@
* @TableName approve_node
*/
@Data
+@TableName(value ="approve_node")
public class ApproveNode implements Serializable {
/**
*
*/
+ @TableId(type = IdType.AUTO)
private Long id;
/**
diff --git a/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java b/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java
index 58cdddb..138c964 100644
--- a/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java
+++ b/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java
@@ -11,8 +11,8 @@
* 瀹℃壒娴佺▼琛�
* @TableName approve_process
*/
+@TableName(value ="approve_process")
@Data
-@TableName("approve_process")
public class ApproveProcess implements Serializable {
/**
*
@@ -41,14 +41,24 @@
private String approveDeptName;
/**
- * 鐢宠鐢ㄦ埛ids
+ * 瀹℃壒鐢ㄦ埛ids
*/
private String approveUserIds;
/**
- * 鐢宠鐢ㄦ埛鍚嶇О
+ * 瀹℃壒鐢ㄦ埛鍚嶇О
*/
private String approveUserNames;
+
+ /**
+ * 褰撳墠瀹℃壒鐢ㄦ埛id
+ */
+ private Long approveUserCurrentId;
+
+ /**
+ * 褰撳墠瀹℃壒鐢ㄦ埛鍚嶇О
+ */
+ private String approveUserCurrentName;
/**
* 鐢宠鍘熷洜
@@ -68,7 +78,7 @@
private Date approveOverTime;
/**
- * 瀹℃壒鐘舵�侊細0寰呭鏍革紝1瀹℃牳涓紝2瀹℃牳瀹屾垚
+ * 瀹℃壒鐘舵�侊細0寰呭鏍革紝1瀹℃牳涓紝2瀹℃牳瀹屾垚 3瀹℃牳涓嶉�氳繃
*/
private Integer approveStatus;
@@ -93,6 +103,7 @@
*/
private String approveRemark;
+ @TableField(exist = false)
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/ruoyi/approve/service/IApproveNodeService.java b/src/main/java/com/ruoyi/approve/service/IApproveNodeService.java
index 14ff91f..d6e9c66 100644
--- a/src/main/java/com/ruoyi/approve/service/IApproveNodeService.java
+++ b/src/main/java/com/ruoyi/approve/service/IApproveNodeService.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.approve.pojo.ApproveNode;
+import com.ruoyi.approve.vo.ApproveNodeVo;
import java.util.List;
@@ -14,5 +15,5 @@
*/
List<ApproveNode> details(String id);
- void updateApproveNode(ApproveNode approveNode);
+ void updateApproveNode(ApproveNodeVo approveNode);
}
diff --git a/src/main/java/com/ruoyi/approve/service/IApproveProcessService.java b/src/main/java/com/ruoyi/approve/service/IApproveProcessService.java
index 5ed770d..6b1cf82 100644
--- a/src/main/java/com/ruoyi/approve/service/IApproveProcessService.java
+++ b/src/main/java/com/ruoyi/approve/service/IApproveProcessService.java
@@ -1,9 +1,12 @@
package com.ruoyi.approve.service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.approve.pojo.ApproveNode;
import com.ruoyi.approve.pojo.ApproveProcess;
import com.ruoyi.approve.vo.ApproveGetAndUpdateVo;
+import com.ruoyi.approve.vo.ApproveNodeVo;
import com.ruoyi.approve.vo.ApproveProcessVO;
import com.ruoyi.project.system.domain.SysDept;
@@ -21,7 +24,7 @@
*/
List<SysDept> selectDeptListByDeptIds(Long[] deptIds);
- List<ApproveProcess> listAll();
+ IPage<ApproveProcess> listAll(Page page);
void delApprove(Long[] ids);
@@ -33,5 +36,5 @@
* 瀹℃壒鐘舵�佹洿鏂�
* @param approveNode
*/
- void updateApproveProcessStatus(ApproveNode approveNode);
+ void updateApproveProcessStatus(ApproveNodeVo approveNode);
}
diff --git a/src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java b/src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java
index 1bc54ed..81af66c 100644
--- a/src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java
+++ b/src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java
@@ -7,6 +7,7 @@
import com.ruoyi.approve.pojo.ApproveProcess;
import com.ruoyi.approve.service.IApproveNodeService;
import com.ruoyi.approve.service.IApproveProcessService;
+import com.ruoyi.approve.vo.ApproveNodeVo;
import com.ruoyi.common.utils.SecurityUtils;
import lombok.AllArgsConstructor;
import lombok.RequiredArgsConstructor;
@@ -63,12 +64,30 @@
}
@Override
- public void updateApproveNode(ApproveNode approveNode) {
+ public void updateApproveNode(ApproveNodeVo approveNode) {
+ //鏌愪釜鑺傜偣瀹℃壒涓嶉�氳繃
+ if(approveNode.getApproveNodeStatus().intValue()==2){
+ //淇敼瀹℃壒娴佺▼
+ ApproveNode node = approveNodeMapper.selectById(approveNode.getId());
+ Long approveProcessId = node.getApproveProcessId();
+ ApproveProcess approveProcess = approveProcessService.getBaseMapper().selectById(approveProcessId);
+ approveProcess.setApproveOverTime(new Date());
+ approveProcess.setApproveStatus(3);
+ approveProcessService.saveOrUpdate(approveProcess);
+
+ //瀹℃壒鑺傜偣鐘舵�佹敼鍙�
+ initApproveNodes(approveProcess.getApproveId());
+
+ return;
+ }
+ //鏇存柊瀹℃壒娴佺▼
approveProcessService.updateApproveProcessStatus(approveNode);
- approveNode.setApproveNodeTime(new Date());
-
- approveNodeMapper.updateById(approveNode);
+ //瀹℃壒娴佺▼褰撳墠瀹℃壒浜轰慨鏀�
+ ApproveNode node = getById(approveNode.getId());
+ node.setApproveNodeTime(new Date());
+ node.setApproveNodeStatus(approveNode.getApproveNodeStatus());
+ approveNodeMapper.updateById(node);
}
}
diff --git a/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java b/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
index 322a498..a07be20 100644
--- a/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
+++ b/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
@@ -1,6 +1,8 @@
package com.ruoyi.approve.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.approve.mapper.ApproveProcessMapper;
import com.ruoyi.approve.pojo.ApproveNode;
@@ -9,10 +11,13 @@
import com.ruoyi.approve.service.IApproveProcessService;
import com.ruoyi.approve.utils.DailyRedisCounter;
import com.ruoyi.approve.vo.ApproveGetAndUpdateVo;
+import com.ruoyi.approve.vo.ApproveNodeVo;
import com.ruoyi.approve.vo.ApproveProcessVO;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.project.system.domain.SysDept;
+import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.mapper.SysDeptMapper;
+import com.ruoyi.project.system.mapper.SysUserMapper;
import lombok.AllArgsConstructor;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
@@ -23,6 +28,7 @@
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Date;
import java.util.List;
@@ -37,6 +43,8 @@
private final SysDeptMapper sysDeptMapper;
private final IApproveNodeService approveNodeService;
+ private final SysUserMapper sysUserMapper;
+ private final ApproveProcessMapper approveProcessMapper;
@Override
public void addApprove(ApproveProcessVO approveProcessVO) {
@@ -50,11 +58,21 @@
//娴佺▼ ID
String approveID = today + formattedCount;
+ //瀹℃壒浜哄鍚嶅鐞�
+ String approverIds = approveProcessVO.getApproverIds();
+ String[] idArray = approverIds.split(",");
+ String approverNames = getApproverNames(approveProcessVO.getApproverIds());
+ String[] namdArray = approverIds.split(",");
+
ApproveProcess approveProcess = new ApproveProcess();
approveProcess.setApproveId(approveID);
approveProcess.setApproveUser(userId);
- approveProcess.setApproveDeptName(approveProcessVO.getDeptName());
- approveProcess.setApproveUserNames(approveProcessVO.getApproverNames());
+ approveProcess.setApproveDeptId(approveProcessVO.getApproveDeptId());
+ // approveProcess.setApproveDeptName(approveProcessVO.getDeptName());
+ approveProcess.setApproveUserIds(approveProcessVO.getApproverIds());
+ approveProcess.setApproveUserNames(approverNames);
+ approveProcess.setApproveUserCurrentId(Long.parseLong(idArray[0]));
+ approveProcess.setApproveUserCurrentName(namdArray[0]);
approveProcess.setApproveTime(new Date());
approveProcess.setApproveReason(approveProcessVO.getApproveReason());
approveProcess.setApproveOverTime(null);
@@ -67,6 +85,22 @@
approveNodeService.initApproveNodes(approveID);
}
+ private String getApproverNames(String approverIds) {
+ String[] idArray = approverIds.split(",");
+
+ Integer[] ids = Arrays.stream(idArray)
+ .map(Integer::parseInt)
+ .toArray(Integer[]::new);
+ String names = "";
+ StringBuilder stringBuilder = new StringBuilder();
+ for (Integer id : ids) {
+ SysUser sysUser = sysUserMapper.selectUserById(id.longValue());
+ names = stringBuilder + "," + sysUser.getUserName();
+ }
+ return names;
+ }
+
+
@Override
public List<SysDept> selectDeptListByDeptIds(Long[] deptIds) {
List<SysDept> sysDeptList =new ArrayList<SysDept>();
@@ -78,17 +112,17 @@
}
@Override
- public List<ApproveProcess> listAll() {
+ public IPage<ApproveProcess> listAll(Page page) {
LambdaQueryWrapper<ApproveProcess> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ApproveProcess::getApproveDelete, 0);
- return list(queryWrapper);
+ return approveProcessMapper.selectPage(page, queryWrapper);
}
@Override
public void delApprove(Long[] ids) {
for (Long id : ids) {
LambdaQueryWrapper<ApproveProcess> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(ApproveProcess::getApproveId, id);
+ queryWrapper.eq(ApproveProcess::getApproveDelete, 1);
update(queryWrapper);
}
}
@@ -102,18 +136,28 @@
}
@Override
- public void updateApproveProcessStatus(ApproveNode approveNode) {
- ApproveProcess approveProcess = getById(approveNode.getApproveProcessId());
- if(approveNode.getIsFirst()){
- if(approveNode.getApproveNodeStatus() == 1){
+ public void updateApproveProcessStatus(ApproveNodeVo approveNodeVo) {
+ ApproveNode node = approveNodeService.getById(approveNodeVo.getId());
+ ApproveProcess approveProcess = getById(node.getApproveProcessId());
+
+ String[] idArray = approveProcess.getApproveUserIds().split(",");
+ String[] nameArray = approveProcess.getApproveUserNames().split(",");
+
+ Integer noderOrder = approveNodeVo.getApproveNodeOrder();
+ approveProcess.setApproveUserCurrentId(Long.parseLong(idArray[noderOrder]));
+ approveProcess.setApproveUserCurrentName(nameArray[noderOrder]);
+
+ if(noderOrder.equals(1)){
+ if(approveNodeVo.getApproveNodeStatus() == 1){
approveProcess.setApproveStatus(1);
}
}
- if(approveNode.getIsLast()){
- if(approveNode.getApproveNodeStatus() == 1){
+ if(noderOrder.equals(idArray.length)){
+ if(approveNodeVo.getApproveNodeStatus() == 1){
approveProcess.setApproveStatus(2);
}
}
+ updateById(approveProcess);
}
diff --git a/src/main/java/com/ruoyi/approve/utils/DailyRedisCounter.java b/src/main/java/com/ruoyi/approve/utils/DailyRedisCounter.java
index eec0e4a..be00664 100644
--- a/src/main/java/com/ruoyi/approve/utils/DailyRedisCounter.java
+++ b/src/main/java/com/ruoyi/approve/utils/DailyRedisCounter.java
@@ -31,10 +31,10 @@
long count = redisTemplate.opsForValue().increment(key, 1);
// 浠呭湪绗竴娆¤缃椂璁剧疆杩囨湡鏃堕棿锛堥伩鍏嶉噸澶嶈缃級
- if (count == 1) {
- long secondsUntilMidnight = calculateSecondsUntilMidnight();
- redisTemplate.expire(key, secondsUntilMidnight, TimeUnit.SECONDS);
- }
+// if (count == 0) {
+// long secondsUntilMidnight = calculateSecondsUntilMidnight();
+// redisTemplate.expire(key, secondsUntilMidnight, TimeUnit.SECONDS);
+// }
return count;
}
diff --git a/src/main/java/com/ruoyi/approve/vo/ApproveGetAndUpdateVo.java b/src/main/java/com/ruoyi/approve/vo/ApproveGetAndUpdateVo.java
index bd9ebd9..9b825ea 100644
--- a/src/main/java/com/ruoyi/approve/vo/ApproveGetAndUpdateVo.java
+++ b/src/main/java/com/ruoyi/approve/vo/ApproveGetAndUpdateVo.java
@@ -7,9 +7,8 @@
@Data
public class ApproveGetAndUpdateVo {
//瀹℃壒id
- @NotBlank(message = "娴佺▼缂栧彿涓嶈兘涓虹┖")
+ // @NotBlank(message = "娴佺▼缂栧彿涓嶈兘涓虹┖")
private String id;
//鐢宠浜嬬敱
- @NotBlank(message = "鐢宠浜嬬敱涓嶈兘涓虹┖")
private String approveReason;
}
diff --git a/src/main/java/com/ruoyi/approve/vo/ApproveNodeVo.java b/src/main/java/com/ruoyi/approve/vo/ApproveNodeVo.java
new file mode 100644
index 0000000..3abc3d6
--- /dev/null
+++ b/src/main/java/com/ruoyi/approve/vo/ApproveNodeVo.java
@@ -0,0 +1,19 @@
+package com.ruoyi.approve.vo;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+public class ApproveNodeVo {
+ @NotNull
+ //娴佺▼鑺傜偣id
+ private Long id;
+ //娴佺▼鑺傜偣椤哄簭
+ private Integer approveNodeOrder;
+ /**
+ * 瀹℃壒鑺傜偣鐘舵��:1鍚屾剰锛�2鎷掔粷锛�0灏氭湭瀹℃牳锛堥粯璁や负0锛�
+ */
+ private Integer approveNodeStatus;
+
+}
diff --git a/src/main/java/com/ruoyi/approve/vo/ApproveProcessVO.java b/src/main/java/com/ruoyi/approve/vo/ApproveProcessVO.java
index 5835645..a22a7ce 100644
--- a/src/main/java/com/ruoyi/approve/vo/ApproveProcessVO.java
+++ b/src/main/java/com/ruoyi/approve/vo/ApproveProcessVO.java
@@ -8,16 +8,13 @@
public class ApproveProcessVO {
//閮ㄩ棬id
- // private Long deptId;
+ private Long approveDeptId;
//閮ㄩ棬鍚嶇О
- @NotBlank(message = "閮ㄩ棬鍚嶇О涓嶈兘涓虹┖")
- private String deptName;
+ //private String deptName;
//瀹℃壒浜� ids
- // private String approverIds;
+ private String approverIds;
//瀹℃壒浜哄悕绉�
- @NotBlank(message = "瀹℃壒浜轰笉鑳戒负绌�")
- private String approverNames;
+ //private String approverNames;
//瀹℃壒浜嬬敱
- @NotBlank(message = "11")
private String approveReason;
}
diff --git a/src/main/java/com/ruoyi/framework/security/service/TokenService.java b/src/main/java/com/ruoyi/framework/security/service/TokenService.java
index bb7e5ca..19fbce1 100644
--- a/src/main/java/com/ruoyi/framework/security/service/TokenService.java
+++ b/src/main/java/com/ruoyi/framework/security/service/TokenService.java
@@ -148,6 +148,7 @@
public void refreshToken(LoginUser loginUser)
{
loginUser.setLoginTime(System.currentTimeMillis());
+
loginUser.setExpireTime(loginUser.getLoginTime() + expireTime * MILLIS_MINUTE);
// 鏍规嵁uuid灏唋oginUser缂撳瓨
String userKey = getTokenKey(loginUser.getToken());
diff --git a/src/main/java/com/ruoyi/project/system/service/ISysUserDeptService.java b/src/main/java/com/ruoyi/project/system/service/ISysUserDeptService.java
index 47f6bbc..4c8e9b9 100644
--- a/src/main/java/com/ruoyi/project/system/service/ISysUserDeptService.java
+++ b/src/main/java/com/ruoyi/project/system/service/ISysUserDeptService.java
@@ -1,5 +1,6 @@
package com.ruoyi.project.system.service;
+import com.ruoyi.project.system.domain.SysUserDept;
import com.ruoyi.project.system.domain.vo.SysUserDeptVo;
import java.util.List;
@@ -7,4 +8,6 @@
public interface ISysUserDeptService {
List<SysUserDeptVo> userLoginFacotryList(SysUserDeptVo userDeptVo);
+
+ List<SysUserDept> getUserDeptList(Long userId);
}
diff --git a/src/main/java/com/ruoyi/project/system/service/impl/SysUserDeptServiceImpl.java b/src/main/java/com/ruoyi/project/system/service/impl/SysUserDeptServiceImpl.java
index 97be11b..d965311 100644
--- a/src/main/java/com/ruoyi/project/system/service/impl/SysUserDeptServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/system/service/impl/SysUserDeptServiceImpl.java
@@ -1,11 +1,14 @@
package com.ruoyi.project.system.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ruoyi.project.system.domain.SysUserDept;
import com.ruoyi.project.system.domain.vo.SysUserDeptVo;
import com.ruoyi.project.system.mapper.SysUserDeptMapper;
import com.ruoyi.project.system.service.ISysUserDeptService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.Collections;
import java.util.List;
@Service
@@ -18,4 +21,11 @@
public List<SysUserDeptVo> userLoginFacotryList(SysUserDeptVo userDeptVo) {
return sysUserDeptMapper.userLoginFacotryList(userDeptVo);
}
+
+ @Override
+ public List<SysUserDept> getUserDeptList(Long userId) {
+ LambdaQueryWrapper<SysUserDept> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(SysUserDept::getUserId, userId);
+ return sysUserDeptMapper.selectList(queryWrapper);
+ }
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index a987879..3cc0e73 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -81,9 +81,9 @@
# 绔彛锛岄粯璁や负6379
port: 6379
# 鏁版嵁搴撶储寮�
- database: 0
+ database: 1
# 瀵嗙爜
- password:
+# password:
# password: 123456
# 杩炴帴瓒呮椂鏃堕棿
--
Gitblit v1.9.3