经营报表问题排查

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentPaymentOrderDao.java

@@ -460,4 +460,6 @@ public interface StudentPaymentOrderDao extends BaseDAO<Long, StudentPaymentOrde
     List<StudentPaymentOrderExportDto> ExportQueryPage2(Map<String, Object> params);
 
     int queryCount1(Map<String, Object> params);
+
+    List<BaseMapDto<Long, BigDecimal>> groupSellOrder(Map<String, Object> params);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentPaymentOrderServiceImpl.java

@@ -1702,7 +1702,12 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
     @Override
     public List<OperatingTotalIncomeDto> queryOperatingSummaryIncome(Map<String, Object> params) {
         List<StudentPaymentOrderExportDto> studentPaymentOrderExportDtos = studentPaymentOrderDao.ExportQueryPage1(params);
-        studentPaymentOrderExportDtos.addAll(studentPaymentOrderDao.ExportQueryPage2(params));
+//        studentPaymentOrderExportDtos.addAll(studentPaymentOrderDao.ExportQueryPage2(params));
+        List<BaseMapDto<Long,BigDecimal>> sellOrderMap = studentPaymentOrderDao.groupSellOrder(params);
+        Map<Long, BigDecimal> sellMap = new HashMap<>();
+        if(CollectionUtils.isNotEmpty(sellOrderMap)){
+            sellMap = sellOrderMap.stream().collect(Collectors.groupingBy(e -> e.getKey(), Collectors.collectingAndThen(Collectors.toList(), v -> v.get(0).getValue())));
+        }
         long i = 1;
         //获取机构费率
         List<Long> otherOrderIds = studentPaymentOrderExportDtos.stream().filter(e -> e.getGroupType() != GroupType.GOODS_SELL
@@ -1992,7 +1997,7 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
                     .add(incomeDto.getGroupPurchaseInstruments())
                     .add(incomeDto.getGroupPurchaseTeachingAids())
                     .add(incomeDto.getLargeInstruments())
-                    .add(incomeDto.getOtherIncome())
+                    .add(incomeDto.getOtherIncome()).add(sellMap.getOrDefault(organId.longValue(),BigDecimal.ZERO))
             );
             incomeDtos.add(incomeDto);
         }

mec-biz/src/main/resources/config/mybatis/StudentPaymentOrderMapper.xml

@@ -1221,6 +1221,12 @@
             #{activityId}
         </foreach>
     </select>
+    <select id="groupSellOrder" resultType="com.ym.mec.biz.dal.dto.BaseMapDto">
+        SELECT so.organ_id_ 'key',SUM(so.actual_amount_) 'value'
+        FROM sell_order so
+        where so.tenant_id_  = 1 AND DATE_FORMAT(so.delivery_time_,'%Y-%m') = #{month}
+        group by so.organ_id_
+    </select>
 
 
 </mapper>

mec-web/src/main/java/com/ym/mec/web/controller/ExportController.java

@@ -234,7 +234,7 @@ public class ExportController extends BaseController {
                     "收费模式", "收费类型", "乐团主管", "成团人数", "在读人数", "申请时间", "成团时间", "清单状态", "收费标准"}, new String[]{
                     "organName", "id", "name", "cooperationOrganName", "status.msg", "courseViewType.msg", "chargeTypeName",
                     "educationalTeacherName", "groupMemberNum", "payNum"
-                    , "createTime", "updateTime", "hasVerifyMusicalList?'已确认':'未确认'", "chargeStandard"}, rows);
+                    , "createTime", "billStartDate", "hasVerifyMusicalList?'已确认':'未确认'", "chargeStandard"}, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attac:wq" +
                     "hment;filename=classGroup-" + DateUtil.getDate(new Date()) + ".xls");