From 2bc90e242eceb83d9aa80d48ea9f991c0f9b99c6 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 12 十二月 2024 19:47:57 +0800
Subject: [PATCH] 工位选择界面 诊室按照room id排序
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/jobrecord/JobRecordServiceImpl.java | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 deletions(-)
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/jobrecord/JobRecordServiceImpl.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/jobrecord/JobRecordServiceImpl.java
index 5da1ab8..17b5515 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/jobrecord/JobRecordServiceImpl.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/jobrecord/JobRecordServiceImpl.java
@@ -1,9 +1,13 @@
package cn.lihu.jh.module.ecg.service.jobrecord;
+import cn.lihu.jh.module.ecg.controller.admin.appointment.vo.AppointmentRespVO;
+import cn.lihu.jh.module.ecg.dal.dataobject.jobrecord.JobRecordStatisticDO;
+import cn.lihu.jh.module.ecg.dal.mysql.devrent.DevRentMapper;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import org.springframework.transaction.annotation.Transactional;
+import java.time.LocalDateTime;
import java.util.*;
import cn.lihu.jh.module.ecg.controller.admin.jobrecord.vo.*;
import cn.lihu.jh.module.ecg.dal.dataobject.jobrecord.JobRecordDO;
@@ -16,6 +20,7 @@
import javax.annotation.Resource;
import static cn.lihu.jh.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.lihu.jh.framework.common.pojo.CommonResult.success;
import static cn.lihu.jh.module.ecg.enums.ErrorCodeConstants.*;
/**
@@ -29,6 +34,9 @@
@Resource
private JobRecordMapper jobRecordMapper;
+
+ @Resource
+ private DevRentMapper devRentMapper;
@Override
public Long createJobRecord(JobRecordSaveReqVO createReqVO) {
@@ -69,7 +77,24 @@
@Override
public PageResult<JobRecordDO> getJobRecordPage(JobRecordPageReqVO pageReqVO) {
- return jobRecordMapper.selectPage(pageReqVO);
+ PageResult<JobRecordDO> pageResult = jobRecordMapper.selectPage(pageReqVO);
+
+ List<JobRecordDO> jobRecordDOList = pageResult.getList();
+ if ( !jobRecordDOList.isEmpty() ) {
+ List<Long> rentIdList = jobRecordDOList.stream().map(item -> item.getRentId()).toList();
+ List<Integer> paidInfoList = devRentMapper.getPaidInfo(rentIdList);
+ for (int i = 0; i < jobRecordDOList.size(); i++) {
+ jobRecordDOList.get(i).setPaid(paidInfoList.get(i));
+ }
+ }
+
+ return pageResult;
+ }
+
+ @Override
+ public List<JobRecordStatisticDO> getJobStatistic(LocalDateTime jobTimeFrom, LocalDateTime jobTimeTo) {
+
+ return jobRecordMapper.getJobStatistic(jobTimeFrom, jobTimeTo);
}
}
\ No newline at end of file
--
Gitblit v1.9.3