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


@@ -19,16 +19,13 @@


import com.ruoyi.system.vo.TTestMethodConfirmSheetVO;


import io.swagger.annotations.Api;


import io.swagger.annotations.ApiOperation;


import org.checkerframework.checker.units.qual.A;


import org.springframework.beans.BeanUtils;


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


import org.springframework.security.access.prepost.PreAuthorize;


import org.springframework.util.CollectionUtils;


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




import java.text.SimpleDateFormat;


import java.time.LocalDateTime;


import java.util.ArrayList;


import java.util.Date;


import java.util.List;


import java.util.Objects;


@@ -56,8 +53,10 @@


    private final TProjectTeamStaffService projectTeamStaffService;


    private final TExperimentDispatchService experimentDispatchService;


    private final TProjectProposalService projectProposalService;


    private final TExperimentDispatchParticipantsService experimentDispatchParticipantsService;


    private final TNoticeService noticeService;


    @Autowired


    public TTestMethodConfirmSheetController(TTestMethodConfirmSheetService testMethodConfirmSheetService, TokenService tokenService, ISysUserService sysUserService, SysUserMapper sysUserMapper, TTestMethodConfirmSheetTermService testMethodConfirmSheetTermService, TTestMethodConfirmSheetOriginalService testMethodConfirmSheetOriginalService, TProjectTeamService projectTeamService, TProjectTeamStaffService projectTeamStaffService, TExperimentDispatchService experimentDispatchService, TProjectProposalService projectProposalService) {


    public TTestMethodConfirmSheetController(TTestMethodConfirmSheetService testMethodConfirmSheetService, TokenService tokenService, ISysUserService sysUserService, SysUserMapper sysUserMapper, TTestMethodConfirmSheetTermService testMethodConfirmSheetTermService, TTestMethodConfirmSheetOriginalService testMethodConfirmSheetOriginalService, TProjectTeamService projectTeamService, TProjectTeamStaffService projectTeamStaffService, TExperimentDispatchService experimentDispatchService, TProjectProposalService projectProposalService, TExperimentDispatchParticipantsService experimentDispatchParticipantsService, TNoticeService noticeService) {


        this.testMethodConfirmSheetService = testMethodConfirmSheetService;


        this.tokenService = tokenService;


        this.sysUserService = sysUserService;


@@ -68,6 +67,8 @@


        this.projectTeamStaffService = projectTeamStaffService;


        this.experimentDispatchService = experimentDispatchService;


        this.projectProposalService = projectProposalService;


        this.experimentDispatchParticipantsService = experimentDispatchParticipantsService;


        this.noticeService = noticeService;


    }




    /**


@@ -78,6 +79,37 @@


    @PostMapping(value = "/api/t-test-method-confirm-sheet/pageList")


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


        TTestMethodConfirmSheetQuery query = JSON.parseObject(param, TTestMethodConfirmSheetQuery.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(testMethodConfirmSheetService.pageList(query));


    }




@@ -90,6 +122,8 @@


    @PostMapping(value = "/api/t-test-method-confirm-sheet/add")


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


        TTestMethodConfirmSheetDTO dto = JSON.parseObject(param,TTestMethodConfirmSheetDTO.class);


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


        dto.setCommitUserId(userId);


        testMethodConfirmSheetService.save(dto);


        List<TTestMethodConfirmSheetTerm> testMethodConfirmSheetTerms = dto.getTestMethodConfirmSheetTerms();


        testMethodConfirmSheetTerms.forEach(testMethodConfirmSheetTerm -> {


@@ -97,9 +131,7 @@


            testMethodConfirmSheetTerm.setStatus(1);


        });


        testMethodConfirmSheetTermService.saveBatch(testMethodConfirmSheetTerms);




        // 通过当前用户查询项目组


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


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


                .eq(TProjectTeamStaff::getUserId, userId)


                .last("LIMIT 1"));


@@ -129,6 +161,16 @@


            testMethodConfirmSheetOriginal.setStatus(1);


            testMethodConfirmSheetOriginalService.save(testMethodConfirmSheetOriginal);


        }




        // MESSAGE 添加消息


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


                .eq(TProjectTeamStaff::getTeamId, projectTeam.getId())


                .eq(TProjectTeamStaff::getRoleType, 3)


                .last("LIMIT 1"));


        if(Objects.nonNull(teamStaff)){


            noticeService.saveNotice(teamStaff.getUserId(), "您有【1】条【检验方法确认单】等待审批", tokenService.getLoginUser().getUser().getNickName(),6);


        }




        return R.ok();


    }




@@ -231,6 +273,11 @@


                .set(TTestMethodConfirmSheet::getAuditTime, LocalDateTime.now())


                .set(TTestMethodConfirmSheet::getAuditPersonId, userId)


                .set(TTestMethodConfirmSheet::getAuditSign, testMethodConfirmSheetSign.getConfirmSign()));




        // MESSAGE 添加消息


        TTestMethodConfirmSheet testMethodConfirmSheet = testMethodConfirmSheetService.getById(testMethodConfirmSheetSign.getTestMethodConfirmSheetId());


        noticeService.saveNotice(testMethodConfirmSheet.getCommitUserId(), "您的【检验方案确认单】已被确认", tokenService.getLoginUser().getUser().getNickName(),12);




        return R.ok();


    }