diff --git a/web/src/main/java/com/ibeetl/jlw/entity/SchoolClass.java b/web/src/main/java/com/ibeetl/jlw/entity/SchoolClass.java index ecfacf11..257d7c14 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/SchoolClass.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/SchoolClass.java @@ -13,67 +13,79 @@ import org.beetl.sql.annotation.entity.AutoID; import javax.validation.constraints.NotNull; import java.util.Date; -/* -* 班级管理 -* gen by Spring Boot2 Admin 2021-06-19 -*/ +/* + * 班级管理 + * gen by Spring Boot2 Admin 2021-06-19 + */ @Builder @NoArgsConstructor @AllArgsConstructor -public class SchoolClass extends BaseEntity{ +public class SchoolClass extends BaseEntity { private static final long serialVersionUID = 8375624410646020614L; //ID - @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) + @NotNull(message = "ID不能为空", groups = ValidateConfig.UPDATE.class) // @SeqID(name = ORACLE_CORE_SEQ_NAME) - @AutoID + @AutoID + + private Long classId; - private Long classId ; - //院校ID - @Dict(type="universities_colleges.universities_colleges_name.universities_colleges_status=1") - @NotNull(message = "请选择院校", groups =ValidateConfig.ADD.class) + @Dict(type = "universities_colleges.universities_colleges_name.universities_colleges_status=1") + @NotNull(message = "请选择院校", groups = ValidateConfig.ADD.class) @ApiModelProperty("院校ID") - private Long universitiesCollegesId ; + private Long universitiesCollegesId; //院系ID - @Dict(type="universities_colleges.universities_colleges_name.universities_colleges_status=1") - @NotNull(message = "请选择院系", groups =ValidateConfig.ADD.class) + @Dict(type = "universities_colleges.universities_colleges_name.universities_colleges_status=1") + @NotNull(message = "请选择院系", groups = ValidateConfig.ADD.class) @ApiModelProperty("院系ID") - private Long universityFacultyId ; + private Long universityFacultyId; /** * 专业ID */ - @Dict(type="university_system.university_system_name.university_system_status=1") + @Dict(type = "university_system.university_system_name.university_system_status=1") @ApiModelProperty("专业ID") - private Long universitySystemId ; - + private Long universitySystemId; + //班级名称 - @NotNull(message = "请填写班级名称", groups =ValidateConfig.ADD.class) + @NotNull(message = "请填写班级名称", groups = ValidateConfig.ADD.class) @ApiModelProperty("班级名称") - private String className ; - + private String className; + //班级编号 @ApiModelProperty("班级编号") - private String classSn ; - + private String classSn; + //状态(1正常 2删除) @ApiModelProperty("状态(1正常 2删除)") - private Integer classStatus ; - + private Integer classStatus; + //添加时间 @ApiModelProperty("添加时间") - private Date addTime ; - + private Date addTime; + //组织机构ID @ApiModelProperty("组织机构ID") - private Long orgId ; - + private Long orgId; + //后台用户ID @ApiModelProperty("后台用户ID") - private Long userId ; - + private Long userId; + + @ApiModelProperty("智云2.0ID") + private Long oldClassId; + + + public Long getOldClassId() { + return oldClassId; + } + + public void setOldClassId(Long oldClassId) { + this.oldClassId = oldClassId; + } + public Long getUniversitySystemId() { return universitySystemId; } @@ -82,107 +94,147 @@ public class SchoolClass extends BaseEntity{ this.universitySystemId = universitySystemId; } - /**ID - *@return - */ - public Long getClassId(){ - return classId; + /** + * ID + * + * @return + */ + public Long getClassId() { + return classId; } - /**ID - *@param classId - */ - public void setClassId(Long classId){ + + /** + * ID + * + * @param classId + */ + public void setClassId(Long classId) { this.classId = classId; } - /**院校ID - *@return - */ - public Long getUniversitiesCollegesId(){ - return universitiesCollegesId; + /** + * 院校ID + * + * @return + */ + public Long getUniversitiesCollegesId() { + return universitiesCollegesId; } - /**院校ID - *@param universitiesCollegesId - */ - public void setUniversitiesCollegesId(Long universitiesCollegesId){ + + /** + * 院校ID + * + * @param universitiesCollegesId + */ + public void setUniversitiesCollegesId(Long universitiesCollegesId) { this.universitiesCollegesId = universitiesCollegesId; } - /**班级名称 - *@return - */ - public String getClassName(){ - return className; + /** + * 班级名称 + * + * @return + */ + public String getClassName() { + return className; } - /**班级名称 - *@param className - */ - public void setClassName(String className){ + + /** + * 班级名称 + * + * @param className + */ + public void setClassName(String className) { this.className = className; } - /**班级编号 - *@return - */ - public String getClassSn(){ - return classSn; + /** + * 班级编号 + * + * @return + */ + public String getClassSn() { + return classSn; } - /**班级编号 - *@param classSn - */ - public void setClassSn(String classSn){ + + /** + * 班级编号 + * + * @param classSn + */ + public void setClassSn(String classSn) { this.classSn = classSn; } - /**状态(1正常 2删除) - *@return - */ - public Integer getClassStatus(){ - return classStatus; + /** + * 状态(1正常 2删除) + * + * @return + */ + public Integer getClassStatus() { + return classStatus; } - /**状态(1正常 2删除) - *@param classStatus - */ - public void setClassStatus(Integer classStatus){ + + /** + * 状态(1正常 2删除) + * + * @param classStatus + */ + public void setClassStatus(Integer classStatus) { this.classStatus = classStatus; } - /**添加时间 - *@return - */ - public Date getAddTime(){ - return addTime; + /** + * 添加时间 + * + * @return + */ + public Date getAddTime() { + return addTime; } - /**添加时间 - *@param addTime - */ - public void setAddTime(Date addTime){ + + /** + * 添加时间 + * + * @param addTime + */ + public void setAddTime(Date addTime) { this.addTime = addTime; } - /**组织机构ID - *@return - */ - public Long getOrgId(){ - return orgId; + /** + * 组织机构ID + * + * @return + */ + public Long getOrgId() { + return orgId; } - /**组织机构ID - *@param orgId - */ - public void setOrgId(Long orgId){ + + /** + * 组织机构ID + * + * @param orgId + */ + public void setOrgId(Long orgId) { this.orgId = orgId; } - /**后台用户ID - *@return - */ - public Long getUserId(){ - return userId; + /** + * 后台用户ID + * + * @return + */ + public Long getUserId() { + return userId; } - /**后台用户ID - *@param userId - */ - public void setUserId(Long userId){ + + /** + * 后台用户ID + * + * @param userId + */ + public void setUserId(Long userId) { this.userId = userId; } diff --git a/web/src/main/java/com/ibeetl/jlw/service/SchoolClassService.java b/web/src/main/java/com/ibeetl/jlw/service/SchoolClassService.java index 5fa76e19..b9bdeff9 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/SchoolClassService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/SchoolClassService.java @@ -273,4 +273,8 @@ public class SchoolClassService extends CoreBaseService { query.setUniversityFacultyId(facultyId); return getFirst(getValuesByQueryNotWithPermission(query)); } + + public List getAll(){ + return schoolClassDao.all(); + } } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/web/AccountController.java b/web/src/main/java/com/ibeetl/jlw/web/AccountController.java index eb575a05..c4ac3c0f 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/AccountController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/AccountController.java @@ -899,4 +899,10 @@ public class AccountController { return JsonResult.success(teacherService.findAllTeacherBySchoolId(schoolId)); } + @ApiOperation("获取已开通证券大赛及模拟交易的学校") + @GetMapping("findByAuthorization.json") + public JsonResult>> findByAuthorization(){ + return null; + } + } diff --git a/web/src/main/java/com/ibeetl/jlw/web/TestController.java b/web/src/main/java/com/ibeetl/jlw/web/TestController.java index 7c468e58..8cee72c1 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TestController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TestController.java @@ -539,15 +539,41 @@ public class TestController { String sql = "select * from EduSchools where Name = '" + colleges1.getUniversitiesCollegesName() + "' and IsDeleted = 0"; ps = connection.prepareStatement(sql); ResultSet resultSet = ps.executeQuery(); - Long oldId=null; + Long oldId = null; while (resultSet.next()) { oldId = resultSet.getLong("id"); } - if(oldId==null){ + if (oldId == null) { oldId = a++; } colleges1.setOldSchoolId(oldId); universitiesCollegesService.updateTemplate(colleges1); } } + + @ApiOperation("修改班级2.0id") + @PostMapping("updateOldClassId.json") + public void updateOldClassId() throws SQLException { + List classes = schoolClassService.getAll(); + Connection connection = openConn(); + PreparedStatement ps = null; + for (SchoolClass schoolClass : classes) { + Long universitiesCollegesId = schoolClass.getUniversitiesCollegesId(); + UniversitiesColleges universitiesColleges = universitiesCollegesService.queryById(universitiesCollegesId); + String sql = "select EduClasses.* from EduClasses join EduSchools on EduClasses.schoolId = EduSchools.Id where EduSchools.Id = " + universitiesColleges.getOldSchoolId() + " and EduClasses.Name = '" + schoolClass.getClassName() + "'"; + + ps = connection.prepareStatement(sql); + ResultSet resultSet = ps.executeQuery(); + Long oldId = null; + while (resultSet.next()) { + oldId = resultSet.getLong("id"); + } + if (oldId == null) { + oldId = 1500 + schoolClass.getClassId(); + } + schoolClass.setOldClassId(oldId); + schoolClassService.updateTemplate(schoolClass); + } + } + }