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 |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/JavaSource/com/mandi/fendan/mapper/Fd_XSTDMXMapper.java b/JavaSource/com/mandi/fendan/mapper/Fd_XSTDMXMapper.java
index 449409a..859e0c3 100644
--- a/JavaSource/com/mandi/fendan/mapper/Fd_XSTDMXMapper.java
+++ b/JavaSource/com/mandi/fendan/mapper/Fd_XSTDMXMapper.java
@@ -162,7 +162,7 @@
 			" left join nc_hw hw on mx.tdmx_hwbh=hw.pkid and hw.state=1 " ,
 			" 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 and zcWc=0"
+			" where SdepartNo=#{sdepartNo} and xt.firstgbtime is not null  and xt.lastgbtime is null"
 	})
 	public List<Map> getHwList(String sdepartNo);
 
@@ -172,8 +172,8 @@
 			"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" ,
-			" where sdepartNo=#{sdepartNo} and x.lastgbtime is  null and zcWc=0"
+			" 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