Browse Source

营销报表接口修改、代码优化

anderx 7 years ago
parent
commit
35c9872081

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

@@ -2,19 +2,15 @@ package com.goafanti.common.dao;
 
 import java.util.Date;
 import java.util.List;
-import java.util.Map;
-
 import org.apache.ibatis.annotations.Param;
 import org.springframework.ui.ModelMap;
-
 import com.goafanti.common.model.DailySalesReport;
-import com.goafanti.report.bo.CountDepMarketingStatisticsBo;
 import com.goafanti.report.bo.CountMarketingStatisticsBo;
 import com.goafanti.report.bo.DepartmentSalesReportBO;
 import com.goafanti.report.bo.PersonalSalesReportBO;
 import com.goafanti.report.bo.SomeTimeMarketingBo;
 import com.goafanti.report.bo.marketingESBo;
-import com.goafanti.report.bo.technicalDepListBo;
+import com.goafanti.report.bo.technicalDepStatisticsListBo;
 
 public interface DailySalesReportMapper {
 
@@ -76,7 +72,7 @@ public interface DailySalesReportMapper {
 
 	SomeTimeMarketingBo countsometimeMarketingDepStatistics(@Param("depId")String depId, @Param("startTime")String startTime, @Param("endTime")String endTime);
 
-	List<technicalDepListBo> technicalDepStatistics(@Param("depId")String depId, @Param("startTime")String startTime, @Param("endTime")String endTime, @Param("publishStatus")String publishStatus,
+	List<technicalDepStatisticsListBo> technicalDepStatistics(@Param("depId")String depId, @Param("startTime")String startTime, @Param("endTime")String endTime, @Param("publishStatus")String publishStatus,
 			@Param("taskStatus")String taskStatus);
 
 

+ 1 - 1
src/main/java/com/goafanti/customer/controller/OrganizationAnnualReportController.java

@@ -18,7 +18,7 @@ import com.goafanti.customer.service.AdminOrgAnnualReportService;
 import com.goafanti.customer.service.CustomerService;
 
 @RestController
-@RequestMapping("/open/api/admin/customers")
+@RequestMapping("/api/admin/customers")
 public class OrganizationAnnualReportController extends BaseApiController{
 	@Resource
 	private CustomerService customerService;

+ 0 - 48
src/main/java/com/goafanti/report/bo/technicalDepListBo.java

@@ -1,48 +0,0 @@
-package com.goafanti.report.bo;
-
-public class technicalDepListBo {
-	/**公司名称*/	
-	private String userName;
-	/**订单部门*/
-	private String depName;
-	/**项目签单金额*/
-	private String price;
-	/**签单日期*/
-	private String signTime;
-	/**合同编号*/
-	private String contractNo;
-	/**订单留言*/
-	private String	orderRemarks;
-	/**企业联系人*/
-	private String	contacts;
-	/**任务名称*/
-	private String	taskName;
-	/**派单时间*/
-	private String	taskDistributionTime;
-	/**部门*/
-	private String	taskDepName;
-	/**任务负责人*/
-	private String 	taskreceiver;
-	/**任务状态*/
-	private String	taskStatus;
-	/**项目任务完成时间*/
-	private String	taskCompleteTime;
-	/**任务说明*/
-	private String	taskComment;
-	/**公示状态*/
-	private String 	publishStatus;
-	
-	/**营销员*/
-	private String 	salesmanName;
-	
-	
-	
-	/***/
-	/***/
-	/***/
-	/***/
-	/***/
-	/***/
-	/***/
-	
-}

+ 1 - 0
src/main/java/com/goafanti/report/bo/technicalDepStatisticsListBo.java

@@ -39,6 +39,7 @@ public class technicalDepStatisticsListBo {
 	private String publishTime;
 	/**营销员*/
 	private String salesmanName;
+	
 	public String getOrgName() {
 		return OrgName;
 	}

+ 2 - 2
src/main/java/com/goafanti/report/controller/ReportApiController.java

@@ -21,7 +21,7 @@ import com.goafanti.report.enums.TimeType;
 import com.goafanti.report.service.SalesReportServiceImpl;
 
 @RestController
-@RequestMapping(value = "/open/api/admin/report")
+@RequestMapping(value = "/api/admin/report")
 public class ReportApiController extends BaseApiController {
 	@Autowired
 	SalesReportServiceImpl reportService;
@@ -202,7 +202,7 @@ public class ReportApiController extends BaseApiController {
 		
 	}
 	/**
-	 * 技术部派单报表统计
+	 * 派单报表统计
 	 */
 	@RequestMapping(value="/technicalDepStatistics" , method=RequestMethod.GET)
 	public Result technicalDepStatistics(String depId,Integer timeType,String startTime,String endTime,String publishStatus,String taskStatus){

+ 2 - 3
src/main/java/com/goafanti/report/service/SalesReportServiceImpl.java

@@ -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) {