~jiangyouyao/beauty-erp.git

			@@ -25,6 +25,10 @@
			//订单类型
			String orderType;

			String beginTimeStr;

			String endTimeStr;

			@Override
			public void setSort(String sort) {
			if(StringUtils.isNotBlank(sort)){

			@@ -1,5 +1,6 @@
			package com.matrix.system.hive.statistics;

			import cn.hutool.core.util.StrUtil;
			import com.baomidou.mybatisplus.core.metadata.IPage;
			import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
			import com.matrix.core.constance.MatrixConstance;
			@@ -126,6 +127,14 @@
			}
			queryDto.setCompanyId(sysUsers.getCompanyId());
			Page<AchieveNewStatisticsVo> page = new Page(1, Long.MAX_VALUE);

			if (StrUtil.isNotBlank(queryDto.getBeginTimeStr())) {
			queryDto.setBeginTime(DateUtil.stringToDate(queryDto.getBeginTimeStr(), DateUtil.DATE_FORMAT_MM));
			}

			if (StrUtil.isNotBlank(queryDto.getEndTimeStr())) {
			queryDto.setEndTime(DateUtil.stringToDate(queryDto.getEndTimeStr(), DateUtil.DATE_FORMAT_MM));
			}
			IPage<AchieveNewStatisticsVo> rows = achieveNewDao.achieveNewStatistics(page,queryDto);
			List<AchieveNewStatisticsVo> dataList = rows.getRecords();
			List<List<Object>> list = new ArrayList<>();

			@@ -354,7 +354,14 @@

			//导出
			exportExcel(){
			window.location.href=basePath+"/admin/achieve/exportAchieveNewStatisticsExcel?"+MTools.jsonToUrlParam(this.getRequestParam());
			var reqParam = this.getRequestParam();
			reqParam.beginTimeStr = reqParam.beginTime;
			reqParam.endTimeStr = reqParam.endTime;
			reqParam.beginTime = null;
			reqParam.endTime = null;
			var param = MTools.jsonToUrlParam(reqParam);
			console.log(param);
			window.location.href=basePath+"/admin/achieve/exportAchieveNewStatisticsExcel?"+param;
			}

			}

	zq-erp/src/main/java/com/matrix/system/hive/dto/AchieveNewStatisticsDto.java	4 ●●●●● patch \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/hive/statistics/AchieveAction.java	9 ●●●●● patch \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/achieveNewStatiostics.html	9 ●●●●● patch \| view \| raw \| blame \| history