From 91ab1a15515c4c213b2ac4f777a7f20c3d0d59ad Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 28 三月 2025 13:49:53 +0800
Subject: [PATCH] 一个订单在每个站点检验都需要扫码入库报检,在中间站点复核继续试验之后默认自动将样品出库,且在列表中也不需要再展示出来,到最后一步复核结束反而是需要手动去出库不能自动出库,且出库之后也不需要在页面展示
---
cnas-server/src/main/resources/mapper/DepartmentMapper.xml | 45 +++++++++++++++------------------------------
1 files changed, 15 insertions(+), 30 deletions(-)
diff --git a/cnas-server/src/main/resources/mapper/DepartmentMapper.xml b/cnas-server/src/main/resources/mapper/DepartmentMapper.xml
index 465bbc1..463e3ba 100644
--- a/cnas-server/src/main/resources/mapper/DepartmentMapper.xml
+++ b/cnas-server/src/main/resources/mapper/DepartmentMapper.xml
@@ -1,39 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.mom.mapper.DepartmentMapper">
- <select id="selectDepartment" resultType="com.yuanchu.mom.pojo.Department">
- WITH RECURSIVE DepartmentHierarchy AS (
- SELECT id, name, father_id
- FROM department
- WHERE father_id IS NULL
-
- UNION ALL
-
- SELECT d.id, d.name, d.father_id
- FROM department d
- JOIN DepartmentHierarchy dh ON d.father_id = dh.id
- )
+ <select id="selectDepartment" resultType="com.yuanchu.mom.dto.DepartmentDto">
SELECT id, name, father_id
- FROM DepartmentHierarchy;
+ FROM department
</select>
- <select id="showUserById" resultType="com.yuanchu.mom.dto.UserDto">
- select * from (select id, name, age, email, phone,depart_id
- from user where FIND_IN_SET( SUBSTRING_INDEX(depart_id, ',', -1) ,#{ids}) > 0 ) a
- <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
- ${ew.customSqlSegment}
- </if>
- </select>
+
<select id="selectSonById" resultType="java.lang.Integer">
- WITH RECURSIVE DepartmentHierarchy AS (
- SELECT id, name, father_id
- FROM department
- WHERE id = #{id}
- UNION ALL
- SELECT d.id, d.name, d.father_id
- FROM department d
- JOIN DepartmentHierarchy dh ON d.father_id = dh.id
- )
+ SELECT au.id
+ FROM (SELECT * FROM department WHERE father_id IS NOT NULL) au,
+ (SELECT @father_id := #{id}) pd
+ WHERE FIND_IN_SET(father_id, @father_id) > 0
+ AND @father_id := concat(@father_id, ',', id)
+ UNION
SELECT id
- FROM DepartmentHierarchy;
+ FROM department
+ WHERE id = #{id}
+ ORDER BY id
+ </select>
+ <select id="selectCustomList" resultType="com.yuanchu.mom.dto.DepartmentDto">
+ select id, name, category fatherId from role;
</select>
</mapper>
--
Gitblit v1.9.3