|
|
@@ -18,7 +18,6 @@ import com.goafanti.common.dao.UserMapper;
|
|
|
import com.goafanti.common.error.BusinessException;
|
|
|
import com.goafanti.common.model.DailySalesReport;
|
|
|
import com.goafanti.core.mybatis.BaseMybatisDao;
|
|
|
-import com.goafanti.report.bo.CountDepMarketingStatisticsBo;
|
|
|
import com.goafanti.report.bo.CountMarketingStatisticsBo;
|
|
|
import com.goafanti.report.bo.DepartmentSalesReportBO;
|
|
|
import com.goafanti.report.bo.PersonalSalesReportBO;
|
|
|
@@ -26,7 +25,7 @@ import com.goafanti.report.bo.ReportDate;
|
|
|
import com.goafanti.report.bo.SalesValues;
|
|
|
import com.goafanti.report.bo.SomeTimeMarketingBo;
|
|
|
import com.goafanti.report.bo.marketingESBo;
|
|
|
-import com.goafanti.report.bo.technicalDepListBo;
|
|
|
+import com.goafanti.report.bo.technicalDepStatisticsListBo;
|
|
|
import com.goafanti.report.bo.userDataListBo;
|
|
|
import com.goafanti.report.enums.OrderBy;
|
|
|
import com.goafanti.report.enums.SalesReportOrderField;
|
|
|
@@ -368,7 +367,7 @@ public class SalesReportServiceImpl extends BaseMybatisDao<DailySalesReportMappe
|
|
|
return null;
|
|
|
}
|
|
|
|
|
|
- public List<technicalDepListBo> technicalDepStatistics(String depId, Integer timeType, String startTime, String endTime,
|
|
|
+ public List<technicalDepStatisticsListBo> technicalDepStatistics(String depId, Integer timeType, String startTime, String endTime,
|
|
|
String publishStatus, String taskStatus) {
|
|
|
ReportDate rd = new ReportDate(new Date());
|
|
|
if (TimeType.WEEKLY.getCode()==timeType) {
|