## 业绩汇总接口;
This commit is contained in:
parent
e21b1412e1
commit
7b04a3c92e
|
@ -31,9 +31,9 @@ import java.util.stream.Collectors;
|
||||||
public class CensusSummaryController extends BaseController {
|
public class CensusSummaryController extends BaseController {
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private ICuMemberSettlePeriodService memberSettlePeriodService;
|
private ICuMemberSettlePeriodService iCuMemberSettlePeriodService;
|
||||||
@Autowired
|
@Autowired
|
||||||
private ICuMemberService memberService;
|
private ICuMemberService iCuMemberService;
|
||||||
|
|
||||||
@DubboReference
|
@DubboReference
|
||||||
IMenuColumnServiceApi iMenuColumnServiceApi;
|
IMenuColumnServiceApi iMenuColumnServiceApi;
|
||||||
|
@ -74,7 +74,7 @@ public class CensusSummaryController extends BaseController {
|
||||||
}
|
}
|
||||||
|
|
||||||
censusSummaryParam.setPkCountry(SecurityUtils.getPkCountry());
|
censusSummaryParam.setPkCountry(SecurityUtils.getPkCountry());
|
||||||
List<CensusSummaryVo> resultList = memberService.selectCensusSummary(censusSummaryParam, days);
|
List<CensusSummaryVo> resultList = iCuMemberService.selectCensusSummary(censusSummaryParam, days);
|
||||||
|
|
||||||
return AjaxResult.success(resultList);
|
return AjaxResult.success(resultList);
|
||||||
}
|
}
|
||||||
|
@ -84,7 +84,8 @@ public class CensusSummaryController extends BaseController {
|
||||||
*/
|
*/
|
||||||
@PostMapping("/export")
|
@PostMapping("/export")
|
||||||
public void export(CensusSummaryParam censusSummaryParam, HttpServletResponse response) {
|
public void export(CensusSummaryParam censusSummaryParam, HttpServletResponse response) {
|
||||||
if (censusSummaryParam.getStartDate() == null || censusSummaryParam.getEndDate() == null) {
|
if (null == censusSummaryParam.getStartDate()
|
||||||
|
|| null == censusSummaryParam.getEndDate()) {
|
||||||
ExcelUtil<CensusSummaryVo> util = new ExcelUtil<>(CensusSummaryVo.class);
|
ExcelUtil<CensusSummaryVo> util = new ExcelUtil<>(CensusSummaryVo.class);
|
||||||
util.exportExcel(response, new ArrayList<>(), "业绩汇总信息");
|
util.exportExcel(response, new ArrayList<>(), "业绩汇总信息");
|
||||||
}
|
}
|
||||||
|
@ -94,13 +95,13 @@ public class CensusSummaryController extends BaseController {
|
||||||
// 查询当天
|
// 查询当天
|
||||||
String thisTime = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, date);
|
String thisTime = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, date);
|
||||||
if (censusSummaryParam.getMemberSettlePeriodId() != null) {
|
if (censusSummaryParam.getMemberSettlePeriodId() != null) {
|
||||||
memberSettlePeriodService.getById(censusSummaryParam.getMemberSettlePeriodId());
|
iCuMemberSettlePeriodService.getById(censusSummaryParam.getMemberSettlePeriodId());
|
||||||
} else {
|
} else {
|
||||||
memberSettlePeriodService.getCuMemberSettlePeriodByDate(thisTime);
|
iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(thisTime);
|
||||||
}
|
}
|
||||||
|
|
||||||
// 查询当前时间范围
|
// 查询当前时间范围
|
||||||
List<String> days = new ArrayList();
|
List<String> days = new ArrayList<>();
|
||||||
if (censusSummaryParam.getStartDate() != null && censusSummaryParam.getEndDate() != null) {
|
if (censusSummaryParam.getStartDate() != null && censusSummaryParam.getEndDate() != null) {
|
||||||
days = DateUtils.findDaysStr(DateUtils.parseDateTimeToStr(DateUtils.YYYY_MM_DD, censusSummaryParam.getStartDate()), DateUtils.parseDateTimeToStr(DateUtils.YYYY_MM_DD, censusSummaryParam.getEndDate()));
|
days = DateUtils.findDaysStr(DateUtils.parseDateTimeToStr(DateUtils.YYYY_MM_DD, censusSummaryParam.getStartDate()), DateUtils.parseDateTimeToStr(DateUtils.YYYY_MM_DD, censusSummaryParam.getEndDate()));
|
||||||
} else {
|
} else {
|
||||||
|
@ -108,7 +109,9 @@ public class CensusSummaryController extends BaseController {
|
||||||
days.add(thisTime);
|
days.add(thisTime);
|
||||||
}
|
}
|
||||||
|
|
||||||
List<CensusSummaryVo> resultList = memberService.selectCensusSummary(censusSummaryParam, days);
|
censusSummaryParam.setPkCountry(SecurityUtils.getPkCountry());
|
||||||
|
List<CensusSummaryVo> resultList = iCuMemberService.selectCensusSummary(censusSummaryParam, days);
|
||||||
|
|
||||||
ExcelUtil<CensusSummaryVo> util = new ExcelUtil<>(CensusSummaryVo.class, iMenuColumnServiceApi.queryMenuColumn("performanceTotal", SecurityUtils.getUserId()).getData());
|
ExcelUtil<CensusSummaryVo> util = new ExcelUtil<>(CensusSummaryVo.class, iMenuColumnServiceApi.queryMenuColumn("performanceTotal", SecurityUtils.getUserId()).getData());
|
||||||
util.exportExcel(response, resultList, "业绩汇总信息");
|
util.exportExcel(response, resultList, "业绩汇总信息");
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue