1、swagger接口文档

web/src/main/java/com/ibeetl/jlw/entity/LoginTodo.java

@@ -108,6 +108,15 @@ public class LoginTodo implements Serializable {
 		final private String code;
 	}
 
+	/**
+	 * 保险系统学校id
+	 */
+    private Integer icibtSchoolId;
+
+	/**
+	 * 保险系统班级id
+	 */
+	private Integer icibtClassId;
 	/**
 	 * 转换成JSON格式
 	 * @return

web/src/main/java/com/ibeetl/jlw/entity/StudentExtendSchoolInfo.java

@@ -59,6 +59,13 @@ public class StudentExtendSchoolInfo extends Student implements ExtendSchoolInfo
      * 院校所在市区
      */
     private String universitiesCollegesCity;
-
+    /**
+     * 保险系统学校id
+     */
+    private Integer icibtSchoolId;
+    /**
+     * 保险系统班级id
+     */
+    private Integer icibtClassId;
 }
 

web/src/main/java/com/ibeetl/jlw/service/LoginTodoService.java

@@ -60,7 +60,6 @@ public class LoginTodoService {
         Assert.notNull(first, "未获取到院校信息！");
         // 类型为未知 时候，传递null
         String gender = UN_KNOW.equals(student.getStudentGender()) || student.getStudentGender() == null ? null : student.getStudentGender().getText();
-
         LoginTodo loginTodo = LoginTodo.builder().username(coreUser.getCode())
                 .password(coreUser.getPassword())
                 .roleid(LoginTodo.ThirdRole.STUDENT_ROLE.getCode())
@@ -74,6 +73,8 @@ public class LoginTodoService {
                 .studentNo(student.getStudentSn())
                 .classId(student.getClassId().toString())
                 .userId(coreUser.getOldId().toString())
+                .icibtClassId(first.getIcibtClassId())
+                .icibtSchoolId(first.getIcibtSchoolId())
                 .build();
         consumer.accept(loginTodo);
         return loginTodo;

web/src/main/java/com/ibeetl/jlw/service/StudentAccountAssetAllocationService.java

@@ -383,11 +383,20 @@ public class StudentAccountAssetAllocationService extends CoreBaseService<Studen
             accountAssetAllocation.setState(state);
 
             if (ObjectUtil.equals(state, 2)) {
+              if(accountAssetAllocation.getId().equals("1739126700303884288")){
+                  int a = 1;
+              }
+              if(accountAssetAllocation!=null){
+                  accountAssetAllocation.setInitialCapital(accountAssetAllocation.getInitialCapital()==null?new BigDecimal(0):accountAssetAllocation.getInitialCapital());
+                  accountAssetAllocation.setAvailableFunds(accountAssetAllocation.getAvailableFunds()==null?new BigDecimal(0):accountAssetAllocation.getAvailableFunds());
+                  accountAssetAllocation.setInitialInvestmentCapital(accountAssetAllocation.getInitialInvestmentCapital()==null?new BigDecimal(0):accountAssetAllocation.getInitialInvestmentCapital());
                   accountAssetAllocation.setInitialCapital(Objects.equals(accountAssetAllocation.getInitialCapital().compareTo(BigDecimal.ZERO), 0) ? new BigDecimal(1000000) : accountAssetAllocation.getInitialCapital());
                   accountAssetAllocation.setAvailableFunds(Objects.equals(accountAssetAllocation.getAvailableFunds().compareTo(BigDecimal.ZERO), 0) ? new BigDecimal(1000000) : accountAssetAllocation.getAvailableFunds());
                   accountAssetAllocation.setInitialInvestmentCapital(Objects.equals(accountAssetAllocation.getInitialInvestmentCapital().compareTo(BigDecimal.ZERO), 0) ? new BigDecimal(1000000) : accountAssetAllocation.getInitialInvestmentCapital());
                   accountAssetAllocation.setUpdateTime(new Date());
               }
+
+            }
             if (!ObjectUtil.equals(accountAssetAllocation.getApplicationId(), -1L) &&
                     !ObjectUtil.equals(accountAssetAllocation.getApplicationId(), -2L) &&
                     !ObjectUtil.equals(accountAssetAllocation.getName().getText(), AccountTypeEnum.OPTIONS_INVESTMENT_ACCOUNT.getText()) &&

web/src/main/java/com/ibeetl/jlw/web/AccountController.java

@@ -711,7 +711,6 @@ public class AccountController {
     }
 
 
-
     @ApiOperation(value = "修改p2p账户资金-3")
     @PostMapping("/updateP2pAccount3.json")
     public JsonResult updateP2pAccount3(Long userId,
@@ -1094,9 +1093,9 @@ public class AccountController {
         //根据逗号分隔studentNo
         List<Integer> userIds = new ArrayList<>();
         String[] studentNos = studentNo.split(",");
-        for(String s : studentNos){
+        for (String s : studentNos) {
             CoreUser coreUser = coreUserService.findByUsername(s);
-            if(coreUser!=null){
+            if (coreUser != null) {
                 userIds.add(coreUser.getOldId().intValue());
             }
         }
@@ -1125,7 +1124,7 @@ public class AccountController {
     @ApiOperation("理财接口：获取教师授课班级列表")
     @GetMapping("getClassIdsByZhiyun.json")
     public JsonResult getClassIdsByZhiyun(Long userId) {
-        if(userId==null){
+        if (userId == null) {
             return JsonResult.success(schoolClassService.getClassIdsByZhiyunAndUserIdIsNull());
         }
         return JsonResult.success(schoolClassService.getClassIdsByZhiyun(userId));
@@ -1154,4 +1153,67 @@ public class AccountController {
     public JsonResult getClassNameByNewClassId(Long newClassId) {
         return JsonResult.success(schoolClassService.findClassNameByClassId(newClassId));
     }
+
+    @ApiOperation("修改保险系统学校id")
+    @PostMapping("updateInsuranceSchoolId.json")
+    public JsonResult updateInsuranceSchoolId() {
+        List<UniversitiesColleges> universitiesColleges = universitiesCollegesService.getAll();
+        for (UniversitiesColleges colleges : universitiesColleges) {
+            Integer schoolId = colleges.getOldSchoolId().intValue();
+            if (schoolId != null && schoolId > 0) {
+                try {
+                    Connection connection = openConn();
+                    PreparedStatement ps = connection.prepareStatement("select ICIBTSchoolId from EduSchools where id = ?");
+                    ps.setInt(1, schoolId);
+                    ResultSet rs = ps.executeQuery();
+                    while (rs.next()) {
+                        Integer icibtschoolId = rs.getInt("ICIBTSchoolId");
+                        if (icibtschoolId != null && icibtschoolId > 0) {
+                            colleges.setIcibtSchoolId(icibtschoolId);
+                            universitiesCollegesService.updateTemplate(colleges);
+                        }
+                    }
+                    connection.close();
+                    ps.close();
+                    rs.close();
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return JsonResult.success();
+    }
+
+
+    @ApiOperation("修改保险系统班级id")
+    @PostMapping("updateInsuranceClassId.json")
+    public JsonResult updateInsuranceClassId() {
+        List<SchoolClass> schoolClasses = schoolClassService.getAll();
+        int i = 0;
+        for (SchoolClass schoolClass : schoolClasses) {
+            System.out.println("已处理：-----------------------------------------------------------" + i++);
+            Integer classId = schoolClass.getOldClassId().intValue();
+            if (classId != null && classId > 0) {
+                try {
+                    Connection connection = openConn();
+                    PreparedStatement ps = connection.prepareStatement("select ICIBTClassId from EduClasses where id = ?");
+                    ps.setInt(1, classId);
+                    ResultSet rs = ps.executeQuery();
+                    while (rs.next()) {
+                        Integer icibtClassId = rs.getInt("ICIBTClassId");
+                        if (icibtClassId != null && icibtClassId > 0) {
+                            schoolClass.setIcibtClassId(icibtClassId);
+                            schoolClassService.updateTemplate(schoolClass);
+                        }
+                    }
+                    connection.close();
+                    ps.close();
+                    rs.close();
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return JsonResult.success();
+    }
 }

web/src/main/resources/sql/jlw/student.md

@@ -1415,7 +1415,9 @@ getStudentExtendSchoolInfo
   td.universities_colleges_id,
   td.universities_colleges_name,
   td.universities_colleges_city,
-  td.universities_colleges_province
+  td.universities_colleges_province,
+  ta.icibt_class_id,
+  td.icibt_school_id
   FROM
   student t
   LEFT JOIN school_class ta ON ta.class_id = t.class_id