From bf12db1f5a59731bcc452449296f876f4b9a0a9a Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Wed, 22 May 2024 13:44:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/xml/KcEvaluationsStatMapper.xml               | 9 +++++++--
 .../modules/kc/wjxWjxx/mapper/xml/WjxWjxxMapper.xml      | 2 +-
 .../controller/ZyInfoStudentController.java              | 9 ++++++++-
 .../modules/kc/zyInfoStudent/entity/ZyInfoStudent.java   | 1 +
 .../kc/zyInfoStudent/service/IZyInfoStudentService.java  | 2 ++
 .../service/impl/ZyInfoStudentServiceImpl.java           | 5 +++++
 6 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/mapper/xml/KcEvaluationsStatMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/mapper/xml/KcEvaluationsStatMapper.xml
index 966686c0..8c110a7f 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/mapper/xml/KcEvaluationsStatMapper.xml
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/mapper/xml/KcEvaluationsStatMapper.xml
@@ -8,7 +8,10 @@
         FROM kc_evaluation EV, KC_EVALUATIONS EVS
         WHERE ev.id = evs.evaluationid
         AND ev.evaluationver = '3'
-          and ev.source != '2'
+<!--        20240522新增大表没有的数据-->
+        and ev.id not in (SELECT col00 from kc_evaluations_stat where col15 = '一般听课表')
+
+<!--          and ev.source != '2'-->
 <!--        and ev.up_date > '2024-02-01'-->
     </select>
 
@@ -17,7 +20,9 @@
         FROM kc_evaluation EV, KC_EVALUATIONS EVS
         WHERE ev.id = evs.evaluationid
         AND ev.evaluationver = '3'
-        and ev.source = '2'
+        <!--        20240522新增大表没有的数据-->
+        and ev.id not in (SELECT col00 from kc_evaluations_stat where col15 = '一般听课表')
+<!--        and ev.source = '2'-->
 <!--        and ev.up_date > '2024-02-01'-->
     </select>
 
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 03c6505b..11e4f965 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
@@ -36,7 +36,7 @@
         <if test="param.qpublish != null and param.qpublish != ''">
             and a.qpublish = #{param.qpublish}
         </if>
-        order by create_time desc,start_time asc
+        order by end_time desc
     </select>
 
     <select id="findStuPage" parameterType="org.jeecg.modules.kc.wjxWjxx.entity.WjxWjxx" resultType="org.jeecg.modules.kc.wjxWjxx.entity.WjxWjxx">
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 9b244494..3d347e17 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
@@ -112,7 +112,14 @@ public class ZyInfoStudentController extends JeecgController<ZyInfoStudent, IZyI
 		zyInfoStudentService.updateById(zyInfoStudent);
 		return Result.OK("编辑成功!");
 	}
-	
+
+	 @AutoLog(value = "发布评分状态")
+	 @ApiOperation(value="发布评分状态", notes="发布评分状态")
+	 @RequestMapping(value = "/editFabu", method = {RequestMethod.PUT,RequestMethod.POST})
+	 public Result<String> editFabu(@RequestBody ZyInfoStudent zyInfoStudent) {
+		 zyInfoStudentService.editFabu(zyInfoStudent);
+		 return Result.OK("编辑成功!");
+	 }
 	/**
 	 *   通过id删除
 	 *
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 0272a25c..424daa33 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
@@ -85,6 +85,7 @@ public class ZyInfoStudent implements Serializable {
     private java.lang.String studentName;
     private java.lang.String score;
     private java.lang.String pdfPath;
+    private String scoreFabu;
 
     @TableField(exist = false)
     private String catename;
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/service/IZyInfoStudentService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/service/IZyInfoStudentService.java
index 39daf099..4e800212 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/service/IZyInfoStudentService.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/service/IZyInfoStudentService.java
@@ -16,4 +16,6 @@ public interface IZyInfoStudentService extends IService<ZyInfoStudent> {
     void deleteMainId(String id);
 
     public boolean updateById(ZyInfoStudent zyInfoStudent);
+
+    void editFabu(ZyInfoStudent zyInfoStudent);
 }
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/service/impl/ZyInfoStudentServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/service/impl/ZyInfoStudentServiceImpl.java
index 469570d9..41d42e02 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/service/impl/ZyInfoStudentServiceImpl.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/service/impl/ZyInfoStudentServiceImpl.java
@@ -119,6 +119,11 @@ public class ZyInfoStudentServiceImpl extends ServiceImpl<ZyInfoStudentMapper, Z
         return false;
     }
 
+    @Override
+    public void editFabu(ZyInfoStudent zyInfoStudent) {
+        baseMapper.updateById(zyInfoStudent);
+    }
+
     //aigc提交
     private void aigcSave(ZyInfoStudent zyInfoStudent) {
         String url = "https://vims.fanyu.com/tool/AIGCCheck/paperSubmit";