From 003c6a1fb5ee409ce2d01c8652201586acd29840 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Sat, 25 May 2024 14:38:55 +0800
Subject: [PATCH] =?UTF-8?q?SFTP=E4=B8=8A=E4=BC=A0,=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E4=BC=98=E5=8C=96=EF=BC=8C=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=BC=96=E5=8F=B7=E5=AD=97=E6=AE=B5=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E5=AD=A6=E6=9C=9F=E3=80=81=E5=8D=95=E4=BD=8D=E3=80=81?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E3=80=81=E6=95=99=E5=B8=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kc/ktgl/mapper/xml/KcKechengbiaoMapper.xml     |  6 ++++--
 .../modules/zyk/service/impl/ZykServiceImpl.java   | 14 ++++++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKechengbiaoMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKechengbiaoMapper.xml
index 1773672b..9608bf90 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKechengbiaoMapper.xml
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKechengbiaoMapper.xml
@@ -188,10 +188,12 @@
     </select>
 
     <select id="getKcbhByRwbh" resultType="org.jeecg.modules.kc.ktgl.entity.KcKechengbiao">
-        select distinct kcbh,rwbh,xqxn,skjs
+        select distinct rwbh,xqxn,kkdw,kcmc,skjs
         from kc_kechengbiao
         where rwbh = #{rwbh}
-        and xqxn = #{xqxn}
+        <if test="xqxn!=null and xqxn!=''">
+            and xqxn = #{xqxn}
+        </if>
     </select>
 
 </mapper>
\ No newline at end of file
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/zyk/service/impl/ZykServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/zyk/service/impl/ZykServiceImpl.java
index 39ba7278..508a5149 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/zyk/service/impl/ZykServiceImpl.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/zyk/service/impl/ZykServiceImpl.java
@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.text.StringUtils;
+import org.jeecg.modules.kc.ktgl.entity.KcKechengbiao;
+import org.jeecg.modules.kc.ktgl.service.IKcKechengbiaoService;
 import org.jeecg.modules.zyk.entity.ZykInfo;
 import org.jeecg.modules.zyk.mapper.ZykMapper;
 import org.jeecg.modules.zyk.service.IZykService;
@@ -32,9 +34,14 @@ public class ZykServiceImpl extends ServiceImpl<ZykMapper, ZykInfo> implements I
     @Autowired
     private FileHandleUtil fileHandleUtil;
 
+    @Autowired
+    IKcKechengbiaoService kcKechengbiaoService;
+
     @Autowired
     private ZykMapper zykMapper;
 
+
+
     @Override
     public Page<ZykInfo> findPage(ZykInfo zykInfo, Page<ZykInfo> page){
         List<ZykInfo> list = zykMapper.findPage(page,zykInfo);
@@ -189,6 +196,13 @@ public class ZykServiceImpl extends ServiceImpl<ZykMapper, ZykInfo> implements I
      */
     @Override
     public Map<String,String> saveToZyk(ZykInfo zykInfo){
+        KcKechengbiao kcb = new KcKechengbiao();
+        kcb.setRwbh(zykInfo.getRwbh());
+        kcb = kcKechengbiaoService.getKcbhByRwbh(kcb);
+        zykInfo.setXqxn(kcb.getXqxn());
+        zykInfo.setKkdw(kcb.getKkdw());
+        zykInfo.setKcmc(kcb.getKcmc());
+        zykInfo.setSkjs(kcb.getSkjs());
 //        Map<String,String> map = fileHandleUtil.uploadFile(zykInfo);
         Map<String,String> map = fileHandleUtil.moveFiles(zykInfo);
         if(!map.get("code").equals("0")){