From ee9f7b9b4cec21f082f34aa905fcc73edd2f39a9 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Mon, 17 Mar 2025 09:40:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A9=B3=E5=9B=9E=E5=8E=9F?=
 =?UTF-8?q?=E5=9B=A0=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/org/jeecg/modules/kc/zyInfo/entity/ZyInfo.java  | 2 ++
 .../org/jeecg/modules/kc/zyInfo/mapper/xml/ZyInfoMapper.xml   | 3 ++-
 .../kc/zyInfoStudent/controller/ZyInfoStudentController.java  | 1 +
 .../jeecg/modules/kc/zyInfoStudent/entity/ZyInfoStudent.java  | 3 +++
 .../src/main/resources/application-linux.yml                  | 4 ++--
 5 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/entity/ZyInfo.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/entity/ZyInfo.java
index 0df94329..1b3f1e90 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/entity/ZyInfo.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/entity/ZyInfo.java
@@ -232,5 +232,7 @@ public class ZyInfo implements Serializable {
     private String yuanTeacherNo;
     @TableField(exist = false)
     private String yuanTeacherName;
+    @TableField(exist = false)
+    private String bhContent;
 
 }
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/mapper/xml/ZyInfoMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/mapper/xml/ZyInfoMapper.xml
index b2d0d69f..87173267 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/mapper/xml/ZyInfoMapper.xml
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/mapper/xml/ZyInfoMapper.xml
@@ -51,7 +51,8 @@
                         a.score                                                                                    as zyzb,
                         b.score_fabu,
                         b.py_content,
-                        b.py_file_path
+                        b.py_file_path,
+                        b.bh_content
         from zy_info a
                  LEFT JOIN xxhbxsxkb c on a.rwbh = c.KCAPZBBH
                  left join zy_info_student b on a.id = b.main_id and b.create_by = c.xh
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/controller/ZyInfoStudentController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/controller/ZyInfoStudentController.java
index 2c576645..172e07ec 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/controller/ZyInfoStudentController.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/controller/ZyInfoStudentController.java
@@ -871,6 +871,7 @@ public class ZyInfoStudentController extends JeecgController<ZyInfoStudent, IZyI
 		 updateWrapper.set("zzdf",null);
 		 updateWrapper.set("score",null);
 		 updateWrapper.eq("id",zyInfoStudent.getId());
+		 updateWrapper.set("bh_content",zyInfoStudent.getBhContent());
 		 zyInfoStudentService.update(updateWrapper);
 
 
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/entity/ZyInfoStudent.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/entity/ZyInfoStudent.java
index 8dca07e9..54050e5b 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/entity/ZyInfoStudent.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/entity/ZyInfoStudent.java
@@ -104,6 +104,9 @@ public class ZyInfoStudent implements Serializable {
     @Dict(dicCode = "cdlx")
     private String cdlx;//存档类型
 
+    //驳回内容
+    private String bhContent;
+
 
 	/**作业名称*/
     @ApiModelProperty(value = "作业名称")
diff --git a/jeecg-module-system/jeecg-system-start/src/main/resources/application-linux.yml b/jeecg-module-system/jeecg-system-start/src/main/resources/application-linux.yml
index b3c416e6..d1b2288e 100644
--- a/jeecg-module-system/jeecg-system-start/src/main/resources/application-linux.yml
+++ b/jeecg-module-system/jeecg-system-start/src/main/resources/application-linux.yml
@@ -189,9 +189,9 @@ jeecg:
     app: http://localhost:8051
   path:
     #文件上传根目录 设置
-    upload: /opt/jeecg-boot/upload
+    upload: /data/jeecg-boot/upload
     #webapp文件路径
-    webapp: /opt/jeecg-boot/webapp
+    webapp: /data/jeecg-boot/webapp
   shiro:
     excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**,/api/getUserInfo
   #阿里云oss存储和大鱼短信秘钥配置