更新维修单

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

@@ -46,7 +46,8 @@
         id_, edu_teacher_id_,organ_id_, cooperation_organ_id_, trans_no_,order_id_, order_no_, expect_amount_,
         actual_amount_,balance_amount_, sell_cost_, sell_cost2_, type_,parent_goods_id_, goods_id_,goods_name_, num_,
         user_id_,
-        payment_channel_,mer_no_,batch_no_,stock_type_,account_type_,status_, refund_time_,sell_time_, create_ime_, update_time_
+        payment_channel_,mer_no_,batch_no_,stock_type_,account_type_,status_, refund_time_,sell_time_, create_ime_,
+        update_time_
     </sql>
     <select id="get" parameterType="java.lang.Integer" resultMap="SellOrder">
         <!--@mbg.generated-->
@@ -444,6 +445,7 @@
     <select id="getRepairGoodsSellGroupMonthReport"
             resultMap="com.ym.mec.biz.dal.dao.OperatingReportDao.OperatingReport"><![CDATA[
         SELECT spo.organ_id_,
+               so.cooperation_organ_id_,
                SUM(so.actual_amount_)       sell_amount_,
                SUM(so.sell_cost_ * so.num_) sell_cost_
         FROM student_payment_order spo
@@ -452,20 +454,22 @@
           AND spo.group_type_ IN ('REPAIR', 'GOODS_SELL')
           AND spo.create_time_ >= #{startTime}
           AND spo.create_time_ <= #{endTime}
-        GROUP BY spo.organ_id_
+        GROUP BY spo.organ_id_, so.cooperation_organ_id_
         ]]></select>
 
     <!-- 获取分部学校的收入支出(维修、商品销售订单) -->
     <select id="getRepairGoodsSellGroupIncome"
             resultMap="com.ym.mec.biz.dal.dao.OperatingReportDao.OperatingReport"><![CDATA[
         SELECT spo.organ_id_,
+               so.cooperation_organ_id_,
                SUM(spo.actual_amount_) income_total_
         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.create_time_ >= #{startTime}
           AND spo.create_time_ <= #{endTime}
-        GROUP BY spo.organ_id_
+        GROUP BY spo.organ_id_, so.cooperation_organ_id_
         ]]></select>
 
 
@@ -554,7 +558,10 @@
     </select>
 
     <select id="getRefundSellOrder" resultMap="SellOrder">
-        SELECT * FROM sell_order WHERE order_id_ = #{orderId} AND status_=0
+        SELECT *
+        FROM sell_order
+        WHERE order_id_ = #{orderId}
+          AND status_ = 0
     </select>