From 724ce090ab22199dd2d95f05186a611511f1dc7c Mon Sep 17 00:00:00 2001
From: hecan <1718492867@qq.com>
Date: Tue, 31 Dec 2024 09:27:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=AD=E8=AF=81=E5=B7=B2=E4=BD=9C=E5=BA=9F?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nxproof/glPzml/dao/ISenderGlPzmlDao.java  |  9 ++++++
 .../glPzml/dao/impl/SenderGlPzmlDaoImpl.java  |  6 ++++
 .../glPzml/entity/SenderGlPzmlEntity.xml      | 28 ++++++++++++++++++-
 .../glPzml/service/ISenderGlPzmlService.java  | 10 +++++++
 .../service/impl/SenderGlPzmlServiceImpl.java |  5 ++++
 5 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/dao/ISenderGlPzmlDao.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/dao/ISenderGlPzmlDao.java
index f4dc3f5f..e81aeb20 100644
--- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/dao/ISenderGlPzmlDao.java
+++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/dao/ISenderGlPzmlDao.java
@@ -95,5 +95,14 @@ public interface ISenderGlPzmlDao extends IBaseDao<SenderGlPzmlEntity, String> {
      * **/
     List<SenderGlPzmlEntity> queryGlPzmlSxy(SenderGlPzmlEntity senderGlPzmlEntity);
 
+    /**
+     *
+     * @content 查询商学院已作废凭证，将已作废凭证推送行控
+     * @Param
+     * @Return
+     * @Author hecan
+     * @Date 2024-12-30 14:23
+     * **/
+    List<SenderGlPzmlEntity> queryGlPzmlSxyCancelled(SenderGlPzmlEntity senderGlPzmlEntity);
 }
 
diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/dao/impl/SenderGlPzmlDaoImpl.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/dao/impl/SenderGlPzmlDaoImpl.java
index 8a228126..4f5cd1eb 100644
--- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/dao/impl/SenderGlPzmlDaoImpl.java
+++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/dao/impl/SenderGlPzmlDaoImpl.java
@@ -70,6 +70,12 @@ public class SenderGlPzmlDaoImpl extends MybatisGenericDao<SenderGlPzmlEntity, S
         return (List<SenderGlPzmlEntity>) super.selectList("queryGlPzmlSxy",senderGlPzmlEntity);
     }
 
+    @DS("#entity.dataSourceCode")
+    @Override
+    public List<SenderGlPzmlEntity> queryGlPzmlSxyCancelled(SenderGlPzmlEntity senderGlPzmlEntity) {
+        return (List<SenderGlPzmlEntity>) super.selectList("queryGlPzmlSxyCancelled",senderGlPzmlEntity);
+    }
+
     @DS("#entity.dataSourceCode")
     @Override
     public SenderGlPzmlEntity queryPzmlByIdpzh(SenderGlPzmlEntity entity) {
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 f900bcc1..9ea16a04 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
@@ -295,7 +295,33 @@
         <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.zt!='0'
-            and  czrz.update_time > #{ts}
+            and  czrz.update_time > #{ts} and pzml.zt in ('1','2','3')
+        </trim>
+        group by pznr.idpznr,
+        pznr.kjqj,
+        pzml.srrq,
+        pznr.zy,
+        pznr.bmdm,
+        pznr.gsdm,pznr.zth,pznr.kjqj,pznr.pzh
+    </select>
+
+    <!-- 查询列表 商学院所需要的凭证数据-->
+    <select id="queryGlPzmlSxyqueryGlPzmlSxyCancelled" resultMap="get-SenderGlPzmlEntity-result" parameterType = "com.hzya.frame.grpU8.nxproof.glPzml.entity.SenderGlPzmlEntity">
+        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
+        left join pzmlCzrzb czrz on czrz.idpzh=pzml.idpzh
+        <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.zt!='0'
+            and  czrz.update_time > #{ts} 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/ISenderGlPzmlService.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/service/ISenderGlPzmlService.java
index 236b5e92..3df4fcff 100644
--- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/service/ISenderGlPzmlService.java
+++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/service/ISenderGlPzmlService.java
@@ -107,4 +107,14 @@ public interface ISenderGlPzmlService extends IBaseService<SenderGlPzmlEntity, S
      * @Date 2024/8/13 17:00
      * **/
     Object queryGlPzmlSxy(JSONObject jsonObject);
+
+    /**
+     *
+     * @content 查询商学院已作废凭证  将已作废凭证推送行控
+     * @Param
+     * @Return
+     * @Author hecan
+     * @Date 2024-12-30 14:22
+     * **/
+    Object queryGlPzmlSxyCancelled(JSONObject jsonObject);
 }
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 4e58f2e8..02b5bcb8 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
@@ -759,6 +759,11 @@ public class SenderGlPzmlServiceImpl extends BaseService<SenderGlPzmlEntity, Str
 		}
 	}
 
+	@Override
+	public Object queryGlPzmlSxyCancelled(JSONObject jsonObject) {
+		return null;
+	}
+
 
 	//获取token
 	private String getToken(){