添加新功能

jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncKcktStat.java

@@ -110,6 +110,17 @@ public class SyncKcktStat extends BaseSync {
             kcKechengbiaoService.removeCfsj(KcKechengbiao);
             //------------------去除课程表重复数据 20231024新增-----------------
 
+
+
+            //------------------刨除指定表的数据 20240314新增 修改flag标志位----------------
+            KcKechengbiao ktbExculde = new KcKechengbiao();
+            ktbExculde.setXnxq(kcSysConfig.getFlag1());
+            kcKechengbiaoService.updateKechengExculde(ktbExculde);
+            //------------------刨除指定表的数据 20240314新增 修改flag标志位----------------
+
+
+
+
             //-------------------删除本年的课程数据冰倩是当天及以后的----------------------
             QueryWrapper<KcKetangbiao> KcKetangbiaoQueryWrapper = new QueryWrapper<>();
             KcKetangbiaoQueryWrapper.eq("xnxq",kcSysConfig.getFlag1());
@@ -121,6 +132,7 @@ public class SyncKcktStat extends BaseSync {
             //插入数据
             KcKetangbiao kcKetangbiao = new KcKetangbiao();
             kcKetangbiao.setXnxq(kcSysConfig.getFlag1());
+            kcKetangbiao.setFlag("0");
             List<KcKetangbiao> list = kcKetangbiaoService.selectSyncList(kcKetangbiao);
             List<KcKetangbiao> arrayList = new ArrayList<>();
             for(int i=0;i<list.size();i++){

jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcSysConfig/controller/KcSysConfigController.java

@@ -13,8 +13,10 @@ import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.DateUtils;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.kc.grab.imports.entity.Xxhbsynclog;
@@ -26,6 +28,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
+import org.jeecg.modules.kc.kcTingkeBmd.entity.KcTingkeBmd;
+import org.jeecg.modules.kc.kcTingkeBmd.service.IKcTingkeBmdService;
 import org.jeecg.modules.kc.kcXqxnHistory.entity.KcXqxnHistory;
 import org.jeecg.modules.kc.kcXqxnHistory.service.IKcXqxnHistoryService;
 import org.jeecg.modules.kc.ktgl.entity.KcKechengbiao;
@@ -79,6 +83,8 @@ public class KcSysConfigController extends JeecgController<KcSysConfig, IKcSysCo
 	 private IKcKetangbiaoHisService kcKetangbiaoHisService;
 	 @Autowired
 	 private IKcXqxnHistoryService kcXqxnHistoryService;
+	 @Autowired
+	 private IKcTingkeBmdService kcTingkeBmdService;
 	/**
 	 * 分页列表查询
 	 *
@@ -187,8 +193,16 @@ public class KcSysConfigController extends JeecgController<KcSysConfig, IKcSysCo
 	@GetMapping(value = "/queryById")
 	public Result<KcSysConfig> queryById(@RequestParam(name="id",required=true) String id) {
 		KcSysConfig kcSysConfig = kcSysConfigService.getById(id);
-		if(kcSysConfig==null) {
+		LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-			return Result.error("未找到对应数据");
+		QueryWrapper<KcTingkeBmd> query = new QueryWrapper<KcTingkeBmd>();
+		query.eq("jgh", user.getUsername());
+		query.eq("xnxq", kcSysConfig.getFlag1());
+		query.last("limit 1");
+		KcTingkeBmd kcTingkeBmd = kcTingkeBmdService.getOne(query);
+		if(kcTingkeBmd==null) {
+			kcSysConfig.setSfbmd("n");
+		}else{
+			kcSysConfig.setSfbmd("y");
 		}
 		return Result.OK(kcSysConfig);
 	}

jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcSysConfig/entity/KcSysConfig.java

@@ -4,10 +4,8 @@ import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.util.Date;
 import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
+
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -108,4 +106,8 @@ public class KcSysConfig implements Serializable {
 	@ApiModelProperty(value = "智慧教室播放错误提示文字")
     private java.lang.String videoPlayErrTitle;
 	private java.lang.String flag9;//今日课表听课按钮
+
+	//是否白名单 y是 n否
+	@TableField(exist = false)
+	private String sfbmd;//是否白名单
 }

jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcTingkeBmd/controller/KcTingkeBmdController.java

@@ -259,4 +259,18 @@ public class KcTingkeBmdController {
       return Result.OK("文件导入失败！");
     }
 
+
+	 @ApiOperation(value="听课白名单教师信息-通过jgh查询", notes="听课白名单教师信息-通过id查询")
+	 @GetMapping(value = "/getBmdInfo")
+	 public Result<String> getBmdInfo(@RequestParam(name="jgh",required=true) String jgh) {
+		QueryWrapper<KcTingkeBmd> query = new QueryWrapper<KcTingkeBmd>();
+		 query.eq("jgh", jgh);
+		 query.last("limit 1");
+		 KcTingkeBmd kcTingkeBmd = kcTingkeBmdService.getOne(query);
+		 if(kcTingkeBmd==null) {
+			 return Result.OK("n");
+		 }else{
+			 return Result.OK("y");
+		 }
+	 }
 }

jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKetangbiaoController.java

@@ -835,28 +835,17 @@ public class KcKetangbiaoController extends JeecgController<KcKetangbiao, IKcKet
 
 
 	@ApiOperation(value="统计年度课程信息数量", notes="统计年度课程信息数量")
-	@GetMapping(value = "/getKtcountList")
+	@GetMapping(value = "/getKccountList")
-	public Result<?> getKtcountList(KcKetangbiao kcKetangbiao,
+	public Result<?> getKccountList(KcKetangbiao kcKetangbiao,
 									@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 									@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 									HttpServletRequest req) {
-		QueryWrapper<KcKetangbiao> queryWrapper = QueryGenerator.initQueryWrapper(kcKetangbiao, req.getParameterMap());
+		Page<Map<String, Object>> page = new Page<>(pageNo, pageSize);
 		if(StringUtils.isBlank(kcKetangbiao.getXnxq())){
 			KcSysConfig kcSysConfig = kcSysConfigService.getById("1");
-			queryWrapper.ge("skrq",kcSysConfig.getBxqkssj());
+			kcKetangbiao.setXnxq(kcSysConfig.getFlag1());
-			queryWrapper.le("skrq",kcSysConfig.getBxqjssj()+" 23:59:59");
-		}else{
-			QueryWrapper<KcXqxnHistory> kcXqxnHistoryQueryWrapper = new QueryWrapper<KcXqxnHistory>();
-			kcXqxnHistoryQueryWrapper.eq("title",kcKetangbiao.getXnxq());
-			kcXqxnHistoryQueryWrapper.last("limit 1");
-			KcXqxnHistory KcXqxnHistory = kcXqxnHistoryService.getOne(kcXqxnHistoryQueryWrapper);
-			queryWrapper.ge("skrq",KcXqxnHistory.getStartTime());
-			queryWrapper.le("skrq",KcXqxnHistory.getEndTime()+" 23:59:59");
 		}
-		queryWrapper.orderByDesc("xnxq");
+		IPage<Map<String, Object>> kcKetangbiaoList = kcKetangbiaoService.getKccountList(page,kcKetangbiao);
-		queryWrapper.groupBy("kkdw");
-		Page<Map<String, Object>> page = new Page<>(pageNo, pageSize);
-		IPage<Map<String, Object>> kcKetangbiaoList = kcKetangbiaoService.getKtcountList(page,queryWrapper);
 		return Result.OK(kcKetangbiaoList);
 	}
 
@@ -873,19 +862,9 @@ public class KcKetangbiaoController extends JeecgController<KcKetangbiao, IKcKet
 		// Step.2 获取导出数据
 		if(StringUtils.isBlank(object.getXnxq())){
 			KcSysConfig kcSysConfig = kcSysConfigService.getById("1");
-			queryWrapper.ge("skrq",kcSysConfig.getBxqkssj());
+			object.setXnxq(kcSysConfig.getFlag1());
-			queryWrapper.le("skrq",kcSysConfig.getBxqjssj()+" 23:59:59");
-		}else{
-			QueryWrapper<KcXqxnHistory> kcXqxnHistoryQueryWrapper = new QueryWrapper<KcXqxnHistory>();
-			kcXqxnHistoryQueryWrapper.eq("title",object.getXnxq());
-			kcXqxnHistoryQueryWrapper.last("limit 1");
-			KcXqxnHistory KcXqxnHistory = kcXqxnHistoryService.getOne(kcXqxnHistoryQueryWrapper);
-			queryWrapper.ge("skrq",KcXqxnHistory.getStartTime());
-			queryWrapper.le("skrq",KcXqxnHistory.getEndTime()+" 23:59:59");
 		}
-		queryWrapper.orderByDesc("xnxq");
+		List<KcKetangbiaoNum> exportList = service.getKccountExportList(object);
-		queryWrapper.groupBy("kkdw");
-		List<KcKetangbiaoNum> exportList = service.getKtcountExportList(queryWrapper);
 
 		// Step.3 AutoPoi 导出Excel
 		ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
@@ -902,4 +881,51 @@ public class KcKetangbiaoController extends JeecgController<KcKetangbiao, IKcKet
 	}
 
 
+	@ApiOperation(value="统计年度课程信息数量", notes="统计年度课程信息数量")
+	@GetMapping(value = "/getKtcountList")
+	public Result<?> getKtcountList(KcKetangbiao kcKetangbiao,
+									@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+									@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+									HttpServletRequest req) {
+		QueryWrapper<KcKetangbiao> queryWrapper = QueryGenerator.initQueryWrapper(kcKetangbiao, req.getParameterMap());
+		if(StringUtils.isBlank(kcKetangbiao.getXnxq())){
+			KcSysConfig kcSysConfig = kcSysConfigService.getById("1");
+			kcKetangbiao.setXnxq(kcSysConfig.getFlag1());
+		}
+		Page<Map<String, Object>> page = new Page<>(pageNo, pageSize);
+		IPage<Map<String, Object>> kcKetangbiaoList = kcKetangbiaoService.getKtcountList(page,kcKetangbiao);
+		return Result.OK(kcKetangbiaoList);
+	}
+
+
+	@RequestMapping(value = "/exportKtnumXls")
+	public ModelAndView exportKtnumXls(HttpServletRequest request, KcKetangbiaoNum kcKetangbiaoNum) {
+		return exportKtnumXls(request, kcKetangbiaoNum, KcKetangbiaoNum.class, "课堂统计");
+	}
+	protected ModelAndView exportKtnumXls(HttpServletRequest request, KcKetangbiaoNum object, Class<KcKetangbiaoNum> clazz, String title) {
+		// Step.1 组装查询条件
+		QueryWrapper<KcKetangbiaoNum> queryWrapper = QueryGenerator.initQueryWrapper(object, request.getParameterMap());
+		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+		// Step.2 获取导出数据
+		if(StringUtils.isBlank(object.getXnxq())){
+			KcSysConfig kcSysConfig = kcSysConfigService.getById("1");
+			object.setXnxq(kcSysConfig.getFlag1());
+		}
+		List<KcKetangbiaoNum> exportList = service.getKtcountExportList(object);
+
+		// 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;
+	}
+
 }

jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKetangbiao.java

@@ -326,4 +326,21 @@ public class KcKetangbiao implements Serializable {
     private String zhjs;
     @TableField(exist = false)
     private String bmdId;
+    @TableField(exist = false)
+    private String a1;
+    @TableField(exist = false)
+    private String a2;
+    @TableField(exist = false)
+    private String a3;
+    @TableField(exist = false)
+    private String a4;
+    @TableField(exist = false)
+    private String a5;
+    @TableField(exist = false)
+    private String a6;
+    @TableField(exist = false)
+    private String a7;
+
+    @TableField(exist = false)
+    private String flag;
 }

jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKetangbiaoNum.java

@@ -46,6 +46,27 @@ public class KcKetangbiaoNum implements Serializable {
     @Excel(name = "开课数量", width = 15)
     private String num;
 
+    @Excel(name = "专业教育选修课", width = 15)
+    private String a2;
+
+    @Excel(name = "专业教育必修课", width = 15)
+    private String a1;
+
+    @Excel(name = "通识教育必修课", width = 15)
+    private String a6;
+
+    @Excel(name = "通识教育选修课", width = 15)
+    private String a7;
+
+    @Excel(name = "教师教育必修课", width = 15)
+    private String a4;
+
+    @Excel(name = "教师教育选修课", width = 15)
+    private String a5;
+
+    @Excel(name = "发展方向课", width = 15)
+    private String a3;
+
 
     private String startTime;
     private String endTime;

jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKechengbiaoMapper.java

@@ -33,4 +33,6 @@ public interface KcKechengbiaoMapper extends BaseMapper<KcKechengbiao> {
     void saveOne(KcKechengbiao kcKechengbiaoPar);
 
     void removeCfsj(KcKechengbiao kcKechengbiao);
+
+    void updateKechengExculde(KcKechengbiao ktbExculde);
 }

jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKetangbiaoMapper.java

@@ -64,7 +64,11 @@ public interface KcKetangbiaoMapper extends BaseMapper<KcKetangbiao> {
 
     void updateSkxs(KcKetangbiao kcKetangbiaoup);
 
-    IPage<Map<String, Object>> getKtcountList(Page<Map<String, Object>> page, @Param(Constants.WRAPPER)QueryWrapper queryWrapper);
+    IPage<Map<String, Object>> getKtcountList(Page<Map<String, Object>> page, @Param(Constants.ENTITY) KcKetangbiao kcKetangbiao);
 
-    List<KcKetangbiaoNum> getKtcountExportList(@Param(Constants.WRAPPER)QueryWrapper<KcKetangbiaoNum> queryWrapper);
+    List<KcKetangbiaoNum> getKtcountExportList(KcKetangbiaoNum kcKetangbiao);
+
+    IPage<Map<String, Object>> getKccountList(Page<Map<String, Object>> page, @Param(Constants.ENTITY) KcKetangbiao kcKetangbiao);
+
+    List<KcKetangbiaoNum> getKccountExportList(KcKetangbiaoNum kcKetangbiao);
 }

jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKechengbiaoMapper.xml

@@ -101,4 +101,21 @@
         kc_kechengbiao t where t.xqxn = #{xqxn}
         GROUP BY  kcbh,kcmc,skjs,rwbh,kkdw,kcxz,sksj,kkdwid,xq,jgh,jzglb,sfcj,xqxn)a)
     </delete>
+
+    <update id="updateKechengExculde">
+        update kc_kechengbiao kc,kc_kecheng_exclude kce
+        set kc.flag = '1'
+        where kc.xqxn = #{xnxq}
+        and kce.sfqtzs in ('否','待定')
+        and ifnull(kc.xqxn,'a') = ifnull(kce.xqxn,'a')
+        and ifnull(kc.kcmc,'a') = ifnull(kce.kcmc,'a')
+        and ifnull(kc.jgh,'a')=ifnull(kce.jgh,'a')
+        and ifnull(kc.skjs,'a')=ifnull(kce.skjs,'a')
+        and ifnull(kc.kkdw,'a')=ifnull(kce.kkdw,'a')
+        and ifnull(kc.kcxz,'a')=ifnull(kce.kcxz,'a')
+        and ifnull(kc.skdd,'a')=ifnull(kce.skdd,'a')
+        and ifnull(kc.sksj,'a')=ifnull(kce.sksj,'a')
+        and ifnull(replace(kc.jkzc,',',''),'a')=ifnull(replace(kce.jkzc,',',''),'a')
+        and ifnull(kc.xnxq,'a') = ifnull(kce.xnxq,'a')
+    </update>
 </mapper>

jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml

@@ -160,6 +160,9 @@
             <if test="xnxq!=null and xnxq!=''">
                 and xqxn = #{xnxq}
             </if>
+            <if test="flag!=null and flag!=''">
+                and flag = #{flag}
+            </if>
         </where>
     </select>
     <select id="getIndexYkktstjYkkttkktList" resultType="java.util.Map">
@@ -649,11 +652,152 @@
     </update>
 
     <select id="getKtcountList" resultType="org.jeecg.modules.kc.ktgl.entity.KcKetangbiao">
-        select xnxq,kkdw,count('*') as num from kc_ketangbiao
+        select xnxq,kkdw,sum(kksl) as num,sum(a1) as a1,sum(a2) as a2,sum(a3) as a3,sum(a4) as a4,sum(a5) as a5, sum(a6) as a6, sum(a7) as a7
-        ${ew.customSqlSegment}
+        from (
+        select xnxq,kkdw,count('*') as kksl,0 as a1 ,0 as a2,0 as a3,0 as a4,0 as a5,0 as a6,0 as a7 from kc_ketangbiao
+        where xnxq = #{et.xnxq}
+        GROUP BY xnxq,kkdw
+        union
+        select xnxq,kkdw,0 as kksl,count('*') as a1 ,0 as a2,0 as a3,0 as a4,0 as a5,0 as a6,0 as a7 from kc_ketangbiao
+        where xnxq = #{et.xnxq} and kcxz = '专业教育必修课'
+        GROUP BY xnxq,kkdw
+        union
+        select xnxq,kkdw,0 as kksl,0 as a1 ,count('*') as a2,0 as a3,0 as a4,0 as a5,0 as a6,0 as a7 from kc_ketangbiao
+        where xnxq = #{et.xnxq} and kcxz = '专业教育选修课'
+        GROUP BY xnxq,kkdw
+        union
+        select xnxq,kkdw,0 as kksl,0 as a1 ,0 as a2,count('*') as a3,0 as a4,0 as a5,0 as a6,0 as a7 from kc_ketangbiao
+        where xnxq = #{et.xnxq} and kcxz = '发展方向课'
+        GROUP BY xnxq,kkdw
+        union
+        select xnxq,kkdw,0 as kksl,0 as a1 ,0 as a2,0 as a3,count('*') as a4,0 as a5,0 as a6,0 as a7 from kc_ketangbiao
+        where xnxq = #{et.xnxq} and kcxz = '教师教育必修课'
+        GROUP BY xnxq,kkdw
+        union
+        select xnxq,kkdw,0 as kksl,0 as a1 ,0 as a2,0 as a3,0 as a4,count('*') as a5,0 as a6,0 as a7 from kc_ketangbiao
+        where xnxq = #{et.xnxq} and kcxz = '教师教育选修课'
+        GROUP BY xnxq,kkdw
+        union
+        select xnxq,kkdw,0 as kksl,0 as a1 ,0 as a2,0 as a3,0 as a4,0 as a5,count('*') as a6,0 as a7 from kc_ketangbiao
+        where xnxq = #{et.xnxq} and kcxz = '通识教育必修课'
+        GROUP BY xnxq,kkdw
+        union
+        select xnxq,kkdw,0 as kksl,0 as a1 ,0 as a2,0 as a3,0 as a4,0 as a5,0 as a6,count('*') as a7 from kc_ketangbiao
+        where xnxq = #{et.xnxq} and kcxz = '通识教育选修课'
+        GROUP BY xnxq,kkdw
+
+        ) t GROUP BY xnxq,kkdw
     </select>
     <select id="getKtcountExportList" resultType="org.jeecg.modules.kc.ktgl.entity.KcKetangbiaoNum">
-        select xnxq,kkdw,count('*') as num from kc_ketangbiao
+        select xnxq as xnxq,kkdw,sum(kksl) as num,sum(a1) as a1,sum(a2) as a2,sum(a3) as a3,sum(a4) as a4,sum(a5) as a5, sum(a6) as a6, sum(a7) as a7
-        ${ew.customSqlSegment}
+        from (
+        select xnxq,kkdw,count('*') as kksl,0 as a1 ,0 as a2,0 as a3,0 as a4,0 as a5,0 as a6,0 as a7 from kc_ketangbiao
+        where xnxq = #{xnxq}
+        GROUP BY xnxq,kkdw
+        union
+        select xnxq,kkdw,0 as kksl,count('*') as a1 ,0 as a2,0 as a3,0 as a4,0 as a5,0 as a6,0 as a7 from kc_ketangbiao
+        where xnxq = #{xnxq} and kcxz = '专业教育必修课'
+        GROUP BY xnxq,kkdw
+        union
+        select xnxq,kkdw,0 as kksl,0 as a1 ,count('*') as a2,0 as a3,0 as a4,0 as a5,0 as a6,0 as a7 from kc_ketangbiao
+        where xnxq = #{xnxq} and kcxz = '专业教育选修课'
+        GROUP BY xnxq,kkdw
+        union
+        select xnxq,kkdw,0 as kksl,0 as a1 ,0 as a2,count('*') as a3,0 as a4,0 as a5,0 as a6,0 as a7 from kc_ketangbiao
+        where xnxq = #{xnxq} and kcxz = '发展方向课'
+        GROUP BY xnxq,kkdw
+        union
+        select xnxq,kkdw,0 as kksl,0 as a1 ,0 as a2,0 as a3,count('*') as a4,0 as a5,0 as a6,0 as a7 from kc_ketangbiao
+        where xnxq = #{xnxq} and kcxz = '教师教育必修课'
+        GROUP BY xnxq,kkdw
+        union
+        select xnxq,kkdw,0 as kksl,0 as a1 ,0 as a2,0 as a3,0 as a4,count('*') as a5,0 as a6,0 as a7 from kc_ketangbiao
+        where xnxq = #{xnxq} and kcxz = '教师教育选修课'
+        GROUP BY xnxq,kkdw
+        union
+        select xnxq,kkdw,0 as kksl,0 as a1 ,0 as a2,0 as a3,0 as a4,0 as a5,count('*') as a6,0 as a7 from kc_ketangbiao
+        where xnxq = #{xnxq} and kcxz = '通识教育必修课'
+        GROUP BY xnxq,kkdw
+        union
+        select xnxq,kkdw,0 as kksl,0 as a1 ,0 as a2,0 as a3,0 as a4,0 as a5,0 as a6,count('*') as a7 from kc_ketangbiao
+        where xnxq = #{xnxq} and kcxz = '通识教育选修课'
+        GROUP BY xnxq,kkdw
+
+        ) t GROUP BY xnxq,kkdw
+    </select>
+
+    <select id="getKccountList" resultType="org.jeecg.modules.kc.ktgl.entity.KcKetangbiao">
+        select xqxn as xnxq,kkdw,sum(kksl) as num,sum(a1) as a1,sum(a2) as a2,sum(a3) as a3,sum(a4) as a4,sum(a5) as a5, sum(a6) as a6, sum(a7) as a7
+        from (
+        select xqxn,kkdw,count('*') as kksl,0 as a1 ,0 as a2,0 as a3,0 as a4,0 as a5,0 as a6,0 as a7 from kc_kechengbiao
+        where xqxn = #{et.xnxq}
+        GROUP BY xqxn,kkdw
+        union
+        select xqxn,kkdw,0 as kksl,count('*') as a1 ,0 as a2,0 as a3,0 as a4,0 as a5,0 as a6,0 as a7 from kc_kechengbiao
+        where xqxn = #{et.xnxq} and kcxz = '专业教育必修课'
+        GROUP BY xqxn,kkdw
+        union
+        select xqxn,kkdw,0 as kksl,0 as a1 ,count('*') as a2,0 as a3,0 as a4,0 as a5,0 as a6,0 as a7 from kc_kechengbiao
+        where xqxn = #{et.xnxq} and kcxz = '专业教育选修课'
+        GROUP BY xqxn,kkdw
+        union
+        select xqxn,kkdw,0 as kksl,0 as a1 ,0 as a2,count('*') as a3,0 as a4,0 as a5,0 as a6,0 as a7 from kc_kechengbiao
+        where xqxn = #{et.xnxq} and kcxz = '发展方向课'
+        GROUP BY xqxn,kkdw
+        union
+        select xqxn,kkdw,0 as kksl,0 as a1 ,0 as a2,0 as a3,count('*') as a4,0 as a5,0 as a6,0 as a7 from kc_kechengbiao
+        where xqxn = #{et.xnxq} and kcxz = '教师教育必修课'
+        GROUP BY xqxn,kkdw
+        union
+        select xqxn,kkdw,0 as kksl,0 as a1 ,0 as a2,0 as a3,0 as a4,count('*') as a5,0 as a6,0 as a7 from kc_kechengbiao
+        where xqxn = #{et.xnxq} and kcxz = '教师教育选修课'
+        GROUP BY xqxn,kkdw
+        union
+        select xqxn,kkdw,0 as kksl,0 as a1 ,0 as a2,0 as a3,0 as a4,0 as a5,count('*') as a6,0 as a7 from kc_kechengbiao
+        where xqxn = #{et.xnxq} and kcxz = '通识教育必修课'
+        GROUP BY xqxn,kkdw
+        union
+        select xqxn,kkdw,0 as kksl,0 as a1 ,0 as a2,0 as a3,0 as a4,0 as a5,0 as a6,count('*') as a7 from kc_kechengbiao
+        where xqxn = #{et.xnxq} and kcxz = '通识教育选修课'
+        GROUP BY xqxn,kkdw
+
+        ) t GROUP BY xqxn,kkdw
+    </select>
+    <select id="getKccountExportList" resultType="org.jeecg.modules.kc.ktgl.entity.KcKetangbiaoNum">
+        select xqxn as xnxq,kkdw,sum(kksl) as num,sum(a1) as a1,sum(a2) as a2,sum(a3) as a3,sum(a4) as a4,sum(a5) as a5, sum(a6) as a6, sum(a7) as a7
+        from (
+        select xqxn,kkdw,count('*') as kksl,0 as a1 ,0 as a2,0 as a3,0 as a4,0 as a5,0 as a6,0 as a7 from kc_kechengbiao
+        where xqxn = #{xnxq}
+        GROUP BY xqxn,kkdw
+        union
+        select xqxn,kkdw,0 as kksl,count('*') as a1 ,0 as a2,0 as a3,0 as a4,0 as a5,0 as a6,0 as a7 from kc_kechengbiao
+        where xqxn = #{xnxq} and kcxz = '专业教育必修课'
+        GROUP BY xqxn,kkdw
+        union
+        select xqxn,kkdw,0 as kksl,0 as a1 ,count('*') as a2,0 as a3,0 as a4,0 as a5,0 as a6,0 as a7 from kc_kechengbiao
+        where xqxn = #{xnxq} and kcxz = '专业教育选修课'
+        GROUP BY xqxn,kkdw
+        union
+        select xqxn,kkdw,0 as kksl,0 as a1 ,0 as a2,count('*') as a3,0 as a4,0 as a5,0 as a6,0 as a7 from kc_kechengbiao
+        where xqxn = #{xnxq} and kcxz = '发展方向课'
+        GROUP BY xqxn,kkdw
+        union
+        select xqxn,kkdw,0 as kksl,0 as a1 ,0 as a2,0 as a3,count('*') as a4,0 as a5,0 as a6,0 as a7 from kc_kechengbiao
+        where xqxn = #{xnxq} and kcxz = '教师教育必修课'
+        GROUP BY xqxn,kkdw
+        union
+        select xqxn,kkdw,0 as kksl,0 as a1 ,0 as a2,0 as a3,0 as a4,count('*') as a5,0 as a6,0 as a7 from kc_kechengbiao
+        where xqxn = #{xnxq} and kcxz = '教师教育选修课'
+        GROUP BY xqxn,kkdw
+        union
+        select xqxn,kkdw,0 as kksl,0 as a1 ,0 as a2,0 as a3,0 as a4,0 as a5,count('*') as a6,0 as a7 from kc_kechengbiao
+        where xqxn = #{xnxq} and kcxz = '通识教育必修课'
+        GROUP BY xqxn,kkdw
+        union
+        select xqxn,kkdw,0 as kksl,0 as a1 ,0 as a2,0 as a3,0 as a4,0 as a5,0 as a6,count('*') as a7 from kc_kechengbiao
+        where xqxn = #{xnxq} and kcxz = '通识教育选修课'
+        GROUP BY xqxn,kkdw
+
+        ) t GROUP BY xqxn,kkdw
     </select>
 </mapper>

jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKechengbiaoService.java

@@ -31,4 +31,6 @@ public interface IKcKechengbiaoService extends IService<KcKechengbiao> {
     void saveOne(KcKechengbiao kcKechengbiaoPar);
 
     void removeCfsj(KcKechengbiao kcKechengbiao);
+
+    void updateKechengExculde(KcKechengbiao ktbExculde);
 }

jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKetangbiaoService.java

@@ -66,7 +66,11 @@ public interface IKcKetangbiaoService extends IService<KcKetangbiao> {
 
     void updateSkxs(KcKetangbiao kcKetangbiaoup);
 
-    IPage<Map<String, Object>> getKtcountList(Page<Map<String, Object>> page, QueryWrapper qw);
+    IPage<Map<String, Object>> getKtcountList(Page<Map<String, Object>> page, KcKetangbiao kcKetangbiao);
 
-    List<KcKetangbiaoNum> getKtcountExportList(QueryWrapper<KcKetangbiaoNum> queryWrapper);
+    List<KcKetangbiaoNum> getKtcountExportList(KcKetangbiaoNum object);
+
+    IPage<Map<String, Object>> getKccountList(Page<Map<String, Object>> page, KcKetangbiao kcKetangbiao);
+
+    List<KcKetangbiaoNum> getKccountExportList(KcKetangbiaoNum object);
 }

jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/impl/KcKechengbiaoServiceImpl.java

@@ -61,4 +61,8 @@ public class KcKechengbiaoServiceImpl extends ServiceImpl<KcKechengbiaoMapper, K
         baseMapper.removeCfsj(kcKechengbiao);
     }
 
+    @Override
+    public void updateKechengExculde(KcKechengbiao ktbExculde) {
+        baseMapper.updateKechengExculde(ktbExculde);    }
+
 }

jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/impl/KcKetangbiaoServiceImpl.java

@@ -158,12 +158,22 @@ public class KcKetangbiaoServiceImpl extends ServiceImpl<KcKetangbiaoMapper, KcK
     }
 
     @Override
-    public IPage<Map<String, Object>> getKtcountList(Page<Map<String, Object>> page, QueryWrapper qw) {
+    public IPage<Map<String, Object>> getKtcountList(Page<Map<String, Object>> page, KcKetangbiao kcKetangbiao) {
-        return baseMapper.getKtcountList(page,qw);
+        return baseMapper.getKtcountList(page,kcKetangbiao);
     }
 
     @Override
-    public List<KcKetangbiaoNum> getKtcountExportList(QueryWrapper<KcKetangbiaoNum> queryWrapper) {
+    public List<KcKetangbiaoNum> getKtcountExportList(KcKetangbiaoNum object) {
-        return baseMapper.getKtcountExportList(queryWrapper);
+        return baseMapper.getKtcountExportList(object);
+    }
+
+    @Override
+    public IPage<Map<String, Object>> getKccountList(Page<Map<String, Object>> page, KcKetangbiao kcKetangbiao) {
+        return baseMapper.getKccountList(page,kcKetangbiao);
+    }
+
+    @Override
+    public List<KcKetangbiaoNum> getKccountExportList(KcKetangbiaoNum object) {
+        return baseMapper.getKccountExportList(object);
     }
 }

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

@@ -93,14 +93,23 @@
         <if test="kcxz!=null and kcxz!=''">
             AND kcxz = #{kcxz}
         </if>
+        <if test="username!=null and username!=''">
+            AND (tk.username like CONCAT('%',#{username},'%') or tk.userid like CONCAT('%',#{username},'%'))
+        </if>
+        <if test="userid!=null and userid!=''">
+            AND tk.userid =#{userid}
+        </if>
         GROUP BY tk.userid, tk.username, college
         ) tk LEFT JOIN (
-        SELECT usercode, username, GROUP_CONCAT( assess1 SEPARATOR ',' ) tksf1, GROUP_CONCAT( assess2 SEPARATOR ',' ) tksf2, max( tkyq ) tkyq,assesscode,dwmc
+
-        FROM kc_assessuser
+        select gh as usercode,xm as username,GROUP_CONCAT( b.item_text SEPARATOR ',' ) as tksf1 ,max(ytkcs-0) as tkyq 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)
+        WHERE 1 = 1
         <if test="tksf!=null and tksf!=''">
-            AND assesscode = #{tksf}
+            and b.item_value = #{tksf}
         </if>
-        WHERE 1 = 1 GROUP BY usercode, username
+        GROUP BY gh,xm
         ) au ON tk.userid = au.usercode
         ORDER BY sjtksl DESC
     </select>