Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -432,7 +432,7 @@
         GROUP BY spo.organ_id_, co.id_
         ]]></select>
 
-    <!-- 获取分部学校的收入支出(维修、商品销售订单) -->
+    <!-- 获取分部学校的收入支出(声部更改、维修、商品销售订单) -->
     <select id="getRepairGoodsSellGroupMonthReport"
             resultMap="com.ym.mec.biz.dal.dao.OperatingReportDao.OperatingReport"><![CDATA[
         SELECT spo.organ_id_,
@@ -441,20 +441,20 @@
         FROM student_payment_order spo
                  LEFT JOIN sell_order so on so.order_id_ = spo.id_
         WHERE spo.status_ = 'SUCCESS'
-          AND spo.group_type_ IN ('REPAIR', 'GOODS_SELL')
+          AND spo.group_type_ IN ('REPAIR', 'GOODS_SELL','SUBJECT_CHANGE')
           AND spo.create_time_ >= #{startTime}
           AND spo.create_time_ <= #{endTime}
         GROUP BY spo.organ_id_
         ]]></select>
 
-    <!-- 获取分部学校的收入支出(维修、商品销售订单) -->
+    <!-- 获取分部学校的收入支出(声部更改、维修、商品销售订单) -->
     <select id="getRepairGoodsSellGroupIncome"
             resultMap="com.ym.mec.biz.dal.dao.OperatingReportDao.OperatingReport"><![CDATA[
         SELECT spo.organ_id_,
                SUM(spo.actual_amount_) income_total_
         FROM student_payment_order spo
         WHERE spo.status_ = 'SUCCESS'
-          AND spo.group_type_ IN ('REPAIR', 'GOODS_SELL')
+          AND spo.group_type_ IN ('REPAIR', 'GOODS_SELL','SUBJECT_CHANGE')
           AND spo.create_time_ >= #{startTime}
           AND spo.create_time_ <= #{endTime}
         GROUP BY spo.organ_id_

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

@@ -23,6 +23,7 @@
             <result column="discount_price_" property="discountPrice"/>
             <result column="agree_cost_price_" property="agreeCostPrice"/>
             <result column="goods_type_" property="type" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+            <result column="complement_goods_id_list_" property="complementGoodsIdList"/>
         </collection>
     </resultMap>
 
@@ -197,7 +198,8 @@
                g.group_purchase_price_,
                g.discount_price_,
                g.agree_cost_price_,
-               g.type_ goods_type_
+               g.type_ goods_type_,
+               g.complement_goods_id_list_
         FROM student_payment_order_detail spod
                  LEFT JOIN goods g ON FIND_IN_SET(g.id_, spod.goods_id_list_)
         WHERE spod.payment_order_id_ = #{orderId}