diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxSchoolController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxSchoolController.java index 1714a12..954737d 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxSchoolController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxSchoolController.java @@ -216,6 +216,19 @@ public class YxSchoolController extends JeecgController exportList = yxSchoolService.exportList(selectionList); + for (SchoolExportDTO schoolExportDTO : exportList) { + schoolExportDTO.setIs985("1".equals(schoolExportDTO.getIs985())?"是":"否"); + schoolExportDTO.setIs211("1".equals(schoolExportDTO.getIs211())?"是":"否"); + schoolExportDTO.setIsStrengthen("1".equals(schoolExportDTO.getIsStrengthen())?"是":"否"); + schoolExportDTO.setYldx("1".equals(schoolExportDTO.getYldx())?"是":"否"); + schoolExportDTO.setGzsz("1".equals(schoolExportDTO.getGzsz())?"是":"否"); + schoolExportDTO.setGjtszy("1".equals(schoolExportDTO.getGjtszy())?"是":"否"); + schoolExportDTO.setStszy("1".equals(schoolExportDTO.getStszy())?"是":"否"); + schoolExportDTO.setGzd("1".equals(schoolExportDTO.getGzd())?"是":"否"); + schoolExportDTO.setSjyl("1".equals(schoolExportDTO.getSjyl())?"是":"否"); + schoolExportDTO.setSfsyl("1".equals(schoolExportDTO.getSfsyl())?"是":"否"); + schoolExportDTO.setIsYs("1".equals(schoolExportDTO.getIsYs())?"是":"否"); + } ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); mv.addObject(NormalExcelConstants.FILE_NAME, title); mv.addObject(NormalExcelConstants.CLASS, SchoolExportDTO.class); @@ -245,6 +258,198 @@ public class YxSchoolController extends JeecgController list = ExcelImportUtil.importExcel(file.getInputStream(), SchoolExportDTO.class, params); + Map schoolMap = new HashMap<>(); + List oldSchoolList = null; + // 查询之前的院校信息 + if(list.size() <= 20){ + LambdaQueryWrapper yxSchoolLambdaQueryWrapper = new LambdaQueryWrapper<>(); + yxSchoolLambdaQueryWrapper.in(YxSchool::getSchoolName, list.stream().map(YxSchool::getSchoolName).collect(Collectors.toList())); + oldSchoolList = yxSchoolService.list(yxSchoolLambdaQueryWrapper); + }else{ + oldSchoolList = yxSchoolService.list(); + } + for (YxSchool yxSchool : oldSchoolList) { + schoolMap.put(yxSchool.getSchoolName(), yxSchool); + } + + // 检查数据 + for (SchoolExportDTO schoolExportDTO : list) { + AssertUtils.notEmpty(schoolExportDTO.getSchoolName(), "请输入[主学校名称]!"); + AssertUtils.notEmpty(schoolExportDTO.getSchoolCode(), "请输入[学校代码]!"); + AssertUtils.notEmpty(schoolExportDTO.getChildSchoolName(), "请输入[子学校名称]!"); +// AssertUtils.notEmpty(schoolExportDTO.getSchoolType(), "请输入[办学类型]!"); +// AssertUtils.notEmpty(schoolExportDTO.getSchoolNature(), "请输入[办学性质]!"); + } + YxSchool yxSchool = null; + YxSchoolChild yxSchoolChild = null; + // 判断 防止二次添加 + List schoolNameList = new ArrayList<>(); + List schoolCodeList = new ArrayList<>(); + // 覆盖之前的院校信息/新增 + for (SchoolExportDTO schoolExportDTO : list) { + yxSchool = schoolMap.get(schoolExportDTO.getSchoolName()); + if(yxSchool == null){ + yxSchool = new YxSchool(); + yxSchool.setCreateTime(new Date()); + } + + if (!schoolNameList.contains(schoolExportDTO.getSchoolName())) { + //是否 字段 处理 + schoolExportDTO.setIs985("是".equals(schoolExportDTO.getIs985())?"1":"0"); + schoolExportDTO.setIs211("是".equals(schoolExportDTO.getIs211())?"1":"0"); + schoolExportDTO.setIsStrengthen("是".equals(schoolExportDTO.getIsStrengthen())?"1":"0"); + schoolExportDTO.setYldx("是".equals(schoolExportDTO.getYldx())?"1":"0"); + schoolExportDTO.setGzsz("是".equals(schoolExportDTO.getGzsz())?"1":"0"); + schoolExportDTO.setGjtszy("是".equals(schoolExportDTO.getGjtszy())?"1":"0"); + schoolExportDTO.setStszy("是".equals(schoolExportDTO.getStszy())?"1":"0"); + schoolExportDTO.setGzd("是".equals(schoolExportDTO.getGzd())?"1":"0"); + schoolExportDTO.setSjyl("是".equals(schoolExportDTO.getSjyl())?"1":"0"); + schoolExportDTO.setSfsyl("是".equals(schoolExportDTO.getSfsyl())?"1":"0"); + schoolExportDTO.setIsYs("是".equals(schoolExportDTO.getIsYs())?"1":"0"); + org.apache.commons.beanutils.BeanUtils.copyProperties(yxSchool, schoolExportDTO); + //BeanUtils.copyProperties(schoolExportDTO, yxSchool); + if(schoolMap.containsKey(schoolExportDTO.getSchoolName())){ + yxSchool.setId(schoolMap.get(schoolExportDTO.getSchoolName()).getId()); + } + yxSchool.setUpdateTime(new Date()); + if(StringUtils.isNotBlank(yxSchool.getId())){ + yxSchoolService.updateById(yxSchool); + }else{ + yxSchoolService.save(yxSchool); + } + schoolNameList.add(schoolExportDTO.getSchoolName()); + } + if (schoolCodeList.contains(schoolExportDTO.getSchoolCode())) { + continue; + } + yxSchoolChild = yxSchoolChildService.getOne( + new LambdaQueryWrapper().eq(YxSchoolChild::getSchoolId, yxSchool.getId()) + .eq(YxSchoolChild::getSchoolCode, schoolExportDTO.getSchoolCode()) + ); + if(yxSchoolChild == null){ + yxSchoolChild = new YxSchoolChild(); + yxSchoolChild.setCreateTime(new Date()); + } + yxSchoolChild.setSchoolId(yxSchool.getId()); + yxSchoolChild.setSchoolCode(schoolExportDTO.getSchoolCode()); + yxSchoolChild.setSchoolName(schoolExportDTO.getSchoolName()); + yxSchoolChild.setSchoolChildName(schoolExportDTO.getChildSchoolName()); + yxSchoolChild.setUpdateTime(new Date()); + if (StringUtils.isNotBlank(yxSchoolChild.getId())) { + yxSchoolChildService.updateById(yxSchoolChild); + }else{ + yxSchoolChildService.save(yxSchoolChild); + } + schoolCodeList.add(schoolExportDTO.getSchoolCode()); + } +// List schoolList = yxSchoolService.list(new LambdaQueryWrapper().select(YxSchool::getId, YxSchool::getSchoolName)); +// Map schoolNameMap = schoolList.stream().collect(Collectors.toMap(YxSchool::getSchoolName, YxSchool::getId)); +// List list = ExcelImportUtil.importExcel(file.getInputStream(), SchoolExportDTO.class, params); +// long start = System.currentTimeMillis(); +// for (SchoolExportDTO schoolExportDTO : list) { +// schoolNameMap.get(schoolExportDTO.getMasterSchoolName()); +// } +// service.saveBatch(list); +// log.info("消耗时间" + (System.currentTimeMillis() - start) + "毫秒"); + return Result.ok("文件导入成功！数据行数：" + list.size()); +// return Result.ok("暂未开放"); + } catch (Exception e) { + String msg = e.getMessage(); + log.error(msg, e); + if (msg != null && msg.indexOf("Duplicate entry") >= 0) { + return Result.error("文件导入失败:有重复数据！"); + } else { + return Result.error("文件导入失败:" + e.getMessage()); + } + } finally { + try { + file.getInputStream().close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + return Result.error("文件导入失败！"); + } + + + /** + * 导入掌上志愿-艺术 院校数据数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importZszySchoolExcel", method = RequestMethod.POST) + public Result importZszySchoolExcel(HttpServletRequest request, HttpServletResponse response) { + MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; + Map fileMap = multipartRequest.getFileMap(); + for (Map.Entry entity : fileMap.entrySet()) { + // 获取上传文件对象 + MultipartFile file = entity.getValue(); + ImportParams params = new ImportParams(); + params.setTitleRows(0); + params.setHeadRows(0); + params.setNeedSave(true); + try { + List list = ExcelImportUtil.importExcel(file.getInputStream(), ZszySchoolImportDTO.class, params); + System.out.println(list.size()); + List schoolList = null; + YxSchool yxSchool = null; + for (ZszySchoolImportDTO zszySchoolImportDTO : list) { + LambdaQueryWrapper objectLambdaQueryWrapper = new LambdaQueryWrapper<>(); + objectLambdaQueryWrapper.eq(YxSchool::getSchoolName,zszySchoolImportDTO.getUnivName()); + schoolList = yxSchoolService.list(objectLambdaQueryWrapper); + if (schoolList.size()>0) { + yxSchool = schoolList.get(0); + }else{ + yxSchool = new YxSchool(); + } + yxSchool.setSchoolName(zszySchoolImportDTO.getUnivName()); + yxSchool.setSchoolWebsiteAddress(zszySchoolImportDTO.getUrl()); + yxSchool.setSchoolPhone(zszySchoolImportDTO.getContact()); + yxSchool.setSchoolIcon(zszySchoolImportDTO.getLogo()); + yxSchool.setSchoolOpenDate(zszySchoolImportDTO.getEstablishYear()); + yxSchool.setProvince(zszySchoolImportDTO.getProvName()); + yxSchool.setCity(zszySchoolImportDTO.getCityName()); + yxSchool.setStreet(zszySchoolImportDTO.getUnivAddress()); + yxSchool.setAffiliation(zszySchoolImportDTO.getCompetentDepart()); + if ("1".equals(zszySchoolImportDTO.getIsPublic())) { + yxSchool.setSchoolNature("公办"); + }else{ + yxSchool.setSchoolNature("民办"); + } + yxSchool.setInstitutionType(zszySchoolImportDTO.getUnivTypeName()); + yxSchool.setStudentNum(null); + yxSchool.setBaseInfo(zszySchoolImportDTO.getUnivDesc()); + yxSchool.setIs211(zszySchoolImportDTO.getIs211()); + yxSchool.setIs985(zszySchoolImportDTO.getIs985()); + if ("是".equals(zszySchoolImportDTO.getIsProvincialKey())) { + yxSchool.setGzsz("省重点"); + } + if (StringUtils.isNotBlank(zszySchoolImportDTO.getMaleProportion())) { + yxSchool.setMaleRatio(Double.valueOf(zszySchoolImportDTO.getMaleProportion())); + yxSchool.setFemaleRatio(100 - yxSchool.getMaleRatio()); + } + if("是".equals(zszySchoolImportDTO.getIsFirstClass()) && + "是".equals(zszySchoolImportDTO.getIsFirstLevel())){ + yxSchool.setSfsyl("1"); + } + yxSchoolService.saveOrUpdate(yxSchool); + + YxSchoolChild yxSchoolChild = yxSchoolChildService.getOne(new LambdaQueryWrapper().eq(YxSchoolChild::getSchoolId, yxSchool.getId()).eq(YxSchoolChild::getSchoolCode, zszySchoolImportDTO.getUnivCode())); + if(yxSchoolChild == null){ + yxSchoolChild = new YxSchoolChild(); + yxSchoolChild.setCreateTime(new Date()); + } + yxSchoolChild.setUpdateTime(new Date()); + yxSchoolChild.setSchoolName(zszySchoolImportDTO.getUnivName()); + yxSchoolChild.setSchoolChildName(zszySchoolImportDTO.getUnivName()); + yxSchoolChild.setSchoolId(yxSchool.getId()); + yxSchoolChild.setSchoolCode(zszySchoolImportDTO.getUnivCode()); + yxSchoolChildService.saveOrUpdate(yxSchoolChild); + } // List schoolList = yxSchoolService.list(new LambdaQueryWrapper().select(YxSchool::getId, YxSchool::getSchoolName)); // Map schoolNameMap = schoolList.stream().collect(Collectors.toMap(YxSchool::getSchoolName, YxSchool::getId)); // List list = ExcelImportUtil.importExcel(file.getInputStream(), SchoolExportDTO.class, params); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/dto/SchoolExportDTO.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/dto/SchoolExportDTO.java index 719f28b..1a17d58 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/dto/SchoolExportDTO.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/dto/SchoolExportDTO.java @@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.jeecg.modules.yx.entity.YxSchool; import org.jeecgframework.poi.excel.annotation.Excel; import java.io.Serializable; @@ -16,25 +17,17 @@ import java.io.Serializable; @Data @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -public class SchoolExportDTO implements Serializable { +public class SchoolExportDTO extends YxSchool implements Serializable{ private static final long serialVersionUID = 1L; - - /** - * 学校名称 - */ - @Excel(name = "主学校名称", width = 15) - @ApiModelProperty(value = "主学校名称") - private java.lang.String masterSchoolName; - /** * 院校代码 */ - @Excel(name = "院校代码", width = 15) + @Excel(name = "院校代码", width = 15, orderNum = "2") private String schoolCode; /** * 院校名称 */ - @Excel(name = "院校名称", width = 15) - private String schoolName; + @Excel(name = "子级院校名称", width = 15, orderNum = "3") + private String childSchoolName; } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/dto/ZszySchoolImportDTO.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/dto/ZszySchoolImportDTO.java new file mode 100644 index 0000000..1662655 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/dto/ZszySchoolImportDTO.java @@ -0,0 +1,211 @@ +package org.jeecg.modules.yx.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.jeecgframework.poi.excel.annotation.Excel; + +/** + * @author ZhouWenTao + * @create 2025-06-24 12:59 + */ +@Data +public class ZszySchoolImportDTO { + private static final long serialVersionUID = 1L; + + + @Excel(name = "学校代码", width = 15) + @ApiModelProperty(value = "学校名称") + private java.lang.String univCode; + + @Excel(name = "学校名称", width = 15) + @ApiModelProperty(value = "学校名称") + private String univName; + + @Excel(name = "查询状态", width = 15) + @ApiModelProperty(value = "查询状态") + private String queryStatus; + + @Excel(name = "出国比例", width = 15) + @ApiModelProperty(value = "出国比例") + private String abroadProportion; + + @Excel(name = "背景", width = 15) + @ApiModelProperty(value = "背景") + private String backGround; + + @Excel(name = "城市代码", width = 15) + @ApiModelProperty(value = "城市代码") + private String city; + + @Excel(name = "城市名称", width = 15) + @ApiModelProperty(value = "城市名称") + private String cityName; + + @Excel(name = "主管部门", width = 15) + @ApiModelProperty(value = "主管部门") + private String competentDepart; + + @Excel(name = "联系方式", width = 15) + @ApiModelProperty(value = "联系方式") + private String contact; + + @Excel(name = "部门类型", width = 15) + @ApiModelProperty(value = "部门类型") + private String departType; + + @Excel(name = "博士点情况", width = 15) + @ApiModelProperty(value = "博士点情况") + private String doctor; + + @Excel(name = "宿舍情况", width = 15) + @ApiModelProperty(value = "宿舍情况") + private String dormitorySituation; + + @Excel(name = "建校年份", width = 15) + @ApiModelProperty(value = "建校年份") + private String establishYear; + + @Excel(name = "考试信息", width = 15) + @ApiModelProperty(value = "考试信息") + private String examInfo; + + @Excel(name = "考试科目", width = 15) + @ApiModelProperty(value = "考试科目") + private String examSubject; + + @Excel(name = "收藏标志", width = 15) + @ApiModelProperty(value = "收藏标志") + private String favFlag; + + @Excel(name = "首字母", width = 15) + @ApiModelProperty(value = "首字母") + private String firstChar; + + @Excel(name = "是否有专科", width = 15) + @ApiModelProperty(value = "是否有专科") + private String hasJunior; + + @Excel(name = "是否有本科", width = 15) + @ApiModelProperty(value = "是否有本科") + private String hasRegular; + + @Excel(name = "历史沿革", width = 15) + @ApiModelProperty(value = "历史沿革") + private String history; + + @Excel(name = "是否211", width = 15) + @ApiModelProperty(value = "是否211") + private String is211; + + @Excel(name = "是否985", width = 15) + @ApiModelProperty(value = "是否985") + private String is985; + + @Excel(name = "是否八校联盟", width = 15) + @ApiModelProperty(value = "是否八校联盟") + private String isEightArts; + + @Excel(name = "是否18所参考高校", width = 15) + @ApiModelProperty(value = "是否18所参考高校") + private String isEighteenReference; + + @Excel(name = "是否考试", width = 15) + @ApiModelProperty(value = "是否考试") + private String isExam; + + @Excel(name = "是否一流学科", width = 15) + @ApiModelProperty(value = "是否一流学科") + private String isFirstClass; + + @Excel(name = "是否一级学科", width = 15) + @ApiModelProperty(value = "是否一级学科") + private String isFirstLevel; + + @Excel(name = "是否省部共建", width = 15) + @ApiModelProperty(value = "是否省部共建") + private String isProvincialCooperate; + + @Excel(name = "是否省属重点", width = 15) + @ApiModelProperty(value = "是否省属重点") + private String isProvincialKey; + + @Excel(name = "是否公办", width = 15) + @ApiModelProperty(value = "是否公办") + private String isPublic; + + @Excel(name = "是否30所独立院校", width = 15) + @ApiModelProperty(value = "是否30所独立院校") + private String isThirtyIndependent; + + @Excel(name = "校徽", width = 15) + @ApiModelProperty(value = "校徽") + private String logo; + + @Excel(name = "男生比例", width = 15) + @ApiModelProperty(value = "男生比例") + private String maleProportion; + + @Excel(name = "硕士点情况", width = 15) + @ApiModelProperty(value = "硕士点情况") + private String master; + + @Excel(name = "照片JSON", width = 15) + @ApiModelProperty(value = "照片JSON") + private String photoJson; + + @Excel(name = "研究生情况", width = 15) + @ApiModelProperty(value = "研究生情况") + private String postgraduate; + + @Excel(name = "省份代码", width = 15) + @ApiModelProperty(value = "省份代码") + private String provId; + + @Excel(name = "省份名称", width = 15) + @ApiModelProperty(value = "省份名称") + private String provName; + + @Excel(name = "奖学金情况", width = 15) + @ApiModelProperty(value = "奖学金情况") + private String scholarship; + + @Excel(name = "学校地址", width = 15) + @ApiModelProperty(value = "学校地址") + private String univAddress; + + @Excel(name = "学校描述", width = 15) + @ApiModelProperty(value = "学校描述") + private String univDesc; + + @Excel(name = "学校ID", width = 15) + @ApiModelProperty(value = "学校ID") + private String univId; + + @Excel(name = "学校状态", width = 15) + @ApiModelProperty(value = "学校状态") + private String univStatus; + + @Excel(name = "学校类型代码", width = 15) + @ApiModelProperty(value = "学校类型代码") + private String univType; + + @Excel(name = "学校类型名称", width = 15) + @ApiModelProperty(value = "学校类型名称") + private String univTypeName; + + @Excel(name = "更新人ID", width = 15) + @ApiModelProperty(value = "更新人ID") + private String updatedBy; + + @Excel(name = "更新人名称", width = 15) + @ApiModelProperty(value = "更新人名称") + private String updatedName; + + @Excel(name = "更新时间", width = 15) + @ApiModelProperty(value = "更新时间") + private String updatedTime; + + @Excel(name = "网址", width = 15) + @ApiModelProperty(value = "网址") + private String url; +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxSchool.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxSchool.java index c0bfc87..53954b4 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxSchool.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxSchool.java @@ -38,105 +38,103 @@ public class YxSchool implements Serializable { /** * 学校名称 */ - @Excel(name = "学校名称", width = 15) - @ApiModelProperty(value = "学校名称") + @Excel(name = "主学校名称", width = 15, orderNum = "1") + @ApiModelProperty(value = "主学校名称") private java.lang.String schoolName; /** * 官方网址 */ - @Excel(name = "官方网址", width = 15) + @Excel(name = "官方网址",orderNum = "20", width = 15) @ApiModelProperty(value = "官方网址") private java.lang.String schoolWebsiteAddress; /** * 学校电话 */ - @Excel(name = "学校电话", width = 15) + @Excel(name = "学校电话",orderNum = "20", width = 15) @ApiModelProperty(value = "学校电话") private java.lang.String schoolPhone; /** * 电子邮箱 */ - @Excel(name = "电子邮箱", width = 15) + @Excel(name = "电子邮箱",orderNum = "20", width = 15) @ApiModelProperty(value = "电子邮箱") private java.lang.String schoolEmail; /** * 学校图标 */ - @Excel(name = "学校图标", width = 15) + @Excel(name = "学校图标",orderNum = "20", width = 15) @ApiModelProperty(value = "学校图标") private java.lang.String schoolIcon; /** * 办学日期 */ - @Excel(name = "办学日期", width = 15) - /*@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd")*/ + @Excel(name = "办学日期",orderNum = "20", width = 15) @ApiModelProperty(value = "办学日期") private String schoolOpenDate; /** * 省 */ - @Excel(name = "省份", width = 15) + @Excel(name = "省份",orderNum = "20", width = 15) @ApiModelProperty(value = "省份") private java.lang.String province; /** * 市 */ - @Excel(name = "城市", width = 15) + @Excel(name = "城市",orderNum = "20", width = 15) @ApiModelProperty(value = "城市") private java.lang.String city; /** * 区 */ - @Excel(name = "区域", width = 15) +// @Excel(name = "区域",orderNum = "20", width = 15) @ApiModelProperty(value = "区域") private java.lang.String area; /** * 详细地址 */ - @Excel(name = "详细地址", width = 15) + @Excel(name = "详细地址",orderNum = "20", width = 15) @ApiModelProperty(value = "详细地址") private java.lang.String street; /** * 隶属于 */ - @Excel(name = "隶属于", width = 15) + @Excel(name = "隶属于",orderNum = "20", width = 15) @ApiModelProperty(value = "隶属于") private java.lang.String affiliation; /** * 办学性质 */ - @Excel(name = "办学性质", width = 15) + @Excel(name = "办学性质",orderNum = "20", width = 15) @ApiModelProperty(value = "办学性质") private java.lang.String schoolNature; /** * 办学类型 */ - @Excel(name = "办学类型", width = 15) + @Excel(name = "办学类型",orderNum = "20", width = 15) @ApiModelProperty(value = "办学类型") private java.lang.String schoolType; /** * 院校类型 */ - @Excel(name = "院校类型", width = 15) + @Excel(name = "院校类型",orderNum = "20", width = 15) @ApiModelProperty(value = "院校类型") private java.lang.String institutionType; /** * 学生人数 */ - @Excel(name = "学生人数", width = 15) + @Excel(name = "学生人数",orderNum = "20", width = 15) @ApiModelProperty(value = "学生人数") private java.lang.String studentNum; /** * 基本信息 */ - @Excel(name = "基本信息", width = 15) + @Excel(name = "基本信息",orderNum = "20", width = 15) @ApiModelProperty(value = "基本信息") private java.lang.String baseInfo; /** * 删除标识 */ - @Excel(name = "删除标识", width = 15) +// @Excel(name = "删除标识",orderNum = "20", width = 15) @ApiModelProperty(value = "删除标识") @TableLogic private java.lang.Integer delFlag; @@ -172,105 +170,105 @@ public class YxSchool implements Serializable { /** * 标签 */ - @Excel(name = "标签", width = 15) + @Excel(name = "标签",orderNum = "20", width = 15) @ApiModelProperty(value = "标签") private java.lang.String tags; /** * 学校批次 */ - @Excel(name = "学校批次", width = 15) + @Excel(name = "学校批次",orderNum = "20", width = 15) @ApiModelProperty(value = "学校批次") private java.lang.String schoolBatch; /** * 985工程 */ - @Excel(name = "985工程", width = 15) + @Excel(name = "985工程",orderNum = "20", width = 15) @ApiModelProperty(value = "985工程") - private java.lang.Integer is985; + private java.lang.String is985; /** * 211工程 */ - @Excel(name = "211工程", width = 15) + @Excel(name = "211工程",orderNum = "20", width = 15) @ApiModelProperty(value = "211工程") - private java.lang.Integer is211; + private java.lang.String is211; /** * 强基计划 */ - @Excel(name = "强基计划", width = 15) + @Excel(name = "强基计划",orderNum = "20", width = 15) @ApiModelProperty(value = "强基计划") - private java.lang.Integer isStrengthen; + private java.lang.String isStrengthen; /** * 占地面积(亩) */ - @Excel(name = "占地面积(亩)", width = 15) + @Excel(name = "占地面积(亩)",orderNum = "20", width = 15) @ApiModelProperty(value = "占地面积(亩)") private java.lang.Double are; /** * 一流大学 */ - @Excel(name = "一流大学", width = 15) + @Excel(name = "一流大学",orderNum = "20", width = 15) @ApiModelProperty(value = "一流大学") private java.lang.String yldx; /** * 省重/国重 */ - @Excel(name = "国重/省重", width = 15) + @Excel(name = "国重/省重",orderNum = "20", width = 15) @ApiModelProperty(value = "国重/省重") private java.lang.String gzsz; /** * 保研率 */ - @Excel(name = "保研率", width = 15) + @Excel(name = "保研率",orderNum = "20", width = 15) @ApiModelProperty(value = "保研率") private java.lang.String byl; /** * 国家特色专业 */ - @Excel(name = "国家特色专业", width = 15) + @Excel(name = "国家特色专业",orderNum = "20", width = 15) @ApiModelProperty(value = "国家特色专业") private java.lang.String gjtszy; /** * 省特色专业 */ - @Excel(name = "省特色专业", width = 15) + @Excel(name = "省特色专业",orderNum = "20", width = 15) @ApiModelProperty(value = "省特色专业") private java.lang.String stszy; /** * 是否国重点 */ - @Excel(name = "是否国重点", width = 15) + @Excel(name = "是否国重点",orderNum = "20", width = 15) @ApiModelProperty(value = "是否国重点") private java.lang.String gzd; /** * 世界一流 */ - @Excel(name = "世界一流", width = 15) + @Excel(name = "世界一流",orderNum = "20", width = 15) @ApiModelProperty(value = "世界一流") private java.lang.String sjyl; /** * 是否双一流 */ - @Excel(name = "是否双一流", width = 15) + @Excel(name = "是否双一流",orderNum = "20", width = 15) @ApiModelProperty(value = "是否双一流") private java.lang.String sfsyl; /** * 男生占比 */ - @Excel(name = "男生占比", width = 15) + @Excel(name = "男生占比",orderNum = "20", width = 15) @ApiModelProperty(value = "男生占比") private java.lang.Double maleRatio; /** * 女生占比 */ - @Excel(name = "女生占比", width = 15) + @Excel(name = "女生占比",orderNum = "20", width = 15) @ApiModelProperty(value = "女生占比") private java.lang.Double femaleRatio; /** * 是否是艺术 */ - @Excel(name = "是否是艺术", width = 15) + @Excel(name = "是否是艺术",orderNum = "20", width = 15) @ApiModelProperty(value = "是否是艺术") - private java.lang.Integer isYs; + private java.lang.String isYs; } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxSchoolMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxSchoolMapper.xml index 5394682..3e831a9 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxSchoolMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxSchoolMapper.xml @@ -470,30 +470,42 @@ ORDER BY FIELD(sc.school_code,#{b}) + diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxCalculationMajorServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxCalculationMajorServiceImpl.java index c5db0ae..cb26c79 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxCalculationMajorServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxCalculationMajorServiceImpl.java @@ -462,10 +462,10 @@ public class YxCalculationMajorServiceImpl extends ServiceImpl