From a966b5abe5fb804464fe1cd09053a03fe94877fd Mon Sep 17 00:00:00 2001
From: hjg <hjg@123.com>
Date: 星期日, 08 十月 2023 12:28:19 +0800
Subject: [PATCH] 义瑞扫码验证

---
 JavaSource/com/mandi/fendan/mapper/Fd_XSTDMXMapper.java |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/JavaSource/com/mandi/fendan/mapper/Fd_XSTDMXMapper.java b/JavaSource/com/mandi/fendan/mapper/Fd_XSTDMXMapper.java
index 99687f6..859e0c3 100644
--- a/JavaSource/com/mandi/fendan/mapper/Fd_XSTDMXMapper.java
+++ b/JavaSource/com/mandi/fendan/mapper/Fd_XSTDMXMapper.java
@@ -157,11 +157,24 @@
 	@Update("update fd_xstdmx set tdmx_ggxh=#{tdmx_ggxh} where tdmx_tdfl=#{tdmx_tdfl}")
 	public int updateMXGG(Fd_XSTDMX mx);
 
+	//鏄庢櫉 LED 瑁呰溅
 	@Select({"select  hw.name tdmx_hwmc,mx.* from fd_xstdmx mx " ,
 			" left join nc_hw hw on mx.tdmx_hwbh=hw.pkid and hw.state=1 " ,
-			" join fd_bsheet on bsNo=tdmx_fdywbh and status='鍦ㄥ姙' and sdepartNo=#{sdepartNo} "
+			" join xs_taskmonitor xt on mx.tdmx_fdywbh = xt.businessNo  ",
+			" join fd_bsheet on bsNo=tdmx_fdywbh and status='鍦ㄥ姙' " ,
+			" where SdepartNo=#{sdepartNo} and xt.firstgbtime is not null  and xt.lastgbtime is null"
 	})
-	public List getHwList(String sdepartNo);
+	public List<Map> getHwList(String sdepartNo);
 
+	// 涔夌憺LED鏄剧ず 搴忓彿  杞﹀彿  瑁呰溅鍖�  鐘舵��
+	@Select({
+			"select  bs.numberplates,businessNo,zcWz,firstzxhtime," ,
+			"case WHEN EXISTS ( SELECT * FROM bussinessitems WHERE bussinessNo = x.businessNo ) THEN '鍦ㄨ'" ,
+			" when x.firstgbtime is not null then '寰呰' else '瀹屾垚' end zcStatus " ,
+			" from xs_taskmonitor x" ,
+			" join bussinesssheet bs on x.businessNo=bs.bussinessNo and bs.sstatus='鍦ㄥ姙' " ,
+			" where sdepartNo=#{sdepartNo} and firstgbtime is not null and x.lastgbtime is  null "
+	})
+	public List<Map> yRZcList(String sdepartNo);
 
 }

--
Gitblit v1.9.3