From 6f5c2e2a27355fe16c82bb64586fc6289627b5d1 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Thu, 19 Dec 2024 15:02:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=A6=E7=94=9F=E6=97=A5?= =?UTF-8?q?=E5=8E=86=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SynchronizationService/SyncKcktStat.java | 8 ++ .../KcEvaluationsStatController.java | 76 ++++++++++++++----- .../mapper/xml/KcEvaluationsStatMapper.xml | 7 ++ .../controller/KcKechengbiaoController.java | 3 + .../controller/KcKetangbiaoController.java | 24 ++++++ .../kc/ktgl/mapper/KcKechengbiaoMapper.java | 5 ++ .../kc/ktgl/mapper/KcKetangbiaoMapper.java | 1 + .../ktgl/mapper/xml/KcKechengbiaoMapper.xml | 10 +++ .../kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml | 4 + .../ktgl/service/IKcKechengbiaoService.java | 5 ++ .../kc/ktgl/service/IKcKetangbiaoService.java | 1 + .../impl/KcKechengbiaoServiceImpl.java | 12 +++ .../service/impl/KcKetangbiaoServiceImpl.java | 1 + 13 files changed, 138 insertions(+), 19 deletions(-) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncKcktStat.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncKcktStat.java index 0e48718d..db232ae9 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncKcktStat.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncKcktStat.java @@ -215,6 +215,14 @@ public class SyncKcktStat extends BaseSync { //--------------------20241204添加修改课堂表的kechengbiaoid字段------------------------- + //--------------------20241219修改课程表及课堂表为思政课程------------------------- + try { + kcKechengbiaoService.updateSzkc(); + } catch (Exception e){ + e.printStackTrace(); + } + //--------------------20241219修改课程表及课堂表为思政课程------------------------- + //---------------------20240416新增手动调停课逻辑------------------ try { editTtkxx(); 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 e45de40d..c94fb60b 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 @@ -213,27 +213,65 @@ public class KcEvaluationsStatController extends JeecgController clazz, String title) { -// // Step.1 组装查询条件 -// QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper("a",object, request.getParameterMap()); + protected ModelAndView exportXls(HttpServletRequest request, KcEvaluationsStat kcEvaluationsStat, Class clazz, String title) { + // Step.1 组装查询条件 + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper("a",kcEvaluationsStat, request.getParameterMap()); // LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); -// queryWrapper.eq(StringUtils.isNotBlank(object.getSzkc()),"c.szkc",object.getSzkc()); -// // Step.2 获取导出数据 -// List exportList = service.list(queryWrapper); +// queryWrapper.eq(StringUtils.isNotBlank(object.getSzkc()),"a.col59",object.getSzkc()); +// queryWrapper.eq(StringUtils.isNotBlank(object.getSzkc()),"b.dwmc",object.getSkjsdw()); // -// // Step.3 AutoPoi 导出Excel -// ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); -// //此处设置的filename无效 ,前端会重更新设置一下 -// mv.addObject(NormalExcelConstants.FILE_NAME, title); -// mv.addObject(NormalExcelConstants.CLASS, clazz); -// //update-begin--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置-------------------- -// ExportParams exportParams=new ExportParams(title + "报表", "导出人:" + sysUser.getRealname(), title); -// exportParams.setImageBasePath(upLoadPath); -// //update-end--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置---------------------- -// mv.addObject(NormalExcelConstants.PARAMS,exportParams); -// mv.addObject(NormalExcelConstants.DATA_LIST, exportList); -// return mv; -// } +// if(StringUtils.isNotBlank(kcEvaluationsStat.getCol13())){ +// kcEvaluationsStat.setCol13("*"+kcEvaluationsStat.getCol13()+"*"); +// } +// + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + List roleList = sysBaseApi.getRolesByUsername(sysUser.getUsername()); + String adminRole = "1";//0 admin 1教务秘书 + for(String role :roleList){ + if(org.apache.commons.lang.StringUtils.equals("admin",role)){ + adminRole = "0"; + break; + } + } + +// QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper("a",kcEvaluationsStat, request.getParameterMap()); + if(StringUtils.isNotBlank(kcEvaluationsStat.getSzkc())){ + String szkc = kcEvaluationsStat.getSzkc(); + if(StringUtils.equals("1",szkc)){ + queryWrapper.eq("col59","是"); + }else if(StringUtils.equals("0",szkc)){ + queryWrapper.eq("col59","否"); + } + } + if(StringUtils.equals("1",adminRole)){ + QueryWrapper xxhbuserQueryWrapper = new QueryWrapper<>(); + xxhbuserQueryWrapper.eq("gh",sysUser.getUsername()); + xxhbuserQueryWrapper.last("limit 1"); + Xxhbuser xxhbuser = xxhbuserService.getOne(xxhbuserQueryWrapper); + queryWrapper.eq("col10",xxhbuser.getDwmc()); + } + queryWrapper.eq(StringUtils.isNotBlank(kcEvaluationsStat.getSkjsdw()),"b.dwmc",kcEvaluationsStat.getSkjsdw()); + +// queryWrapper.eq(StringUtils.isNotBlank(kcEvaluationsStat.getSzkc()),"c.szkc",kcEvaluationsStat.getSzkc()); +// Page page = new Page(pageNo, pageSize); +// IPage pageList = kcEvaluationsStatService.page(page, queryWrapper); + + // Step.2 获取导出数据 + List exportList = kcEvaluationsStatService.list(queryWrapper); + + // Step.3 AutoPoi 导出Excel + ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); + //此处设置的filename无效 ,前端会重更新设置一下 + mv.addObject(NormalExcelConstants.FILE_NAME, title); + mv.addObject(NormalExcelConstants.CLASS, clazz); + //update-begin--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置-------------------- + ExportParams exportParams=new ExportParams(title + "报表", "导出人:" + sysUser.getRealname(), title); + exportParams.setImageBasePath(upLoadPath); + //update-end--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置---------------------- + mv.addObject(NormalExcelConstants.PARAMS,exportParams); + mv.addObject(NormalExcelConstants.DATA_LIST, exportList); + return mv; + } /** * 通过excel导入数据 diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/mapper/xml/KcEvaluationsStatMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/mapper/xml/KcEvaluationsStatMapper.xml index aac1f444..09a46528 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/mapper/xml/KcEvaluationsStatMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/mapper/xml/KcEvaluationsStatMapper.xml @@ -1481,4 +1481,11 @@ select max(id) as id,gh,xqxn from KC_EXPORT_CONFIG_TPKWCQKJZGLX where xqxn = #{x ${ew.customSqlSegment} + + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKechengbiaoController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKechengbiaoController.java index d49860ac..bbc5c1ba 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKechengbiaoController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKechengbiaoController.java @@ -22,6 +22,7 @@ import org.jeecg.modules.kc.kcSysConfig.service.IKcSysConfigService; import org.jeecg.modules.kc.kcSzkc.entity.KcSzkc; import org.jeecg.modules.kc.kcSzkc.service.IKcSzkcService; import org.jeecg.modules.kc.ktgl.entity.KcKechengbiao; +import org.jeecg.modules.kc.ktgl.entity.KcKetangbiao; import org.jeecg.modules.kc.ktgl.service.IKcKechengbiaoService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -334,4 +335,6 @@ public class KcKechengbiaoController extends JeecgController> getStudentRiliKclist(KcKetangbiao kcKetangbiao, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(kcKetangbiao, req.getParameterMap()); + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + KcSysConfig kcSysConfig = kcSysConfigService.getById("1"); + kcKetangbiao.setXnxq(kcSysConfig.getFlag1()); + kcKetangbiao.setXh(sysUser.getUsername()); + + List pageList = kcKechengbiaoService.getStudentRiliKclist(kcKetangbiao); + + + + return Result.OK(pageList); + } + } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKechengbiaoMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKechengbiaoMapper.java index f33e0654..0578838e 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKechengbiaoMapper.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKechengbiaoMapper.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.jeecg.modules.kc.ktgl.entity.KcKechengbiao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.kc.ktgl.entity.KcKetangbiao; /** * @Description: 课程管理-主表 @@ -45,4 +46,8 @@ public interface KcKechengbiaoMapper extends BaseMapper { IPage getStudentKclist(Page page,@Param(Constants.WRAPPER) QueryWrapper queryWrapper); KcKechengbiao getKcbhByRwbh(KcKechengbiao kcKechengbiao); + + List getStudentRiliKclist(KcKetangbiao kcKetangbiao); + + void updateSzkc(); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKetangbiaoMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKetangbiaoMapper.java index 5d1ac1df..66303217 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKetangbiaoMapper.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKetangbiaoMapper.java @@ -73,4 +73,5 @@ public interface KcKetangbiaoMapper extends BaseMapper { List getKccountExportList(KcKetangbiaoNum kcKetangbiao); void updateKechengbiaoid( @Param("skrq") String skrq); + } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKechengbiaoMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKechengbiaoMapper.xml index b3f974af..8d8f08a9 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKechengbiaoMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKechengbiaoMapper.xml @@ -228,4 +228,14 @@ limit 1 + + + + update kc_kechengbiao set szkc = '1' where kkdw = '马列教研室' + \ No newline at end of file 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 d6b38e7c..7a9d9e6c 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 @@ -814,4 +814,8 @@ LEFT JOIN kc_kechengbiao b on a.kcmc = b.kcmc and a.rwbh = b.rwbh and a.skjs = b.skjs and a.hh = b.hh set a.kechengbiao1 = b.id , a.kechengbiaoid = b.id where skrq = #{skrq} and b.flag = 0 + + + + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKechengbiaoService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKechengbiaoService.java index bd821d6a..95237679 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKechengbiaoService.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKechengbiaoService.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.jeecg.modules.kc.ktgl.entity.KcKechengbiao; import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.kc.ktgl.entity.KcKetangbiao; import java.util.List; @@ -43,4 +44,8 @@ public interface IKcKechengbiaoService extends IService { IPage getStudentKclist(Page page, QueryWrapper queryWrapper); public KcKechengbiao getKcbhByRwbh(KcKechengbiao kcKechengbiao); + + List getStudentRiliKclist(KcKetangbiao kcKetangbiao); + + void updateSzkc(); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKetangbiaoService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKetangbiaoService.java index 1d250d17..72f32f88 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKetangbiaoService.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKetangbiaoService.java @@ -75,4 +75,5 @@ public interface IKcKetangbiaoService extends IService { List getKccountExportList(KcKetangbiaoNum object); void updateKechengbiaoid(String skrq); + } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/impl/KcKechengbiaoServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/impl/KcKechengbiaoServiceImpl.java index 2b4170a6..4d128fd7 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/impl/KcKechengbiaoServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/impl/KcKechengbiaoServiceImpl.java @@ -4,12 +4,14 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.jeecg.modules.kc.ktgl.entity.KcKechengbiao; +import org.jeecg.modules.kc.ktgl.entity.KcKetangbiao; import org.jeecg.modules.kc.ktgl.mapper.KcKechengbiaoMapper; import org.jeecg.modules.kc.ktgl.service.IKcKechengbiaoService; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import java.util.Collections; import java.util.List; /** @@ -90,4 +92,14 @@ public class KcKechengbiaoServiceImpl extends ServiceImpl