anderx лет назад: 3
Родитель
Сommit
4b11e6189c

+ 1 - 1
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -1754,7 +1754,7 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
     </if>
     <if test=" deps !=null">
       and a.order_dep in
-      <foreach close=")" collection="deps" item="depId" open="(" separator=",">
+      <foreach close=")" collection="listDep" item="depId" open="(" separator=",">
         #{depId}
       </foreach>
     </if>

+ 13 - 3
src/main/java/com/goafanti/order/bo/InputOrderSalesSource.java

@@ -16,13 +16,23 @@ public class InputOrderSalesSource {
     private Integer sort;
 
 
-    private List deps ;
+    private String deps ;
 
-    public List getDeps() {
+    private List<String> listDep;
+
+    public List<String> getListDep() {
+        return listDep;
+    }
+
+    public void setListDep(List<String> listDep) {
+        this.listDep = listDep;
+    }
+
+    public String getDeps() {
         return deps;
     }
 
-    public void setDeps(List deps) {
+    public void setDeps(String deps) {
         this.deps = deps;
     }
 

+ 5 - 0
src/main/java/com/goafanti/order/service/impl/OrderStatisticsServiceImpl.java

@@ -1,5 +1,6 @@
 package com.goafanti.order.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.goafanti.common.dao.TOrderNewMapper;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.order.bo.*;
@@ -20,6 +21,10 @@ public class OrderStatisticsServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 	public List<OutOrderSalesSource> orderSalesSource(InputOrderSalesSource in) {
 		if (in.getSort()==null)in.setSort(0);
 		if(in.getEndDate()!=null)in.setEndDate(in.getEndDate()+" 23:59:59");
+		if (in.getDeps()!=null){
+			List<String> ls= JSON.parseArray(in.getDeps(),String.class);
+			in.setListDep(ls);
+		}
 		return tOrderNewMapper.orderSalesSource(in);
 	}