|
|
@@ -10,6 +10,7 @@ import java.util.*;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
import javax.servlet.http.HttpServletResponseWrapper;
|
|
|
|
|
|
+import com.goafanti.admin.service.DepartmentService;
|
|
|
import com.goafanti.common.bo.Result;
|
|
|
import com.goafanti.common.utils.excel.NewExcelUtil;
|
|
|
import com.goafanti.order.bo.*;
|
|
|
@@ -23,6 +24,7 @@ import org.apache.poi.xssf.usermodel.XSSFRow;
|
|
|
import org.apache.poi.xssf.usermodel.XSSFSheet;
|
|
|
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
+import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
@@ -41,6 +43,8 @@ public class ProjectStatisticsServiceImpl extends BaseMybatisDao<TOrderTaskMappe
|
|
|
|
|
|
@Value("${upload.path}")
|
|
|
private String downloadPath;
|
|
|
+ @Autowired
|
|
|
+ private DepartmentService departmentService;
|
|
|
|
|
|
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@@ -50,8 +54,8 @@ public class ProjectStatisticsServiceImpl extends BaseMybatisDao<TOrderTaskMappe
|
|
|
Integer pageNo=1,pageSize=10;
|
|
|
if(ps.getStartDate()!=null)params.put("startDate", ps.getStartDate());
|
|
|
if(ps.getEndDate()!=null)params.put("endDate", ps.getEndDate()+" 23:59:59");
|
|
|
- if(ps.getDepId()!=null)params.put("depId", ps.getDepId());
|
|
|
- if(ps.getThchDepId()!=null)params.put("thchDepId", ps.getThchDepId());
|
|
|
+ if(ps.getDeps()!=null)params.put("deps", departmentService.parseArray(ps.getDeps()));
|
|
|
+ if(ps.getThchDeps()!=null)params.put("thchDeps", departmentService.parseArray(ps.getThchDeps()));
|
|
|
if(ps.getProjectStatus()!=null)params.put("projectStatus", ps.getProjectStatus());
|
|
|
if(ps.getProjectType()!=null)params.put("projectType", ps.getProjectType());
|
|
|
if(ps.getOrderNo()!=null)params.put("orderNo", ps.getOrderNo());
|
|
|
@@ -187,8 +191,8 @@ public class ProjectStatisticsServiceImpl extends BaseMybatisDao<TOrderTaskMappe
|
|
|
str=StringUtils.join(str,i++,"-筛选分类:",screenName," ");
|
|
|
}
|
|
|
if(ib.getProvinceName()!=null)str=StringUtils.join(str,i++,"-省份:",ib.getProvinceName()," ");
|
|
|
- if(ib.getDepId()!=null)str=StringUtils.join(str,i++,"-订单部门:",ib.getDepName()," ");
|
|
|
- if(ib.getThchDepId()!=null)str=StringUtils.join(str,i++,"-责任部门:",ib.getThchDepName()," ");
|
|
|
+ if(ib.getDeps()!=null)str=StringUtils.join(str,i++,"-订单部门:",ib.getDepName()," ");
|
|
|
+ if(ib.getThchDeps()!=null)str=StringUtils.join(str,i++,"-责任部门:",ib.getThchDepName()," ");
|
|
|
if(ib.getProjectStatus()!=null)str=StringUtils.join(str,i++,"-项目别类:",ib.getProjectStatusName()," ");
|
|
|
if(ib.getProjectType()!=null)str=StringUtils.join(str,i++,"-项目分类:",ib.getProjectTypeName()," ");
|
|
|
if(ib.getOrderNo()!=null)str=StringUtils.join(str,i++,"-订单编号:",ib.getOrderNo()," ");
|
|
|
@@ -234,7 +238,7 @@ public class ProjectStatisticsServiceImpl extends BaseMybatisDao<TOrderTaskMappe
|
|
|
Integer pageNo=1,pageSize=10;
|
|
|
if(is.getStartDate()!=null)params.put("startDate", is.getStartDate());
|
|
|
if(is.getEndDate()!=null)params.put("endDate", is.getEndDate()+" 23:59:59");
|
|
|
- if(is.getThchDepId()!=null)params.put("thchDepId", is.getThchDepId());
|
|
|
+ if(is.getThchDeps()!=null)params.put("thchDeps", departmentService.parseArray(is.getThchDeps()));
|
|
|
if(is.getProjectStatus()!=null)params.put("projectStatus", is.getProjectStatus());
|
|
|
if(is.getProjectType()!=null)params.put("projectType", is.getProjectType());
|
|
|
if(is.getProvince()!=null)params.put("province", is.getProvince());
|
|
|
@@ -372,7 +376,7 @@ public class ProjectStatisticsServiceImpl extends BaseMybatisDao<TOrderTaskMappe
|
|
|
if(ib.getStartDate()!=null) str=StringUtils.join(str,i++,"-开始时间:",ib.getStartDate()," ");
|
|
|
if(ib.getEndDate()!=null)str=StringUtils.join(str,i++,"-结束时间:",ib.getEndDate()," ");
|
|
|
if(ib.getProvince()!=null)str=StringUtils.join(str,i++,"-省份:",ib.getProvinceName()," ");
|
|
|
- if(ib.getThchDepId()!=null)str=StringUtils.join(str,i++,"-责任部门:",ib.getThchDepName()," ");
|
|
|
+ if(ib.getThchDeps()!=null)str=StringUtils.join(str,i++,"-责任部门:",ib.getThchDepName()," ");
|
|
|
if(ib.getProjectStatus()!=null)str=StringUtils.join(str,i++,"-项目别类:",ib.getProjectStatusName()," ");
|
|
|
if(ib.getProjectType()!=null)str=StringUtils.join(str,i++,"-项目分类:",ib.getProjectTypeName()," ");
|
|
|
if(ib.getProjectId()!=null)str=StringUtils.join(str,i++,"-项目名称:",ib.getProjectName()," ");
|