From 4a3640d07fe479159089cc6b2749656e2b1ad5c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Mon, 27 May 2024 11:39:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=99=E5=AD=A6=E5=A4=A7=E7=BA=B2=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=97=B6=E8=8E=B7=E5=8F=96=E8=AF=BE=E7=A8=8B=E7=BC=96?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/kc/ktgl/mapper/xml/KcKechengbiaoMapper.xml |  2 +-
 .../modules/kc/zyJxdg/controller/ZyJxdgController.java | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

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 9608bf90..8a20fa25 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,7 +188,7 @@
     </select>
 
     <select id="getKcbhByRwbh" resultType="org.jeecg.modules.kc.ktgl.entity.KcKechengbiao">
-        select distinct rwbh,xqxn,kkdw,kcmc,skjs
+        select distinct kcbh,rwbh,xqxn,kkdw,kcmc,skjs
         from kc_kechengbiao
         where rwbh = #{rwbh}
         <if test="xqxn!=null and xqxn!=''">
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdg/controller/ZyJxdgController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdg/controller/ZyJxdgController.java
index ff060d6b..00a20274 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdg/controller/ZyJxdgController.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdg/controller/ZyJxdgController.java
@@ -369,6 +369,16 @@ public class ZyJxdgController extends JeecgController<ZyJxdg, IZyJxdgService> {
 
 
 		if(isAdd){
+			KcKechengbiao kcKechengbiao = new KcKechengbiao();
+			kcKechengbiao.setRwbh(zyJxdg.getRwbh());
+			kcKechengbiao.setXqxn(zyJxdg.getXqxn());
+			kcKechengbiao = kcKechengbiaoService.getKcbhByRwbh(kcKechengbiao);
+			if(kcKechengbiao != null){
+				zyJxdg.setKcbh(kcKechengbiao.getKcbh());
+				zyJxdg.setSkjs(kcKechengbiao.getSkjs());
+			}else{
+				zyJxdg.setKcbh("-1");
+			}
 			zyJxdgService.save(zyJxdg);
 		}else{
 			UpdateWrapper<ZyJxdg> updateWrapper = new UpdateWrapper<>();