|
|
@@ -15,6 +15,7 @@
|
|
|
<result column="service_amount_" property="serviceAmount" />
|
|
|
<result column="cloud_amount_" property="cloudAmount" />
|
|
|
<result column="course_amount_" property="courseAmount" />
|
|
|
+ <result column="maintenance_amount_" property="maintenanceAmount" />
|
|
|
<result column="business_refund_" property="businessRefund" />
|
|
|
<result column="total_income_" property="totalIncome" />
|
|
|
<result column="sale_cost_" property="saleCost" />
|
|
|
@@ -46,22 +47,22 @@
|
|
|
|
|
|
<!-- 向数据库增加一条记录 -->
|
|
|
<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.OperatingReportNew" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
|
|
|
- INSERT INTO operating_report_new (id_,principal_,organ_id_,organ_name_,sale_amount_,service_amount_,cloud_amount_,course_amount_,
|
|
|
+ INSERT INTO operating_report_new (id_,principal_,organ_id_,organ_name_,sale_amount_,service_amount_,cloud_amount_,course_amount_,maintenance_amount_,
|
|
|
business_refund_,total_income_,sale_cost_,fixed_costs_,variable_costs_,internal_settlement_,
|
|
|
total_cost_,quasi_discretionary_profit_,prepaid_fee_,cloud_prepaid_fee_,course_prepaid_fee_,sale_prepaid_fee_,other_prepaid_fee_
|
|
|
,prepayments_,receivables_,payable_,month_)
|
|
|
- VALUES(#{id},#{principal},#{organId},#{organName},#{saleAmount},#{serviceAmount},#{cloudAmount},#{courseAmount},
|
|
|
+ VALUES(#{id},#{principal},#{organId},#{organName},#{saleAmount},#{serviceAmount},#{cloudAmount},#{courseAmount},#{maintenanceAmount},
|
|
|
#{businessRefund},#{totalIncome},#{saleCost},#{fixedCosts},#{variableCosts},#{internalSettlement},
|
|
|
#{totalCost},#{quasiDiscretionaryProfit},#{prepaidFee},#{cloudPrepaidFee},#{coursePrepaidFee},#{salePrepaidFee},#{otherPrepaidFee},
|
|
|
#{prepayments},#{receivables},#{payable},#{month})
|
|
|
</insert>
|
|
|
<insert id="batchInsert">
|
|
|
- INSERT INTO operating_report_new (principal_,organ_id_,organ_name_,sale_amount_,service_amount_,cloud_amount_,course_amount_,business_refund_,total_income_,sale_cost_,
|
|
|
+ INSERT INTO operating_report_new (principal_,organ_id_,organ_name_,sale_amount_,service_amount_,cloud_amount_,course_amount_,maintenance_amount_,business_refund_,total_income_,sale_cost_,
|
|
|
fixed_costs_,variable_costs_,internal_settlement_,total_cost_,quasi_discretionary_profit_,
|
|
|
prepaid_fee_,cloud_prepaid_fee_,course_prepaid_fee_,sale_prepaid_fee_,other_prepaid_fee_,prepayments_,receivables_,payable_,month_)
|
|
|
VALUES
|
|
|
<foreach collection="operatingList" item="bean" separator=",">
|
|
|
- (#{bean.principal},#{bean.organId},#{bean.organName},#{bean.saleAmount},#{bean.serviceAmount},#{bean.cloudAmount},#{bean.courseAmount},#{bean.businessRefund},#{bean.totalIncome},
|
|
|
+ (#{bean.principal},#{bean.organId},#{bean.organName},#{bean.saleAmount},#{bean.serviceAmount},#{bean.cloudAmount},#{bean.courseAmount},#{bean.maintenanceAmount},#{bean.businessRefund},#{bean.totalIncome},
|
|
|
#{bean.saleCost},#{bean.fixedCosts},#{bean.variableCosts},#{bean.internalSettlement},#{bean.totalCost},#{bean.quasiDiscretionaryProfit},
|
|
|
#{bean.prepaidFee},#{bean.cloudPrepaidFee},#{bean.coursePrepaidFee},#{bean.salePrepaidFee},#{bean.otherPrepaidFee},
|
|
|
#{bean.prepayments},#{bean.receivables},#{bean.payable},#{bean.month})
|
|
|
@@ -155,8 +156,8 @@
|
|
|
<if test="organId != null and organId != ''">
|
|
|
AND FIND_IN_SET(organ_id_,#{organId})
|
|
|
</if>
|
|
|
- <if test="startTime != null and startTime != ''">
|
|
|
- AND month_ BETWEEN #{startTime} AND #{endTime}
|
|
|
+ <if test="date != null and date != ''">
|
|
|
+ AND month_ = #{date}
|
|
|
</if>
|
|
|
</where>
|
|
|
</sql>
|
|
|
@@ -292,11 +293,13 @@
|
|
|
</select>
|
|
|
<select id="sumActivityUserMapperAmount" resultType="java.util.Map">
|
|
|
SELECT mgpc.organ_id_ 'key',(SUM(CASE WHEN aum.sub_course_num_ > 0 AND aum.category_id_ != 8 THEN aum.sub_course_num_ ELSE 0 END) +
|
|
|
- SUM(CASE WHEN aum.sub_give_course_num_ > 0 AND aum.give_category_id_ != 8 THEN aum.sub_give_course_num_ ELSE 0 END)) * oct.price_ 'value'
|
|
|
+ SUM(CASE WHEN aum.sub_give_course_num_ > 0 AND aum.give_category_id_ != 8 THEN aum.sub_give_course_num_ ELSE 0 END)) *
|
|
|
+ CASE WHEN oct.id_ IS NULL THEN oct1.price_ ELSE oct.price_ END 'value'
|
|
|
FROM activity_user_mapper aum
|
|
|
LEFT JOIN music_group_payment_calender mgpc ON mgpc.id_ = aum.calender_id_
|
|
|
- LEFT JOIN organ_course_type_original_cost oct ON oct.course_type_ = 'VIP' AND oct.organ_id_ = mgpc.organ_id_
|
|
|
- WHERE aum.calender_id_ IS NOT NULL AND return_fee_ = 0
|
|
|
+ left join organ_course_type_original_cost oct ON oct.course_type_ = 'VIP' AND oct.organ_id_ = mgpc.organ_id_
|
|
|
+ left join organ_course_type_original_cost oct1 ON oct1.course_type_ = 'VIP' AND oct1.organ_id_ = 0
|
|
|
+ WHERE aum.calender_id_ IS NOT NULL AND aum.return_fee_ = 0
|
|
|
AND ((aum.sub_course_num_ > 0 AND aum.category_id_ != 8) OR (aum.sub_give_course_num_ > 0 AND aum.give_category_id_ != 8))
|
|
|
GROUP BY mgpc.organ_id_
|
|
|
</select>
|
|
|
@@ -323,4 +326,10 @@
|
|
|
where cto.status_ = 1 AND cto.operating_amount_ > 0
|
|
|
group by cto.organ_id_;
|
|
|
</select>
|
|
|
+ <select id="sumMaintenanceAmount" resultType="java.util.Map">
|
|
|
+ select spo.organ_id_ 'key',SUM(spod.price_) 'value' from student_payment_order_detail spod
|
|
|
+ left join student_payment_order spo ON spo.id_ = spod.payment_order_id_
|
|
|
+ where spod.type_ = 'MAINTENANCE' AND DATE_FORMAT(spod.create_time_,'%Y-%m') = #{month}
|
|
|
+ group by spo.organ_id_
|
|
|
+ </select>
|
|
|
</mapper>
|
zouxuan