From 62f6fb7cbd971cdc907fa7a830e19920c7d0cf33 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Wed, 19 Apr 2023 22:04:14 +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

---
 .../jeecg/modules/kc/ktgl/entity/KcKetangbiao.java   |  3 +++
 .../kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml        | 12 +++++++++---
 .../qa/controller/KcEvaluationstudentController.java |  3 ---
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKetangbiao.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKetangbiao.java
index 50989201..3e317de0 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKetangbiao.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKetangbiao.java
@@ -260,4 +260,7 @@ public class KcKetangbiao implements Serializable {
     private String xh;
     @TableField(exist = false)
     private String xjkssj;
+    @TableField(exist = false)
+    private String stars;
+
 }
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml
index ee57f663..e015eb76 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml
@@ -76,10 +76,16 @@
 
 
     <select id="getStudentKclblist" parameterType="org.jeecg.modules.kc.ktgl.entity.KcKetangbiao"  resultType="org.jeecg.modules.kc.ktgl.entity.KcKetangbiao">
-        SELECT id, kcbh,kcmc,f_skjs(skjs) as skjs,zc,xkrs,rwbh,kkdw,kcxz,skdd,sksj,jkzc,hh,week,
+        SELECT kt.id, kcbh,kcmc,f_skjs(skjs) as skjs,zc,xkrs,rwbh,kkdw,kcxz,skdd,sksj,jkzc,hh,week,
             hhks,hhjs,dsz,wwks,wwjs,zbfs,hyh,hymm,kclj,beizhu,zbpx,kkdwid,skrq,kechengbiaoid,
-            tingkecishu,sftk,tkyy,sfcj,skxs,sfxsk
-        FROM kc_ketangbiao kt WHERE 1=1
+            tingkecishu,sftk,tkyy,sfcj,skxs,sfxsk,st.stars
+        FROM kc_ketangbiao kt
+        LEFT JOIN kc_evaluationstudent st on kt.id = st.ketangbiaoid
+        <if test="kcKetangbiao.xh!=null and kcKetangbiao.xh!=''">
+            and st.sid = #{kcKetangbiao.xh}
+        </if>
+
+        WHERE 1=1
             <if test="kcKetangbiao.hh!=null and kcKetangbiao.hh!=''">
                 and kt.hh in
                 <foreach item="item" index="index" collection="kcKetangbiao.hh.split(',')"  open="(" separator="," close=")">
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/controller/KcEvaluationstudentController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/controller/KcEvaluationstudentController.java
index 876cac0c..3485972c 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/controller/KcEvaluationstudentController.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/controller/KcEvaluationstudentController.java
@@ -65,7 +65,6 @@ public class KcEvaluationstudentController extends JeecgController<KcEvaluations
 	 */
 	@AutoLog(value = "kc_evaluationstudent-添加")
 	@ApiOperation(value="kc_evaluationstudent-添加", notes="kc_evaluationstudent-添加")
-	@RequiresPermissions("qa:kc_evaluationstudent:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody KcEvaluationstudent kcEvaluationstudent) {
 		kcEvaluationstudentService.save(kcEvaluationstudent);
@@ -80,7 +79,6 @@ public class KcEvaluationstudentController extends JeecgController<KcEvaluations
 	 */
 	@AutoLog(value = "kc_evaluationstudent-编辑")
 	@ApiOperation(value="kc_evaluationstudent-编辑", notes="kc_evaluationstudent-编辑")
-	@RequiresPermissions("qa:kc_evaluationstudent:edit")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody KcEvaluationstudent kcEvaluationstudent) {
 		kcEvaluationstudentService.updateById(kcEvaluationstudent);
@@ -110,7 +108,6 @@ public class KcEvaluationstudentController extends JeecgController<KcEvaluations
 	 */
 	@AutoLog(value = "kc_evaluationstudent-批量删除")
 	@ApiOperation(value="kc_evaluationstudent-批量删除", notes="kc_evaluationstudent-批量删除")
-	@RequiresPermissions("qa:kc_evaluationstudent:deleteBatch")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		this.kcEvaluationstudentService.removeByIds(Arrays.asList(ids.split(",")));