Browse Source

统计计算结果修改

anderx 6 years ago
parent
commit
ceb5fb519d

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

@@ -93,9 +93,9 @@ public interface TemporaryReceivablesMapper {
 
 	void updateRepeatOrderNo(String adminId);
 
-	int  getCountlistReceivablesAmount(Map<String, Object> parameter);
+	String  getCountlistReceivablesAmount(Map<String, Object> parameter);
 
-	int getCountlistReceivablesTotalAmount(Map<String, Object> parameter);
+	String getCountlistReceivablesTotalAmount(Map<String, Object> parameter);
 
 
 	

+ 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" resultType="java.lang.Integer">
+  <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" resultType="java.lang.Integer">
+	<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 

+ 1 - 1
src/main/java/com/goafanti/order/service/impl/OrderReceivablesServiceImpl.java

@@ -405,7 +405,7 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 						trb.setRemarks(getCellValue(cell));
 						break;
 					}
-			    	} catch (ParseException e) {
+			    	} catch (Exception e) {
 			    		throw new BusinessException(new Error("表格第"+(rowNum+1)+"行输入内容不正确。"));
 					}
 		        }