merge

luodangjia

2025-01-02 6868940dd432de9d48f5128be700ff97867ebc39

merge

 medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwCollectRecordController.java

@@ -206,11 +206,11 @@

    @ApiOperation(value = "确认接受",tags = "处置人员")
    @PostMapping("/end/down/collect/confirm")
    public R tanscollecttotal4(String boxNum) {
    public R tanscollecttotal4(@RequestParam BoxListDto boxListDto) {
        SysUser  sysUser = SecurityUtils.getLoginUser().getUser();
        SysDepartment byId = departmentService.getById(sysUser.getDepartmentId());
        //将record变为已接受
        List<MwCollectRecord> list = collectRecordService.lambdaQuery().eq(MwCollectRecord::getStatus,2).eq(MwCollectRecord::getBoxNumber, boxNum).list();
        List<MwCollectRecord> list = collectRecordService.lambdaQuery().eq(MwCollectRecord::getStatus,2).eq(MwCollectRecord::getBoxNumber, boxListDto.getBoxNum()).list();
        Set<String> boxes = new HashSet<>();
        BigDecimal receiveQuantity = BigDecimal.ZERO;
        for (MwCollectRecord mwCollectRecord : list) {

 medicalWaste-system/src/main/java/com/sinata/system/domain/dto/BoxListDto.java

New file
@@ -0,0 +1,10 @@
package com.sinata.system.domain.dto;

import lombok.Data;

import java.util.List;

@Data
public class BoxListDto {
    List<String>  boxNum;
}