From 51f460f3b1a8b9fa365e4195c41bb9c5e16fcb7c Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 02 一月 2025 10:55:24 +0800
Subject: [PATCH] merge
---
medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwCollectRecordController.java | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
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 d31c0e8..c5f21b9 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
@@ -4,7 +4,9 @@
import java.util.*;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.sinata.common.core.domain.R;
+import com.sinata.common.core.domain.entity.SysDictData;
import com.sinata.common.core.domain.entity.SysUser;
import com.sinata.common.entity.PageDTO;
import com.sinata.common.utils.SecurityUtils;
@@ -19,6 +21,7 @@
import io.swagger.annotations.ApiParam;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -40,6 +43,7 @@
@Api(tags = {"医院工作人员"})
@RequiredArgsConstructor
@RequestMapping("/applet/mwCollectRecord")
+
public class AppMwCollectRecordController {
private final MwCollectRecordService collectRecordService;
@Autowired
@@ -53,9 +57,10 @@
private final MwDisposalHandleRecordService disposalHandleRecordService;
private final MwDisposalHandleRecordItemService disposalHandleRecordItemService;
private final MwStagingRoomService roomService;
+ private final ISysDictDataService dictDataService;
- @ApiOperation("新增医废记录")
+ @ApiOperation(value = "新增医废记录")
@PostMapping("/add")
public R<?> add(@Valid @RequestBody MwCollectRecord mwCollectRecord) {
SysUser sysUser = SecurityUtils.getLoginUser().getUser();
@@ -68,6 +73,7 @@
}
mwCollectRecord.setStagingRoomId(one1.getId());
mwCollectRecord.setDepartmentId(sysUser.getDepartmentId());
+ mwCollectRecord.setBoxTime(new Date());
// 创建一个随机数生成器实例
Random random = new Random();
@@ -75,6 +81,11 @@
// 生成一个6位数范围内的随机整数（100000 到 999999）
int randomNumber = 10000000 + random.nextInt(90000000);
mwCollectRecord.setMedicalWasteNumber(String.valueOf(randomNumber));
+
+ SysDictData medicalWasteType = dictDataService.getById(mwCollectRecord.getWasteType());
+ if (medicalWasteType!=null){
+ mwCollectRecord.setWasteTypeStr(medicalWasteType.getDictLabel());
+ }
collectRecordService.save(mwCollectRecord);
return R.ok();
}
@@ -173,7 +184,7 @@
@ApiOperation(value = "扫码接收列表",tags = "处置人员")
@PostMapping("/end/down/collect/total")
- public R<List<HospitalCollectTotalUpDto>> tanscollecttotal3(String boxNum) {
+ public R<List<HospitalCollectTotalUp1Dto>> tanscollecttotal3(String boxNum) {
SysUser sysUser = SecurityUtils.getLoginUser().getUser();
MwCollectRecord one = collectRecordService.lambdaQuery().eq(MwCollectRecord::getBoxNumber, boxNum).eq(MwCollectRecord::getStatus, 2).last("limit 1").one();
if (one==null){
@@ -182,10 +193,10 @@
//先获取医院ids
List<MwCollectRecord> list = collectRecordService.lambdaQuery().eq(MwCollectRecord::getStatus,2).eq(MwCollectRecord::getCheckoutUserId, one.getCheckoutUserId()).groupBy(MwCollectRecord::getDepartmentId).list();
//循环医院，然后放入
- List<HospitalCollectTotalUpDto> list1 = new ArrayList<>();
+ List<HospitalCollectTotalUp1Dto> list1 = new ArrayList<>();
for (MwCollectRecord mwCollectRecord : list) {
- List<CollectTotalUpDto> collectTotalUpDtos = collectRecordService.collectTotal1(null, sysUser.getUserId(), mwCollectRecord.getDepartmentId());
- HospitalCollectTotalUpDto hospitalCollectTotalUpDto = new HospitalCollectTotalUpDto();
+ List<CollectDto> collectTotalUpDtos = collectRecordService.getGroup1(null, mwCollectRecord.getDepartmentId());
+ HospitalCollectTotalUp1Dto hospitalCollectTotalUpDto = new HospitalCollectTotalUp1Dto();
hospitalCollectTotalUpDto.setHospitalName(mwCollectRecord.getHospitalName());
hospitalCollectTotalUpDto.setCollectTotalUpDtos(collectTotalUpDtos);
list1.add(hospitalCollectTotalUpDto);
@@ -338,13 +349,13 @@
@ApiOperation("收集统计上")
@PostMapping("/collect/total")
- public R<List<CollectTotalUpDto>> collecttotal1(LocalDate date) {
+ public R<List<CollectTotalUpDto>> collecttotal1(@DateTimeFormat(iso = DateTimeFormat.ISO.DATE)LocalDate date) {
SysUser sysUser = SecurityUtils.getLoginUser().getUser();
return R.ok(collectRecordService.collectTotal(date,sysUser.getDepartmentId()));
}
@ApiOperation("收集统计下")
@PostMapping("/collect/down/total")
- public R<Page<MwCollectRecord>> collecttotal2(LocalDate date,@RequestParam Integer pageNum, @RequestParam Integer pageSize) {
+ public R<Page<MwCollectRecord>> collecttotal2(@DateTimeFormat(iso = DateTimeFormat.ISO.DATE)LocalDate date,@RequestParam Integer pageNum, @RequestParam Integer pageSize) {
SysUser sysUser = SecurityUtils.getLoginUser().getUser();
Page<MwCollectRecord> page = collectRecordService.lambdaQuery().eq(date!=null,MwCollectRecord::getCollectTime,date).eq(MwCollectRecord::getDepartmentId, sysUser.getDepartmentId()).orderByDesc(MwCollectRecord::getCollectTime).page(Page.of(pageNum, pageSize));
return R.ok(page);
--
Gitblit v1.7.1