From 578639bf4bb9be9808d7c482345b8c35b02510b7 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期一, 18 八月 2025 17:02:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/jeecg/modules/andon/mapper/xml/AndonButtonConfigMapper.xml | 200 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 199 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/andon/mapper/xml/AndonButtonConfigMapper.xml b/src/main/java/org/jeecg/modules/andon/mapper/xml/AndonButtonConfigMapper.xml
index ec55989..0475bda 100644
--- a/src/main/java/org/jeecg/modules/andon/mapper/xml/AndonButtonConfigMapper.xml
+++ b/src/main/java/org/jeecg/modules/andon/mapper/xml/AndonButtonConfigMapper.xml
@@ -2,6 +2,204 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.andon.mapper.AndonButtonConfigMapper">
<select id="getAndonButtonById" resultType="org.jeecg.modules.andon.entity.AndonButtonConfig">
- SELECT * FROM andon_button_config WHERE id = #{id} and del_flag = 0 and button_status = '鍚敤'
+ SELECT *
+ FROM andon_button_config
+ WHERE id = #{id}
+ and del_flag = 0
+ and button_status = '鍚敤'
</select>
+ <select id="queryUserAndonButtonList" resultType="org.jeecg.modules.andon.dto.AndonButtonDTO">
+ select arc.id,
+ abc.id as button_id,
+ abc.button_name,
+ abc.button_code,
+ (select count(1)
+ from andon_order ao
+ where ao.button_id = arc.button_id
+ and ao.factory_id = arc.factory_id
+ and ao.order_status != '3') as blinking_flag, STUFF((SELECT ',' + CAST (ao.id AS VARCHAR)
+ FROM andon_order ao
+ WHERE ao.button_id = arc.button_id
+ and ao.factory_id = arc.factory_id
+ FOR XML PATH ('')), 1, 1, '') as order_ids
+ from andon_response_config arc
+ left join andon_button_config abc
+ on arc.button_id = abc.id
+ where arc.factory_id=#{factoryId};
+ </select>
+
+ <select id="queryUserAndonCallList" resultType="org.jeecg.modules.andon.dto.AndonButtonDTO">
+ select arc.id,
+ abc.id as buttonId,
+ abc.button_name as buttonName,
+ abc.button_code as buttonCode,
+ (select count(1)
+ from andon_order ao
+ where ao.button_id = arc.button_id
+ and ao.factory_id = arc.factory_id
+ and ao.order_status = '1') as blinkingFlag,
+ STUFF((SELECT ',' + CAST (ao.id AS VARCHAR)
+ FROM andon_order ao
+ WHERE ao.button_id = arc.button_id
+ and ao.factory_id = arc.factory_id
+ and ao.order_status = '1'
+ FOR XML PATH ('')), 1, 1, '') as orderIds,
+ bf.factory_name as factoryName,
+ parent_bf.factory_name as parentFactoryName,
+ abc.upgrade_response_duration as upgradeResponseDuration,
+ abc.second_upgrade_response_duration as secondUpgradeResponseDuration,
+ arc.firster_responder as responder,
+ arc.second_responder,
+ arc.third_responder,
+ STUFF((SELECT ',' + ao.order_status
+ FROM andon_order ao
+ WHERE ao.button_id = arc.button_id
+ and ao.factory_id = arc.factory_id
+ and ao.order_status = '1'
+ FOR XML PATH ('')), 1, 1, '') as orderStatus
+ from andon_response_config arc
+ left join andon_button_config abc
+ on arc.button_id = abc.id
+ left join base_factory bf on arc.factory_id = bf.id
+ left join base_factory parent_bf on bf.parent_id = parent_bf.id
+ where arc.factory_id=#{factoryId}
+ and (select count (1)
+ from andon_order ao
+ where ao.button_id = arc.button_id
+ and ao.factory_id = arc.factory_id
+ and ao.order_status = '1') = 1
+ </select>
+
+ <select id="queryUserAndonRespondList" resultType="org.jeecg.modules.andon.dto.AndonButtonDTO">
+ select arc.id,
+ abc.id as buttonId,
+ abc.button_name as buttonName,
+ abc.button_code as buttonCode,
+ (select count(1)
+ from andon_order ao
+ where ao.button_id = arc.button_id
+ and ao.factory_id = arc.factory_id
+ and ao.order_status = '2') as blinkingFlag,
+ STUFF((SELECT ',' + CAST(ao.id AS VARCHAR)
+ FROM andon_order ao
+ WHERE ao.button_id = arc.button_id
+ and ao.factory_id = arc.factory_id
+ and ao.order_status = '2'
+ FOR XML PATH ('')), 1, 1, '') as orderIds,
+ bf.factory_name as factoryName,
+ parent_bf.factory_name as parentFactoryName,
+ abc.upgrade_response_duration as upgradeResponseDuration,
+ abc.second_upgrade_response_duration as secondUpgradeResponseDuration,
+ arc.firster_responder as responder,
+ arc.second_responder,
+ arc.third_responder,
+ STUFF((SELECT ',' + ao.order_status
+ FROM andon_order ao
+ WHERE ao.button_id = arc.button_id
+ and ao.factory_id = arc.factory_id
+ and ao.order_status = '2'
+ FOR XML PATH ('')), 1, 1, '') as orderStatus,
+ (SELECT TOP 1 ao.operator
+ FROM andon_order ao
+ WHERE ao.button_id = arc.button_id
+ and ao.factory_id = arc.factory_id
+ and ao.order_status = '2') as operator
+ from andon_response_config arc
+ left join andon_button_config abc
+ on arc.button_id = abc.id
+ left join base_factory bf on arc.factory_id = bf.id
+ left join base_factory parent_bf on bf.parent_id = parent_bf.id
+ where arc.factory_id = #{factoryId}
+ and (select count(1)
+ from andon_order ao
+ where ao.button_id = arc.button_id
+ and ao.factory_id = arc.factory_id
+ and ao.order_status = '2') = 1
+ </select>
+<!-- <select id="queryUserAndonRespondList" resultType="org.jeecg.modules.andon.dto.AndonButtonDTO">-->
+<!-- select arc.id,-->
+<!-- abc.id as buttonId,-->
+<!-- abc.button_name as buttonName,-->
+<!-- abc.button_code as buttonCode,-->
+<!-- (select count(1)-->
+<!-- from andon_order ao-->
+<!-- where ao.button_id = arc.button_id-->
+<!-- and ao.factory_id = arc.factory_id-->
+<!-- and ao.order_status = '2') as blinkingFlag,-->
+<!-- STUFF((SELECT ',' + CAST(ao.id AS VARCHAR)-->
+<!-- FROM andon_order ao-->
+<!-- WHERE ao.button_id = arc.button_id-->
+<!-- and ao.factory_id = arc.factory_id-->
+<!-- and ao.order_status = '2'-->
+<!-- FOR XML PATH ('')), 1, 1, '') as orderIds,-->
+<!-- bf.factory_name as factoryName,-->
+<!-- parent_bf.factory_name as parentFactoryName,-->
+<!-- abc.upgrade_response_duration as upgradeResponseDuration,-->
+<!-- abc.second_upgrade_response_duration as secondUpgradeResponseDuration,-->
+<!-- arc.firster_responder as responder,-->
+<!-- arc.second_responder,-->
+<!-- arc.third_responder,-->
+<!-- STUFF((SELECT ',' + ao.order_status-->
+<!-- FROM andon_order ao-->
+<!-- WHERE ao.button_id = arc.button_id-->
+<!-- and ao.factory_id = arc.factory_id-->
+<!-- and ao.order_status = '2'-->
+<!-- FOR XML PATH ('')), 1, 1, '') as orderStatus-->
+<!-- from andon_response_config arc-->
+<!-- left join andon_button_config abc-->
+<!-- on arc.button_id = abc.id-->
+<!-- left join base_factory bf on arc.factory_id = bf.id-->
+<!-- left join base_factory parent_bf on bf.parent_id = parent_bf.id-->
+<!-- where arc.factory_id = #{factoryId}-->
+<!-- and (select count(1)-->
+<!-- from andon_order ao-->
+<!-- where ao.button_id = arc.button_id-->
+<!-- and ao.factory_id = arc.factory_id-->
+<!-- and ao.order_status = '2') = 1-->
+<!-- </select>-->
+
+
+ <select id="queryUserAndonHandelList" resultType="org.jeecg.modules.andon.dto.AndonButtonDTO">
+ select arc.id,
+ abc.id as buttonId,
+ abc.button_name as buttonName,
+ abc.button_code as buttonCode,
+ (select count(1)
+ from andon_order ao
+ where ao.button_id = arc.button_id
+ and ao.factory_id = arc.factory_id
+ and ao.order_status = '3') as blinkingFlag,
+ STUFF((SELECT ',' + CAST(ao.id AS VARCHAR)
+ FROM andon_order ao
+ WHERE ao.button_id = arc.button_id
+ and ao.factory_id = arc.factory_id
+ and ao.order_status = '3'
+ FOR XML PATH ('')), 1, 1, '') as orderIds,
+ bf.factory_name as factoryName,
+ parent_bf.factory_name as parentFactoryName,
+ abc.upgrade_response_duration as upgradeResponseDuration,
+ abc.second_upgrade_response_duration as secondUpgradeResponseDuration,
+ arc.firster_responder as responder,
+ arc.second_responder,
+ arc.third_responder,
+ STUFF((SELECT ',' + ao.order_status
+ FROM andon_order ao
+ WHERE ao.button_id = arc.button_id
+ and ao.factory_id = arc.factory_id
+ and ao.order_status = '3'
+ FOR XML PATH ('')), 1, 1, '') as orderStatus
+ from andon_response_config arc
+ left join andon_button_config abc
+ on arc.button_id = abc.id
+ left join base_factory bf on arc.factory_id = bf.id
+ left join base_factory parent_bf on bf.parent_id = parent_bf.id
+ where arc.factory_id = #{factoryId}
+ and (select count(1)
+ from andon_order ao
+ where ao.button_id = arc.button_id
+ and ao.factory_id = arc.factory_id
+ and ao.order_status = '3') = 1
+ </select>
+
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3