From 2ce51b91e7f5813264d3878c91a9b7183c70f06a Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Sat, 17 Jun 2023 08:56:56 +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/KcGongkaikeMapper.xml            | 12 +++++++-----
 .../kc/qa/mapper/xml/KcEvaluationMapper.xml     |  4 ++--
 .../kc/tktj/controller/KcTingkeController.java  | 10 +++++-----
 .../src/main/resources/application-prod.yml     | 17 ++++++++---------
 4 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcGongkaike/mapper/xml/KcGongkaikeMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcGongkaike/mapper/xml/KcGongkaikeMapper.xml
index 00a0c354..b7d18e06 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcGongkaike/mapper/xml/KcGongkaikeMapper.xml
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcGongkaike/mapper/xml/KcGongkaikeMapper.xml
@@ -5,11 +5,13 @@
     <select id="getIndexList" resultType="org.jeecg.modules.kc.kcGongkaike.entity.KcGongkaike">
         SELECT * from (
             SELECT * from (
-            select * from (
-                select *,'1' as  type from kc_gongkaike where rq >= DATE_FORMAT(now(),'%Y-%m-%d') ORDER BY rq asc,kssj asc
-            ) a2
-            union
-            select *,'2' as type from kc_gongkaike where rq &lt; DATE_FORMAT(now(),'%Y-%m-%d') ORDER BY rq desc,kssj desc
+                select * from (
+                    select *,'1' as  type from kc_gongkaike where rq >= DATE_FORMAT(now(),'%Y-%m-%d') ORDER BY rq asc,kssj asc
+                ) a2
+                union
+                select * from (
+                    select *,'2' as type from kc_gongkaike where rq &lt; DATE_FORMAT(now(),'%Y-%m-%d') ORDER BY rq desc,kssj desc
+                ) a3
             ) a ORDER BY type asc
         ) a
         ${ew.customSqlSegment}
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 04c6a6ab..22597bb5 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
@@ -265,9 +265,9 @@
 
     <select id="selectKkdwExportList" 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, ev.source
+        tk.upuserid AS userid, tk.upuser AS username, tksf1, tkyq, sjtksl, mltksl, tkdw, tk.source
         FROM (
-        SELECT ev.upuserid, ev.upuser, count( ev.id ) sjtksl, count( CASE WHEN kt.kkdw = '马列教研室' THEN 1 END ) mltksl, college AS tkdw
+        SELECT ev.upuserid, ev.upuser, count( ev.id ) sjtksl, count( CASE WHEN kt.kkdw = '马列教研室' THEN 1 END ) mltksl, college AS tkdw,ev.source
         FROM
         kc_evaluation ev,
         kc_ketangbiao kt,
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/controller/KcTingkeController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/controller/KcTingkeController.java
index 9f44c335..21a223cd 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/controller/KcTingkeController.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/controller/KcTingkeController.java
@@ -358,14 +358,14 @@ public class KcTingkeController extends JeecgController<KcTingke, IKcTingkeServi
 		 kcEvaluation.setKcxz(kcTingke.getKcxz());
 		 List<KcEvaluation> list = kcEvaluationService.getPkfglTjt(kcEvaluation);
 		 for(int i=0;i<pageList.size();i++){
-			 if(list.size()==0 || list.get(i)==null){
-				 pageList.get(i).setPkrc("0");
-				 pageList.get(i).setLjqxpkrl("0");
-			 }else{
+
+			 if(i<list.size()){
 				 pageList.get(i).setPkrc(list.get(i).getLjtkv());
 				 pageList.get(i).setLjqxpkrl(list.get(i).getAvgtkv());
+			 }else{
+				 pageList.get(i).setPkrc("0");
+				 pageList.get(i).setLjqxpkrl("0");
 			 }
-
 		 }
 		 return Result.OK(pageList);
 	 }
diff --git a/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml b/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml
index 217f75a3..e5ed95e7 100644
--- a/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml
+++ b/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml
@@ -131,18 +131,17 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://127.0.0.1:3307/course_information_center_jeecg_db?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          url: jdbc:mysql://127.0.0.1:3306/course_information_center_jeecg_db?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
           username: root
-#          password: ABCabc@123
-          password: root
+          password: ABCabc@123
+#          password: root
           driver-class-name: com.mysql.cj.jdbc.Driver
           # 多数据源配置
-#        multi-oracle:
-#          #url: jdbc:oracle:thin:@//JN7JP1QPL10ZKOW:1521/ORCL
-#          url: jdbc:oracle:thin:@202.198.129.24:1521:orcl
-#          username: C##XSKC
-#          password: mAPP2t2ABAfx7
-#          driver-class-name: oracle.jdbc.OracleDriver
+        multi-oracle:
+          url: jdbc:oracle:thin:@202.198.129.24:1521:orcl
+          username: C##XSKC
+          password: mAPP2t2ABAfx7
+          driver-class-name: oracle.jdbc.OracleDriver
   #redis 配置
   redis:
     database: 0