yangjun
/
dbsd_kczx_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/mini-org-project/course_information_center_java

This commit is contained in:
bai 2023-06-17 22:44:00 +08:00
parent dc87cff171 2ce51b91e7
commit 48d0bb9224
4 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcGongkaike/mapper/xml/KcGongkaikeMapper.xml
View File

@ -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}

4
jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/xml/KcEvaluationMapper.xml
View File

@ -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,

10
jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/controller/KcTingkeController.java
View File

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

17
jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml
View File

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