浏览代码

Merge branch 'test' of jishutao/kede-server into prod

anderx 6 年之前
父节点
当前提交
6821378f39
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      src/main/java/com/goafanti/common/mapper/TemporaryReceivablesMapper.xml

+ 2 - 2
src/main/java/com/goafanti/common/mapper/TemporaryReceivablesMapper.xml

@@ -456,7 +456,7 @@
 	and a.status= #{status}
 	</if>
   </select>
-  <select id="getCountlistReceivablesAmount" parameterType="Map" >
+  <select id="getCountlistReceivablesAmount" parameterType="Map" resultType="java.lang.String">
   select  ifnull(sum(a.amount),0) amount from temporary_receivables a left join t_order_new b on a.order_no=b.order_no 
 	left join user c on b.buyer_id=c.id left join department d on b.order_dep=d.id left join admin e on b.salesman_id=e.id 
 	where 1=1
@@ -489,7 +489,7 @@
 	</if>
 	</select>
 	
-	<select id="getCountlistReceivablesTotalAmount" parameterType="Map" >
+	<select id="getCountlistReceivablesTotalAmount" parameterType="Map" resultType="java.lang.String">
   select ifnull(sum(x.total_amount),0) from (select  b.order_no,b.total_amount  from temporary_receivables a 
   left join t_order_new b on a.order_no=b.order_no left join user c on b.buyer_id=c.id left join department d on b.order_dep=d.id 
 	left join admin e on b.salesman_id=e.id