From 3c3b23c17cb52a3050803b102d5b015126a908f4 Mon Sep 17 00:00:00 2001
From: hecan <1718492867@qq.com>
Date: Tue, 5 Nov 2024 11:42:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=87=AD=E8=AF=81=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E5=85=B3=E8=81=94=EF=BC=8C=E5=BD=93=E5=87=AD=E8=AF=81?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=97=B6=E9=97=B4=E5=A4=A7=E4=BA=8E=E5=BD=93?=
 =?UTF-8?q?=E5=89=8D=E6=97=B6=E9=97=B4=E6=89=8D=E6=8E=A8=E9=80=81=E5=87=AD?=
 =?UTF-8?q?=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nxproof/glPzml/entity/SenderGlPzmlEntity.java      | 10 ++++++++++
 .../grpU8/nxproof/glPzml/entity/SenderGlPzmlEntity.xml |  3 +++
 .../glPzml/service/impl/SenderGlPzmlServiceImpl.java   |  9 +++++++++
 3 files changed, 22 insertions(+)

diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/entity/SenderGlPzmlEntity.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/entity/SenderGlPzmlEntity.java
index 6bd890fd..39754d35 100644
--- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/entity/SenderGlPzmlEntity.java
+++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/entity/SenderGlPzmlEntity.java
@@ -59,6 +59,16 @@ public class SenderGlPzmlEntity extends BaseEntity {
 
  private String bmdm;
 
+ private String ts;
+
+    public String getTs() {
+        return ts;
+    }
+
+    public void setTs(String ts) {
+        this.ts = ts;
+    }
+
     public String getBmdm() {
         return bmdm;
     }
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 09d1585d..f900bcc1 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
@@ -42,6 +42,7 @@
            <result property="pzsbm" column="pzsbm" jdbcType="VARCHAR"/>
            <result property="stamp" column="stamp" jdbcType="VARCHAR"/>
            <result property="yspzje" column="yspzje" jdbcType="VARCHAR"/>
+        <result property="ts" column="ts" jdbcType="VARCHAR"/>
         </resultMap>
     <!-- 查询的字段-->
     <sql id = "SenderGlPzmlEntity_Base_Column_List">
@@ -290,9 +291,11 @@
         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}
         </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 b8ec18f0..4e58f2e8 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
@@ -38,6 +38,8 @@ public class SenderGlPzmlServiceImpl extends BaseService<SenderGlPzmlEntity, Str
 	private static String URLTest="http://60.205.205.82/";//测试环境 http://39.106.158.149/
 	private static String URL="http://192.168.250.71/";//正式环境 http://192.168.42.22/
 
+	private String ts = "";
+
 	private ISenderGlPzmlDao senderGlPzmlDao;
 
 	@Autowired
@@ -684,11 +686,18 @@ public class SenderGlPzmlServiceImpl extends BaseService<SenderGlPzmlEntity, Str
 		if(StrUtil.isEmpty(token)){
 			return BaseResult.getFailureMessageEntity("token为空，请先获取token");
 		}
+		if(null== ts|| "".equals(ts)){
+			ts = com.hzya.frame.dateutil.DateUtil.dateToString(new Date(), "yyyy-MM-dd HH:mm:ss");
+		}
+		glPzmlEntity.setTs(ts);
 		//查询凭证数据
 		List<SenderGlPzmlEntity> list = senderGlPzmlDao.queryGlPzmlSxy(glPzmlEntity);
 		if(CollectionUtils.isEmpty(list)){
 			return BaseResult.getSuccessMessageEntity("没有需要同步得凭证",null);
 		}
+		//更新TS时间
+		ts = com.hzya.frame.dateutil.DateUtil.dateToString(new Date(), "yyyy-MM-dd HH:mm:ss");
+		logger.info("凭证TS已更新：" + ts);
 		try {
 			String result=null;
 			for (SenderGlPzmlEntity pzmlEntity : list) {