From ae7f04be9321ddbe17c46fae8ab05d34e7493f9f Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 二月 2025 13:40:06 +0800
Subject: [PATCH] 管理后台bug修改
---
medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwCheckoutRecordServiceImpl.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwCheckoutRecordServiceImpl.java b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwCheckoutRecordServiceImpl.java
index 58e3dac..92e6def 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwCheckoutRecordServiceImpl.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwCheckoutRecordServiceImpl.java
@@ -1,10 +1,13 @@
package com.sinata.system.service.impl;
+import cn.hutool.core.date.DateUtil;
import cn.idev.excel.FastExcel;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.sinata.common.entity.PageDTO;
import com.sinata.common.utils.BeanUtils;
+import com.sinata.common.utils.CollUtils;
+import com.sinata.common.utils.DateUtils;
import com.sinata.common.utils.StringUtils;
import com.sinata.system.domain.MwCheckoutRecord;
import com.sinata.system.domain.dto.CollectTotalUpDto;
@@ -110,15 +113,19 @@
return this.baseMapper.totalUp1(outId);
}
+ @Override
+ public List<CollectTotalUpDto> totalUp6( Long outId) {
+ return this.baseMapper.totalUp6(outId);
+ }
/**
* 转运记录详情
*
- * @param departmentId
+ * @param id
* @return
*/
@Override
- public MwCheckoutRecordVO hospitalDetail(Long departmentId) {
- return baseMapper.hospitalDetail(departmentId);
+ public MwCheckoutRecordVO hospitalDetail(Long id) {
+ return baseMapper.hospitalDetail(id);
}
/**
@@ -145,6 +152,14 @@
if (StringUtils.isBlank(treeCode)) {
return PageDTO.empty(0L, 0L);
}
+ if (CollUtils.isNotEmpty(query.getStartTime())) {
+ query.setStartTimeStart(DateUtil.parse(query.getStartTime().get(0), DateUtils.YYYY_MM_DD_HH_MM_SS));
+ query.setStartTimeEnd(DateUtil.parse(query.getStartTime().get(1), DateUtils.YYYY_MM_DD_HH_MM_SS));
+ }
+ if (CollUtils.isNotEmpty(query.getEndTime())) {
+ query.setEndTimeStart(DateUtil.parse(query.getEndTime().get(0), DateUtils.YYYY_MM_DD_HH_MM_SS));
+ query.setEndTimeEnd(DateUtil.parse(query.getEndTime().get(1), DateUtils.YYYY_MM_DD_HH_MM_SS));
+ }
Page<MwTransitRecordVO> page = baseMapper.transitPageList(new Page<>(query.getPageCurr(), query.getPageSize()), query, treeCode);
return PageDTO.of(page);
}
--
Gitblit v1.7.1