From f7a9f7036f862500a03ce31b322a928392131fa7 Mon Sep 17 00:00:00 2001
From: luoyisheng <yangdongji@argo-ai.cn>
Date: 星期二, 01 四月 2025 17:54:12 +0800
Subject: [PATCH] bug
---
medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppDepartmentController.java | 2 +-
medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwCheckoutRecordController.java | 14 ++++++++------
medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwCheckoutRecordServiceImpl.java | 4 ++++
medicalWaste-system/src/main/java/com/sinata/system/service/MwCheckoutRecordService.java | 1 +
medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwCollectRecordController.java | 8 ++++++++
medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppUserController.java | 5 +++++
medicalWaste-system/src/main/resources/mapper/system/MwCheckoutRecordMapper.xml | 16 ++++++++++++++--
medicalWaste-system/src/main/java/com/sinata/system/mapper/MwCheckoutRecordMapper.java | 1 +
8 files changed, 42 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 7c320c9..50ec357 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
@@ -127,7 +127,7 @@
LocalDate now = LocalDate.now();
for (SysDepartment sysDepartment : list) {
//获取库存总量
- BigDecimal count1 = collectRecordService.lambdaQuery().eq(MwCollectRecord::getReceiveDepartmentId, sysDepartment.getId()).list().stream()
+ BigDecimal count1 = collectRecordService.lambdaQuery().eq(MwCollectRecord::getReceiveDepartmentId, sysDepartment.getId()).eq(MwCollectRecord::getStatus ,3).list().stream()
.map(MwCollectRecord::getWeight)
.reduce(BigDecimal.ZERO, BigDecimal::add);
//获取接收数量
diff --git a/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwCheckoutRecordController.java b/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwCheckoutRecordController.java
index 281d65f..5413ab4 100644
--- a/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwCheckoutRecordController.java
+++ b/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwCheckoutRecordController.java
@@ -66,16 +66,18 @@
@ApiOperation(value = "接收统计上",tags = "处置人员")
@PostMapping("/out/total")
public R<List<CollectTotalUpDto>> outtotal(@DateTimeFormat(iso = DateTimeFormat.ISO.DATE)LocalDate date) {
- SysUser sysUser = SecurityUtils.getLoginUser().getUser();
- return R.ok(mwCheckoutRecordService.totalUp2(date,sysUser.getUserId()));
+// SysUser sysUser = SecurityUtils.getLoginUser().getUser();
+ SysDepartment myDepartment = departmentService.getMyDepartment();
+ return R.ok(mwCheckoutRecordService.totalUp2(date,myDepartment.getId()));
}
@ApiOperation(value = "接收统计下",tags = "处置人员")
@PostMapping("/out/record")
public R<List<CheckOutDto>> record1(@DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date) {
- SysUser sysUser1 = SecurityUtils.getLoginUser().getUser();
- SysUser sysUser = userService.getById(sysUser1.getUserId());
- LocalDate now = LocalDate.now();
- List<MwDisposalRecord> list = disposalRecordService.lambdaQuery().ge(date!=null,MwDisposalRecord::getReceiveTime, date.atStartOfDay()).le(date!=null,MwDisposalRecord::getReceiveTime,date.atTime(23,59,59)).eq(MwDisposalRecord::getDepartmentId, sysUser.getDepartmentId()).orderByDesc(MwDisposalRecord::getReceiveTime).list();
+// SysUser sysUser1 = SecurityUtils.getLoginUser().getUser();
+// SysUser sysUser = userService.getById(sysUser1.getUserId());
+// LocalDate now = LocalDate.now();
+ SysDepartment myDepartment = departmentService.getMyDepartment();
+ List<MwDisposalRecord> list = disposalRecordService.lambdaQuery().ge(date!=null,MwDisposalRecord::getReceiveTime, date.atStartOfDay()).le(date!=null,MwDisposalRecord::getReceiveTime,date.atTime(23,59,59)).eq(MwDisposalRecord::getDepartmentId, myDepartment.getId()).orderByDesc(MwDisposalRecord::getReceiveTime).list();
List<CheckOutDto> backList = new ArrayList<>();
for (MwDisposalRecord mwCheckoutRecord : list) {
CheckOutDto checkOutDto = new CheckOutDto();
diff --git a/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwCollectRecordController.java b/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwCollectRecordController.java
index 0837c72..5163bef 100644
--- a/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwCollectRecordController.java
+++ b/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwCollectRecordController.java
@@ -500,6 +500,14 @@
return R.ok(list);
}
+ @ApiOperation("库存详情")
+ @PostMapping("/record1")
+ public R<List<MwCollectRecord>> record1(@RequestParam String boxNumber) {
+ List<MwCollectRecord> list = collectRecordService.lambdaQuery().isNull(MwCollectRecord::getCheckoutTime).eq(MwCollectRecord::getBoxNumber, boxNumber).orderByDesc(MwCollectRecord::getCollectTime).list();
+ return R.ok(list);
+ }
+
+
@ApiOperation("收集统计上")
@PostMapping("/collect/total")
public R<List<CollectTotalUpDto>> collecttotal1(@DateTimeFormat(iso = DateTimeFormat.ISO.DATE)LocalDate date) {
diff --git a/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppUserController.java b/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppUserController.java
index a1ac1c8..fe5a8d5 100644
--- a/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppUserController.java
+++ b/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppUserController.java
@@ -75,6 +75,11 @@
@ApiOperation(value = "更换绑定车辆",tags = "运输人员")
@PostMapping("/change")
public R<List<MwTransitCar>> change(@RequestParam Long carId) {
+
+ SysUser one = userService.lambdaQuery().eq(SysUser::getCarId, carId).one();
+ if (one!=null){
+ return R.fail("当前车辆已绑定");
+ }
SysUser sysUser = SecurityUtils.getLoginUser().getUser();
SysUser byId = userService.getById(sysUser.getUserId());
byId.setCarId(carId);
diff --git a/medicalWaste-system/src/main/java/com/sinata/system/mapper/MwCheckoutRecordMapper.java b/medicalWaste-system/src/main/java/com/sinata/system/mapper/MwCheckoutRecordMapper.java
index dd94589..441753b 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/mapper/MwCheckoutRecordMapper.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/mapper/MwCheckoutRecordMapper.java
@@ -95,6 +95,7 @@
List<CollectTotalUpDto> totalUp(@Param("date") LocalDate date, @Param("departmentId")Long departmentId);
List<CollectTotalUpDto> totalUp4(@Param("departmentId")Long departmentId);
List<CollectTotalUpDto> totalUp2(@Param("date") LocalDate date ,@Param("departmentId")Long departmentId);
+ List<CollectTotalUpDto> totalUp22(@Param("date") LocalDate date ,@Param("departmentId")Long departmentId);
List<CollectTotalUpDto> totalUp5(@Param("departmentId")Long departmentId);
List<CollectTotalUpDto> totalUp3(@Param("date1") LocalDate date1, @Param("date2") LocalDate date2,@Param("departmentId")Long departmentId);
List<CollectTotalUpDto> totalUp1(@Param("outId")Long outId);
diff --git a/medicalWaste-system/src/main/java/com/sinata/system/service/MwCheckoutRecordService.java b/medicalWaste-system/src/main/java/com/sinata/system/service/MwCheckoutRecordService.java
index dabcf05..bee052f 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/service/MwCheckoutRecordService.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/service/MwCheckoutRecordService.java
@@ -108,6 +108,7 @@
List<CollectTotalUpDto> totalUp(LocalDate date, Long departmentId);
List<CollectTotalUpDto> totalUp4(Long departmentId);
List<CollectTotalUpDto> totalUp2(LocalDate date1, Long departmentId);
+ List<CollectTotalUpDto> totalUp22(LocalDate date1, Long departmentId);
List<CollectTotalUpDto> totalUp5(Long departmentId);
List<CollectTotalUpDto> totalUp3(LocalDate date1,LocalDate date2, Long departmentId);
List<CollectTotalUpDto> totalUp1(Long outId);
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 fbde780..ccf359b 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
@@ -101,6 +101,10 @@
return this.baseMapper.totalUp2(date,departmentId);
}
@Override
+ public List<CollectTotalUpDto> totalUp22(LocalDate date,Long departmentId) {
+ return this.baseMapper.totalUp22(date,departmentId);
+ }
+ @Override
public List<CollectTotalUpDto> totalUp5( Long departmentId) {
return this.baseMapper.totalUp5(departmentId);
}
diff --git a/medicalWaste-system/src/main/resources/mapper/system/MwCheckoutRecordMapper.xml b/medicalWaste-system/src/main/resources/mapper/system/MwCheckoutRecordMapper.xml
index 7d070f1..792ac44 100644
--- a/medicalWaste-system/src/main/resources/mapper/system/MwCheckoutRecordMapper.xml
+++ b/medicalWaste-system/src/main/resources/mapper/system/MwCheckoutRecordMapper.xml
@@ -322,7 +322,7 @@
SELECT WASTE_TYPE as wasteType, WASTE_TYPE_STR as wasteTypeStr, COUNT(DISTINCT BOX_NUMBER) as boxNum, COUNT(1) as num, sum(WEIGHT) as weight
FROM MEDICAL_WASTE.MW_COLLECT_RECORD
<where>
- RECEIVE_USER_ID is not null AND DEPARTMENT_ID = #{departmentId}
+ RECEIVE_USER_ID is not null AND RECEIVE_DEPARTMENT_ID = #{departmentId}
<if test="date != null">
AND TRUNC(RECEIVE_TIME) = TO_DATE(#{date}, 'YYYY-MM-DD')
</if>
@@ -330,10 +330,22 @@
GROUP BY WASTE_TYPE
</select>
+
+ <select id="totalUp22" resultType="com.sinata.system.domain.dto.CollectTotalUpDto">
+ SELECT WASTE_TYPE as wasteType, WASTE_TYPE_STR as wasteTypeStr, COUNT(DISTINCT BOX_NUMBER) as boxNum, COUNT(1) as num, sum(WEIGHT) as weight
+ FROM MEDICAL_WASTE.MW_COLLECT_RECORD
+ <where>
+ DISPOSAL_USER_ID is not null AND RECEIVE_DEPARTMENT_ID = #{departmentId}
+ <if test="date != null">
+ AND TRUNC(RECEIVE_TIME) = TO_DATE(#{date}, 'YYYY-MM-DD')
+ </if>
+ </where>
+ GROUP BY WASTE_TYPE
+ </select>
<select id="totalUp5" resultType="com.sinata.system.domain.dto.CollectTotalUpDto">
SELECT WASTE_TYPE as wasteType,WASTE_TYPE_STR as wasteTypeStr,COUNT(DISTINCT BOX_NUMBER ) as boxNum ,COUNT(1)as num,sum(WEIGHT) as weight from MEDICAL_WASTE.MW_COLLECT_RECORD
<where>
- RECEIVE_DEPARTMENT_ID is not null AND RECEIVE_DEPARTMENT_ID = #{departmentId}
+ RECEIVE_DEPARTMENT_ID is not null AND RECEIVE_DEPARTMENT_ID = #{departmentId} AND STATUS = 3
</where>
GROUP BY WASTE_TYPE
</select>
--
Gitblit v1.7.1