乐山实验室
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
xuhy
7 天以前 a069a12647ab551281091efb0f066163d1c8c156 
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSamplingRecordController.java


@@ -22,6 +22,7 @@


import io.swagger.annotations.ApiOperation;


import org.springframework.beans.BeanUtils;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.util.CollectionUtils;


import org.springframework.web.bind.annotation.*;




import java.text.SimpleDateFormat;


@@ -54,8 +55,9 @@


    private final TProjectTeamService projectTeamService;


    private final TProjectTeamStaffService projectTeamStaffService;


    private final TExperimentDispatchParticipantsService experimentDispatchParticipantsService;


    private final TNoticeService noticeService;


    @Autowired


    public TSamplingRecordController(TSamplingRecordService samplingRecordService, TokenService tokenService, ISysUserService sysUserService, SysUserMapper sysUserMapper, TSamplingRecordOperationService samplingRecordOperationService, TExperimentDispatchService experimentDispatchService, TProjectProposalService projectProposalService, TProjectTeamService projectTeamService, TProjectTeamStaffService projectTeamStaffService, TExperimentDispatchParticipantsService experimentDispatchParticipantsService) {


    public TSamplingRecordController(TSamplingRecordService samplingRecordService, TokenService tokenService, ISysUserService sysUserService, SysUserMapper sysUserMapper, TSamplingRecordOperationService samplingRecordOperationService, TExperimentDispatchService experimentDispatchService, TProjectProposalService projectProposalService, TProjectTeamService projectTeamService, TProjectTeamStaffService projectTeamStaffService, TExperimentDispatchParticipantsService experimentDispatchParticipantsService, TNoticeService noticeService) {


        this.samplingRecordService = samplingRecordService;


        this.tokenService = tokenService;


        this.sysUserService = sysUserService;


@@ -66,6 +68,7 @@


        this.projectTeamService = projectTeamService;


        this.projectTeamStaffService = projectTeamStaffService;


        this.experimentDispatchParticipantsService = experimentDispatchParticipantsService;


        this.noticeService = noticeService;


    }




    /**


@@ -76,6 +79,37 @@


    @PostMapping(value = "/api/t-sampling-record/pageList")


    public R<PageInfo<TSamplingRecordVO>> pageList(@RequestBody String param) {


        TSamplingRecordQuery query = JSON.parseObject(param, TSamplingRecordQuery.class);


        // 获取当前用户


        Long userId = tokenService.getLoginUser().getUserId();


        Integer roleType = tokenService.getLoginUser().getUser().getRoleType();


        if (roleType != 1){


            query.setUserId(userId);


            if(roleType ==2){


                // 查询项目组


                TProjectTeamStaff projectTeamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)


                        .eq(TProjectTeamStaff::getUserId, userId));


                // 查询项目的工艺工程师id


                TProjectTeamStaff teamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)


                        .eq(TProjectTeamStaff::getTeamId, projectTeamStaff.getTeamId())


                        .eq(TProjectTeamStaff::getRoleType, 3)


                        .last("LIMIT 1"));


                // 查询实验参与人员


                List<TExperimentDispatchParticipants> experimentDispatchParticipants = experimentDispatchParticipantsService.list(Wrappers.lambdaQuery(TExperimentDispatchParticipants.class)


                        .eq(TExperimentDispatchParticipants::getUserId, teamStaff.getUserId()));


                if(!CollectionUtils.isEmpty(experimentDispatchParticipants)){


                    List<String> dispatchIds = experimentDispatchParticipants.stream().map(TExperimentDispatchParticipants::getDispatchId).distinct().collect(Collectors.toList());


                    query.setDispatchIds(dispatchIds);


                }


            }else {


                // 查询实验参与人员


                List<TExperimentDispatchParticipants> experimentDispatchParticipants = experimentDispatchParticipantsService.list(Wrappers.lambdaQuery(TExperimentDispatchParticipants.class)


                        .eq(TExperimentDispatchParticipants::getUserId, userId));


                if (!CollectionUtils.isEmpty(experimentDispatchParticipants)) {


                    List<String> dispatchIds = experimentDispatchParticipants.stream().map(TExperimentDispatchParticipants::getDispatchId).distinct().collect(Collectors.toList());


                    query.setDispatchIds(dispatchIds);


                }


            }


        }


        return R.ok(samplingRecordService.pageList(query));


    }




@@ -274,13 +308,30 @@


    public R<Boolean> batchSendSamples(@RequestBody String param) {


        BatchSendSamplesDTO batchSendSamplesDTO = JSON.parseObject(param, BatchSendSamplesDTO.class);


        Long userId = tokenService.getLoginUser().getUserId();


        List<String> ids = batchSendSamplesDTO.getRecordOperationId();


        // 批量送样


        samplingRecordOperationService.update(Wrappers.lambdaUpdate(TSamplingRecordOperation.class)


                .eq(TSamplingRecordOperation::getId, batchSendSamplesDTO.getRecordOperationId())


                .set(TSamplingRecordOperation::getStatus, 2)


                .set(TSamplingRecordOperation::getSendSign, batchSendSamplesDTO.getSendSign())


                .set(TSamplingRecordOperation::getSendTime, LocalDateTime.now())


                .set(TSamplingRecordOperation::getSendPersonId, userId));


        List<TSamplingRecordOperation> samplingRecordOperations = samplingRecordOperationService.list(Wrappers.lambdaQuery(TSamplingRecordOperation.class)


                .in(TSamplingRecordOperation::getId, ids));


        for (TSamplingRecordOperation samplingRecordOperation : samplingRecordOperations) {


            samplingRecordOperation.setStatus(2);


            samplingRecordOperation.setSendPersonId(userId);


            samplingRecordOperation.setSendSign(samplingRecordOperation.getSendSign());


            samplingRecordOperation.setSendTime(LocalDateTime.now());


        }


        samplingRecordOperationService.updateBatchById(samplingRecordOperations);




        // 查询取样记录信息


        TSamplingRecord samplingRecord = samplingRecordService.getById(samplingRecordOperations.get(0).getSamplingId());


        // 查询实验调度


        TExperimentDispatch experimentDispatch = experimentDispatchService.getById(samplingRecord.getDispatchId());


        // 查询实验调度参与人员


        List<TExperimentDispatchParticipants> teamStaffs = experimentDispatchParticipantsService.list(Wrappers.lambdaQuery(TExperimentDispatchParticipants.class)


                .eq(TExperimentDispatchParticipants::getDispatchId, experimentDispatch.getId())


                .eq(TExperimentDispatchParticipants::getRoleType, 4));


        // MESSAGE 添加消息


        teamStaffs.forEach(teamStaff -> {


            noticeService.saveNotice(teamStaff.getUserId(), "您有【1】条【送样单】等待确认接收样品", tokenService.getLoginUser().getUser().getNickName(),13);


        });


        return R.ok();


    }




@@ -294,13 +345,17 @@


    public R<Boolean> batchCollectSamples(@RequestBody String param) {


        BatchCollectSamplesDTO batchCollectSamplesDTO = JSON.parseObject(param, BatchCollectSamplesDTO.class);


        Long userId = tokenService.getLoginUser().getUserId();


        List<String> ids = batchCollectSamplesDTO.getRecordOperationId();


        // 批量送样


        samplingRecordOperationService.update(Wrappers.lambdaUpdate(TSamplingRecordOperation.class)


                .eq(TSamplingRecordOperation::getId, batchCollectSamplesDTO.getRecordOperationId())


                .set(TSamplingRecordOperation::getStatus, 3)


                .set(TSamplingRecordOperation::getReceiptsSign, batchCollectSamplesDTO.getReceiptsSign())


                .set(TSamplingRecordOperation::getReceiptsTime, LocalDateTime.now())


                .set(TSamplingRecordOperation::getReceiptsPersonId, userId));


        List<TSamplingRecordOperation> samplingRecordOperations = samplingRecordOperationService.list(Wrappers.lambdaQuery(TSamplingRecordOperation.class)


                .in(TSamplingRecordOperation::getId, ids));


        for (TSamplingRecordOperation samplingRecordOperation : samplingRecordOperations) {


            samplingRecordOperation.setStatus(3);


            samplingRecordOperation.setSendPersonId(userId);


            samplingRecordOperation.setSendSign(samplingRecordOperation.getReceiptsSign());


            samplingRecordOperation.setSendTime(LocalDateTime.now());


        }


        samplingRecordOperationService.updateBatchById(samplingRecordOperations);


        return R.ok();


    }