From 69acef6e09343509fb49075b66fe1b20d5ced095 Mon Sep 17 00:00:00 2001
From: xiechao <768159101@qq.com>
Date: Thu, 25 Apr 2024 16:28:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E6=8E=A8=E9=80=81=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dao/jxgl/jxfpgl/fphq/FphqMapper.java      |  2 ++
 .../xxgl/xmkpgl/cgfp/BoCgfpServiceImpl.java   | 26 +++++++++--------
 .../mapper/mysql/jxgl/FphqMapper.xml          | 28 +++++++++++++++++--
 3 files changed, 43 insertions(+), 13 deletions(-)

diff --git a/src/main/java/net/htjs/pt4/zzsxt/dao/jxgl/jxfpgl/fphq/FphqMapper.java b/src/main/java/net/htjs/pt4/zzsxt/dao/jxgl/jxfpgl/fphq/FphqMapper.java
index b906f1e..de1ae1c 100644
--- a/src/main/java/net/htjs/pt4/zzsxt/dao/jxgl/jxfpgl/fphq/FphqMapper.java
+++ b/src/main/java/net/htjs/pt4/zzsxt/dao/jxgl/jxfpgl/fphq/FphqMapper.java
@@ -58,4 +58,6 @@ public interface FphqMapper extends BaseDao {
       */
     List<Map> selectZZSGL_JX_FPXX_BY_DMHM(Map userMap);
 
+    Map select_JX_FPXX_BY_DMHM(Map userMap);
+
 }
diff --git a/src/main/java/net/htjs/pt4/zzsxt/service/impl/xxgl/xmkpgl/cgfp/BoCgfpServiceImpl.java b/src/main/java/net/htjs/pt4/zzsxt/service/impl/xxgl/xmkpgl/cgfp/BoCgfpServiceImpl.java
index 61ab705..11ac413 100644
--- a/src/main/java/net/htjs/pt4/zzsxt/service/impl/xxgl/xmkpgl/cgfp/BoCgfpServiceImpl.java
+++ b/src/main/java/net/htjs/pt4/zzsxt/service/impl/xxgl/xmkpgl/cgfp/BoCgfpServiceImpl.java
@@ -6,12 +6,13 @@ import com.alibaba.fastjson.JSONObject;
 import net.htjs.pt4.core.ServiceException;
 import net.htjs.pt4.swgxpt.mapper.SwgxptMapper;
 import net.htjs.pt4.swgxpt.vo.InvoiceSearchRes;
-import net.htjs.pt4.zzsxt.controller.jxgl.jxfpgl.fppz.JxpzController;
+import net.htjs.pt4.zzsxt.dao.jxgl.jxfpgl.fphq.FphqMapper;
 import net.htjs.pt4.zzsxt.dao.xxgl.xmkpgl.cgfp.CgfpMapper;
 import net.htjs.pt4.zzsxt.entity.*;
 import net.htjs.pt4.zzsxt.service.xxgl.xmkpgl.cgfp.IBoCgfpService;
 import net.htjs.pt4.zzsxt.service.xxgl.xmkpgl.kpsq.IBoKpsqService;
 import net.htjs.pt4.zzsxt.tools.HttpClientUtil;
+import net.htjs.util.Get16BM;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -27,6 +28,8 @@ public class BoCgfpServiceImpl implements IBoCgfpService {
 
     @Resource
     private CgfpMapper cgfpMapper;
+    @Resource
+    private FphqMapper fphqMapper;
 
     @Autowired
     private IBoKpsqService iBoKpsqService;
@@ -63,21 +66,22 @@ public class BoCgfpServiceImpl implements IBoCgfpService {
 
         Map<String,Object> fpxxMap = new HashMap<>();
 
-        fpxxMap.put("fpdm",fpxx.get("fpdm"));
-        fpxxMap.put("fphm",fpxx.get("fphm"));
-        fpxxMap.put("kprq",fpxx.get("kprq"));
-        fpxxMap.put("bhsje",fpxx.get("hjje"));
-        fpxxMap.put("se",fpxx.get("hjse"));
-        fpxxMap.put("fplxdm",fpxx.get("pjlx"));
-        fpxxMap.put("fylx",fpxx.get("fylx"));
+        fpxxMap.put("FPID", Get16BM.getUnquieID());
+        fpxxMap.put("FPDM",fpxx.get("fpdm"));
+        fpxxMap.put("FPHM",fpxx.get("fphm"));
+        fpxxMap.put("KPRQ",fpxx.get("kprq"));
+        fpxxMap.put("JEBHS",fpxx.get("hjje"));
+        fpxxMap.put("SE",fpxx.get("hjse"));
+        fpxxMap.put("JSHJ",fpxx.get("jshj"));
+        fpxxMap.put("FYLX",fpxx.get("fylx"));
 
-        Map map = cgfpMapper.selectInvoiceByFpdmhm(fpxxMap);
+        Map map = fphqMapper.select_JX_FPXX_BY_DMHM(fpxxMap);
 
         if (map == null){
-            return this.insertZZSGL_XX_JXFP(fpxxMap);
+            return fphqMapper.insertZZSGL_JX_FPXX_FPXZ(fpxxMap);
         }else {
             fpxxMap.put("fpid",map.get("fpid"));
-            return this.updateZZSGL_XX_JXFP(fpxxMap);
+            return fphqMapper.updateZZSGL_JX_FPXX_FPXZ(fpxxMap);
         }
     }
 
diff --git a/src/main/resources/mapper/mysql/jxgl/FphqMapper.xml b/src/main/resources/mapper/mysql/jxgl/FphqMapper.xml
index fd9db30..94cecc9 100644
--- a/src/main/resources/mapper/mysql/jxgl/FphqMapper.xml
+++ b/src/main/resources/mapper/mysql/jxgl/FphqMapper.xml
@@ -105,6 +105,9 @@
                 <if test="RZRQ!=null and RZRQ!=''">
                     ,RZRQ
                 </if>
+                <if test="FYLX!=null and FYLX!=''">
+                    ,FYLX
+                </if>
                 )
         VALUES
               ( #{FPID}, #{FPDM}, #{FPHM}, #{FPZT}, #{KPRQ}, #{XFMC}, #{XFSH}, #{SL},
@@ -112,6 +115,9 @@
                 <if test="RZRQ!=null and RZRQ!=''">
                     ,DATE_FORMAT(#{RZRQ}, '%Y-%m-%d')
                 </if>
+                <if test="FYLX!=null and FYLX!=''">
+                    ,#{FYLX}
+                </if>
                 )
     </insert>
     <!--/**
@@ -188,7 +194,25 @@
         SELECT XX.FPID, XX.FPHM, XX.FPDM, GS.CZZT
           FROM ZZSGL_JX_FPXX XX
           LEFT JOIN ZZSGL_JX_FPGS GS ON XX.FPID = GS.FPID
-         WHERE XX.FPDM = #{FPDM} AND XX.FPHM = #{FPHM}
+         WHERE  XX.FPHM = #{FPHM}
+            <if test="FPDM != null and FPDM!=''">
+                AND XX.FPDM = #{FPDM}
+            </if>
     </select>
 
-</mapper>
\ No newline at end of file
+    <!--/**
+      *@Author: yangrong
+      *@Description： 发票下载-查询票是否重复
+      *@Date: 17:24 2018/5/22
+      */-->
+    <select id="select_JX_FPXX_BY_DMHM" parameterType="map" resultType="hashMap">
+        <!--后期需要可以添加字段-->
+        SELECT *
+        FROM ZZSGL_JX_FPXX
+        WHERE  FPHM = #{FPHM}
+        <if test="FPDM != null and FPDM!=''">
+            AND FPDM = #{FPDM}
+        </if>
+    </select>
+
+</mapper>