From 0e420d68f407fde240709ac1800da20b0bb99490 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 09 六月 2026 16:06:16 +0800
Subject: [PATCH] feat：反审核操作。可以对已审核的订单进行反审核，反审核的时候可以选择作废还是重新生成一条，并记录反审核描述。选择作废的话则不生成新增订单。选择重新生成的话则跳转到新增台账页面对反审核的销售产品进行编辑保存重新生成一条新增的订单。反审核的订单即使是发货了还是可以反审核，并且需要将对应的入库、出库、发货进行作废。
---
src/main/resources/mapper/system/SysUserDeptMapper.xml | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/system/SysUserDeptMapper.xml b/src/main/resources/mapper/system/SysUserDeptMapper.xml
index 898d3d1..34d669f 100644
--- a/src/main/resources/mapper/system/SysUserDeptMapper.xml
+++ b/src/main/resources/mapper/system/SysUserDeptMapper.xml
@@ -3,8 +3,25 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.system.mapper.SysUserDeptMapper">
-
- <select id="selectUserDeptList" resultType="com.ruoyi.project.system.domain.vo.SysUserDeptVo">
+ <select id="setSchemeApplicableStaffUserInfo" resultType="java.util.Map">
+ SELECT
+ T1.id as id,
+ T1.staff_no as staffNo,
+ T1.staff_name as staffName,
+ T2.dept_id as deptId,
+ T2.dept_name as deptName,
+ T1.staff_state as staffState
+ FROM
+ staff_on_job T1
+ LEFT JOIN sys_dept T2 ON T1.sys_dept_id = T2.dept_id
+ <where>
+ T1.sys_dept_id in<foreach collection="ids" item="id" separator="," close=")" open="(">#{id}</foreach>
+ </where>
+ GROUP BY
+ T1.id
+ </select>
+
+ <select id="userLoginFacotryList" resultType="com.ruoyi.project.system.domain.vo.SysUserDeptVo">
SELECT
T1.user_id,
T1.dept_id,
@@ -13,12 +30,13 @@
sys_user_dept T1
LEFT JOIN sys_dept T2 ON T1.dept_id = T2.dept_id
<where>
+ T1.dept_id IN (select dept_id from sys_dept where parent_id != 0)
<if test="userDeptVo.userId != null">
- T1.user_id = #{userDeptVo.userId}
+ AND T1.user_id = #{userDeptVo.userId}
</if>
<if test="userDeptVo.userName != null and userDeptVo.userName != '' ">
- T1.user_id IN (
- SELECT user_id FROM sys_user WHERE nick_name LIKE CONCAT('%',#{userDeptVo.userName},'%')
+ AND T1.user_id IN (
+ SELECT user_id FROM sys_user WHERE user_name LIKE CONCAT('%',#{userDeptVo.userName},'%')
)
</if>
</where>
--
Gitblit v1.9.3