浏览代码

订单统计报表后台开发

anderx 7 年之前
父节点
当前提交
55974128d4

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

@@ -1,83 +1,83 @@
-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;
-
-public interface DailySalesReportMapper {
-
-	DailySalesReport selectByPrimaryKey(Long id);
-
-	List<DailySalesReport> selectAdmins();
-
-	List<DailySalesReport> selectDailySalesReports(@Param("startTime") Date startTime, @Param("endTime") Date endTime);
-
-	int insertBatch(List<DailySalesReport> list);
-
-	int deleteByDate(@Param("createTime") Date createTime);
-
-	List<PersonalSalesReportBO> selectSalesPersonalReports(@Param("startTime") Date startTime,
-			@Param("endTime") Date endTime, @Param("pageNo") Integer pageNo, @Param("pageSize") Integer pageSize,
-			@Param("orderField") String orderField, @Param("order") String order,
-			@Param("countField") String countField, @Param("amountField") String amountField,
-			@Param("depName") String depName, @Param("name") String name, @Param("position") String position);
-
-	List<PersonalSalesReportBO> selectPersonalByPage(@Param("pageNo") Integer pageNo,
-			@Param("pageSize") Integer pageSize, @Param("depName") String depName, @Param("name") String name,
-			@Param("position") String position);
-
-	Long selectSalesPersonalReportsCount(@Param("startTime") Date startTime, @Param("endTime") Date endTime,
-			@Param("depName") String depName, @Param("name") String name, @Param("position") String position);
-
-	List<ModelMap> selectSalesPersonalExtraReports(@Param("startTime") Date startTime, @Param("endTime") Date endTime,
-			@Param("ids") List<String> ids);
-
-	ModelMap selectTotalReports(@Param("startTime") Date startTime, @Param("endTime") Date endTime,
-			@Param("depName") String depName, @Param("name") String name, @Param("position") String position);
-
-	List<DepartmentSalesReportBO> selectSalesDepartmentReports();
-
-	List<ModelMap> selectSalesDepartmentExtraReports(@Param("startTime") Date startTime,
-			@Param("endTime") Date endTime);
-
-	List<marketingESBo> findmarketingStatisticsList(@Param("depId")String depId, @Param("dayStart")String dayStart, @Param("dayEnd")String dayEnd,
-			@Param("weeklyStart")String weeklyStart, @Param("weeklyEnd")String weeklyEnd, @Param("monthStart")String monthStart, @Param("monthEnd")String monthEnd,
-			@Param("yearStart")String yearStart, @Param("yearEnd")String yearEnd);
-	
-	List<marketingESBo> marketingDepStatisticsList(@Param("depId")String depId, @Param("dayStart")String dayStart, @Param("dayEnd")String dayEnd,
-			@Param("weeklyStart")String weeklyStart, @Param("weeklyEnd")String weeklyEnd, @Param("monthStart")String monthStart, @Param("monthEnd")String monthEnd,
-			@Param("yearStart")String yearStart, @Param("yearEnd")String yearEnd);
-
-	CountMarketingStatisticsBo privateCustomersCount(@Param("depId")String depId, @Param("dayStart")String dayStart, @Param("dayEnd")String dayEnd,
-			@Param("weeklyStart")String weeklyStart, @Param("weeklyEnd")String weeklyEnd, @Param("monthStart")String monthStart, @Param("monthEnd")String monthEnd,
-			@Param("yearStart")String yearStart, @Param("yearEnd")String yearEnd);
-
-	CountMarketingStatisticsBo privateCustomersDepCount(@Param("depId")String depId, @Param("dayStart")String dayStart, @Param("dayEnd")String dayEnd,
-			@Param("weeklyStart")String weeklyStart, @Param("weeklyEnd")String weeklyEnd, @Param("monthStart")String monthStart, @Param("monthEnd")String monthEnd,
-			@Param("yearStart")String yearStart, @Param("yearEnd")String yearEnd);
-
-	List<SomeTimeMarketingBo> sometimeMarketingStatistics(@Param("depId")String depId, @Param("startTime")String startTime, @Param("endTime")String endTime);
-
-	List<SomeTimeMarketingBo> sometimeMarketingDepStatistics(@Param("depId")String depId, @Param("startTime")String startTime, @Param("endTime")String endTime);
-
-	SomeTimeMarketingBo countsometimeMarketingStatistics(@Param("depId")String depId, @Param("startTime")String startTime, @Param("endTime")String endTime);
-
-	SomeTimeMarketingBo countsometimeMarketingDepStatistics(@Param("depId")String depId, @Param("startTime")String startTime, @Param("endTime")String endTime);
-
-	List<technicalDepListBo> technicalDepStatistics(String depId, String stringWeeklyStart, String stringWeeklyEnd, String publishStatus,
-			String taskStatus);
-
-
+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;
+
+public interface DailySalesReportMapper {
+
+	DailySalesReport selectByPrimaryKey(Long id);
+
+	List<DailySalesReport> selectAdmins();
+
+	List<DailySalesReport> selectDailySalesReports(@Param("startTime") Date startTime, @Param("endTime") Date endTime);
+
+	int insertBatch(List<DailySalesReport> list);
+
+	int deleteByDate(@Param("createTime") Date createTime);
+
+	List<PersonalSalesReportBO> selectSalesPersonalReports(@Param("startTime") Date startTime,
+			@Param("endTime") Date endTime, @Param("pageNo") Integer pageNo, @Param("pageSize") Integer pageSize,
+			@Param("orderField") String orderField, @Param("order") String order,
+			@Param("countField") String countField, @Param("amountField") String amountField,
+			@Param("depName") String depName, @Param("name") String name, @Param("position") String position);
+
+	List<PersonalSalesReportBO> selectPersonalByPage(@Param("pageNo") Integer pageNo,
+			@Param("pageSize") Integer pageSize, @Param("depName") String depName, @Param("name") String name,
+			@Param("position") String position);
+
+	Long selectSalesPersonalReportsCount(@Param("startTime") Date startTime, @Param("endTime") Date endTime,
+			@Param("depName") String depName, @Param("name") String name, @Param("position") String position);
+
+	List<ModelMap> selectSalesPersonalExtraReports(@Param("startTime") Date startTime, @Param("endTime") Date endTime,
+			@Param("ids") List<String> ids);
+
+	ModelMap selectTotalReports(@Param("startTime") Date startTime, @Param("endTime") Date endTime,
+			@Param("depName") String depName, @Param("name") String name, @Param("position") String position);
+
+	List<DepartmentSalesReportBO> selectSalesDepartmentReports();
+
+	List<ModelMap> selectSalesDepartmentExtraReports(@Param("startTime") Date startTime,
+			@Param("endTime") Date endTime);
+
+	List<marketingESBo> findmarketingStatisticsList(@Param("depId")String depId, @Param("dayStart")String dayStart, @Param("dayEnd")String dayEnd,
+			@Param("weeklyStart")String weeklyStart, @Param("weeklyEnd")String weeklyEnd, @Param("monthStart")String monthStart, @Param("monthEnd")String monthEnd,
+			@Param("yearStart")String yearStart, @Param("yearEnd")String yearEnd);
+	
+	List<marketingESBo> marketingDepStatisticsList(@Param("depId")String depId, @Param("dayStart")String dayStart, @Param("dayEnd")String dayEnd,
+			@Param("weeklyStart")String weeklyStart, @Param("weeklyEnd")String weeklyEnd, @Param("monthStart")String monthStart, @Param("monthEnd")String monthEnd,
+			@Param("yearStart")String yearStart, @Param("yearEnd")String yearEnd);
+
+	CountMarketingStatisticsBo privateCustomersCount(@Param("depId")String depId, @Param("dayStart")String dayStart, @Param("dayEnd")String dayEnd,
+			@Param("weeklyStart")String weeklyStart, @Param("weeklyEnd")String weeklyEnd, @Param("monthStart")String monthStart, @Param("monthEnd")String monthEnd,
+			@Param("yearStart")String yearStart, @Param("yearEnd")String yearEnd);
+
+	CountMarketingStatisticsBo privateCustomersDepCount(@Param("depId")String depId, @Param("dayStart")String dayStart, @Param("dayEnd")String dayEnd,
+			@Param("weeklyStart")String weeklyStart, @Param("weeklyEnd")String weeklyEnd, @Param("monthStart")String monthStart, @Param("monthEnd")String monthEnd,
+			@Param("yearStart")String yearStart, @Param("yearEnd")String yearEnd);
+
+	List<SomeTimeMarketingBo> sometimeMarketingStatistics(@Param("depId")String depId, @Param("startTime")String startTime, @Param("endTime")String endTime);
+
+	List<SomeTimeMarketingBo> sometimeMarketingDepStatistics(@Param("depId")String depId, @Param("startTime")String startTime, @Param("endTime")String endTime);
+
+	SomeTimeMarketingBo countsometimeMarketingStatistics(@Param("depId")String depId, @Param("startTime")String startTime, @Param("endTime")String endTime);
+
+	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,
+			@Param("taskStatus")String taskStatus);
+
+
 }
 }

+ 41 - 0
src/main/java/com/goafanti/common/mapper/DailySalesReportMapper.xml

@@ -650,4 +650,45 @@ select a.id,a.name,d.id as departmentId,d.name as departmentName,role_name as ro
 		and a.department_id= #{depId,jdbcType=VARCHAR}
 		and a.department_id= #{depId,jdbcType=VARCHAR}
 		</if>
 		</if>
 	</select>
 	</select>
+	<select id="technicalDepStatistics" parameterType='String' resultType="com.goafanti.report.bo.technicalDepStatisticsListBo">
+		select
+	d.nickname as OrgName,f.name as orderDep,c.sign_total_amount as signTotalAmount,
+	date_format( c.sign_time, '%Y-%m-%d' ) as signTime,c.contract_no as contractNo,
+	c.order_remarks as orderRemarks, g.contacts, g.contact_mobile as contactMobile,
+	a.commodity_name as commodityName, date_format( a.task_distribution_time, '%Y-%m-%d %H:%i:%S' ) as taskDistributionTime,
+	i.name as dutyDep, h.name as dutyName, h.contact_mobile as dutyContactMobile,
+	(case when a.task_status = 0 then '未分配' when a.task_status = 1 then '已派单'
+	when a.task_status = 2 then '材料已启动' when a.task_status = 3 then '材料已完成'end ) as taskStatus,
+	a.finish_time as finishTime, a.task_comment as taskComment,
+	(case when a.publish_status = 0 then '已公示' when a.publish_status = 1 then '未公示' 
+	when a.publish_status = 2 then '待公示' when a.publish_status = 3 then '抽查中' end) as publishStatus,
+	a.publish_time as publishTime, e.name as salesmanName
+from
+	contract_task a left join contract b on
+	a.contract_id = b.id left join user d on
+	b.uid = d.id left join t_order c on
+	b.order_no = c.order_no left join admin e on
+	c.salesman_id = e.id left join department_management f on
+	e.department_id = f.id left join organization_identity g on
+	d.id = g.uid left join admin h on
+	a.task_receiver = h.id left join department_management i on
+	h.department_id = i.id
+		where 1=1
+		<if test="depId != null">
+		and e.department_id= #{depId,jdbcType=VARCHAR}
+		</if>
+		<if test="taskStatus != null">
+		and a.task_status = #{taskStatus,jdbcType=VARCHAR}
+		</if>
+		<if test="publishStatus != null">
+		and a.publish_status= #{publishStatus,jdbcType=VARCHAR}
+		</if>
+		<if test="startTime !=null">
+		and c.sign_time &gt;  #{startTime,jdbcType=VARCHAR}
+		</if>
+		<if test="endTime !=null">
+		and c.sign_time &lt;  #{endTime,jdbcType=VARCHAR}
+		</if>
+		order by c.sign_time desc,f.name
+	</select>
 </mapper>
 </mapper>

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

@@ -0,0 +1,157 @@
+package com.goafanti.report.bo;
+
+public class technicalDepStatisticsListBo {
+	/**公司名称*/
+	private String OrgName;
+	/**订单部门*/
+	private String orderDep;
+	/**项目签单金额*/
+	private String signTotalAmount;
+	/**签单日期*/
+	private String signTime;
+	/**合同编号*/
+	private String contractNo;
+	/**订单留言*/
+	private String orderRemarks;
+	/**企业联系人*/
+	private String contacts;
+	/**企业联系电话*/
+	private String contactMobile;
+	/**任务名称*/
+	private String commodityName;
+	/**派单时间*/
+	private String taskDistributionTime;
+	/**任务负责部门*/
+	private String dutyDep;
+	/**任务负责人*/
+	private String dutyName;
+	/**负责人联系方式*/
+	private String dutyContactMobile;
+	/**任务状态*/
+	private String taskStatus;
+	/**完成时间*/
+	private String finishTime;
+	/**任务说明*/
+	private String taskComment;
+	/**公示状态*/
+	private String publishStatus;
+	/**公示时间*/
+	private String publishTime;
+	/**营销员*/
+	private String salesmanName;
+	public String getOrgName() {
+		return OrgName;
+	}
+	public void setOrgName(String orgName) {
+		OrgName = orgName;
+	}
+	public String getOrderDep() {
+		return orderDep;
+	}
+	public void setOrderDep(String orderDep) {
+		this.orderDep = orderDep;
+	}
+	public String getSignTotalAmount() {
+		return signTotalAmount;
+	}
+	public void setSignTotalAmount(String signTotalAmount) {
+		this.signTotalAmount = signTotalAmount;
+	}
+	public String getSignTime() {
+		return signTime;
+	}
+	public void setSignTime(String signTime) {
+		this.signTime = signTime;
+	}
+	public String getContractNo() {
+		return contractNo;
+	}
+	public void setContractNo(String contractNo) {
+		this.contractNo = contractNo;
+	}
+	public String getOrderRemarks() {
+		return orderRemarks;
+	}
+	public void setOrderRemarks(String orderRemarks) {
+		this.orderRemarks = orderRemarks;
+	}
+	public String getContacts() {
+		return contacts;
+	}
+	public void setContacts(String contacts) {
+		this.contacts = contacts;
+	}
+	public String getContactMobile() {
+		return contactMobile;
+	}
+	public void setContactMobile(String contactMobile) {
+		this.contactMobile = contactMobile;
+	}
+	public String getCommodityName() {
+		return commodityName;
+	}
+	public void setCommodityName(String commodityName) {
+		this.commodityName = commodityName;
+	}
+	public String getTaskDistributionTime() {
+		return taskDistributionTime;
+	}
+	public void setTaskDistributionTime(String taskDistributionTime) {
+		this.taskDistributionTime = taskDistributionTime;
+	}
+	public String getDutyDep() {
+		return dutyDep;
+	}
+	public void setDutyDep(String dutyDep) {
+		this.dutyDep = dutyDep;
+	}
+	public String getDutyName() {
+		return dutyName;
+	}
+	public void setDutyName(String dutyName) {
+		this.dutyName = dutyName;
+	}
+	public String getDutyContactMobile() {
+		return dutyContactMobile;
+	}
+	public void setDutyContactMobile(String dutyContactMobile) {
+		this.dutyContactMobile = dutyContactMobile;
+	}
+	public String getTaskStatus() {
+		return taskStatus;
+	}
+	public void setTaskStatus(String taskStatus) {
+		this.taskStatus = taskStatus;
+	}
+	public String getFinishTime() {
+		return finishTime;
+	}
+	public void setFinishTime(String finishTime) {
+		this.finishTime = finishTime;
+	}
+	public String getTaskComment() {
+		return taskComment;
+	}
+	public void setTaskComment(String taskComment) {
+		this.taskComment = taskComment;
+	}
+	public String getPublishStatus() {
+		return publishStatus;
+	}
+	public void setPublishStatus(String publishStatus) {
+		this.publishStatus = publishStatus;
+	}
+	public String getPublishTime() {
+		return publishTime;
+	}
+	public void setPublishTime(String publishTime) {
+		this.publishTime = publishTime;
+	}
+	public String getSalesmanName() {
+		return salesmanName;
+	}
+	public void setSalesmanName(String salesmanName) {
+		this.salesmanName = salesmanName;
+	}
+	
+}

+ 1 - 1
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;
 import com.goafanti.report.service.SalesReportServiceImpl;
 
 
 @RestController
 @RestController
-@RequestMapping(value = "/api/admin/report")
+@RequestMapping(value = "/open/api/admin/report")
 public class ReportApiController extends BaseApiController {
 public class ReportApiController extends BaseApiController {
 	@Autowired
 	@Autowired
 	SalesReportServiceImpl reportService;
 	SalesReportServiceImpl reportService;

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

@@ -36,18 +36,18 @@ import com.goafanti.report.enums.TimeType;
 public class SalesReportServiceImpl extends BaseMybatisDao<DailySalesReportMapper> {
 public class SalesReportServiceImpl extends BaseMybatisDao<DailySalesReportMapper> {
 
 
 	@Autowired
 	@Autowired
-	DailySalesReportMapper salesReportMapper;
+	DailySalesReportMapper dailySalesReportMapper;
 	@Autowired
 	@Autowired
 	UserMapper userMapper;
 	UserMapper userMapper;
 
 
 	public int insertDailyReports(Date startTime, Date endTime) {
 	public int insertDailyReports(Date startTime, Date endTime) {
-		List<DailySalesReport> list = salesReportMapper.selectAdmins();
+		List<DailySalesReport> list = dailySalesReportMapper.selectAdmins();
 		Map<String, DailySalesReport> map = new HashMap<>();
 		Map<String, DailySalesReport> map = new HashMap<>();
 		for (DailySalesReport dsr : list) {
 		for (DailySalesReport dsr : list) {
 			dsr.setCreateTime(endTime);
 			dsr.setCreateTime(endTime);
 			map.put(dsr.getAdminId(), dsr);
 			map.put(dsr.getAdminId(), dsr);
 		}
 		}
-		List<DailySalesReport> reports = salesReportMapper.selectDailySalesReports(startTime, endTime);
+		List<DailySalesReport> reports = dailySalesReportMapper.selectDailySalesReports(startTime, endTime);
 		for (DailySalesReport dsr : reports) {
 		for (DailySalesReport dsr : reports) {
 			DailySalesReport item = map.get(dsr.getAdminId());
 			DailySalesReport item = map.get(dsr.getAdminId());
 			if (item != null) {
 			if (item != null) {
@@ -55,8 +55,8 @@ public class SalesReportServiceImpl extends BaseMybatisDao<DailySalesReportMappe
 				item.setOrderCount(item.getOrderCount() + dsr.getOrderCount());
 				item.setOrderCount(item.getOrderCount() + dsr.getOrderCount());
 			}
 			}
 		}
 		}
-		salesReportMapper.deleteByDate(endTime);
-		return salesReportMapper.insertBatch(list);
+		dailySalesReportMapper.deleteByDate(endTime);
+		return dailySalesReportMapper.insertBatch(list);
 	}
 	}
 
 
 	public ModelMap getReportTotal(Date startTime, String depName, String name, String position) {
 	public ModelMap getReportTotal(Date startTime, String depName, String name, String position) {
@@ -72,10 +72,10 @@ public class SalesReportServiceImpl extends BaseMybatisDao<DailySalesReportMappe
 				name, position);
 				name, position);
 		putField(mm, "annuallyTotalCount", "annuallyTotalAmount", rd.getYearStart(), rd.getYearEnd(), depName, name,
 		putField(mm, "annuallyTotalCount", "annuallyTotalAmount", rd.getYearStart(), rd.getYearEnd(), depName, name,
 				position);
 				position);
-		long totalCount = salesReportMapper.selectSalesPersonalReportsCount(rd.getDailyStart(), rd.getDailyEnd(),
+		long totalCount = dailySalesReportMapper.selectSalesPersonalReportsCount(rd.getDailyStart(), rd.getDailyEnd(),
 				depName, name, position);
 				depName, name, position);
 		if (totalCount == 0) {
 		if (totalCount == 0) {
-			totalCount = salesReportMapper.selectSalesPersonalReportsCount(null, null, depName, name, position);
+			totalCount = dailySalesReportMapper.selectSalesPersonalReportsCount(null, null, depName, name, position);
 		}
 		}
 		mm.put("totalRecordCount", totalCount);
 		mm.put("totalRecordCount", totalCount);
 		return mm;
 		return mm;
@@ -83,7 +83,7 @@ public class SalesReportServiceImpl extends BaseMybatisDao<DailySalesReportMappe
 
 
 	private void putField(ModelMap mm, String count, String amount, Date start, Date end, String depName, String name,
 	private void putField(ModelMap mm, String count, String amount, Date start, Date end, String depName, String name,
 			String position) {
 			String position) {
-		ModelMap res = salesReportMapper.selectTotalReports(start, end, depName, name, position);
+		ModelMap res = dailySalesReportMapper.selectTotalReports(start, end, depName, name, position);
 		mm.put(count, res == null ? 0 : res.get("totalCount"));
 		mm.put(count, res == null ? 0 : res.get("totalCount"));
 		mm.put(amount, res == null ? 0 : res.get("totalAmount"));
 		mm.put(amount, res == null ? 0 : res.get("totalAmount"));
 	}
 	}
@@ -95,39 +95,39 @@ public class SalesReportServiceImpl extends BaseMybatisDao<DailySalesReportMappe
 		switch (orderField) {
 		switch (orderField) {
 		case DailyOrderAmount:
 		case DailyOrderAmount:
 		case DailyOrderCount:
 		case DailyOrderCount:
-			list = salesReportMapper.selectSalesPersonalReports(rd.getDailyStart(), rd.getDailyEnd(), pageNo, pageSize,
+			list = dailySalesReportMapper.selectSalesPersonalReports(rd.getDailyStart(), rd.getDailyEnd(), pageNo, pageSize,
 					orderField.getCode(), order.getCode(), SalesReportOrderField.DailyOrderCount.getCode(),
 					orderField.getCode(), order.getCode(), SalesReportOrderField.DailyOrderCount.getCode(),
 					SalesReportOrderField.DailyOrderAmount.getCode(), depName, name, position);
 					SalesReportOrderField.DailyOrderAmount.getCode(), depName, name, position);
 			break;
 			break;
 		case WeeklyOrderCount:
 		case WeeklyOrderCount:
 		case WeeklyOrderAmount:
 		case WeeklyOrderAmount:
-			list = salesReportMapper.selectSalesPersonalReports(rd.getWeeklyStart(), rd.getWeeklyEnd(), pageNo,
+			list = dailySalesReportMapper.selectSalesPersonalReports(rd.getWeeklyStart(), rd.getWeeklyEnd(), pageNo,
 					pageSize, orderField.getCode(), order.getCode(), SalesReportOrderField.WeeklyOrderCount.getCode(),
 					pageSize, orderField.getCode(), order.getCode(), SalesReportOrderField.WeeklyOrderCount.getCode(),
 					SalesReportOrderField.WeeklyOrderAmount.getCode(), depName, name, position);
 					SalesReportOrderField.WeeklyOrderAmount.getCode(), depName, name, position);
 			break;
 			break;
 		case MonthlyOrderCount:
 		case MonthlyOrderCount:
 		case MonthlyOrderAmount:
 		case MonthlyOrderAmount:
-			list = salesReportMapper.selectSalesPersonalReports(rd.getMonthStart(), rd.getMonthEnd(), pageNo, pageSize,
+			list = dailySalesReportMapper.selectSalesPersonalReports(rd.getMonthStart(), rd.getMonthEnd(), pageNo, pageSize,
 					orderField.getCode(), order.getCode(), SalesReportOrderField.MonthlyOrderCount.getCode(),
 					orderField.getCode(), order.getCode(), SalesReportOrderField.MonthlyOrderCount.getCode(),
 					SalesReportOrderField.MonthlyOrderAmount.getCode(), depName, name, position);
 					SalesReportOrderField.MonthlyOrderAmount.getCode(), depName, name, position);
 			break;
 			break;
 		case QuarterlyOrderCount:
 		case QuarterlyOrderCount:
 		case QuarterlyOrderAmount:
 		case QuarterlyOrderAmount:
-			list = salesReportMapper.selectSalesPersonalReports(rd.getQuarterStart(), rd.getQuarterEnd(), pageNo,
+			list = dailySalesReportMapper.selectSalesPersonalReports(rd.getQuarterStart(), rd.getQuarterEnd(), pageNo,
 					pageSize, orderField.getCode(), order.getCode(),
 					pageSize, orderField.getCode(), order.getCode(),
 					SalesReportOrderField.QuarterlyOrderCount.getCode(),
 					SalesReportOrderField.QuarterlyOrderCount.getCode(),
 					SalesReportOrderField.QuarterlyOrderAmount.getCode(), depName, name, position);
 					SalesReportOrderField.QuarterlyOrderAmount.getCode(), depName, name, position);
 			break;
 			break;
 		case AnnuallyOrderCount:
 		case AnnuallyOrderCount:
 		case AnnuallyOrderAmount:
 		case AnnuallyOrderAmount:
-			list = salesReportMapper.selectSalesPersonalReports(rd.getYearStart(), rd.getYearEnd(), pageNo, pageSize,
+			list = dailySalesReportMapper.selectSalesPersonalReports(rd.getYearStart(), rd.getYearEnd(), pageNo, pageSize,
 					orderField.getCode(), order.getCode(), SalesReportOrderField.AnnuallyOrderCount.getCode(),
 					orderField.getCode(), order.getCode(), SalesReportOrderField.AnnuallyOrderCount.getCode(),
 					SalesReportOrderField.AnnuallyOrderAmount.getCode(), depName, name, position);
 					SalesReportOrderField.AnnuallyOrderAmount.getCode(), depName, name, position);
 			break;
 			break;
 		}
 		}
 
 
 		if (list.isEmpty()) {
 		if (list.isEmpty()) {
-			list = salesReportMapper.selectPersonalByPage(pageNo, pageSize, depName, name, position);
+			list = dailySalesReportMapper.selectPersonalByPage(pageNo, pageSize, depName, name, position);
 		}
 		}
 		if (list.isEmpty()) {
 		if (list.isEmpty()) {
 			return list;
 			return list;
@@ -154,7 +154,7 @@ public class SalesReportServiceImpl extends BaseMybatisDao<DailySalesReportMappe
 
 
 	private void getPersonalExtraInfo(Map<String, PersonalSalesReportBO> map, List<String> ids, String field,
 	private void getPersonalExtraInfo(Map<String, PersonalSalesReportBO> map, List<String> ids, String field,
 			Date start, Date end) {
 			Date start, Date end) {
-		List<ModelMap> mms = salesReportMapper.selectSalesPersonalExtraReports(start, end, ids);
+		List<ModelMap> mms = dailySalesReportMapper.selectSalesPersonalExtraReports(start, end, ids);
 		for (ModelMap mm : mms) {
 		for (ModelMap mm : mms) {
 			Optional<SalesValues> svo = Optional.ofNullable(map.get(mm.get("id"))).map(it -> it.getValues())
 			Optional<SalesValues> svo = Optional.ofNullable(map.get(mm.get("id"))).map(it -> it.getValues())
 					.map(it -> it.get(field));
 					.map(it -> it.get(field));
@@ -167,7 +167,7 @@ public class SalesReportServiceImpl extends BaseMybatisDao<DailySalesReportMappe
 
 
 	public List<DepartmentSalesReportBO> getDepartmentSalesReports(Date startTime) {
 	public List<DepartmentSalesReportBO> getDepartmentSalesReports(Date startTime) {
 		ReportDate rd = new ReportDate(startTime);
 		ReportDate rd = new ReportDate(startTime);
-		List<DepartmentSalesReportBO> list = salesReportMapper.selectSalesDepartmentReports();
+		List<DepartmentSalesReportBO> list = dailySalesReportMapper.selectSalesDepartmentReports();
 		Map<String, DepartmentSalesReportBO> map = new HashMap<>();
 		Map<String, DepartmentSalesReportBO> map = new HashMap<>();
 
 
 		for (DepartmentSalesReportBO dsr : list) {
 		for (DepartmentSalesReportBO dsr : list) {
@@ -240,7 +240,7 @@ public class SalesReportServiceImpl extends BaseMybatisDao<DailySalesReportMappe
 	}
 	}
 
 
 	private void getDepartmentExtraInfo(Map<String, DepartmentSalesReportBO> map, String field, Date start, Date end) {
 	private void getDepartmentExtraInfo(Map<String, DepartmentSalesReportBO> map, String field, Date start, Date end) {
-		List<ModelMap> mms = salesReportMapper.selectSalesDepartmentExtraReports(start, end);
+		List<ModelMap> mms = dailySalesReportMapper.selectSalesDepartmentExtraReports(start, end);
 		for (ModelMap mm : mms) {
 		for (ModelMap mm : mms) {
 			Optional<SalesValues> svo = Optional.ofNullable(map.get(mm.get("id"))).map(it -> it.getValues())
 			Optional<SalesValues> svo = Optional.ofNullable(map.get(mm.get("id"))).map(it -> it.getValues())
 					.map(it -> it.get(field));
 					.map(it -> it.get(field));
@@ -254,7 +254,7 @@ public class SalesReportServiceImpl extends BaseMybatisDao<DailySalesReportMappe
 	
 	
 	public List<marketingESBo> marketingStatistics(String depId) {
 	public List<marketingESBo> marketingStatistics(String depId) {
 		ReportDate rd = new ReportDate(new Date());
 		ReportDate rd = new ReportDate(new Date());
-		List<marketingESBo> list=salesReportMapper.findmarketingStatisticsList(depId,rd.getStringDailyStart(),rd.getStringDailyEnd(),rd.getStringWeeklyStart(),rd.getStringWeeklyEnd(),
+		List<marketingESBo> list=dailySalesReportMapper.findmarketingStatisticsList(depId,rd.getStringDailyStart(),rd.getStringDailyEnd(),rd.getStringWeeklyStart(),rd.getStringWeeklyEnd(),
 														rd.getStringMonthStart(),rd.getStringMonthEnd(),rd.getStringYearStart(),rd.getStringYearEnd());
 														rd.getStringMonthStart(),rd.getStringMonthEnd(),rd.getStringYearStart(),rd.getStringYearEnd());
 		
 		
 			return list;
 			return list;
@@ -263,7 +263,7 @@ public class SalesReportServiceImpl extends BaseMybatisDao<DailySalesReportMappe
 
 
 	public List<marketingESBo> marketingDepStatistics(String depId) {
 	public List<marketingESBo> marketingDepStatistics(String depId) {
 		ReportDate rd = new ReportDate(new Date());
 		ReportDate rd = new ReportDate(new Date());
-		List<marketingESBo> list=salesReportMapper.marketingDepStatisticsList(depId,rd.getStringDailyStart(),rd.getStringDailyEnd(),rd.getStringWeeklyStart(),rd.getStringWeeklyEnd(),
+		List<marketingESBo> list=dailySalesReportMapper.marketingDepStatisticsList(depId,rd.getStringDailyStart(),rd.getStringDailyEnd(),rd.getStringWeeklyStart(),rd.getStringWeeklyEnd(),
 				rd.getStringMonthStart(),rd.getStringMonthEnd(),rd.getStringYearStart(),rd.getStringYearEnd());
 				rd.getStringMonthStart(),rd.getStringMonthEnd(),rd.getStringYearStart(),rd.getStringYearEnd());
 			
 			
 		return list;
 		return list;
@@ -271,14 +271,14 @@ public class SalesReportServiceImpl extends BaseMybatisDao<DailySalesReportMappe
 
 
 	public CountMarketingStatisticsBo countMarketingStatistics(String depId) {
 	public CountMarketingStatisticsBo countMarketingStatistics(String depId) {
 		ReportDate rd = new ReportDate(new Date());
 		ReportDate rd = new ReportDate(new Date());
-		CountMarketingStatisticsBo count=salesReportMapper.privateCustomersCount(depId,rd.getStringDailyStart(),rd.getStringDailyEnd(),rd.getStringWeeklyStart(),rd.getStringWeeklyEnd(),
+		CountMarketingStatisticsBo count=dailySalesReportMapper.privateCustomersCount(depId,rd.getStringDailyStart(),rd.getStringDailyEnd(),rd.getStringWeeklyStart(),rd.getStringWeeklyEnd(),
 				rd.getStringMonthStart(),rd.getStringMonthEnd(),rd.getStringYearStart(),rd.getStringYearEnd());
 				rd.getStringMonthStart(),rd.getStringMonthEnd(),rd.getStringYearStart(),rd.getStringYearEnd());
 		return count;
 		return count;
 	}
 	}
 
 
 	public CountMarketingStatisticsBo countMarketingDepStatistics(String depId) {
 	public CountMarketingStatisticsBo countMarketingDepStatistics(String depId) {
 		ReportDate rd = new ReportDate(new Date());
 		ReportDate rd = new ReportDate(new Date());
-		CountMarketingStatisticsBo count=salesReportMapper.privateCustomersDepCount(depId,rd.getStringDailyStart(),rd.getStringDailyEnd(),rd.getStringWeeklyStart(),rd.getStringWeeklyEnd(),
+		CountMarketingStatisticsBo count=dailySalesReportMapper.privateCustomersDepCount(depId,rd.getStringDailyStart(),rd.getStringDailyEnd(),rd.getStringWeeklyStart(),rd.getStringWeeklyEnd(),
 				rd.getStringMonthStart(),rd.getStringMonthEnd(),rd.getStringYearStart(),rd.getStringYearEnd());
 				rd.getStringMonthStart(),rd.getStringMonthEnd(),rd.getStringYearStart(),rd.getStringYearEnd());
 		
 		
 		return count;
 		return count;
@@ -288,19 +288,19 @@ public class SalesReportServiceImpl extends BaseMybatisDao<DailySalesReportMappe
 		List<SomeTimeMarketingBo> list = null;
 		List<SomeTimeMarketingBo> list = null;
 		ReportDate rd = new ReportDate(new Date());
 		ReportDate rd = new ReportDate(new Date());
 		if (TimeType.WEEKLY.getCode()==timeType) {
 		if (TimeType.WEEKLY.getCode()==timeType) {
-			list=salesReportMapper.sometimeMarketingStatistics(depId,rd.getStringWeeklyStart(),rd.getStringWeeklyEnd());
+			list=dailySalesReportMapper.sometimeMarketingStatistics(depId,rd.getStringWeeklyStart(),rd.getStringWeeklyEnd());
 		}
 		}
 		if (TimeType.MONTH.getCode()==timeType) {
 		if (TimeType.MONTH.getCode()==timeType) {
-			list=salesReportMapper.sometimeMarketingStatistics(depId,rd.getStringMonthStart(),rd.getStringMonthEnd());
+			list=dailySalesReportMapper.sometimeMarketingStatistics(depId,rd.getStringMonthStart(),rd.getStringMonthEnd());
 		}
 		}
 		if (TimeType.QTR.getCode()==timeType) {
 		if (TimeType.QTR.getCode()==timeType) {
-			list=salesReportMapper.sometimeMarketingStatistics(depId,rd.getStringQuarterStart(),rd.getStringQuarterEnd());
+			list=dailySalesReportMapper.sometimeMarketingStatistics(depId,rd.getStringQuarterStart(),rd.getStringQuarterEnd());
 		}
 		}
 		if (TimeType.YEAR.getCode()==timeType) {
 		if (TimeType.YEAR.getCode()==timeType) {
-			list=salesReportMapper.sometimeMarketingStatistics(depId,rd.getStringYearStart(),rd.getStringYearEnd());
+			list=dailySalesReportMapper.sometimeMarketingStatistics(depId,rd.getStringYearStart(),rd.getStringYearEnd());
 		}
 		}
 		if (TimeType.ZS.getCode()==timeType) {
 		if (TimeType.ZS.getCode()==timeType) {
-			list=salesReportMapper.sometimeMarketingStatistics(depId,startTime,endTime);
+			list=dailySalesReportMapper.sometimeMarketingStatistics(depId,startTime,endTime);
 		}
 		}
 		return list;
 		return list;
 	}
 	}
@@ -309,19 +309,19 @@ public class SalesReportServiceImpl extends BaseMybatisDao<DailySalesReportMappe
 		List<SomeTimeMarketingBo> list = null;
 		List<SomeTimeMarketingBo> list = null;
 		ReportDate rd = new ReportDate(new Date());
 		ReportDate rd = new ReportDate(new Date());
 		if (TimeType.WEEKLY.getCode()==timeType) {
 		if (TimeType.WEEKLY.getCode()==timeType) {
-			list=salesReportMapper.sometimeMarketingDepStatistics(depId,rd.getStringWeeklyStart(),rd.getStringWeeklyEnd());
+			list=dailySalesReportMapper.sometimeMarketingDepStatistics(depId,rd.getStringWeeklyStart(),rd.getStringWeeklyEnd());
 		}
 		}
 		if (TimeType.MONTH.getCode()==timeType) {
 		if (TimeType.MONTH.getCode()==timeType) {
-			list=salesReportMapper.sometimeMarketingDepStatistics(depId,rd.getStringMonthStart(),rd.getStringMonthEnd());
+			list=dailySalesReportMapper.sometimeMarketingDepStatistics(depId,rd.getStringMonthStart(),rd.getStringMonthEnd());
 		}
 		}
 		if (TimeType.QTR.getCode()==timeType) {
 		if (TimeType.QTR.getCode()==timeType) {
-			list=salesReportMapper.sometimeMarketingDepStatistics(depId,rd.getStringQuarterStart(),rd.getStringQuarterEnd());
+			list=dailySalesReportMapper.sometimeMarketingDepStatistics(depId,rd.getStringQuarterStart(),rd.getStringQuarterEnd());
 		}
 		}
 		if (TimeType.YEAR.getCode()==timeType) {
 		if (TimeType.YEAR.getCode()==timeType) {
-			list=salesReportMapper.sometimeMarketingDepStatistics(depId,rd.getStringYearStart(),rd.getStringYearEnd());
+			list=dailySalesReportMapper.sometimeMarketingDepStatistics(depId,rd.getStringYearStart(),rd.getStringYearEnd());
 		}
 		}
 		if (TimeType.ZS.getCode()==timeType) {
 		if (TimeType.ZS.getCode()==timeType) {
-			list=salesReportMapper.sometimeMarketingDepStatistics(depId,startTime,endTime);
+			list=dailySalesReportMapper.sometimeMarketingDepStatistics(depId,startTime,endTime);
 		}
 		}
 		return list;
 		return list;
 	}
 	}
@@ -329,19 +329,19 @@ public class SalesReportServiceImpl extends BaseMybatisDao<DailySalesReportMappe
 	public SomeTimeMarketingBo countSometimeMarketingStatistics(String depId, Integer timeType, String startTime, String endTime) {
 	public SomeTimeMarketingBo countSometimeMarketingStatistics(String depId, Integer timeType, String startTime, String endTime) {
 		ReportDate rd = new ReportDate(new Date());
 		ReportDate rd = new ReportDate(new Date());
 		if (TimeType.WEEKLY.getCode()==timeType) {
 		if (TimeType.WEEKLY.getCode()==timeType) {
-			return salesReportMapper.countsometimeMarketingStatistics(depId,rd.getStringWeeklyStart(),rd.getStringWeeklyEnd());
+			return dailySalesReportMapper.countsometimeMarketingStatistics(depId,rd.getStringWeeklyStart(),rd.getStringWeeklyEnd());
 		}
 		}
 		if (TimeType.MONTH.getCode()==timeType) {
 		if (TimeType.MONTH.getCode()==timeType) {
-			return salesReportMapper.countsometimeMarketingStatistics(depId,rd.getStringMonthStart(),rd.getStringMonthEnd());
+			return dailySalesReportMapper.countsometimeMarketingStatistics(depId,rd.getStringMonthStart(),rd.getStringMonthEnd());
 		}
 		}
 		if (TimeType.QTR.getCode()==timeType) {
 		if (TimeType.QTR.getCode()==timeType) {
-			return salesReportMapper.countsometimeMarketingStatistics(depId,rd.getStringQuarterStart(),rd.getStringQuarterEnd());
+			return dailySalesReportMapper.countsometimeMarketingStatistics(depId,rd.getStringQuarterStart(),rd.getStringQuarterEnd());
 		}
 		}
 		if (TimeType.YEAR.getCode()==timeType) {
 		if (TimeType.YEAR.getCode()==timeType) {
-			return salesReportMapper.countsometimeMarketingStatistics(depId,rd.getStringYearStart(),rd.getStringYearEnd());
+			return dailySalesReportMapper.countsometimeMarketingStatistics(depId,rd.getStringYearStart(),rd.getStringYearEnd());
 		}
 		}
 		if (TimeType.ZS.getCode()==timeType) {
 		if (TimeType.ZS.getCode()==timeType) {
-			return salesReportMapper.countsometimeMarketingStatistics(depId,startTime,endTime);
+			return dailySalesReportMapper.countsometimeMarketingStatistics(depId,startTime,endTime);
 		}
 		}
 		return null;
 		return null;
 	}
 	}
@@ -351,19 +351,19 @@ public class SalesReportServiceImpl extends BaseMybatisDao<DailySalesReportMappe
 
 
 		ReportDate rd = new ReportDate(new Date());
 		ReportDate rd = new ReportDate(new Date());
 		if (TimeType.WEEKLY.getCode()==timeType) {
 		if (TimeType.WEEKLY.getCode()==timeType) {
-			return salesReportMapper.countsometimeMarketingDepStatistics(depId,rd.getStringWeeklyStart(),rd.getStringWeeklyEnd());
+			return dailySalesReportMapper.countsometimeMarketingDepStatistics(depId,rd.getStringWeeklyStart(),rd.getStringWeeklyEnd());
 		}
 		}
 		if (TimeType.MONTH.getCode()==timeType) {
 		if (TimeType.MONTH.getCode()==timeType) {
-			return salesReportMapper.countsometimeMarketingDepStatistics(depId,rd.getStringMonthStart(),rd.getStringMonthEnd());
+			return dailySalesReportMapper.countsometimeMarketingDepStatistics(depId,rd.getStringMonthStart(),rd.getStringMonthEnd());
 		}
 		}
 		if (TimeType.QTR.getCode()==timeType) {
 		if (TimeType.QTR.getCode()==timeType) {
-			return salesReportMapper.countsometimeMarketingDepStatistics(depId,rd.getStringQuarterStart(),rd.getStringQuarterEnd());
+			return dailySalesReportMapper.countsometimeMarketingDepStatistics(depId,rd.getStringQuarterStart(),rd.getStringQuarterEnd());
 		}
 		}
 		if (TimeType.YEAR.getCode()==timeType) {
 		if (TimeType.YEAR.getCode()==timeType) {
-			return salesReportMapper.countsometimeMarketingDepStatistics(depId,rd.getStringYearStart(),rd.getStringYearEnd());
+			return dailySalesReportMapper.countsometimeMarketingDepStatistics(depId,rd.getStringYearStart(),rd.getStringYearEnd());
 		}
 		}
 		if (TimeType.ZS.getCode()==timeType) {
 		if (TimeType.ZS.getCode()==timeType) {
-			return salesReportMapper.countsometimeMarketingDepStatistics(depId,startTime,endTime);
+			return dailySalesReportMapper.countsometimeMarketingDepStatistics(depId,startTime,endTime);
 		}
 		}
 			return null;
 			return null;
 	}
 	}
@@ -372,19 +372,19 @@ public class SalesReportServiceImpl extends BaseMybatisDao<DailySalesReportMappe
 			String publishStatus, String taskStatus) {
 			String publishStatus, String taskStatus) {
 		ReportDate rd = new ReportDate(new Date());
 		ReportDate rd = new ReportDate(new Date());
 		if (TimeType.WEEKLY.getCode()==timeType) {
 		if (TimeType.WEEKLY.getCode()==timeType) {
-			return salesReportMapper.technicalDepStatistics(depId,rd.getStringWeeklyStart(),rd.getStringWeeklyEnd(),publishStatus,taskStatus);
+			return dailySalesReportMapper.technicalDepStatistics(depId,rd.getStringWeeklyStart(),rd.getStringWeeklyEnd(),publishStatus,taskStatus);
 		}
 		}
 		if (TimeType.MONTH.getCode()==timeType) {
 		if (TimeType.MONTH.getCode()==timeType) {
-			return salesReportMapper.technicalDepStatistics(depId,rd.getStringMonthStart(),rd.getStringMonthEnd(),publishStatus,taskStatus);
+			return dailySalesReportMapper.technicalDepStatistics(depId,rd.getStringMonthStart(),rd.getStringMonthEnd(),publishStatus,taskStatus);
 		}
 		}
 		if (TimeType.QTR.getCode()==timeType) {
 		if (TimeType.QTR.getCode()==timeType) {
-			return salesReportMapper.technicalDepStatistics(depId,rd.getStringQuarterStart(),rd.getStringQuarterEnd(),publishStatus,taskStatus);
+			return dailySalesReportMapper.technicalDepStatistics(depId,rd.getStringQuarterStart(),rd.getStringQuarterEnd(),publishStatus,taskStatus);
 		}
 		}
 		if (TimeType.YEAR.getCode()==timeType) {
 		if (TimeType.YEAR.getCode()==timeType) {
-			return salesReportMapper.technicalDepStatistics(depId,rd.getStringYearStart(),rd.getStringYearEnd(),publishStatus,taskStatus);
+			return dailySalesReportMapper.technicalDepStatistics(depId,rd.getStringYearStart(),rd.getStringYearEnd(),publishStatus,taskStatus);
 		}
 		}
 		if (TimeType.ZS.getCode()==timeType) {
 		if (TimeType.ZS.getCode()==timeType) {
-			return salesReportMapper.technicalDepStatistics(depId,startTime,endTime,publishStatus,taskStatus);
+			return dailySalesReportMapper.technicalDepStatistics(depId,startTime,endTime,publishStatus,taskStatus);
 		}
 		}
 		return null;
 		return null;
 	}
 	}