From edafeb41a52e6d2670ad818a7e735a8d8909ec80 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Fri, 8 Dec 2023 21:27:12 +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

---
 .../KcExportConfigTpkwcqkjzglxServiceImpl.java     |  5 ++++-
 .../controller/KcZhihuijiaoshiController.java      |  1 +
 .../controller/KcEvaluationsStatController.java    |  3 +++
 .../kcZzThpjb/controller/KcZzThpjbController.java  |  2 +-
 .../kcZzXstkb/controller/KcZzXstkbController.java  |  2 +-
 .../kcZzYbtkb/controller/KcZzYbtkbController.java  |  2 +-
 .../kc/qa/mapper/xml/KcEvaluationMapper.xml        | 14 +++++++++-----
 7 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/service/impl/KcExportConfigTpkwcqkjzglxServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/service/impl/KcExportConfigTpkwcqkjzglxServiceImpl.java
index 63386bbd..70f67d2a 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/service/impl/KcExportConfigTpkwcqkjzglxServiceImpl.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/service/impl/KcExportConfigTpkwcqkjzglxServiceImpl.java
@@ -175,13 +175,16 @@ public class KcExportConfigTpkwcqkjzglxServiceImpl extends ServiceImpl<KcExportC
 //            KcSysConfig kcSysConfig = kcSysConfigService.getById("1");
             Map<String, Object> resMap = new HashMap<>();
             String title = dictUtils.translateDictValue("tpkwcqkjzglx",tklx);
+            resMap.put("title", title);
+            if(StringUtils.equals("210,270,280",tklx)){
+                resMap.put("title", "学院（部）其他党政领导");
+            }
             if(StringUtils.equals("70",tklx)||StringUtils.equals("100",tklx)||StringUtils.equals("160",tklx)){
                 resMap.put("type","0");//0代表管理员 1代表教务秘书
             }else{
                 resMap.put("type","1");//0代表管理员 1代表教务秘书
             }
             resMap.put("code", tklx);
-            resMap.put("title", title);
             KcExportConfigTpkwcqkjzglx kcExportConfigTpkwcqkjzglx1 = new KcExportConfigTpkwcqkjzglx();
             kcExportConfigTpkwcqkjzglx1.setDwmc(schoolname);
             kcExportConfigTpkwcqkjzglx1.setTklx(tklx);
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/controller/KcZhihuijiaoshiController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/controller/KcZhihuijiaoshiController.java
index d6e7cef3..5e739139 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/controller/KcZhihuijiaoshiController.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/controller/KcZhihuijiaoshiController.java
@@ -101,6 +101,7 @@ public class KcZhihuijiaoshiController extends JeecgController<KcZhihuijiaoshi,
 												  QueryWrapper<KcZhihuijiaoshi> queryWrapper) {
 		 TimeInterval timer = DateUtil.timer();
 		 Page<KcZhihuijiaoshi> page = new Page<>(pageNo, pageSize);
+		 queryWrapper.orderByAsc("sort");
 		 IPage<KcZhihuijiaoshi> pageList = kcZhihuijiaoshiService.page(page, queryWrapper);
 
 		 log.info("01: {}",timer.intervalRestart());
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/controller/KcEvaluationsStatController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/controller/KcEvaluationsStatController.java
index e111b577..42164d53 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/controller/KcEvaluationsStatController.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/controller/KcEvaluationsStatController.java
@@ -164,6 +164,9 @@ public class KcEvaluationsStatController extends JeecgController<KcEvaluationsSt
     */
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, KcEvaluationsStat kcEvaluationsStat) {
+		if(StringUtils.isNotBlank(kcEvaluationsStat.getCol13())){
+			kcEvaluationsStat.setCol13("*"+kcEvaluationsStat.getCol13()+"*");
+		}
         return super.exportXls(request, kcEvaluationsStat, KcEvaluationsStat.class, "全量评价表");
     }
 
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzThpjb/controller/KcZzThpjbController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzThpjb/controller/KcZzThpjbController.java
index 270838f3..27028f0a 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzThpjb/controller/KcZzThpjbController.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzThpjb/controller/KcZzThpjbController.java
@@ -115,7 +115,7 @@ public class KcZzThpjbController extends JeecgController<KcZzThpjb, IKcZzThpjbSe
 			}
 		}
 		if(StringUtils.equals("1",adminRole)){
-			queryWrapper.eq("d.gh",sysUser.getUsername());
+			queryWrapper.eq("a.create_by",sysUser.getUsername());
 		}
 		//-------------获取当前登陆人是否是管理员角色，如果不是都按照教务秘书处理---------------------------
 		Page<KcZzThpjb> page = new Page<KcZzThpjb>(pageNo, pageSize);
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzXstkb/controller/KcZzXstkbController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzXstkb/controller/KcZzXstkbController.java
index b2998146..9c4f79bc 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzXstkb/controller/KcZzXstkbController.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzXstkb/controller/KcZzXstkbController.java
@@ -110,7 +110,7 @@ public class KcZzXstkbController extends JeecgController<KcZzXstkb, IKcZzXstkbSe
 			}
 		}
 		if(StringUtils.equals("1",adminRole)){
-			queryWrapper.eq("d.gh",sysUser.getUsername());
+			queryWrapper.eq("a.create_by",sysUser.getUsername());
 		}
 		//-------------获取当前登陆人是否是管理员角色，如果不是都按照教务秘书处理---------------------------
 		Page<KcZzXstkb> page = new Page<KcZzXstkb>(pageNo, pageSize);
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzYbtkb/controller/KcZzYbtkbController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzYbtkb/controller/KcZzYbtkbController.java
index 4d572a03..104df6d1 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzYbtkb/controller/KcZzYbtkbController.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzYbtkb/controller/KcZzYbtkbController.java
@@ -115,7 +115,7 @@ public class KcZzYbtkbController extends JeecgController<KcZzYbtkb, IKcZzYbtkbSe
 			}
 		}
 		if(StringUtils.equals("1",adminRole)){
-			queryWrapper.eq("d.gh",sysUser.getUsername());
+			queryWrapper.eq("a.create_by",sysUser.getUsername());
 		}
 		//-------------获取当前登陆人是否是管理员角色，如果不是都按照教务秘书处理---------------------------
 		Page<KcZzYbtkb> page = new Page<KcZzYbtkb>(pageNo, pageSize);
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/xml/KcEvaluationMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/xml/KcEvaluationMapper.xml
index 7eacf77e..acfb918f 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/xml/KcEvaluationMapper.xml
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/xml/KcEvaluationMapper.xml
@@ -3,7 +3,8 @@
 <mapper namespace="org.jeecg.modules.kc.qa.mapper.KcEvaluationMapper">
     <select id="getPktjbList" parameterType="org.jeecg.modules.kc.qa.entity.KcEvaluation" resultType="org.jeecg.modules.kc.qa.entity.KcEvaluation">
         SELECT
-        tk.upuserid AS userid, tk.upuser AS username, tksf1, tkyq, sjtksl, mltksl, tkdw
+        tk.upuserid AS userid, tk.upuser AS username, tksf1, tkyq, sjtksl, mltksl, tkdw ,
+        au.tklx
         FROM (
         SELECT ev.upuserid, cu.xm as upuser, count( ev.id ) sjtksl, count( CASE WHEN kt.kkdw = '马列教研室' THEN 1 END ) mltksl, cu.dwmc AS tkdw,kt.skrq
         FROM
@@ -36,15 +37,18 @@
         GROUP BY ev.upuserid, cu.dwh
         ) tk left join
         (
-        select gh as usercode,xm as username,GROUP_CONCAT( b.item_text SEPARATOR ',' ) as tksf1 ,max(ytkcs) as tkyq from kc_export_config_tpkwcqkjzglx a
+        select gh as usercode,xm as username,GROUP_CONCAT( b.item_text SEPARATOR ',' ) as tksf1 ,
+        max( ytkcs-0 ) AS tkyq , tklx AS tklx from kc_export_config_tpkwcqkjzglx a
         LEFT JOIN sys_dict_item b on a.tklx = b.item_value and dict_id = '1682386362753224705'
             and a.xqxn = (select flag1 from kc_sys_config where id = 1)
-        <if test="kcEvaluation.tksf != null and kcEvaluation.tksf != ''">
-            AND b.item_value = #{kcEvaluation.tksf}
-        </if>
         GROUP BY gh,xm
         ) au
         on tk.upuserid = au.usercode
+        <where>
+            <if test="kcEvaluation.tksf != null and kcEvaluation.tksf != ''">
+                and au.tklx = #{kcEvaluation.tksf}
+            </if>
+        </where>
         ORDER BY sjtksl DESC
     </select>