From 97e105959d04d24eee3ce14c50685d57dceb5b1a Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 27 三月 2025 18:05:12 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/boymi/YiFeiNN
---
medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppDepartmentController.java | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppDepartmentController.java b/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppDepartmentController.java
index 8d37177..6138c85 100644
--- a/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppDepartmentController.java
+++ b/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppDepartmentController.java
@@ -3,6 +3,7 @@
import com.sinata.common.core.domain.R;
import com.sinata.common.core.domain.entity.SysUser;
import com.sinata.common.utils.SecurityUtils;
+import com.sinata.common.utils.StringUtils;
import com.sinata.system.domain.*;
import com.sinata.system.domain.dto.CheckOutDto;
import com.sinata.system.domain.dto.CollectTotalUpDto;
@@ -93,8 +94,10 @@
@ApiOperation("获取医院监管列表")
@PostMapping("/hospita/list")
- public R<List<SysDepartment>> list(String name,Long areaId) {
- List<SysDepartment> list = sysDepartmentService.lambdaQuery().eq(areaId!=null,SysDepartment::getParentId,areaId).like(name!=null,SysDepartment::getDepartmentName,name).eq(SysDepartment::getOrgType, 2).list();
+ public R<List<SysDepartment>> list(String name, Long areaId) {
+// SysDepartment byId = sysDepartmentService.getMyDepartment();
+ SysDepartment byId = sysDepartmentService.getById(areaId);
+ List<SysDepartment> list = sysDepartmentService.lambdaQuery().likeRight(SysDepartment::getTreeCode, byId.getTreeCode()).like(StringUtils.isNotEmpty(name), SysDepartment::getDepartmentName, name).eq(SysDepartment::getOrgType, 2).list();
for (SysDepartment sysDepartment : list) {
//获取医院暂存间信息
MwStagingRoom one = roomService.lambdaQuery().eq(MwStagingRoom::getDepartmentId, sysDepartment.getId()).one();
@@ -109,7 +112,6 @@
sysDepartment.setMaxCapacity(one.getMaxCapacity());
sysDepartment.setNowCapacity(count.intValue());
sysDepartment.setPercentage(percentage);
-
}
return R.ok(list);
}
@@ -118,16 +120,17 @@
@ApiOperation("获取处置监管列表")
@PostMapping("/end/list")
- public R<List<SysDepartment>> list2(String name) {
- List<SysDepartment> list = sysDepartmentService.lambdaQuery().like(name!=null,SysDepartment::getDepartmentName,name).eq(SysDepartment::getOrgType, 3).list();
+ public R<List<SysDepartment>> list2(String name,Long areaId) {
+ SysDepartment byId = sysDepartmentService.getById(areaId);
+ List<SysDepartment> list = sysDepartmentService.lambdaQuery().likeRight(SysDepartment::getTreeCode, byId.getTreeCode()).like(name!=null,SysDepartment::getDepartmentName,name).eq(SysDepartment::getOrgType, 3).list();
LocalDate now = LocalDate.now();
for (SysDepartment sysDepartment : list) {
//获取库存总量
Long count1 = collectRecordService.lambdaQuery().eq(MwCollectRecord::getReceiveDepartmentId, sysDepartment.getId()).count();
//获取接收数量
- Long count2 = collectRecordService.lambdaQuery().isNotNull(MwCollectRecord::getReceiveTime).eq(MwCollectRecord::getReceiveDepartmentId, sysDepartment.getId()).count();
+ Long count2 = collectRecordService.lambdaQuery().ge(MwCollectRecord::getReceiveTime,now.atStartOfDay()).le(MwCollectRecord::getReceiveTime,now.atTime(23,59,59)).eq(MwCollectRecord::getReceiveDepartmentId, sysDepartment.getId()).count();
//获取处置数量
- Long count3 = collectRecordService.lambdaQuery().isNotNull(MwCollectRecord::getDisposalTime).eq(MwCollectRecord::getReceiveDepartmentId, sysDepartment.getId()).count();
+ Long count3 = collectRecordService.lambdaQuery().ge(MwCollectRecord::getDisposalTime,now.atStartOfDay()).le(MwCollectRecord::getDisposalTime,now.atTime(23,59,59)).eq(MwCollectRecord::getReceiveDepartmentId, sysDepartment.getId()).count();
sysDepartment.setCont1(count1);
sysDepartment.setCont2(count2);
sysDepartment.setCont3(count3);
@@ -183,8 +186,8 @@
public R<CountTwoDto> outtotal2(@ApiParam("处置机构id")@RequestParam Long departmentId) {
CountTwoDto countTwoDto = new CountTwoDto();
LocalDate now = LocalDate.now();
- Long count = collectRecordService.lambdaQuery().eq(MwCollectRecord::getReceiveDepartmentId, departmentId).eq(MwCollectRecord::getReceiveTime, now).count();
- Long count1 = collectRecordService.lambdaQuery().eq(MwCollectRecord::getReceiveDepartmentId, departmentId).eq(MwCollectRecord::getDisposalTime, now).count();
+ Long count = collectRecordService.lambdaQuery().eq(MwCollectRecord::getReceiveDepartmentId, departmentId).ge(MwCollectRecord::getReceiveTime, now.atStartOfDay()).le(MwCollectRecord::getReceiveTime,now.atTime(23,59,59)).count();
+ Long count1 = collectRecordService.lambdaQuery().eq(MwCollectRecord::getReceiveDepartmentId, departmentId).ge(MwCollectRecord::getDisposalTime, now.atStartOfDay()).le(MwCollectRecord::getDisposalTime,now.atTime(23,59,59)).count();
countTwoDto.setCount(count);
countTwoDto.setCount1(count1);
return R.ok(countTwoDto);
--
Gitblit v1.7.1