乐山实验室
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
xuhy
1 天以前 1a2e22a27627b40689257442cc5a46598c634f8e 
 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,9 @@


    private final TProjectTeamStaffService projectTeamStaffService;


    private final TExperimentDispatchService experimentDispatchService;


    private final TProjectProposalService projectProposalService;


    private final TExperimentDispatchParticipantsService experimentDispatchParticipantsService;


    @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) {


        this.testMethodConfirmSheetService = testMethodConfirmSheetService;


        this.tokenService = tokenService;


        this.sysUserService = sysUserService;


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


        this.projectTeamStaffService = projectTeamStaffService;


        this.experimentDispatchService = experimentDispatchService;


        this.projectProposalService = projectProposalService;


        this.experimentDispatchParticipantsService = experimentDispatchParticipantsService;


    }




    /**


@@ -78,6 +77,19 @@


    @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);


            // 查询实验参与人员


            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));


    }