优化订单导出接口

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentPaymentOrderExportDto.java

@@ -29,6 +29,8 @@ public class StudentPaymentOrderExportDto extends StudentPaymentOrder {
     private String schoolName;
     private String subjectName;
 
+    private Integer chargeType;
+
     private List<StudentPaymentOrderDetail> orderDetailList;
 
     public BigDecimal getSporadicAmount() {
@@ -110,4 +112,12 @@ public class StudentPaymentOrderExportDto extends StudentPaymentOrder {
     public void setOrderDetailList(List<StudentPaymentOrderDetail> orderDetailList) {
         this.orderDetailList = orderDetailList;
     }
+
+    public Integer getChargeType() {
+        return chargeType;
+    }
+
+    public void setChargeType(Integer chargeType) {
+        this.chargeType = chargeType;
+    }
 }

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

@@ -409,6 +409,7 @@
                extends="StudentPaymentOrder">
         <result column="organ_name" property="organName"/>
         <result column="username_" property="user.username"/>
+        <result column="charge_type_" property="chargeType"/>
         <collection property="orderDetailList" ofType="com.ym.mec.biz.dal.entity.StudentPaymentOrderDetail">
             <result column="detail_type_" property="type"/>
             <result column="detail_price_" property="price"/>
@@ -417,11 +418,12 @@
 
     <!-- 分页查询 -->
     <select id="ExportQueryPage" resultMap="orderAndDetail" parameterType="map">
-        SELECT spo.*,u.username_,spod.type_ detail_type_,spod.price_ detail_price_,o.name_ organ_name
+        SELECT spo.*,u.username_,spod.type_ detail_type_,spod.price_ detail_price_,o.name_ organ_name,sci.charge_type_
         FROM student_payment_order spo
         LEFT JOIN sys_user u on spo.user_id_ = u.id_
         LEFT JOIN student_payment_order_detail spod on spo.id_ = spod.payment_order_id_
         LEFT JOIN organization o on spo.organ_id_ = o.id_
+        LEFT JOIN sporadic_charge_info sci on spo.music_group_id_ = sci.id_
         <include refid="queryPaymentOrder"/>
         ORDER BY spo.id_ ASC
     </select>

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

@@ -219,19 +219,18 @@ public class ExportController extends BaseController {
                 }
 
             } else if (row.getGroupType().equals(GroupType.SPORADIC)) {
-                SporadicChargeInfo sporadicChargeInfo = sporadicChargeInfoDao.findInfoById(Integer.parseInt(row.getMusicGroupId()));
                 row.setSporadicAmount(row.getActualAmount());
                 row.setMusicalFee(BigDecimal.ZERO);
                 row.setTeachingFee(BigDecimal.ZERO);
                 row.setTeachingFee(BigDecimal.ZERO);
-                if (sporadicChargeInfo != null) {
-                    if (sporadicChargeInfo.getChargeType().equals("1")) {
+                if (row.getChargeType() != null) {
+                    if (row.getChargeType().equals(1)) {
                         row.setSporadicType("考级");
-                    } else if (sporadicChargeInfo.getChargeType().equals("2")) {
+                    } else if (row.getChargeType().equals(2)) {
                         row.setSporadicType("缴费");
-                    } else if (sporadicChargeInfo.getChargeType().equals("3")) {
+                    } else if (row.getChargeType().equals(3)) {
                         row.setSporadicType("声部更改");
-                    } else if (sporadicChargeInfo.getChargeType().equals("4")) {
+                    } else if (row.getChargeType().equals(4)) {
                         row.setSporadicType("乐器更换");
                     }
                 }