Browse Source

学生评价列表导出增加学生评分

周箭河 5 năm trước cách đây
mục cha
commit
8ad2740c25

+ 10 - 4
mec-student/src/main/java/com/ym/mec/student/controller/StudentOrderController.java

@@ -423,14 +423,20 @@ public class StudentOrderController extends BaseController {
             }
             //当月新增金额和人数
             for (PracticeGroupsDto monthOrganBuyMoney : monthOrganBuyMoneys) {
-                practiceGroupsDto.setMonthBuyMoney(monthOrganBuyMoney.getTotalMoney());
-                practiceGroupsDto.setMonthBuyNums(monthOrganBuyMoney.getBuyNums());
+                if (organ.getId().equals(monthOrganBuyMoney.getOrganId())) {
+                    practiceGroupsDto.setMonthBuyMoney(monthOrganBuyMoney.getTotalMoney());
+                    practiceGroupsDto.setMonthBuyNums(monthOrganBuyMoney.getBuyNums());
+                    break;
+                }
             }
 
             //当月续费金额和人数
             for (PracticeGroupsDto monthOrganRenewMoney : monthOrganRenewMoneys) {
-                practiceGroupsDto.setMonthRenewNums(monthOrganRenewMoney.getBuyNums());
-                practiceGroupsDto.setMonthRenewMoney(monthOrganRenewMoney.getTotalMoney());
+                if (organ.getId().equals(monthOrganRenewMoney.getOrganId())) {
+                    practiceGroupsDto.setMonthRenewNums(monthOrganRenewMoney.getBuyNums());
+                    practiceGroupsDto.setMonthRenewMoney(monthOrganRenewMoney.getTotalMoney());
+                    break;
+                }
             }
 
             if(practiceGroupsDto.getTotalNums() >0 ){