Merge remote-tracking branch 'origin/master'

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>
 

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">

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删除
 	 *

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;

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);
 }

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";