|
|
@@ -1,25 +1,21 @@
|
|
|
package com.goafanti.order.service.impl;
|
|
|
|
|
|
-import java.io.File;
|
|
|
-import java.io.FileOutputStream;
|
|
|
-import java.io.IOException;
|
|
|
-import java.io.OutputStream;
|
|
|
-import java.text.SimpleDateFormat;
|
|
|
-import java.util.*;
|
|
|
-
|
|
|
-import javax.servlet.http.HttpServletResponse;
|
|
|
-import javax.servlet.http.HttpServletResponseWrapper;
|
|
|
-
|
|
|
-import com.alibaba.fastjson.JSON;
|
|
|
import com.alibaba.fastjson.JSONArray;
|
|
|
-import com.alibaba.fastjson.JSONObject;
|
|
|
import com.goafanti.admin.service.DepartmentService;
|
|
|
+import com.goafanti.common.bo.Error;
|
|
|
import com.goafanti.common.bo.Result;
|
|
|
+import com.goafanti.common.dao.TOrderTaskMapper;
|
|
|
+import com.goafanti.common.error.BusinessException;
|
|
|
+import com.goafanti.common.utils.ExportExcelUtil;
|
|
|
import com.goafanti.common.utils.excel.NewExcelUtil;
|
|
|
-import com.goafanti.order.bo.*;
|
|
|
+import com.goafanti.core.mybatis.BaseMybatisDao;
|
|
|
+import com.goafanti.core.mybatis.page.Pagination;
|
|
|
+import com.goafanti.order.bo.InputProjectStatistics;
|
|
|
+import com.goafanti.order.bo.InputProvincialStatistics;
|
|
|
+import com.goafanti.order.bo.OutProjectStatistics;
|
|
|
+import com.goafanti.order.bo.OutProvincialStatistics;
|
|
|
import com.goafanti.order.bo.outStatistics.*;
|
|
|
-import com.google.gson.JsonArray;
|
|
|
-import com.google.gson.JsonObject;
|
|
|
+import com.goafanti.order.service.ProjectStatisticsService;
|
|
|
import groovy.util.logging.Log4j;
|
|
|
import org.apache.commons.collections4.map.HashedMap;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
@@ -33,14 +29,12 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
-import com.goafanti.common.bo.Error;
|
|
|
-import com.goafanti.common.dao.TOrderTaskMapper;
|
|
|
-import com.goafanti.common.error.BusinessException;
|
|
|
-import com.goafanti.common.utils.ExportExcelUtil;
|
|
|
-import com.goafanti.core.mybatis.BaseMybatisDao;
|
|
|
-import com.goafanti.core.mybatis.page.Pagination;
|
|
|
-import com.goafanti.order.enums.NewProjectStatus;
|
|
|
-import com.goafanti.order.service.ProjectStatisticsService;
|
|
|
+import javax.servlet.http.HttpServletResponse;
|
|
|
+import java.io.File;
|
|
|
+import java.io.FileOutputStream;
|
|
|
+import java.io.IOException;
|
|
|
+import java.io.OutputStream;
|
|
|
+import java.util.*;
|
|
|
|
|
|
@Service
|
|
|
@Log4j
|
|
|
@@ -68,6 +62,10 @@ public class ProjectStatisticsServiceImpl extends BaseMybatisDao<TOrderTaskMappe
|
|
|
if(ps.getContractNo()!=null)params.put("contractNo", ps.getContractNo());
|
|
|
if(ps.getUserName()!=null)params.put("userName", ps.getUserName());
|
|
|
if (ps.getThchId()!=null)params.put("thchId", ps.getThchId());
|
|
|
+ if (ps.getType()!=null){
|
|
|
+ String[] split = ps.getType().split(",");
|
|
|
+ params.put("type", split);
|
|
|
+ }
|
|
|
if(ps.getDeclarationBatch()!=null)params.put("declarationBatch", ps.getDeclarationBatch());
|
|
|
if(ps.getProjectSituation()!=null)params.put("projectSituation", ps.getProjectSituation());
|
|
|
if(ps.getProjectAmount()!=null) {
|