From bccd5f86b1fc0b2cfd076df54b5983401da11fe2 Mon Sep 17 00:00:00 2001
From: hecan <1718492867@qq.com>
Date: Thu, 31 Oct 2024 16:32:30 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=87=AD=E8=AF=81=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=EF=BC=8C=E5=88=87=E6=8D=A2=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../frame/grpU8/nxproof/glPzml/entity/SenderGlPzmlEntity.xml  | 2 +-
 .../nxproof/glPzml/service/impl/SenderGlPzmlServiceImpl.java  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/entity/SenderGlPzmlEntity.xml b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/entity/SenderGlPzmlEntity.xml
index f80c46f2..09d1585d 100644
--- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/entity/SenderGlPzmlEntity.xml
+++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/entity/SenderGlPzmlEntity.xml
@@ -292,7 +292,7 @@
         left join gl_pznr pznr on pznr.idpzh=pzml.idpzh and pzml.kjqj=pznr.kjqj
         <trim prefix="where" prefixOverrides="and">
             <if test="idpzh !=null and  idpzh!='' "> and pzml.idpzh = #{idpzh} </if>
-            and (pzml.srrq>=#{srrq} or pzml.shrq >=#{shrq} or pzml.jzrq>=#{jzrq})  and pznr.zbid!=0
+            and (pzml.srrq>=#{srrq} or pzml.shrq >=#{shrq} or pzml.jzrq>=#{jzrq})  and pznr.zbid!=0 and pzml.zt!='0'
         </trim>
         group by pznr.idpznr,
         pznr.kjqj,
diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/service/impl/SenderGlPzmlServiceImpl.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/service/impl/SenderGlPzmlServiceImpl.java
index da361f99..b8ec18f0 100644
--- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/service/impl/SenderGlPzmlServiceImpl.java
+++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/service/impl/SenderGlPzmlServiceImpl.java
@@ -737,7 +737,7 @@ public class SenderGlPzmlServiceImpl extends BaseService<SenderGlPzmlEntity, Str
 				jsonObjectData.put("data",jsonArray);
 				String params = jsonObjectData.toJSONString();
 				logger.info("调用商学院凭证保存接口请求参数：{}",params);
-				result = HttpRequest.post(URLTest + "nky/service/zsApi/saveZJSYPZReimburse?accessToken="+token).header("Content-Type", "application/json;charset=UTF-8").timeout(30000).body(params).execute().body();
+				result = HttpRequest.post(URL + "nky/service/zsApi/saveZJSYPZReimburse?accessToken="+token).header("Content-Type", "application/json;charset=UTF-8").timeout(30000).body(params).execute().body();
 				logger.info("调用商学院凭证保存接口返回参数：{}",result);
 			}
 			JSONObject jsonObjectResult=new JSONObject();
@@ -759,7 +759,7 @@ public class SenderGlPzmlServiceImpl extends BaseService<SenderGlPzmlEntity, Str
 		String params = jsonObject.toJSONString();
 		logger.info("=========获取凭证token请求参数:{}========",params);
 		String urlToken="nky/service/session/getAccessToken";
-		String result = HttpRequest.post(URLTest + urlToken).header("Content-Type", "application/json;charset=UTF-8").timeout(30000).body(params).execute().body();
+		String result = HttpRequest.post(URL + urlToken).header("Content-Type", "application/json;charset=UTF-8").timeout(30000).body(params).execute().body();
 		logger.info("=========获取凭证token返回结果:{}========",result);
 		JSONObject jsonObjectResult=JSONObject.parseObject(result);
 		String value=jsonObjectResult.getString("value");