update

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/service/ExaminationBasicService.java

@@ -94,8 +94,12 @@ public interface ExaminationBasicService extends BaseService<Long, ExaminationBa
 
 
     /**
-     * 获取首页收入支出
-     * @return
+     * @describe 获取首页收入支出
+     * @author zouxuan
+     * @date 15:42
+     * @param tenantId:
+     * @param day:
+     * @return java.lang.Object
      */
     Object homeBalanceOfPayment(String tenantId,Integer day);
 

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/service/impl/ExamRoomStudentRelationServiceImpl.java

@@ -738,7 +738,6 @@ public class ExamRoomStudentRelationServiceImpl extends BaseServiceImpl<Long, Ex
 	}
 
 	public PublishMessageDto getPublishMessage(Long examRegistrationId){
-
 		ExamRoomStudentRelation examRoomStudentRelation = examRoomStudentRelationDao.getStudentExamRoom(examRegistrationId);
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		String userId;

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/service/impl/ExaminationBasicServiceImpl.java

@@ -509,16 +509,22 @@ public class ExaminationBasicServiceImpl extends BaseServiceImpl<Long, Examinati
                 dayPayments.put(e,BigDecimal.ZERO);
             }
         });
+        LinkedHashMap<String,BigDecimal> hashMap1 = new LinkedHashMap<>();
+        dayIncomes.entrySet().stream().sorted(Map.Entry.comparingByKey())
+                .forEachOrdered(e -> hashMap1.put(e.getKey(), e.getValue()));
+        LinkedHashMap<String,BigDecimal> hashMap2 = new LinkedHashMap<>();
+        dayPayments.entrySet().stream().sorted(Map.Entry.comparingByKey())
+                .forEachOrdered(e -> hashMap2.put(e.getKey(), e.getValue()));
 
         BigDecimal annualPayment = examManualLedgerDao.getAnnualPayment(tenantId);
         BigDecimal monthPayment = examManualLedgerDao.getMonthPayment(tenantId);
-        HashMap<Object, Object> resultMap = new HashMap<>();
+        HashMap<Object, Object> resultMap = new HashMap<>(6);
         resultMap.put("annualIncome",annualIncome);
         resultMap.put("monthIncome",monthIncome);
-        resultMap.put("dayIncomes",dayIncomes);
+        resultMap.put("dayIncomes",hashMap1);
         resultMap.put("annualPayment",annualPayment);
         resultMap.put("monthPayment",monthPayment);
-        resultMap.put("dayPayments",dayPayments);
+        resultMap.put("dayPayments",hashMap2);
         return resultMap;
     }
 }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/StudentExamResultController.java

@@ -38,6 +38,7 @@ public class StudentExamResultController extends BaseController {
     @Autowired
     private EmployeeService employeeService;
 
+
     @RequestMapping(value = "/recordSync")
     public void recordSync(@RequestBody String body) throws Exception {
         RecordNotify recordNotify = JSONObject.parseObject(body, RecordNotify.class);