From 47b511b98b816eb6e13acfab7c844034ebfe8c28 Mon Sep 17 00:00:00 2001
From: hecan <1718492867@qq.com>
Date: Thu, 31 Oct 2024 10:14:35 +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=A2=9E=E5=8A=A0=E9=83=A8=E9=97=A8=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../glPzml/entity/SenderGlPzmlEntity.xml      | 24 +++++++++++++++++--
 .../service/impl/SenderGlPzmlServiceImpl.java |  7 +++---
 .../glPznr/entity/SenderGlPznrEntity.xml      |  2 +-
 3 files changed, 27 insertions(+), 6 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 46ce768f..f80c46f2 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
@@ -261,7 +261,7 @@
 
     <!-- 查询列表 商学院所需要的凭证数据-->
     <select id="queryGlPzmlSxy" resultMap="get-SenderGlPzmlEntity-result" parameterType = "com.hzya.frame.grpU8.nxproof.glPzml.entity.SenderGlPzmlEntity">
-        select
+       <!-- select
         pzml.idpzh as idpzh,
         pzml.kjqj as kjqj,
         pzml.srrq as srrq,
@@ -278,8 +278,28 @@
         pzml.kjqj,
         pzml.srrq,
         pzml.pzzy,
-        pzml.gsdm,pzml.zth,pzml.kjqj,pzml.pzh
+        pzml.gsdm,pzml.zth,pzml.kjqj,pzml.pzh-->
 
+        select
+        pznr.idpznr as idpzh,
+        pznr.kjqj as kjqj,
+        pzml.srrq as srrq,
+        pznr.bmdm,
+        pznr.zy as pzzy,
+        sum(pznr.je) as pzje,
+        pznr.gsdm,pznr.zth,pznr.kjqj,pznr.pzh
+        from GL_Pzml pzml
+        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
+        </trim>
+        group by pznr.idpznr,
+        pznr.kjqj,
+        pzml.srrq,
+        pznr.zy,
+        pznr.bmdm,
+        pznr.gsdm,pznr.zth,pznr.kjqj,pznr.pzh
     </select>
 
 <!--新增所有列-->
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 71a09333..da361f99 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
@@ -706,12 +706,13 @@ public class SenderGlPzmlServiceImpl extends BaseService<SenderGlPzmlEntity, Str
 				jsonObjectParams.put("code",pzmlEntity.getIdpzh());//pzid
 				jsonObjectParams.put("budgetYear",pzmlEntity.getKjqj().substring(0,4));//预算年度
 				jsonObjectParams.put("applyDate",outputDateString);//日期
+				jsonObjectParams.put("depCode",pzmlEntity.getBmdm());//部门代码
 				jsonObjectParams.put("description",pzmlEntity.getPzzy());//说明
 				jsonObjectParams.put("amount",roundedValue.doubleValue());//金额
 				jsonObjectParams.put("pzNum",pzNum);//凭证号 例如：公司代码+账套号+会计期间+凭证号：001_001_202408_付款_1
 				//根据idpzh查询指标id和指标金额以及部门经济科目
 				SenderGlPznrEntity senderGlPznrEntity=new SenderGlPznrEntity();
-				senderGlPznrEntity.setIdpzh(pzmlEntity.getIdpzh());
+				senderGlPznrEntity.setIdpznr(pzmlEntity.getIdpzh());
 				senderGlPznrEntity.setDataSourceCode(glPzmlEntity.getDataSourceCode());
 				List<SenderGlPznrEntity> senderGlPznrEntities = senderGlPznrDao.queryGlPznrSxy(senderGlPznrEntity);
 				logger.info("=======根据凭证idpzh:{}查询的指标金额和指标id以及部门经济科目数据有{}条",pzmlEntity.getIdpzh(),senderGlPznrEntities.size());
@@ -736,7 +737,7 @@ public class SenderGlPzmlServiceImpl extends BaseService<SenderGlPzmlEntity, Str
 				jsonObjectData.put("data",jsonArray);
 				String params = jsonObjectData.toJSONString();
 				logger.info("调用商学院凭证保存接口请求参数：{}",params);
-				result = HttpRequest.post(URL + "nky/service/zsApi/saveZJSYPZReimburse?accessToken="+token).header("Content-Type", "application/json;charset=UTF-8").timeout(30000).body(params).execute().body();
+				result = HttpRequest.post(URLTest + "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();
@@ -758,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(URL + urlToken).header("Content-Type", "application/json;charset=UTF-8").timeout(30000).body(params).execute().body();
+		String result = HttpRequest.post(URLTest + 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");
diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/entity/SenderGlPznrEntity.xml b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/entity/SenderGlPznrEntity.xml
index ab9335fe..54b620b4 100644
--- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/entity/SenderGlPznrEntity.xml
+++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/entity/SenderGlPznrEntity.xml
@@ -473,7 +473,7 @@
 </select>
 
     <select id="queryGlPznrSxy" resultMap="get-SenderGlPznrEntity-result" parameterType = "com.hzya.frame.grpU8.nxproof.glPznr.entity.SenderGlPznrEntity">
-        select je,fzdm5,zbid from gl_pznr where  zbid !=0 and idpzh=#{idpzh}
+        select je,fzdm5,zbid from gl_pznr where  zbid !=0 and idpznr=#{idpznr}
     </select>
 
 <!--新增所有列-->