更新代码

puzhibing

6 天以前 082bddee7df8a05ca95f473ec2643701d41a5213

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

@@ -2,7 +2,10 @@


import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.basic.PageInfo;
@@ -95,12 +98,14 @@
    public R<PageInfo<TProjectTeamVO>> choiceProjectList(@RequestBody String param) {
        LoginUser loginUser = tokenService.getLoginUser();
        SysUser sysUser = sysUserService.selectUserById(loginUser.getUserId());
        List<String> projectIds = projectTeamStaffService.lambdaQuery().eq(TProjectTeamStaff::getUserId, sysUser.getUserId()).list().stream().map(TProjectTeamStaff::getTeamId).collect(Collectors.toList());
        if (projectIds.isEmpty()){
            projectIds.add("0");
        }
        ChoiceProjectDTO query = JSON.parseObject(param, ChoiceProjectDTO.class);
        query.setProjectIds(projectIds);
        if (!"1".equals(sysUser.getRoleType())) {
            List<String> projectIds = getAccessibleProjectIds(sysUser.getUserId());
            if (projectIds.isEmpty()) {
                projectIds.add("0");
            }
            query.setProjectIds(projectIds);
        }
        return R.ok(projectTeamService.choiceProjectList(query));
    }

@@ -113,36 +118,43 @@
        Long userId = tokenService.getLoginUser().getUserId();
        SysUser sysUser = sysUserService.selectUserById(userId);
        TTrainLibraryQuery query = JSON.parseObject(param, TTrainLibraryQuery.class);
        if (sysUser.getRoleType().equals("2")){
            List<String> allProjectIds = projectTeamStaffService.lambdaQuery().eq(TProjectTeamStaff::getUserId, tokenService.getLoginUser().getUserId())
                    .list().stream().map(TProjectTeamStaff::getTeamId).collect(Collectors.toList());
            if (!allProjectIds.isEmpty()){                List<String> projectIds = projectTeamService.lambdaQuery().in(TProjectTeam::getId, allProjectIds)
                    .list().stream().map(TProjectTeam::getId).collect(Collectors.toList());

                if (projectIds.isEmpty()){
                    return R.ok(new PageInfo<>());
                }
                query.setProjectIds(projectIds);
            }else {
        if (!sysUser.getRoleType().equals("1")){
            List<String> accessibleProjectIds = getAccessibleProjectIds(userId);
            if (accessibleProjectIds.isEmpty()) {
                return R.ok(new PageInfo<>());
            }
        }else if (!sysUser.getRoleType().equals("1")){
            List<String> allProjectIds = projectTeamStaffService.lambdaQuery().eq(TProjectTeamStaff::getUserId, tokenService.getLoginUser().getUserId())
                    .list().stream().map(TProjectTeamStaff::getTeamId).collect(Collectors.toList());
            if (!allProjectIds.isEmpty()){
                List<String> projectIds = projectTeamService.lambdaQuery().in(TProjectTeam::getId, allProjectIds)
                        .eq(TProjectTeam::getStatus, 1).list().stream().map(TProjectTeam::getId).collect(Collectors.toList());

                if (projectIds.isEmpty()){
            if (CollectionUtils.isNotEmpty(query.getProjectIds())) {
                List<String> requestedProjectIds = new ArrayList<>(query.getProjectIds());
                requestedProjectIds.retainAll(accessibleProjectIds);
                if (requestedProjectIds.isEmpty()) {
                    return R.ok(new PageInfo<>());
                }
                query.setProjectIds(projectIds);
            }else {
                return R.ok(new PageInfo<>());
                query.setProjectIds(requestedProjectIds);
            } else {
                query.setProjectIds(accessibleProjectIds);
            }
        }
        return R.ok(tTrainLibraryService.pageList(query));
        return R.ok(tTrainLibraryService.pageList(query, sysUser.getRoleType()));
    }

    private List<String> getAccessibleProjectIds(Long userId) {
        List<String> teamIds = projectTeamStaffService.lambdaQuery()
                .eq(TProjectTeamStaff::getUserId, userId)
                .list().stream()
                .map(TProjectTeamStaff::getTeamId)
                .distinct()
                .collect(Collectors.toList());
        if (teamIds.isEmpty()) {
            return new ArrayList<>();
        }
        return projectTeamService.lambdaQuery()
                .in(TProjectTeam::getId, teamIds)
                .eq(TProjectTeam::getStatus, 1)
                .list().stream()
                .map(TProjectTeam::getId)
                .collect(Collectors.toList());
    }

    /**
     * 获取菌种库出入库时间轴列表
     */
@@ -183,15 +195,17 @@
            return R.fail(401,"登陆失效");
        }
        TTrainLibraryDTO dto = JSON.parseObject(param,TTrainLibraryDTO.class);
        List<String> projectIds = projectTeamStaffService.lambdaQuery().eq(TProjectTeamStaff::getUserId, tokenService.getLoginUser().getUserId())
                .list().stream().map(TProjectTeamStaff::getTeamId).collect(Collectors.toList());
        if (!projectIds.isEmpty()){
            TProjectTeam projectTeam = projectTeamService.lambdaQuery().in(TProjectTeam::getId, projectIds)
                    .eq(TProjectTeam::getStatus, 1)
                    .orderByDesc(BaseModel::getCreateTime)
                    .last("limit 1").one();
            dto.setProjectId(projectTeam.getId());
        }

        //改为前端传值
//        List<String> projectIds = projectTeamStaffService.lambdaQuery().eq(TProjectTeamStaff::getUserId, tokenService.getLoginUser().getUserId())
//                .list().stream().map(TProjectTeamStaff::getTeamId).collect(Collectors.toList());
//        if (!projectIds.isEmpty()){
//            TProjectTeam projectTeam = projectTeamService.lambdaQuery().in(TProjectTeam::getId, projectIds)
//                    .eq(TProjectTeam::getStatus, 1)
//                    .orderByDesc(BaseModel::getCreateTime)
//                    .last("limit 1").one();
//            dto.setProjectId(projectTeam.getId());
//        }
        tTrainLibraryService.save(dto);
        if (dto.getIsDraft()==0){
            // 新增入库记录
@@ -225,6 +239,9 @@
                case 3:
                    content.append("【生产细胞库】");
                    break;
                case 4:
                    content.append("【孙细胞库】");
                    break;
            }

            tNotice.setNoticeContent("您有【1】条"+content+"入库记录等待签字确认;");
@@ -233,6 +250,20 @@
            noticeService.save(tNotice);
        }
        return R.ok();
    }

    public static void main(String[] args) {
//        String jsonStr = "[{\"id\":1,\"num1\":\"00:00\",\"num2\":\"19:00\",\"num3\":1,\"num4\":1,\"num5\":1,\"num6\":1,\"num7\":1}]";
//        JSONArray startingFareJsonArray = JSONArray.parseArray(jsonStr);
//        for (int i = 0; i < startingFareJsonArray.size(); i++) {
//            JSONObject jsonObject = startingFareJsonArray.getJSONObject(i);
//            System.out.println(jsonObject.getString("num1"));
//            System.out.println(jsonObject.getString("num2"));
//            System.out.println(jsonObject.getInteger("num3"));
//        }
        Long temp =2027571910897541122L;
        System.out.println(temp%20);

    }
    /**
     * 新增菌种库
@@ -293,6 +324,9 @@
                    case 3:
                        content.append("【生产细胞库】");
                        break;
                    case 4:
                        content.append("【孙细胞库】");
                        break;
                }

                tNotice.setNoticeContent("您有【1】条"+content+"入库记录等待签字确认;");
@@ -321,7 +355,7 @@
        }
        TTrainLibraryDTO dto = JSON.parseObject(param,TTrainLibraryDTO.class);
        tTrainLibraryService.updateById(dto);
        if (dto.getIsDraft()==0){
        if (dto.getIsDraft()==0) {
            List<TTrainLibraryWarehousing> list = tTrainLibraryWarehousingService.lambdaQuery().eq(TTrainLibraryWarehousing::getTrainLibraryId, dto.getId()).list();
            if (list.isEmpty()){
                // 新增入库记录
@@ -373,6 +407,9 @@
    @GetMapping(value = "/open/t-train-library/getDetailEditById")
    public R<TTrainLibraryDetailVO> getDetailEditById(@RequestParam String id) {
        TTrainLibrary trainLibrary = tTrainLibraryService.getById(id);
        if (trainLibrary == null) {
            return R.fail("菌种库记录不存在或已删除");
        }
        TTrainLibraryDetailVO tTrainLibraryDetailVO = new TTrainLibraryDetailVO();
        BeanUtils.copyProperties(trainLibrary,tTrainLibraryDetailVO);
        return R.ok(tTrainLibraryDetailVO);
@@ -499,6 +536,9 @@
            case 3:
                content.append("【生产细胞库】");
                break;
            case 4:
                content.append("【孙细胞库】");
                break;
        }
        switch (query.getType()){
            case 1: