From b9e2063513feb01aafc7751e36ec3789538a59c3 Mon Sep 17 00:00:00 2001 From: bai <1643359946@qq.com> Date: Mon, 28 Aug 2023 22:27:03 +0800 Subject: [PATCH] =?UTF-8?q?2023=E5=B9=B48=E6=9C=8828=E6=97=A5=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=AF=BC=E5=87=BA=E5=92=8C=E8=BA=AB=E4=BB=BD=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../KcExportConfigTpkwcqkjzglxController.java | 21 +++++++++++++++---- .../modules/kc/config/export/Export.java | 4 +--- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/controller/KcExportConfigTpkwcqkjzglxController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/controller/KcExportConfigTpkwcqkjzglxController.java index ca150209..9648e698 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/controller/KcExportConfigTpkwcqkjzglxController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/controller/KcExportConfigTpkwcqkjzglxController.java @@ -38,10 +38,7 @@ 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; -import java.util.Set; +import java.util.*; import java.util.stream.Collectors; /** @@ -149,6 +146,22 @@ public class KcExportConfigTpkwcqkjzglxController extends JeecgController add(@RequestBody KcExportConfigTpkwcqkjzglx kcExportConfigTpkwcqkjzglx) { + //新增学期学年 + //按学期筛选 + KcXqxnHistory common = changeTingKeTongJi.getXqConfig(); + String xqxn; + if(common != null) { + //Map tongJiMap = Maps.newHashMap(); + //清洗数据核心 +// Date startSjDate = common.getStartTime(); +// Date endSjDate = common.getEndTime(); +// String startSj = DateUtil.format(startSjDate,DatePattern.NORM_DATETIME_FORMAT); +// String endSj = DateUtil.format(endSjDate,DatePattern.NORM_DATETIME_FORMAT); + xqxn = common.getTitle(); + } else { + xqxn = null; + } + kcExportConfigTpkwcqkjzglx.setXqxn(xqxn); kcExportConfigTpkwcqkjzglxService.save(kcExportConfigTpkwcqkjzglx); return Result.OK("添加成功！"); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/export/Export.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/export/Export.java index 1e2e9082..19068fcc 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/export/Export.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/export/Export.java @@ -91,7 +91,7 @@ public class Export extends BaseExport { config = genConfig("threeList","其他党政领导及辅导员","210"); putGroupConfigMap(config.getKey(),config); config = genConfig("threeList","其他党政领导及辅导员","270"); putGroupConfigMap(config.getKey(),config); config = genConfig("threeList","其他党政领导及辅导员","280"); putGroupConfigMap(config.getKey(),config); - config = genConfig("fourList","其他专任教师","1"); putGroupConfigMap(config.getKey(),config); + config = genConfig("fourList","其他专任教师","10"); putGroupConfigMap(config.getKey(),config); } // /** // * @@ -148,8 +148,6 @@ public class Export extends BaseExport { queryWrapper.eq("dwmc ",xxhbUser.getDwmc()); } - - List KcExportConfigTpkwcqkjzglxList = kcExportConfigTpkwcqkjzglxService.list(queryWrapper); Map> ghMap = KcExportConfigTpkwcqkjzglxList.stream().filter(x -> StringUtils.isNotBlank(x.getGh())).collect(Collectors.groupingBy(KcExportConfigTpkwcqkjzglx::getGh)); Map> typeMap = KcExportConfigTpkwcqkjzglxList.stream().filter(x -> StringUtils.isNotBlank(x.getTklx())).collect(Collectors.groupingBy(KcExportConfigTpkwcqkjzglx::getTklx));