yitisheng
/
yitisheng-new-api
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updates

This commit is contained in:
zhouwentao 2024-03-12 09:31:10 +08:00
parent 806440aefa
commit b0bf4f9e80
2 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxSchoolController.java
View File

@ -1929,16 +1929,16 @@ public class YxSchoolController extends JeecgController<YxSchool, IYxSchoolServi
oldSchool.setGzd(school.getSfgzd());//是否国重点
oldSchool.setSjyl(school.getSjyl());//世界一流
oldSchool.setSfsyl(school.getSfsyl());//是否双一流
if (StringUtils.isNotBlank(school.getSsd())) {
oldSchool.setMasterPoint(Integer.valueOf(school.getSsd()));//硕士点
}else{
oldSchool.setMasterPoint(0);
}
if (StringUtils.isNotBlank(school.getBsd())) {
oldSchool.setDoctoralPoint(Integer.valueOf(school.getBsd()));//博士点
}else{
oldSchool.setDoctoralPoint(0);
}
// if (StringUtils.isNotBlank(school.getSsd())) {
// oldSchool.setMasterPoint(Integer.valueOf(school.getSsd()));//硕士点
// }else{
// oldSchool.setMasterPoint(0);
// }
// if (StringUtils.isNotBlank(school.getBsd())) {
// oldSchool.setDoctoralPoint(Integer.valueOf(school.getBsd()));//博士点
// }else{
// oldSchool.setDoctoralPoint(0);
// }
//成立时间
if (StringUtils.isNotBlank(school.getClsj()) && !school.getClsj().equals("-") && !school.getClsj().equals("0")) {

12
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxSchool.java
View File

@ -143,18 +143,6 @@ public class YxSchool implements Serializable {
@Excel(name = "院校类型", width = 15)
@ApiModelProperty(value = "院校类型")
private java.lang.String institutionType;
/**
* 博士点
*/
@Excel(name = "博士点", width = 15)
@ApiModelProperty(value = "博士点")
private java.lang.Integer doctoralPoint;
/**
* 硕士点
*/
@Excel(name = "硕士点", width = 15)
@ApiModelProperty(value = "硕士点")
private java.lang.Integer masterPoint;
/**
* 学生人数
*/