财务管理更新

Signed-off-by: you.chen <you.chen@cloudcross.com>

src/main/java/com/cloudcross/ssp/model/mapper/finance.sql.xml

@@ -18,26 +18,38 @@
 	</sql>
 	
 	<select id="findByParams"  parameterType="map" resultType="com.cloudcross.ssp.model.Finance">
-	    select a.id as id, a.name as advertiserName, (ifnull(sum(b.allocate), 0) - ifnull(sum(b.consume), 0)) as adBalance, ifnull(sum(b.allocate), 0) as sumAllocation, max(b.act_time) as upDated from t_advertiser a left join t_adv_balance b 
-      	on a.id = b.advertiser_id 
-      	<if test="agentId != null">
-				and a.agent_id = #{agentId}
-		</if>
+	   select advertiserId , advertiserName, (ifnull(sum(allocate), 0) - ifnull(sum(consume), 0)) as adBalance, 
+       ifnull(sum(allocate), 0) as sumAllocation, max(actTime) as upDated from
+      (select a.agent_id as agentId,a.id as advertiserId, a.name as advertiserName, b.allocate as allocate, b.consume as consume, b.act_time
+      as actTime
+       from t_advertiser as a left join t_adv_balance as b 
+      	on a.id = b.advertiser_id) aa
+       where 
+       <if test="agentId != null">
+            agentId = #{agentId}
+       </if>
 			<if test="advertiserId != null">
-				and a.id = #{advertiserId}
+				and advertiserId = #{advertiserId}
 			</if>
+			group by advertiserId
 		limit #{pager.offset}, #{pager.limit}
 	</select>
 	
 	<select id="findByParams1" parameterType="map" resultType="com.cloudcross.ssp.model.Finance">
-		 select a.id as id, a.name as advertiserName, (ifnull(sum(b.allocate), 0) - ifnull(sum(b.consume), 0)) as adBalance, ifnull(sum(b.allocate), 0) as sumAllocation, max(b.act_time) as upDated from t_adv_balance b,t_advertiser a 
-      	where a.id = b.advertiser_id 
-      	<if test="agentId != null">
-				and a.agent_id = #{agentId}
-		</if>
+		select advertiserId , advertiserName, (ifnull(sum(allocate), 0) - ifnull(sum(consume), 0)) as adBalance, 
+       ifnull(sum(allocate), 0) as sumAllocation, max(actTime) as upDated from
+      (select a.agent_id as agentId,a.id as advertiserId, a.name as advertiserName, b.allocate as allocate, b.consume as consume, b.act_time
+      as actTime
+       from t_advertiser as a left join t_adv_balance as b 
+      	on a.id = b.advertiser_id) aa
+       where 
+       <if test="agentId != null">
+            agentId = #{agentId}
+       </if>
 			<if test="advertiserId != null">
-				and a.id = #{advertiserId}
+				and advertiserId = #{advertiserId}
 			</if>
+			group by advertiserId
 	</select>
 	
 	<select id="countByParams" parameterType="map" resultType="int">

src/main/webapp/WEB-INF/pages/advertiser/main/finance/finance-data/financelist.ftl

@@ -125,13 +125,13 @@
 					<#list financeList as finance>
 						<tr style="text-align:center;">
 							<td class="center">
-								<label><input  autocomplete="off" type="checkbox" name="id" value="#{finance.id}"><span class="lbl"></span></label>
+								<label><input  autocomplete="off" type="checkbox" name="id" value="#{finance.advertiserId}"><span class="lbl"></span></label>
 							</td>
 							<td class="breakword">${finance.advertiserName!}</td>
                         	<td class="breakword">${finance.adBalance!}</td>
 							<td class="breakword">${finance.sumAllocation!}</td>
 				        	<td class="breakword"><#if finance.upDated ??>${finance.upDated?datetime}</#if></td>
-							<td class="breakword"><a href="${ctx}/advertiser/main/finance/finance-data/allocation?advertiserId=${finance.id}&agentBalance=${agentBalance}" style="text-decoration:none;color:#36aeea">资金分配</a></td>
+							<td class="breakword"><a href="${ctx}/advertiser/main/finance/finance-data/allocation?advertiserId=${finance.advertiserId}&agentBalance=${agentBalance}" style="text-decoration:none;color:#36aeea">资金分配</a></td>
 						</tr>
 					</#list>
 					</#if>