From dc8bccd8445175ef673d24533e95eb4596c7a231 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 28 二月 2025 15:23:02 +0800
Subject: [PATCH] 修改bug
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseModel.java | 1 -
ruoyi-system/src/main/java/com/ruoyi/system/query/SysUserQuery.java | 4 ++--
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 1 +
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 15 +++++++++------
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StateProcessTemplateServiceImpl.java | 5 ++---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractServiceImpl.java | 12 ++++++++++++
ruoyi-system/src/main/java/com/ruoyi/system/vo/ProcessTaskListVO.java | 1 +
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java | 2 +-
ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java | 3 +++
ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml | 2 +-
10 files changed, 32 insertions(+), 14 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseModel.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseModel.java
index 3e5ea1d..94db5c6 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseModel.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseModel.java
@@ -60,7 +60,6 @@
* 最后修改时间
*/
@ApiModelProperty(value = "记录修改时间，前端忽略")
- @JsonIgnore
@TableField("update_time")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime updateTime;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java
index 843a7fc..10b64d6 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java
@@ -72,5 +72,5 @@
*/
public int deleteUserRoleInfos(@Param("roleId") Long roleId, @Param("userIds") Long[] userIds);
- void insertBatchUserDept(List<TDeptToUser> deptToUserList);
+ void insertBatchUserDept(@Param("deptToUserList")List<TDeptToUser> deptToUserList);
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java
index 12c8605..9c3cfbf 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java
@@ -167,5 +167,8 @@
@ApiModelProperty(value = "房屋地址")
@TableField(exist = false)
private String houseAddress;
+ @ApiModelProperty(value = "审批流实例id")
+ @TableField(exist = false)
+ private Long instanceId;
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/SysUserQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/SysUserQuery.java
index 3727f0a..3c7b3d4 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/query/SysUserQuery.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/SysUserQuery.java
@@ -12,10 +12,10 @@
public class SysUserQuery extends BasePage {
@ApiModelProperty(value = "姓名")
- private String nickNameAndPhone;
+ private String nickNameOrPhone;
@ApiModelProperty(value = "角色id")
- private Integer roleId;
+ private List<Integer> roleIds;
@ApiModelProperty(value = "部门id集合")
private List<String> deptIds;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StateProcessTemplateServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StateProcessTemplateServiceImpl.java
index 9b7b737..9b71738 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StateProcessTemplateServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StateProcessTemplateServiceImpl.java
@@ -1270,8 +1270,6 @@
processTaskListVO.setContract(contract);
}
- pageInfo.setRecords(processTaskListVOS);
-
if (ObjectUtil.isEmpty(processTaskListVOS)) {
return pageInfo;
}
@@ -1288,13 +1286,14 @@
} else {
sysUserMap = new HashMap<>();
}
-
for (ProcessTaskListVO processTaskListVO : processTaskListVOS) {
+ processTaskListVO.setTaskId(processTaskListVO.getId());
SysUser sysUser = sysUserMap.get(processTaskListVO.getCreateBy());
if (Objects.nonNull(sysUser)) {
processTaskListVO.setCreateBy(sysUser.getNickName());
}
}
+ pageInfo.setRecords(processTaskListVOS);
return pageInfo;
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index ed7ae34..442f09e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -675,6 +675,7 @@
for (SysUserVO sysUserVO : list) {
tDeptToUsers.stream().filter(tDeptToUser -> tDeptToUser.getUserId().equals(sysUserVO.getUserId())).forEach(tDeptToUser -> {
sysUserVO.setDeptList(depts.stream().filter(tDept -> tDept.getId().equals(tDeptToUser.getDeptId())).map(TDept::getDeptName).collect(Collectors.toList()));
+ sysUserVO.setDeptIds(depts.stream().map(TDept::getId).filter(id -> id.equals(tDeptToUser.getDeptId())).collect(Collectors.toList()));
});
}
pageInfo.setRecords(list);
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractServiceImpl.java
index 3e62453..bbccfa7 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractServiceImpl.java
@@ -1,5 +1,7 @@
package com.ruoyi.system.service.impl;
+import com.aizuda.bpm.engine.entity.FlwHisTask;
+import com.aizuda.bpm.mybatisplus.mapper.FlwHisTaskMapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.ruoyi.common.basic.PageInfo;
@@ -28,6 +30,7 @@
import com.ruoyi.system.vo.CheckAcceptRecordVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
import java.math.BigDecimal;
@@ -36,6 +39,7 @@
import java.time.temporal.ChronoUnit;
import java.time.temporal.TemporalAdjusters;
import java.util.*;
+import java.util.stream.Collectors;
/**
* <p>
@@ -59,6 +63,8 @@
private TContractMapper contractMapper;
@Autowired
private StateProcessTemplateService stateProcessTemplateService;
+ @Autowired
+ private FlwHisTaskMapper flwHisTaskMapper;
@Override
public PageInfo<TContract> contractList(TContractQuery query) {
@@ -80,6 +86,12 @@
for (TContract tContract : list) {
tContract.setPayType(DictUtils.getDictLabel(DictConstants.DICT_TYPE_CONTRACT_PAY_TYPE,tContract.getPayType()));
tContract.setStatus(DictUtils.getDictLabel(DictConstants.DICT_TYPE_CONTRACT_STATUS,tContract.getStatus()));
+ FlwHisTask flwHisTask = flwHisTaskMapper.selectOne(new LambdaQueryWrapper<FlwHisTask>()
+ .like(FlwHisTask::getVariable, tContract.getId())
+ .last("LIMIT 1"));
+ if (Objects.nonNull(flwHisTask)){
+ tContract.setInstanceId(flwHisTask.getInstanceId());
+ }
}
pageInfo.setRecords(list);
return pageInfo;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/ProcessTaskListVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/ProcessTaskListVO.java
index 337a265..cada03f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/ProcessTaskListVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/ProcessTaskListVO.java
@@ -19,6 +19,7 @@
public class ProcessTaskListVO {
private String nodeName;
+ private String id;
private String flowId;
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 477a6ee..17ba3a3 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -230,12 +230,9 @@
left join sys_role r on r.role_id = ur.role_id
left join t_dept_to_user tdtu on u.user_id = tdtu.user_id
WHERE u.del_flag = 0
- <if test="query.nickNameAndPhone != null and query.nickNameAndPhone != ''">
- AND (u.nick_name LIKE concat('%',#{query.nickNameAndPhone},'%')
- OR u.phonenumber LIKE concat('%',#{query.nickNameAndPhone},'%'))
- </if>
- <if test="query.roleId != null">
- AND r.role_id = #{query.roleId}
+ <if test="query.nickNameOrPhone != null and query.nickNameOrPhone != ''">
+ AND (u.nick_name LIKE concat('%',#{query.nickNameOrPhone},'%')
+ OR u.phonenumber LIKE concat('%',#{query.nickNameOrPhone},'%'))
</if>
<if test="query.status != null and query.status != ''">
AND u.status = #{query.status}
@@ -246,6 +243,12 @@
#{deptId}
</foreach>)
</if>
+ <if test="query.roleIds != null and query.roleIds.size()>0">
+ AND r.role_id IN
+ <foreach collection="query.roleIds" close=")" open="(" item="roleId" separator=",">
+ #{roleId}
+ </foreach>
+ </if>
ORDER BY u.create_time DESC
</select>
<select id="selectIdByPhone" resultType="java.lang.Long">
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml
index 9b0d3cd..9f93e27 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml
@@ -34,7 +34,7 @@
insert into sys_user_role(user_id, role_id) values (#{userRole.userId},#{userRole.roleId})
</insert>
<insert id="insertBatchUserDept">
- insert into sys_user_role(user_id, dept_id) values
+ insert into t_dept_to_user(user_id, dept_id) values
<foreach item="item" index="index" collection="deptToUserList" separator=",">
(#{item.userId},#{item.deptId})
</foreach>
--
Gitblit v1.7.1