2023年8月11日 修复问题

jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/controller/KcExportConfigTpkwcqkjzglxController.java

@@ -3,6 +3,7 @@ package org.jeecg.modules.kc.config.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.google.common.collect.Maps;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -15,7 +16,11 @@ import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.kc.config.entity.KcExportConfigTpkwcqkjzglx;
 import org.jeecg.modules.kc.config.export.Export;
 import org.jeecg.modules.kc.config.service.IKcExportConfigTpkwcqkjzglxService;
+import org.jeecg.modules.kc.grab.SynchronizationService.tools.ChangeTingKeTongJi;
 import org.jeecg.modules.kc.grab.imports.service.IXxhbuserService;
+import org.jeecg.modules.kc.kcXqxnHistory.entity.KcXqxnHistory;
+import org.jeecg.modules.kc.tksf.kctkcstj.entity.KcTkcstj;
+import org.jeecg.modules.kc.tksf.kctkcstj.service.IKcTkcstjService;
 import org.jeecg.modules.tools.word.ExportWord;
 import org.jeecg.modules.tools.word.WordOperator;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,8 +30,10 @@ import org.springframework.web.servlet.ModelAndView;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
 
- /**
+/**
  * @Description: kc_export_config_tpkwcqkjzglx
  * @Author: jeecg-boot
  * @Date:   2023-07-21
@@ -42,8 +49,14 @@ public class KcExportConfigTpkwcqkjzglxController extends JeecgController<KcExpo
 
 	@Autowired
 	private IXxhbuserService xxhbuserService;
-	
+
-	/**
+	 @Autowired
+	 private IKcTkcstjService kcTkcstjService;
+
+	 @Autowired
+	 private ChangeTingKeTongJi changeTingKeTongJi;
+
+	 /**
 	 * 分页列表查询
 	 *
 	 * @param kcExportConfigTpkwcqkjzglx
@@ -61,8 +74,29 @@ public class KcExportConfigTpkwcqkjzglxController extends JeecgController<KcExpo
 								   HttpServletRequest req) {
 		QueryWrapper<KcExportConfigTpkwcqkjzglx> queryWrapper = QueryGenerator.initQueryWrapper(kcExportConfigTpkwcqkjzglx, req.getParameterMap());
 //		queryWrapper.eq(StringUtils.isNotBlank(kcExportConfigTpkwcqkjzglx.getDwmc()),"b.dwmc",kcExportConfigTpkwcqkjzglx.getDwmc());
-		Page<KcExportConfigTpkwcqkjzglx> page = new Page<KcExportConfigTpkwcqkjzglx>(pageNo, pageSize);
+		Page<KcExportConfigTpkwcqkjzglx> page = new Page<>(pageNo, pageSize);
 		IPage<KcExportConfigTpkwcqkjzglx> pageList = kcExportConfigTpkwcqkjzglxService.page(page, queryWrapper);
+		//根据当前学期学年，硬合并出来一个数据
+		QueryWrapper<KcTkcstj> tjQw = new QueryWrapper<>();
+		KcXqxnHistory kcXqxnHistory = changeTingKeTongJi.getXqConfig(kcExportConfigTpkwcqkjzglx.getXqxn());
+		tjQw.eq("xnxq",kcXqxnHistory.getTitle());
+		List<KcTkcstj> tjList = kcTkcstjService.list(tjQw);
+		Map<String,KcTkcstj> tjMap = Maps.newHashMap();
+		tjList.forEach(x -> {
+			tjMap.put(x.getJgh(),x);
+		});
+
+		pageList.getRecords().forEach(x -> {
+			x.setTkxttj("0");
+			x.setYskcs("0");
+			if(tjMap.containsKey(x.getGh())){
+				KcTkcstj tkcstj = tjMap.get(x.getGh());
+				x.setTkxttj(tkcstj.getTkxttj());
+				x.setYskcs(tkcstj.getYskcs());
+			}
+		});
+
+
 		return Result.OK(pageList);
 	}
 	

jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/entity/KcExportConfigTpkwcqkjzglx.java

@@ -88,4 +88,16 @@ public class KcExportConfigTpkwcqkjzglx implements Serializable {
     @TableField(exist = false)
     private String zwmc;
 
+    /**学期学年*/
+    @TableField(exist = false)
+    private String xqxn;
+
+    /**应听课次数*/
+    @TableField(exist = false)
+    private java.lang.String yskcs;
+    /**听课次数*/
+    @TableField(exist = false)
+    private java.lang.String tkxttj;
+
+
 }

jeecg-module-main/src/main/java/org/jeecg/modules/kc/statistics/KcEvaluationVo.java

@@ -178,4 +178,19 @@ public class KcEvaluationVo implements Serializable {
     @TableField(exist = false)
     private String upUserName;
 
+    @TableField(exist = false)
+    private String findGh;
+
+    /**
+     * 按当前用户的部门查询评课
+     */
+    @TableField(exist = false)
+    private boolean findByPkdwmc;
+
+    /**
+     * 按当前用户的部门查询被评课
+     */
+    @TableField(exist = false)
+    private boolean findByBeiTkkdwmc;
+
 }

jeecg-module-main/src/main/java/org/jeecg/modules/kc/statistics/TingKeStatisticsController.java

@@ -86,6 +86,27 @@ public class TingKeStatisticsController {
 
 
     public IPage<KcEvaluationVo> loadPageData(KcEvaluationVo evaluation,QueryWrapper<KcEvaluationVo> queryWrapper,Page<KcEvaluationVo> page){
+
+        //查询当前用户的学院
+        if(evaluation.isFindByPkdwmc() || evaluation.isFindByBeiTkkdwmc()){
+            QueryWrapper<KcExportConfigTpkwcqkjzglx> uqw = new QueryWrapper<>();
+            //LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+            uqw.eq("gh",evaluation.getFindGh());
+            uqw.last("limit 1");
+            KcExportConfigTpkwcqkjzglx exportConfigTpkwcqkjzglx = kcExportConfigTpkwcqkjzglxService.getOne(uqw);
+            if(exportConfigTpkwcqkjzglx == null) {
+                return new Page<>();
+            }
+            //queryWrapper.eq()
+            if(evaluation.isFindByPkdwmc()){
+                queryWrapper.eq("xu.DWMC",exportConfigTpkwcqkjzglx.getDwmc());
+            }
+            if(evaluation.isFindByBeiTkkdwmc()){
+                queryWrapper.eq("kt.kkdw ",exportConfigTpkwcqkjzglx.getDwmc());
+            }
+        }
+
+
         queryWrapper.isNotNull("a.upuserid");
         queryWrapper.isNotNull("a.minkcid");