财务管理更新

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

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

@@ -18,8 +18,8 @@
 	</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_adv_balance b,t_advertiser a 
-      	where a.id = b.advertiser_id 
+	    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>

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

@@ -130,7 +130,7 @@
 							<td class="breakword">${finance.advertiserName!}</td>
                         	<td class="breakword">${finance.adBalance!}</td>
 							<td class="breakword">${finance.sumAllocation!}</td>
-				        	<td class="breakword">${finance.upDated?datetime}</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>
 						</tr>
 					</#list>