update

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

@@ -210,18 +210,18 @@
 		where #{month} BETWEEN DATE_FORMAT(orc.start_date_,'%Y-%m') AND DATE_FORMAT(orc.end_date_,'%Y-%m') AND orc.cloud_price_ > 0 AND orc.start_date_  IS NOT NULL;
 	</select>
 	<select id="sumRefundAmount" resultType="java.util.Map">
-		select organ_id_ 'key',SUM(amount_) 'value' from financial_expenditure where process_id_ IN (19,22,23,28,51) AND fee_project_ = 19
+		select organ_id_ 'key',SUM(current_amount_) 'value' from financial_expenditure where process_id_ IN (19,22,23,28,51) AND fee_project_ = 19
 		AND effective_time_ = #{month} AND amount_ > 0 and del_flag_ = 0 group by organ_id_;
 	</select>
 	<select id="sumVariableCosts" resultType="java.util.Map">
-		select fe.organ_id_ 'key',SUM(amount_) 'value' from financial_expenditure fe
+		select fe.organ_id_ 'key',SUM(current_amount_) 'value' from financial_expenditure fe
 		where effective_time_ = #{month} AND amount_ > 0 and del_flag_ = 0
-		AND fee_project_ BETWEEN 6 AND 21 AND process_id_ IN (19,22,23,28,51) group by fe.organ_id_;
+		AND fee_project_ IN (6,7,8,9,10,11,12,15,16,17,20,21) AND process_id_ IN (19,22,23,28,51) group by fe.organ_id_;
 	</select>
 	<select id="sumFixedCosts" resultType="java.util.Map">
-		select fe.organ_id_ 'key',SUM(amount_) 'value' from financial_expenditure fe
+		select fe.organ_id_ 'key',SUM(current_amount_) 'value' from financial_expenditure fe
 		where effective_time_ = #{month} AND amount_ > 0 and del_flag_ = 0
-		AND fee_project_ IN (1,2,3,4,5) AND process_id_ IN (19,22,23,28,51) group by fe.organ_id_;
+		AND fee_project_ IN (3,4,5) AND process_id_ IN (19,22,23,28,51) group by fe.organ_id_;
 	</select>
 	<select id="sumCloudPreAmount" resultType="java.util.Map">
 		select cto.organ_id_ 'key',TRUNCATE(SUM(operating_amount_ / (TIMESTAMPDIFF(DAY,cto.start_time_,cto.end_time_) + 1) *