From b04459ba7397f690c70398c5abc404c144d0ccbb Mon Sep 17 00:00:00 2001 From: yz <3614508250@qq.com> Date: Mon, 5 Aug 2024 16:26:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B4=A6=E5=8F=B7=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ibeetl/admin/core/dao/CoreUserDao.java | 5 +- .../admin/core/service/CoreUserService.java | 6 +++ .../src/main/resources/sql/core/coreUser.md | 34 +++++++++++- .../cn/jlw/Interceptor/InterceptorConfig.java | 3 +- .../java/com/ibeetl/jlw/dao/StudentDao.java | 3 ++ .../java/com/ibeetl/jlw/dao/TeacherDao.java | 2 + ...gesJurisdictionCurriculumResourcesDao.java | 3 -- ...egesJurisdictionExperimentalSystemDao.java | 2 + .../com/ibeetl/jlw/enums/SubsystemName.java | 3 +- .../ibeetl/jlw/service/StudentService.java | 14 +++++ .../ibeetl/jlw/service/TeacherService.java | 12 +++++ ...urisdictionCurriculumResourcesService.java | 1 + ...JurisdictionExperimentalSystemService.java | 45 +++++++++++++--- .../jlw/service/WebPlatformService.java | 2 + .../java/com/ibeetl/jlw/util/HttpUtil.java | 54 +++++++++++++++++++ .../ibeetl/jlw/util/SubsystemUserUtil.java | 21 ++++++-- .../com/ibeetl/jlw/web/StudentController.java | 2 +- web/src/main/resources/sql/jlw/student.md | 6 ++- web/src/main/resources/sql/jlw/teacher.md | 5 ++ ...sCollegesJurisdictionExperimentalSystem.md | 6 ++- .../jlw/resourcesApplication/add.html | 19 +++++-- .../templates/jlw/schoolClass/index.html | 2 +- 22 files changed, 226 insertions(+), 24 deletions(-) diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreUserDao.java b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreUserDao.java index 1841664e..3901def9 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreUserDao.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreUserDao.java @@ -17,7 +17,7 @@ import java.util.Map; @Repository @SqlResource("core.coreUser") public interface CoreUserDao extends BaseMapper { - + /** * 根据角色编码查询用户集合 * @@ -91,4 +91,7 @@ public interface CoreUserDao extends BaseMapper { MapgetUserInfoByUsername(String username); List>getUserInfosByUsername(); + + + Map getSonSystemUserInfoByUserName(String username); } diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreUserService.java b/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreUserService.java index 8a9e4433..d583fd2e 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreUserService.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreUserService.java @@ -418,7 +418,13 @@ public class CoreUserService extends CoreBaseService { return coreUserDao.getUserInfoByUsername(username); } + + public Map getSonSystemUserInfoByUserName(String username) { + return coreUserDao.getSonSystemUserInfoByUserName(username); + } + public List> getUserInfosByUsername() { return coreUserDao.getUserInfosByUsername(); } + } diff --git a/admin-core/src/main/resources/sql/core/coreUser.md b/admin-core/src/main/resources/sql/core/coreUser.md index ef588af1..c9de9eb1 100644 --- a/admin-core/src/main/resources/sql/core/coreUser.md +++ b/admin-core/src/main/resources/sql/core/coreUser.md @@ -311,4 +311,36 @@ left join university_faculty uf1 on sc.university_faculty_id = uf1.university_fa left join university_system us on t.university_system_id = us.university_system_id left join university_system us1 on sc.university_system_id = us1.university_system_id left join core_user_role cur on cu.ID = cur.USER_ID -where cur.ROLE_ID in (192, 194) \ No newline at end of file +where cur.ROLE_ID in (192, 194) + + +getSonSystemUserInfoByUserName +=== +select cu.CODE as username, +cu.PASSWORD as password, +IF(s.student_name IS NULL, t.teacher_name, s.student_name) as name, +cu.old_id as userId, +if(cur.ROLE_ID = 192, 4, 3) as roleId, +uc.universities_colleges_id as schoolId, +uc.universities_colleges_name as schoolName, +sc.class_id as classId, +sc.class_name as className, +IF(s.student_mobile IS NULL, t.teacher_mobile, s.student_mobile) as phone, +IF(uf.old_id is null, uf1.old_id, uf.old_id) as collegeId, +IF(uf.university_faculty_name is null, uf1.university_faculty_name, uf.university_faculty_name) as collegeName, +IF(us.old_id is null, us1.old_id, us.old_id) as majorId, +IF(us.university_system_name is null, us1.university_system_name, us.university_system_name) as majorName, +s.old_id as studentId, +t.old_id as teacherId +from core_user cu +join universities_colleges uc on cu.ORG_ID = uc.org_id +left join student s on cu.ID = s.user_id +left join teacher t on cu.ID = t.user_id +left join school_class sc on s.class_id = sc.class_id +left join university_faculty uf on t.university_faculty_id = uf.university_faculty_id +left join university_faculty uf1 on sc.university_faculty_id = uf1.university_faculty_id +left join university_system us on t.university_system_id = us.university_system_id +left join university_system us1 on sc.university_system_id = us1.university_system_id +left join core_user_role cur on cu.ID = cur.USER_ID +where cu.CODE = #username# +and cur.ROLE_ID in (192, 194) \ No newline at end of file diff --git a/web/src/main/java/cn/jlw/Interceptor/InterceptorConfig.java b/web/src/main/java/cn/jlw/Interceptor/InterceptorConfig.java index 23281982..2a75d944 100644 --- a/web/src/main/java/cn/jlw/Interceptor/InterceptorConfig.java +++ b/web/src/main/java/cn/jlw/Interceptor/InterceptorConfig.java @@ -113,7 +113,8 @@ public class InterceptorConfig implements WebMvcConfigurer, InitializingBean { "/wx", "/test/**", "/account/**", - "/api/resourcesApplication/logicPicture.json" + "/api/resourcesApplication/logicPicture.json", + "/api/resourcesApplication/getPageList.do" // "/upload/**" ) .excludePathPatterns("/swagger-resources/**", "/webjars/**", "/v2/**", "/swagger-ui.html/**").order(1); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/StudentDao.java b/web/src/main/java/com/ibeetl/jlw/dao/StudentDao.java index 098f0ead..40f1c4d2 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/StudentDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/StudentDao.java @@ -123,6 +123,8 @@ public interface StudentDao extends BaseMapper{ List> findAllBySchoolId(Long schoolId); + List> findAllSonSystemAllBySchoolId(Long schoolId); + List getStudentByStudentNoAndOrgId(String studentNo,Long orgId); ListgetValuesByOrgId(Long orgId); @@ -142,4 +144,5 @@ public interface StudentDao extends BaseMapper{ List getNoAssetStudent(); Map getMapByStudentIdForForeign(Long studentId); + } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/dao/TeacherDao.java b/web/src/main/java/com/ibeetl/jlw/dao/TeacherDao.java index 3953a463..a8b01e42 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherDao.java @@ -66,4 +66,6 @@ public interface TeacherDao extends BaseMapper{ Teacher getByTeacherSn(String teacherSn); void deleteById1(Long teacherId); + + List> findAllByUniversitiesCollegesId(Long universitiesCollegesId); } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/dao/UniversitiesCollegesJurisdictionCurriculumResourcesDao.java b/web/src/main/java/com/ibeetl/jlw/dao/UniversitiesCollegesJurisdictionCurriculumResourcesDao.java index 9fb14383..def4ddfd 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/UniversitiesCollegesJurisdictionCurriculumResourcesDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/UniversitiesCollegesJurisdictionCurriculumResourcesDao.java @@ -73,7 +73,4 @@ public interface UniversitiesCollegesJurisdictionCurriculumResourcesDao extends */ List getAuthorizedCourse(Long orgId, String courseLabelIdPlural); - - - } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/dao/UniversitiesCollegesJurisdictionExperimentalSystemDao.java b/web/src/main/java/com/ibeetl/jlw/dao/UniversitiesCollegesJurisdictionExperimentalSystemDao.java index 69c77cf3..3eabbe12 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/UniversitiesCollegesJurisdictionExperimentalSystemDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/UniversitiesCollegesJurisdictionExperimentalSystemDao.java @@ -55,4 +55,6 @@ public interface UniversitiesCollegesJurisdictionExperimentalSystemDao extends B ListforexSimulationTradingAuthorizationSchoolDataInterface(); List getAllApplicationIdBySchoolId(Long schoolId); + + List getTypeIdListBySchoolId(Long universitiesCollegesId); } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/enums/SubsystemName.java b/web/src/main/java/com/ibeetl/jlw/enums/SubsystemName.java index 21d7abf7..cc53c8f5 100644 --- a/web/src/main/java/com/ibeetl/jlw/enums/SubsystemName.java +++ b/web/src/main/java/com/ibeetl/jlw/enums/SubsystemName.java @@ -34,7 +34,8 @@ public enum SubsystemName { SECURITIES_TRADING("证券交易"), CSRC("证监会、银保监会、行业协会"), RISK_MANAGEMENT("风险管理"), - BIG_DATA_STORAGE("大数据储存"); + BIG_DATA_STORAGE("金融大数据"), + BIG_DATA_BASICS("大数据基础"); diff --git a/web/src/main/java/com/ibeetl/jlw/service/StudentService.java b/web/src/main/java/com/ibeetl/jlw/service/StudentService.java index c1fe9b17..f3d02c0a 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/StudentService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/StudentService.java @@ -1767,6 +1767,20 @@ public class StudentService extends CoreBaseService { return dataList; } + public List> findAllSonSystemBySchoolId(Long schoolId) { + List> mapList = studentDao.findAllSonSystemAllBySchoolId(schoolId); + List> dataList = new ArrayList<>(); + //将内部元素弄成驼峰 + for (Map map : mapList) { + Map data = new HashMap<>(); + data.put("studentNo", map.get("studentno")); + data.put("name", map.get("name")); + data.put("classId", map.get("classid")); + dataList.add(data); + } + return dataList; + } + public List findStudentNoByClassId(Long classId) { return studentDao.findStudentNoByClassId(classId); } diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherService.java index 7d96e99b..d2f405e9 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherService.java @@ -932,4 +932,16 @@ public class TeacherService extends CoreBaseService { public void deleteById1(Long teacherId){ sqlManager.deleteById(Teacher.class, teacherId); } + + public List> findAllByUniversitiesCollegesId(Long universitiesCollegesId) { + List> mapList = teacherDao.findAllByUniversitiesCollegesId(universitiesCollegesId); + List> dataList = new ArrayList<>(); + for (Map map : mapList) { + Map dataMap = new HashMap<>(); + dataMap.put("teacherNo", map.get("teacherno")); + dataMap.put("name", map.get("name")); + dataList.add(dataMap); + } + return dataList; + } } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesJurisdictionCurriculumResourcesService.java b/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesJurisdictionCurriculumResourcesService.java index 665d04cd..8e9aa169 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesJurisdictionCurriculumResourcesService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesJurisdictionCurriculumResourcesService.java @@ -307,4 +307,5 @@ public class UniversitiesCollegesJurisdictionCurriculumResourcesService extends } return theoryCourseList; } + } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesJurisdictionExperimentalSystemService.java b/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesJurisdictionExperimentalSystemService.java index 3857ece1..c323edb7 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesJurisdictionExperimentalSystemService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesJurisdictionExperimentalSystemService.java @@ -6,6 +6,7 @@ import cn.jlw.util.ToolUtils; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.fasterxml.jackson.core.JsonProcessingException; +import com.ibeetl.admin.core.dao.CoreUserDao; import com.ibeetl.admin.core.service.CoreBaseService; import com.ibeetl.admin.core.service.CorePlatformService; import com.ibeetl.admin.core.service.CoreUserService; @@ -57,6 +58,8 @@ public class UniversitiesCollegesJurisdictionExperimentalSystemService extends C private StudentService studentService; @Autowired private CoreUserService coreUserService; + @Autowired + private TeacherService teacherService; public PageQueryqueryByCondition(PageQuery query){ PageQuery ret = universitiesCollegesJurisdictionExperimentalSystemDao.queryByCondition(query); @@ -101,10 +104,14 @@ public class UniversitiesCollegesJurisdictionExperimentalSystemService extends C ToolUtils.deleteNullList(usList); if(null != usList && usList.size()>0){ //删掉旧的 - this.deleteByUniversitiesCollegesId(universitiesCollegesId); + deleteByUniversitiesCollegesId(universitiesCollegesId); } List universitiesCollegesJurisdictionExperimentalSystemList = new ArrayList<>(); +// List typeIdList=universitiesCollegesJurisdictionExperimentalSystemDao.getTypeIdListBySchoolId(universitiesCollegesId); for(int i=0;i0){ this.insertBatch(universitiesCollegesJurisdictionExperimentalSystemList); //子系统添加用户数据 - List> students = studentService.findAllBySchoolId(universitiesCollegesId); + List> students = studentService.findAllSonSystemBySchoolId(universitiesCollegesId); + List applications = getAllApplicationIdBySchoolId(universitiesCollegesId); if(null != students && students.size()>0){ List userInfos = new ArrayList<>(); for(Map student : students){ - Map map = coreUserService.getUserInfoByUsername(String.valueOf(student.get("studentNo"))); + Map map = coreUserService.getSonSystemUserInfoByUserName(String.valueOf(student.get("studentNo"))); + map.put("collegeid",universitiesCollegesId); ZYUserInfo info = new ZYUserInfo(map); userInfos.add(info); } - List applications = getAllApplicationIdBySchoolId(universitiesCollegesId); try { SubsystemUserUtil.subsystemUserCreate(userInfos,applications); } catch (JsonProcessingException e) { throw new RuntimeException(e); } } - //应用授权后开通资金账户权限 - studentAccountAssetAllocationService.updateApplicationAuthority(uc.getOrgId()); - } + List userInfos=new ArrayList<>(); + List> teacherList=teacherService.findAllByUniversitiesCollegesId(universitiesCollegesId); + for (int i = 0; i < teacherList.size(); i++) { + Map userInfoByUsername = coreUserService.getUserInfoByUsername(String.valueOf(teacherList.get(i).get("name"))); + if (userInfoByUsername==null){ + continue; + } + ZYUserInfo info = new + ZYUserInfo( + coreUserService.getUserInfoByUsername(String.valueOf(teacherList.get(i).get("name")))); + userInfos.add(info); + } + try { + SubsystemUserUtil.subsystemUserCreate(userInfos,applications); + } catch (JsonProcessingException e) { + throw new RuntimeException(e); + } + +// return null; + +// 应用授权后开通资金账户权限 + if(uc.getOrgId()!=254L){ + studentAccountAssetAllocationService.updateApplicationAuthority(uc.getOrgId()); + } + } List urList = new ArrayList<>(); try { urList = JSON.parseArray(uQuery.getUniversitiesCollegesJurisdictionCurriculumResourcesListJson(), UniversitiesCollegesJurisdictionCurriculumResourcesQuery.class); diff --git a/web/src/main/java/com/ibeetl/jlw/service/WebPlatformService.java b/web/src/main/java/com/ibeetl/jlw/service/WebPlatformService.java index 29ad1f66..9bb6a6ef 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/WebPlatformService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/WebPlatformService.java @@ -27,6 +27,7 @@ import org.springframework.stereotype.Service; import javax.validation.constraints.NotNull; import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -122,6 +123,7 @@ public class WebPlatformService { * @param user */ public Object getUserInfoFromSessionByIdentity(@NotNull(message = "登录用户不能为空!") CoreUser user) { +// return httpRequestLocal.getSessionValue(T_STUDENT); switch (EnumUtil.fromString(MenuEnums.class, user.getJobType1())) { case JT_S_01: { return httpRequestLocal.getSessionValue(T_ADMIN); diff --git a/web/src/main/java/com/ibeetl/jlw/util/HttpUtil.java b/web/src/main/java/com/ibeetl/jlw/util/HttpUtil.java index de5b6f72..240f96b6 100644 --- a/web/src/main/java/com/ibeetl/jlw/util/HttpUtil.java +++ b/web/src/main/java/com/ibeetl/jlw/util/HttpUtil.java @@ -1,6 +1,18 @@ package com.ibeetl.jlw.util; +import cn.hutool.json.JSONObject; +import org.apache.commons.lang3.StringUtils; +import org.apache.http.HttpResponse; +import org.apache.http.HttpStatus; +import org.apache.http.client.HttpClient; +import org.apache.http.client.config.RequestConfig; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.entity.StringEntity; +import org.apache.http.impl.client.HttpClients; +import org.apache.http.util.EntityUtils; + import java.io.BufferedReader; +import java.io.IOException; import java.io.InputStreamReader; import java.io.OutputStream; import java.net.HttpURLConnection; @@ -92,4 +104,46 @@ public class HttpUtil { return null; } + + // 发送POST请求 + public static JSONObject sendPost(String url, String paramStr, String contentType, String token) throws IOException { + try { + JSONObject ret = new JSONObject(); + HttpPost method = new HttpPost(url); + StringEntity entity = new StringEntity(paramStr, "utf-8"); + entity.setContentEncoding("UTF-8"); + + if (StringUtils.isEmpty(contentType)) + entity.setContentType("application/json"); + else + entity.setContentType(contentType); + + if (StringUtils.isNotEmpty(token)) { + method.setHeader("Authorization", "Bearer " + token); + } + + method.setEntity(entity); + int timeout = 60000; + RequestConfig requestConfig = RequestConfig.custom() + .setSocketTimeout(timeout) + .setConnectTimeout(timeout) + .build(); + method.setConfig(requestConfig); + HttpClient client = HttpClients.createDefault(); + HttpResponse resp = client.execute(method); + int statusCode = resp.getStatusLine().getStatusCode(); + if (statusCode != HttpStatus.SC_OK) { + return null; + } + String respString = EntityUtils.toString(resp.getEntity(), "UTF-8"); + ret.set("statusCode",statusCode); + if(StringUtils.isNotEmpty(respString)){ + ret.set("respString",respString); + } + return ret; + }catch (Exception e) { + e.printStackTrace(); + } + return null; + } } diff --git a/web/src/main/java/com/ibeetl/jlw/util/SubsystemUserUtil.java b/web/src/main/java/com/ibeetl/jlw/util/SubsystemUserUtil.java index 7e2f37d4..1d27ee54 100644 --- a/web/src/main/java/com/ibeetl/jlw/util/SubsystemUserUtil.java +++ b/web/src/main/java/com/ibeetl/jlw/util/SubsystemUserUtil.java @@ -11,6 +11,7 @@ import com.ibeetl.jlw.web.query.SchoolClassQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -25,7 +26,8 @@ public class SubsystemUserUtil { private static final String MNJY_USER_INSERT_API_URL="http://120.79.161.177:8091/account/saveNewUsersFromZhiyunPlatform"; private static final String SZJJ_USER_INSERT_API_URL="http://112.74.160.81:9909/api/user/synchronizationStudentInfoByAuto"; private static final String QKL_USER_INSERT_API_URL="http://120.79.54.255:8800/account/checkOrCreateForexSimulationUser"; - private static final String JRDSJ_USER_INSERT_API_URL="http://120.78.220.29:8838/tea/user/checkOrCreateForexSimulationUser"; + private static final String JRDSJ_USER_INSERT_API_URL="http://120.78.220.29:9988/tea/user/checkOrCreateForexSimulationUser"; + private static final String PYTHON_USER_INSERT_API_URL="http://120.78.220.29:9988/tea/user/checkOrCreateForexSimulationUser"; @@ -52,8 +54,21 @@ public class SubsystemUserUtil { HttpUtil.sendPostRequest(QKL_USER_INSERT_API_URL, json, "application/json"); } if (applications.contains(SubsystemName.BIG_DATA_STORAGE.getText())) { - //MNJY系统新增用户信息 - HttpUtil.sendPostRequest(JRDSJ_USER_INSERT_API_URL, json, "application/json"); + //金融大数据系统新增用户信息 + String systemOwner="?systemOwner=金融大数据"; + try { + HttpUtil.sendPost(JRDSJ_USER_INSERT_API_URL+systemOwner, json, "application/json", null); + } catch (IOException e) { + e.printStackTrace(); + } + } + if(applications.contains(SubsystemName.BIG_DATA_BASICS.getText())){ + String systemOwner="?systemOwner=Python基础实训教学系统"; + try { + HttpUtil.sendPost(PYTHON_USER_INSERT_API_URL+systemOwner, json, "application/json", null); + } catch (IOException e) { + e.printStackTrace(); + } } } diff --git a/web/src/main/java/com/ibeetl/jlw/web/StudentController.java b/web/src/main/java/com/ibeetl/jlw/web/StudentController.java index 69f92d81..88308ed8 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/StudentController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/StudentController.java @@ -2302,7 +2302,7 @@ public class StudentController extends BaseController { write(response, filename, "Sheet1", header.values(), convertData(header.keySet(), maps)); } - @PostMapping(MODEL + "/add.json") + @PostMapping("/jlw/student/add.json") @Function("student.add") @ResponseBody @ApiOperation("添加") diff --git a/web/src/main/resources/sql/jlw/student.md b/web/src/main/resources/sql/jlw/student.md index 2bf61cbf..46f79fa8 100644 --- a/web/src/main/resources/sql/jlw/student.md +++ b/web/src/main/resources/sql/jlw/student.md @@ -2223,7 +2223,11 @@ pagedListStudentInfoByClassId findAllBySchoolId === -select student.student_sn as studentNo,student.student_name as name,school_class.old_class_id as classId from student join universities_colleges uc on student.org_id = uc.org_id join school_class on student.class_id =school_class.class_id where old_school_id = #schoolId# +select student.student_sn as studentNo,student.student_name as name,school_class.old_class_id as classId from student join universities_colleges uc on student.org_id = uc.org_id join school_class on student.class_id =school_class.class_id where uc.old_school_id = #schoolId# + +findAllSonSystemAllBySchoolId +=== +select student.student_sn as studentNo,student.student_name as name,school_class.class_id as classId from student join universities_colleges uc on student.org_id = uc.org_id join school_class on student.class_id =school_class.class_id where uc.universities_colleges_id = #schoolId# getStudentByStudentNoAndOrgId === diff --git a/web/src/main/resources/sql/jlw/teacher.md b/web/src/main/resources/sql/jlw/teacher.md index 4267500d..c13bf015 100644 --- a/web/src/main/resources/sql/jlw/teacher.md +++ b/web/src/main/resources/sql/jlw/teacher.md @@ -565,6 +565,11 @@ findAllTeacherBySchoolId select teacher_job_number as teacherNo,teacher_name as name from teacher join universities_colleges on teacher.universities_colleges_id= universities_colleges.universities_colleges_id where old_school_id =#schoolId# +findAllByUniversitiesCollegesId +=== +select teacher_job_number as teacherNo,teacher_name as name from teacher join universities_colleges on teacher.universities_colleges_id= +universities_colleges.universities_colleges_id where teacher.universities_colleges_id=#universitiesCollegesId# + getByTeacherJobNameAndOrgId === diff --git a/web/src/main/resources/sql/jlw/universitiesCollegesJurisdictionExperimentalSystem.md b/web/src/main/resources/sql/jlw/universitiesCollegesJurisdictionExperimentalSystem.md index 56691eb9..98b70e86 100644 --- a/web/src/main/resources/sql/jlw/universitiesCollegesJurisdictionExperimentalSystem.md +++ b/web/src/main/resources/sql/jlw/universitiesCollegesJurisdictionExperimentalSystem.md @@ -274,4 +274,8 @@ getAllApplicationIdBySchoolId === select ra.application_second_level_relation from universities_colleges_jurisdiction_experimental_system ues join resources_application ra on ues.type_id = ra.resources_application_id -where universities_colleges_id =#schoolId#; \ No newline at end of file +where universities_colleges_id =#schoolId#; + +getTypeIdListBySchoolId +=== +SELECT type_id from universities_colleges_jurisdiction_experimental_system WHERE universities_colleges_id=#universitiesCollegesId# \ No newline at end of file diff --git a/web/src/main/resources/templates/jlw/resourcesApplication/add.html b/web/src/main/resources/templates/jlw/resourcesApplication/add.html index 8d7820c8..bf09c48e 100644 --- a/web/src/main/resources/templates/jlw/resourcesApplication/add.html +++ b/web/src/main/resources/templates/jlw/resourcesApplication/add.html @@ -186,16 +186,29 @@ layui.use(['add','form'], function(){ // } // 从老智云,获取到的最新的数据 2023.03.07 index.html中也有一份 + // var levelRelationMap = { + // 1:{name:"国内外宏观经济运行与金融监管平台",child:[{name:"中央银行、财政部、其他政府机构"},{name:"证监会、银保监会、行业协会"},{name:"国外经济、国外政局"}]}, + // 2:{name:"金融产品设计",child:[{name:"风险管理"},{name:"征信评级"},{name:"估值定价"},{name:"期权建模"},{name:"仿真预测"},{name:"资产证券化"}]}, + // 3:{name:"金融产品发行市场",child:[{name:"承销/挂牌"},{name:"并购重组"},{name:"私募"},{name:"PE/VC"}]}, + // 4:{name:"金融产品流通市场",child:[{name:"证券交易"},{name:"融资融券"},{name:"数据资讯"},{name:"研究咨询"},{name:"登记清算"},{name:"财富管理"}]}, + // 5:{name:"金融市场参与主体",child:[{name:"经纪/做市商"},{name:"证券/期货/基金/信托/资管公司"},{name:"商业银行/政策性银行/信用合作社机构"},{name:"保险公司"},{name:"P2P网络借贷公司"}, + // {name:"众筹公司"},{name:"第三方支付公司"},{name:"征信评级机构"},{name:"供应链金融服务公司"},{name:"金融科技服务公司"}]}, + // 6:{name:"大数据技术",child:[{name:"大数据采集"},{name:"大数据储存"},{name:"大数据分析挖掘"},{name:"大数据可视化"}]}, + // 7:{name:"人工智能技术",child:[{name:"智能数据"},{name:"人工智能技术"},{name:"智能营销"},{name:"智能交易"},{name:"智能投研"},{name:"智能支付"},{name:"智能风控"},{name:"智能投顾"}]}, + // 8:{name:"云计算技术",child:[{name:"云主机"},{name:"云储存"},{name:"云数据库"},{name:"容器服务"},{name:"金融SaaS应用"},{name:"公有云"},{name:"私有云"}]}, + // 9:{name:"区块链技术",child:[{name:"区块链技术"},{name:"数字资产"},{name:"区块链发票"},{name:"数字人民币"},{name:"数字票据"},{name:"供应链金融"},{name:"支付清算"},{name:"......"}]} + // } + var levelRelationMap = { 1:{name:"国内外宏观经济运行与金融监管平台",child:[{name:"中央银行、财政部、其他政府机构"},{name:"证监会、银保监会、行业协会"},{name:"国外经济、国外政局"}]}, 2:{name:"金融产品设计",child:[{name:"风险管理"},{name:"征信评级"},{name:"估值定价"},{name:"期权建模"},{name:"仿真预测"},{name:"资产证券化"}]}, 3:{name:"金融产品发行市场",child:[{name:"承销/挂牌"},{name:"并购重组"},{name:"私募"},{name:"PE/VC"}]}, 4:{name:"金融产品流通市场",child:[{name:"证券交易"},{name:"融资融券"},{name:"数据资讯"},{name:"研究咨询"},{name:"登记清算"},{name:"财富管理"}]}, 5:{name:"金融市场参与主体",child:[{name:"证券/期货/基金/信托/资管公司"},{name:"外汇"},{name:"商业银行/政策性银行/信用合作社机构"},{name:"保险公司"},{name:"P2P网络借贷公司"}, {name:"众筹公司"},{name:"第三方支付公司"},{name:"征信评级机构"},{name:"供应链金融服务公司"},{name:"金融科技服务公司"}]}, - 6:{name:"大数据技术",child:[{name:"大数据采集"},{name:"大数据储存"},{name:"大数据分析挖掘"},{name:"大数据可视化"}]}, - 7:{name:"人工智能技术",child:[{name:"智能数据"},{name:"人工智能技术"},{name:"智能营销"},{name:"智能交易"},{name:"智能投研"},{name:"智能支付"},{name:"智能风控"},{name:"智能投顾"}]}, + 6:{name:"大数据技术",child:[{name:"文本挖掘"},{name:"大数据基础"},{name:"分析挖掘"},{name:"可视化BI"},{name:"大数据ETL"},{name:"金融大数据"},{name:"商务大数据"},{name:"用户画像"}]}, + 7:{name:"人工智能技术",child:[{name:"机器学习"},{name:"AI基础"},{name:"数字营销"},{name:"智能交易"},{name:"AIGC大模型"},{name:"数字贸易"},{name:"智能风控"},{name:"智能投顾"}]}, 8:{name:"云计算技术",child:[{name:"云主机"},{name:"云储存"},{name:"云数据库"},{name:"容器服务"},{name:"金融SaaS应用"},{name:"公有云"},{name:"私有云"}]}, - 9:{name:"区块链技术",child:[{name:"区块链技术"},{name:"数字资产"},{name:"区块链发票"},{name:"数字人民币"},{name:"数字票据"},{name:"供应链金融"},{name:"支付清算"},{name:"......"}]} + 9:{name:"区块链技术",child:[{name:"区块链技术"},{name:"数字资产"},{name:"数字发票"},{name:"数字人民币"},{name:"数字票据"},{name:"供应链金融"},{name:"支付清算"},{name:"......"}]} } $.each(levelRelationMap,function (key,value){ diff --git a/web/src/main/resources/templates/jlw/schoolClass/index.html b/web/src/main/resources/templates/jlw/schoolClass/index.html index 6eff10fe..64b34428 100644 --- a/web/src/main/resources/templates/jlw/schoolClass/index.html +++ b/web/src/main/resources/templates/jlw/schoolClass/index.html @@ -35,7 +35,7 @@
新增 - 导入 + 刷新