|  | @@ -225,10 +225,10 @@
 | 
	
		
			
				|  |  |  		where DATE_FORMAT(fe.create_time_,'%Y-%m') = #{month} AND fee_project_ IN (1,2,4,5) AND process_id_ = 28 group by fe.organ_id_;
 | 
	
		
			
				|  |  |  	</select>
 | 
	
		
			
				|  |  |  	<select id="sumCloudPreAmount" resultType="java.util.Map">
 | 
	
		
			
				|  |  | -		select orc.organ_id_ 'key',TRUNCATE(SUM(operating_amount_ / (TIMESTAMPDIFF(DAY,orc.start_date_,orc.end_date_) + 1) *
 | 
	
		
			
				|  |  | +		select cto.organ_id_ 'key',TRUNCATE(SUM(operating_amount_ / (TIMESTAMPDIFF(DAY,cto.start_time_,cto.end_time_) + 1) *
 | 
	
		
			
				|  |  |  		TIMESTAMPDIFF(DAY,CASE WHEN start_time_ < #{lastDay} THEN #{lastDay} ELSE start_time_ END,end_time_)),2) 'value'
 | 
	
		
			
				|  |  | -		from cloud_teacher_order orc
 | 
	
		
			
				|  |  | -		where operating_amount_ > 0 AND DATE_FORMAT(end_time_,'%Y-%m') > #{month} group by orc.organ_id_;
 | 
	
		
			
				|  |  | +		from cloud_teacher_order cto
 | 
	
		
			
				|  |  | +		where operating_amount_ > 0 AND DATE_FORMAT(end_time_,'%Y-%m') > #{month} group by cto.organ_id_;
 | 
	
		
			
				|  |  |  	</select>
 | 
	
		
			
				|  |  |  	<select id="sumGroupCloudPreAmount" resultType="java.util.Map">
 | 
	
		
			
				|  |  |  		select orc.organ_id_ 'key',TRUNCATE(SUM(orc.cloud_price_ / (TIMESTAMPDIFF(DAY,orc.start_date_,orc.end_date_) + 1) * TIMESTAMPDIFF(DAY,#{lastDay},orc.end_date_)),2) 'value'
 |