提交最新代码

puzhibing

6 天以前 2fa7f761cf80802f54f727381b282d3b264501a7

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSamplingRecordController.java

@@ -286,24 +286,26 @@
        List<Long> receiptsUserIds = samplingRecordOperations.stream().map(TSamplingRecordOperation::getReceiptsPersonId).collect(Collectors.toList());
        userIds.addAll(sendUserIds);
        userIds.addAll(receiptsUserIds);
        List<SysUser> sysUsers = sysUserMapper.selectUserByIds(userIds);
        for (TSamplingRecordOperation samplingRecordOperation : samplingRecordOperations) {
            if(Objects.nonNull(samplingRecordOperation.getHandlePersonId())){
                List<SysUser> users = sysUsers.stream().filter(user -> user.getUserId().equals(samplingRecordOperation.getHandlePersonId())).collect(Collectors.toList());
                if(!CollectionUtils.isEmpty(users)){
                    samplingRecordOperation.setHandlePersonName(users.get(0).getNickName());
        if(!CollectionUtils.isEmpty(userIds)){
            List<SysUser> sysUsers = sysUserMapper.selectUserByIds(userIds);
            for (TSamplingRecordOperation samplingRecordOperation : samplingRecordOperations) {
                if(Objects.nonNull(samplingRecordOperation.getHandlePersonId())){
                    List<SysUser> users = sysUsers.stream().filter(user -> user.getUserId().equals(samplingRecordOperation.getHandlePersonId())).collect(Collectors.toList());
                    if(!CollectionUtils.isEmpty(users)){
                        samplingRecordOperation.setHandlePersonName(users.get(0).getNickName());
                    }
                }
            }
            if(Objects.nonNull(samplingRecordOperation.getSendPersonId())){
                List<SysUser> users = sysUsers.stream().filter(user -> user.getUserId().equals(samplingRecordOperation.getSendPersonId())).collect(Collectors.toList());
                if(!CollectionUtils.isEmpty(users)){
                    samplingRecordOperation.setSendPersonName(users.get(0).getNickName());
                if(Objects.nonNull(samplingRecordOperation.getSendPersonId())){
                    List<SysUser> users = sysUsers.stream().filter(user -> user.getUserId().equals(samplingRecordOperation.getSendPersonId())).collect(Collectors.toList());
                    if(!CollectionUtils.isEmpty(users)){
                        samplingRecordOperation.setSendPersonName(users.get(0).getNickName());
                    }
                }
            }
            if(Objects.nonNull(samplingRecordOperation.getReceiptsPersonId())){
                List<SysUser> users = sysUsers.stream().filter(user -> user.getUserId().equals(samplingRecordOperation.getReceiptsPersonId())).collect(Collectors.toList());
                if(!CollectionUtils.isEmpty(users)){
                    samplingRecordOperation.setReceiptsPersonName(users.get(0).getNickName());
                if(Objects.nonNull(samplingRecordOperation.getReceiptsPersonId())){
                    List<SysUser> users = sysUsers.stream().filter(user -> user.getUserId().equals(samplingRecordOperation.getReceiptsPersonId())).collect(Collectors.toList());
                    if(!CollectionUtils.isEmpty(users)){
                        samplingRecordOperation.setReceiptsPersonName(users.get(0).getNickName());
                    }
                }
            }
        }
@@ -333,6 +335,7 @@
            TProjectProposal projectProposal = projectProposalService.getById(experimentDispatch.getProposalId());
            if(Objects.nonNull(projectProposal)){
                experimentDispatch.setProjectName(projectProposal.getProjectName());
                experimentDispatch.setProjectCode(projectProposal.getProjectCode());
            }
        }
        samplingRecordVO.setExperimentDispatch(experimentDispatch);
@@ -348,8 +351,15 @@
    @DeleteMapping(value = "/open/t-sampling-record/deleteById")
    public R<Boolean> deleteById(@RequestParam String id) {
        // 删除取样操作记录
        samplingRecordOperationService.remove(Wrappers.lambdaQuery(TSamplingRecordOperation.class).eq(TSamplingRecordOperation::getSamplingId, id));
        return R.ok(samplingRecordService.removeById(id));
        TSamplingRecord samplingRecord = samplingRecordService.getById(id);
        if (Objects.nonNull(samplingRecord)) {
            samplingRecordOperationService.remove(Wrappers.lambdaQuery(TSamplingRecordOperation.class)
                    .eq(TSamplingRecordOperation::getSamplingId, id));
            samplingRecordService.removeById(id);
        } else {
            samplingRecordOperationService.removeById(id);
        }
        return R.ok();
    }

    /**