|
@@ -2,13 +2,21 @@ package com.jzg.console.service.impl;
|
|
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
|
|
+import com.jzg.commons.core.page.HttpResult;
|
|
|
|
|
+import com.jzg.commons.entity.dto.FeeAuditParam;
|
|
|
import com.jzg.commons.entity.report.dto.FeeAuditSummaryVo;
|
|
import com.jzg.commons.entity.report.dto.FeeAuditSummaryVo;
|
|
|
|
|
+import com.jzg.commons.entity.report.vo.FeeAuditDetailParam;
|
|
|
import com.jzg.commons.entity.report.vo.FeeAuditSummaryParam;
|
|
import com.jzg.commons.entity.report.vo.FeeAuditSummaryParam;
|
|
|
|
|
+import com.jzg.commons.entity.orders.vo.FeeAuditVo;
|
|
|
|
|
+import com.jzg.console.client.FeeAuditClient;
|
|
|
import com.jzg.console.mapper.ReportFeeAuditSummaryMapper;
|
|
import com.jzg.console.mapper.ReportFeeAuditSummaryMapper;
|
|
|
import com.jzg.console.service.ReportFeeAuditSummaryService;
|
|
import com.jzg.console.service.ReportFeeAuditSummaryService;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
|
|
|
|
+import java.time.LocalTime;
|
|
|
|
|
+import java.util.Objects;
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 费用审核汇总统计 Service 实现
|
|
* 费用审核汇总统计 Service 实现
|
|
|
*/
|
|
*/
|
|
@@ -18,11 +26,38 @@ public class ReportFeeAuditSummaryServiceImpl implements ReportFeeAuditSummarySe
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private ReportFeeAuditSummaryMapper reportFeeAuditSummaryMapper;
|
|
private ReportFeeAuditSummaryMapper reportFeeAuditSummaryMapper;
|
|
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
|
+ private FeeAuditClient feeAuditClient;
|
|
|
|
|
+
|
|
|
@Override
|
|
@Override
|
|
|
public IPage<FeeAuditSummaryVo> getFeeAuditSummaryPage(FeeAuditSummaryParam param) {
|
|
public IPage<FeeAuditSummaryVo> getFeeAuditSummaryPage(FeeAuditSummaryParam param) {
|
|
|
- // 创建分页对象
|
|
|
|
|
Page<FeeAuditSummaryVo> page = new Page<>(param.getPages(), param.getSize());
|
|
Page<FeeAuditSummaryVo> page = new Page<>(param.getPages(), param.getSize());
|
|
|
- // 执行分组统计查询(逻辑分页:先查出全部再在内存中分页)
|
|
|
|
|
return reportFeeAuditSummaryMapper.getFeeAuditSummaryPage(page, param);
|
|
return reportFeeAuditSummaryMapper.getFeeAuditSummaryPage(page, param);
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+ @Override
|
|
|
|
|
+ public Page<FeeAuditVo> getFeeAuditDetailPage(FeeAuditDetailParam param) {
|
|
|
|
|
+ // 构建调用 quotation-summary /feeAudit/auditList 的参数
|
|
|
|
|
+ FeeAuditParam feeAuditParam = new FeeAuditParam();
|
|
|
|
|
+ feeAuditParam.setPages(param.getPages());
|
|
|
|
|
+ feeAuditParam.setSize(param.getSize());
|
|
|
|
|
+ feeAuditParam.setCompanyId(param.getCompanyId());
|
|
|
|
|
+
|
|
|
|
|
+ // 转换时间:LocalDate -> LocalDateTime(开始日期的00:00:00,结束日期的23:59:59)
|
|
|
|
|
+ if (param.getAuditTimeStart() != null) {
|
|
|
|
|
+ feeAuditParam.setAuditTimeStart(param.getAuditTimeStart().atStartOfDay());
|
|
|
|
|
+ }
|
|
|
|
|
+ if (param.getAuditTimeEnd() != null) {
|
|
|
|
|
+ feeAuditParam.setAuditTimeEnd(param.getAuditTimeEnd().atTime(LocalTime.MAX));
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ // 调用远程服务获取审核列表
|
|
|
|
|
+ HttpResult<Page<FeeAuditVo>> result = feeAuditClient.auditList(feeAuditParam);
|
|
|
|
|
+
|
|
|
|
|
+ if (result.isSuccess() && result.getData() != null) {
|
|
|
|
|
+ return result.getData();
|
|
|
|
|
+ }
|
|
|
|
|
+ // 返回空分页避免前端报错
|
|
|
|
|
+ return new Page<>(param.getPages(), param.getSize());
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|