From 2de52530bf8f5163912761702e3cbd80ed8cfa3c Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Wed, 5 Feb 2025 11:00:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B0=83=E6=9F=A5=E9=97=AE?=
 =?UTF-8?q?=E5=8D=B7=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/kc/wjxDjxx/service/impl/WjxDjxxServiceImpl.java    | 1 +
 .../main/java/org/jeecg/modules/kc/wjxWjxx/entity/WjxWjxx.java | 2 ++
 .../org/jeecg/modules/kc/wjxWjxx/mapper/xml/WjxWjxxMapper.xml  | 3 ++-
 .../kc/wjxWjxxTmlb/service/impl/WjxWjxxTmlbServiceImpl.java    | 2 +-
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/service/impl/WjxDjxxServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/service/impl/WjxDjxxServiceImpl.java
index 7a74eb73..70f01f4c 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/service/impl/WjxDjxxServiceImpl.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/service/impl/WjxDjxxServiceImpl.java
@@ -280,6 +280,7 @@ public class WjxDjxxServiceImpl extends ServiceImpl<WjxDjxxMapper, WjxDjxx> impl
                 }
             } else {
                 baseMapper.updateErrMsg(user.getUsername(), vid, jsonResult.getString("errormsg"));
+
                 return jsonResult.getString("errormsg");
             }
         }
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/entity/WjxWjxx.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/entity/WjxWjxx.java
index 0e9afa63..7ac0c68e 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/entity/WjxWjxx.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/entity/WjxWjxx.java
@@ -164,4 +164,6 @@ public class WjxWjxx implements Serializable {
     private String yuanTeacherName;
     @TableField(exist = false)
     private String ts;
+    @TableField(exist = false)
+    private String errorMsg;
 }
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/mapper/xml/WjxWjxxMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/mapper/xml/WjxWjxxMapper.xml
index ef362a12..302b080e 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/mapper/xml/WjxWjxxMapper.xml
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/mapper/xml/WjxWjxxMapper.xml
@@ -43,7 +43,8 @@
             a.fzbms,
             a.zdsx,
             ifnull(b.flag,'-1') as flag,
-            b.id as djId
+            b.id as djId,
+            b.error_msg
         from wjx_wjxx a
         left join wjx_djxx b on a.vid = b.vid and b.user_id = #{param.userId}
         where a.qpublish in ('1','2')
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/service/impl/WjxWjxxTmlbServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/service/impl/WjxWjxxTmlbServiceImpl.java
index ed893c72..d3dbad31 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/service/impl/WjxWjxxTmlbServiceImpl.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/service/impl/WjxWjxxTmlbServiceImpl.java
@@ -46,7 +46,7 @@ public class WjxWjxxTmlbServiceImpl extends ServiceImpl<WjxWjxxTmlbMapper, WjxWj
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void saveMain(WjxWjxxTmlb wjxWjxxTmlb, List<WjxWjxxTmxx> wjxWjxxTmxxList) {
-		wjxWjxxTmlb.setWjLeixing("6");
+//		wjxWjxxTmlb.setWjLeixing("6");
 		wjxWjxxTmlbMapper.insert(wjxWjxxTmlb);
 		if(wjxWjxxTmxxList!=null && wjxWjxxTmxxList.size()>0) {
 			for(WjxWjxxTmxx entity:wjxWjxxTmxxList) {