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

修改bug

This commit is contained in:
yangjun 2023-06-29 21:46:20 +08:00
parent 7559f48c91
commit aa5b798824
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncKcKechengbiao.java
View File

@ -52,9 +52,9 @@ public class SyncKcKechengbiao extends BaseSync {
try {
//更新历史数据
KcKechengbiao KcKechengbiaohis = new KcKechengbiao();
KcKechengbiaohis.setTs(DateUtils.formatDate(new Date(),"yyyyMMddHHmmss"));
kcKechengbiaoService.saveHis(KcKechengbiaohis);
// KcKechengbiao KcKechengbiaohis = new KcKechengbiao();
// KcKechengbiaohis.setTs(DateUtils.formatDate(new Date(),"yyyyMMddHHmmss"));
// kcKechengbiaoService.saveHis(KcKechengbiaohis);
//保留历史数据但是删除当前学期的数据
// KcSysConfig kcSysConfig = kcSysConfigService.getById("1");

6
jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncKcKetangbiao.java
View File

@ -48,9 +48,9 @@ public class SyncKcKetangbiao extends BaseSync {
try {
//更新历史数据
KcKetangbiao kcKetangbiaohis = new KcKetangbiao();
kcKetangbiaohis.setTs(DateUtils.formatDate(new Date(),"yyyyMMddHHmmss"));
kcKetangbiaoService.saveHis(kcKetangbiaohis);
// KcKetangbiao kcKetangbiaohis = new KcKetangbiao();
// kcKetangbiaohis.setTs(DateUtils.formatDate(new Date(),"yyyyMMddHHmmss"));
// kcKetangbiaoService.saveHis(kcKetangbiaohis);
KcSysConfig kcSysConfig = kcSysConfigService.getById("1");
String bxqkssj = kcSysConfig.getBxqkssj();

2
jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKechengbiaoController.java
View File

@ -78,7 +78,7 @@ public class KcKechengbiaoController extends JeecgController<KcKechengbiao, IKcK
queryWrapper.apply("(kcmc like CONCAT('%','"+kcKechengbiao.getSearchInput()+"','%') or skjs like CONCAT('%','"+kcKechengbiao.getSearchInput()+"','%'))");
}
queryWrapper.apply(StringUtils.isNotBlank(kcKechengbiao.getYwcol())," length(kcbh)<25");
queryWrapper.apply("kcmc not like '%实习%' and kcmc not like '%实训%' and kcmc not like '%实践%' and kcmc not like '%实验%' and kcmc not like '%美术%'");
// queryWrapper.apply("kcmc not like '%实习%' and kcmc not like '%实训%' and kcmc not like '%实践%' and kcmc not like '%实验%' and kcmc not like '%美术%'");
Page<KcKechengbiao> page = new Page<KcKechengbiao>(pageNo, pageSize);
IPage<KcKechengbiao> pageList = kcKechengbiaoService.page(page, queryWrapper);
return Result.OK(pageList);

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

@ -754,7 +754,9 @@
FROM kc_ketangbiao k, kc_tingke t, kc_casusers c
WHERE k.id = t.kechengbiaoid AND t.userid = c.USER
) tk
LEFT JOIN kc_assessuser sf ON tk.USER = sf.usercode
LEFT JOIN (SELECT usercode,username, GROUP_CONCAT(assess1) assess1
FROM kc_assessuser
GROUP BY usercode) sf ON tk.USER = sf.usercode
<where>
<if test="tksf !=null and tksf != ''">
and sf.assesscode = #{tksf}