2023年8月28日 修复导出和身份的问题
This commit is contained in:
parent
469fd09cb0
commit
b9e2063513
|
@ -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<KcExpo
|
|||
// @RequiresPermissions("config:kc_export_config_tpkwcqkjzglx:add")
|
||||
@PostMapping(value = "/add")
|
||||
public Result<String> add(@RequestBody KcExportConfigTpkwcqkjzglx kcExportConfigTpkwcqkjzglx) {
|
||||
//新增学期学年
|
||||
//按学期筛选
|
||||
KcXqxnHistory common = changeTingKeTongJi.getXqConfig();
|
||||
String xqxn;
|
||||
if(common != null) {
|
||||
//Map<String, KcTkcstj> 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("添加成功!");
|
||||
}
|
||||
|
|
|
@ -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<KcExportConfigTpkwcqkjzglx> KcExportConfigTpkwcqkjzglxList = kcExportConfigTpkwcqkjzglxService.list(queryWrapper);
|
||||
Map<String, List<KcExportConfigTpkwcqkjzglx>> ghMap = KcExportConfigTpkwcqkjzglxList.stream().filter(x -> StringUtils.isNotBlank(x.getGh())).collect(Collectors.groupingBy(KcExportConfigTpkwcqkjzglx::getGh));
|
||||
Map<String, List<KcExportConfigTpkwcqkjzglx>> typeMap = KcExportConfigTpkwcqkjzglxList.stream().filter(x -> StringUtils.isNotBlank(x.getTklx())).collect(Collectors.groupingBy(KcExportConfigTpkwcqkjzglx::getTklx));
|
||||
|
|
Loading…
Reference in New Issue