From 3647aa5008055528f075ee73002542a1399575ae Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 19 三月 2025 14:45:39 +0800
Subject: [PATCH] 单点登录调整
---
inspect-server/src/main/resources/mapper/InsOrderMapper.xml | 110 ++-----------------------------------------------------
1 files changed, 4 insertions(+), 106 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
index d6baaef..f7bc779 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
@@ -594,9 +594,6 @@
A.company,
A.`name`
)B
- <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
- ${ew.customSqlSegment}
- </if>
</select>
<select id="selectDeviceList" resultType="com.ruoyi.inspect.vo.DeviceVO">
select
@@ -840,7 +837,7 @@
</select>
<select id="seldepLimsId" resultType="java.lang.String">
- select name
+ select `name`
from department_lims
where id = #{depLimsId}
</select>
@@ -855,105 +852,6 @@
<select id="selectCommissionFees" resultType="com.ruoyi.inspect.dto.CommissionFeesDto">
-<!-- SELECT-->
-<!-- date_format(create_time, '%Y-%m-%d') AS create_time,-->
-<!-- entrust_code,-->
-<!-- sample_name,-->
-<!-- sample_model,-->
-<!-- sample_num,-->
-<!-- ins_item,-->
-<!-- production,-->
-<!-- company,-->
-<!-- custom,-->
-<!-- engineering,-->
-<!-- total_price-->
-<!-- FROM-->
-<!-- (-->
-<!-- SELECT-->
-<!-- io.*,-->
-<!-- sample_counts.sample_num,-->
-<!-- GROUP_CONCAT( DISTINCT isa.sample SEPARATOR '銆�' ) AS sample_name,-->
-<!-- GROUP_CONCAT( DISTINCT isa.model SEPARATOR '銆�' ) AS sample_model,-->
-<!-- total_product_counts.ins_item,-->
-<!-- total_price-->
-<!-- FROM-->
-<!-- ins_order io-->
-<!-- LEFT JOIN ins_sample isa ON io.id = isa.ins_order_id-->
-<!-- LEFT JOIN ins_sample_user isau ON isau.ins_sample_id = io.id-->
-<!-- LEFT JOIN ins_order_state iot ON iot.ins_order_id = io.id-->
-<!-- LEFT JOIN ins_report ir ON io.id = ir.ins_order_id-->
-<!-- AND ir.is_ratify = 1-->
-<!-- LEFT JOIN USER u ON io.create_user = u.id-->
-<!-- LEFT JOIN (-->
-<!-- SELECT-->
-<!-- ins_order_id,-->
-<!-- COUNT(*) AS sample_num-->
-<!-- FROM-->
-<!-- ins_sample-->
-<!-- WHERE-->
-<!-- id IN (-->
-<!-- SELECT-->
-<!-- id1-->
-<!-- FROM-->
-<!-- (-->
-<!-- SELECT-->
-<!-- is2.id id1,-->
-<!-- ip.id-->
-<!-- FROM-->
-<!-- ins_sample is2-->
-<!-- LEFT JOIN ins_product ip ON is2.id = ip.ins_sample_id-->
-<!-- WHERE-->
-<!-- ip.id IS NOT NULL-->
-<!-- ) s-->
-<!-- )-->
-<!-- GROUP BY-->
-<!-- ins_order_id-->
-<!-- ) sample_counts ON io.id = sample_counts.ins_order_id-->
-<!-- LEFT JOIN (-->
-<!-- SELECT-->
-<!-- SUM( price ) AS total_price,-->
-<!-- sample_id,-->
-<!-- ins_order_id,-->
-<!-- man_hour_group,-->
-<!-- ins_item-->
-<!-- FROM-->
-<!-- (-->
-<!-- SELECT-->
-<!-- ins_sample.id AS sample_id,-->
-<!-- ins_sample.ins_order_id,-->
-<!-- ins_product.man_hour_group,-->
-<!-- GROUP_CONCAT( DISTINCT inspection_item SEPARATOR ',' ) AS ins_item,-->
-<!-- price-->
-<!-- FROM-->
-<!-- ins_product-->
-<!-- JOIN ins_sample ON ins_product.ins_sample_id = ins_sample.id-->
-<!-- WHERE-->
-<!-- ins_product.state = 1-->
-<!-- GROUP BY-->
-<!-- ins_sample.ins_order_id,-->
-<!-- ins_sample.id,-->
-<!-- ins_product.man_hour_group-->
-<!-- ) b-->
-<!-- GROUP BY-->
-<!-- ins_order_id-->
-<!-- ) total_product_counts ON io.id = total_product_counts.ins_order_id-->
-<!-- WHERE-->
-<!-- <if test="laboratory!=null and laboratory!=''">-->
-<!-- io.laboratory=#{laboratory} AND-->
-<!-- </if>-->
-<!-- io.create_time between #{startTime} and #{endTime}-->
-<!-- AND-->
-<!-- io.state NOT IN ( 0, 2, 3 )-->
-<!-- GROUP BY-->
-<!-- io.id,-->
-<!-- type-->
-<!-- ORDER BY-->
-<!-- type DESC,-->
-<!-- io.id DESC-->
-<!-- ) a-->
-
-
-
SELECT
A.entrust_code,
A.engineering,
@@ -1086,8 +984,8 @@
group by io.entrust_code
order by send_time desc
</select>
-
-
+
+
<select id="getTasksShow" resultType="com.ruoyi.inspect.dto.TasksShowDto">
SELECT
io.entrust_code,
@@ -1141,7 +1039,7 @@
LEFT JOIN `user` u ON ips.update_user = u.id
WHERE
io.entrust_code IS NOT NULL
- AND u.state = 1
+ AND u.status = 0
AND io.state in (1,4)
AND IFNULL(ir.is_ratify,-1) != 1
AND ios.laboratory = #{sonLaboratory}
--
Gitblit v1.9.3