From 86bb056b91af5c9c99a482eaac114c4f6214d7c4 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 26 九月 2024 17:49:40 +0800
Subject: [PATCH] 设备准备-确费功能
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/jobrecord/JobRecordServiceImpl.java | 18 +++++++++++++++++-
1 files changed, 17 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 a04aeb5..1c439bb 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,6 +1,8 @@
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;
@@ -18,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.*;
/**
@@ -31,6 +34,9 @@
@Resource
private JobRecordMapper jobRecordMapper;
+
+ @Resource
+ private DevRentMapper devRentMapper;
@Override
public Long createJobRecord(JobRecordSaveReqVO createReqVO) {
@@ -71,7 +77,17 @@
@Override
public PageResult<JobRecordDO> getJobRecordPage(JobRecordPageReqVO pageReqVO) {
- return jobRecordMapper.selectPage(pageReqVO);
+ PageResult<JobRecordDO> pageResult = jobRecordMapper.selectPage(pageReqVO);
+
+ List<JobRecordDO> jobRecordDOList = pageResult.getList();
+ 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
--
Gitblit v1.9.3