修复了已知BUG

wenminjie

2026-07-13 0220811fbcffd4bd4df334502a2af272ae29f1e3

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

@@ -9,6 +9,7 @@
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.enums.QATestItemReportStatusEnum;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.TTestMethodConfirmSheetDTO;
import com.ruoyi.system.dto.TestMethodConfirmSheetSignDTO;
@@ -170,21 +171,22 @@
            testMethodConfirmSheetTerm.setStatus(1);
        });
        testMethodConfirmSheetTermService.saveBatch(testMethodConfirmSheetTerms);
        // 生成原始记录编号
        String format = new SimpleDateFormat("yyyyMMdd").format(new Date());
        String originalCode = projectTeam.getTeamName() + format.substring(2) + "-JL";
        for (TTestMethodConfirmSheetTerm testMethodConfirmSheetTerm : testMethodConfirmSheetTerms) {
            // 添加原始记录
            TTestMethodConfirmSheetOriginal testMethodConfirmSheetOriginal = new TTestMethodConfirmSheetOriginal();
            testMethodConfirmSheetOriginal.setTermId(testMethodConfirmSheetTerm.getId());
            // 查询上个项目课题方案的序号
            long count = testMethodConfirmSheetOriginalService.count(Wrappers.lambdaQuery(TTestMethodConfirmSheetOriginal.class)
                    .like(TTestMethodConfirmSheetOriginal::getOriginalCode, originalCode));
            originalCode = originalCode + String.format("%02d", count+1);
            testMethodConfirmSheetOriginal.setOriginalCode(originalCode);
            testMethodConfirmSheetOriginal.setStatus(1);
            testMethodConfirmSheetOriginalService.save(testMethodConfirmSheetOriginal);
        }
//        // 生成原始记录编号
//        String format = new SimpleDateFormat("yyyyMMdd").format(new Date());
//        String originalCode = projectTeam.getTeamName() + format.substring(2) + "-JL";
//        for (TTestMethodConfirmSheetTerm testMethodConfirmSheetTerm : testMethodConfirmSheetTerms) {
//            // 添加原始记录
//            TTestMethodConfirmSheetOriginal testMethodConfirmSheetOriginal = new TTestMethodConfirmSheetOriginal();
//            testMethodConfirmSheetOriginal.setTermId(testMethodConfirmSheetTerm.getId());
//            // 查询上个项目课题方案的序号
//            long count = testMethodConfirmSheetOriginalService.count(Wrappers.lambdaQuery(TTestMethodConfirmSheetOriginal.class)
//                    .like(TTestMethodConfirmSheetOriginal::getOriginalCode, originalCode));
//            originalCode = originalCode + String.format("%02d", count+1);
//            testMethodConfirmSheetOriginal.setOriginalCode(originalCode);
//            testMethodConfirmSheetOriginal.setStatus(1);
//            testMethodConfirmSheetOriginal.setCommitUserId(userId);
//            testMethodConfirmSheetOriginalService.save(testMethodConfirmSheetOriginal);
//        }

        // MESSAGE 添加消息
        TProjectTeamStaff teamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)
@@ -206,21 +208,28 @@
    @ApiOperation(value = "修改检验方法确认单")
    @PostMapping(value = "/api/t-test-method-confirm-sheet/update")
    public R<Boolean> update(@RequestBody String param) {
        TTestMethodConfirmSheetDTO dto = JSON.parseObject(param,TTestMethodConfirmSheetDTO.class);
        TTestMethodConfirmSheetDTO dto = JSON.parseObject(param, TTestMethodConfirmSheetDTO.class);

        if (SecurityUtils.isAdmin(SecurityUtils.getUserId())){
            dto.setAuditStatus(null);
        }

        testMethodConfirmSheetService.updateById(dto);
        List<TTestMethodConfirmSheetTerm> list = testMethodConfirmSheetTermService.list(Wrappers.lambdaQuery(TTestMethodConfirmSheetTerm.class)
                .eq(TTestMethodConfirmSheetTerm::getTestId, dto.getId()));
        if(!CollectionUtils.isEmpty(list)){
            List<String> termIds = list.stream().map(TTestMethodConfirmSheetTerm::getId).collect(Collectors.toList());
            // 删除原始检验记录
            testMethodConfirmSheetOriginalService.remove(Wrappers.lambdaQuery(TTestMethodConfirmSheetOriginal.class)
                    .in(TTestMethodConfirmSheetOriginal::getTermId, termIds));
        }
//        if(!CollectionUtils.isEmpty(list)){
//            List<String> termIds = list.stream().map(TTestMethodConfirmSheetTerm::getId).collect(Collectors.toList());
//            // 删除原始检验记录
//            testMethodConfirmSheetOriginalService.remove(Wrappers.lambdaQuery(TTestMethodConfirmSheetOriginal.class)
//                    .in(TTestMethodConfirmSheetOriginal::getTermId, termIds));
//        }
        testMethodConfirmSheetTermService.remove(Wrappers.lambdaQuery(TTestMethodConfirmSheetTerm.class).eq(TTestMethodConfirmSheetTerm::getTestId,dto.getId()));
        List<TTestMethodConfirmSheetTerm> testMethodConfirmSheetTerms = dto.getTestMethodConfirmSheetTerms();
        testMethodConfirmSheetTerms.forEach(testMethodConfirmSheetTerm -> {
            testMethodConfirmSheetTerm.setTestId(dto.getId());
            testMethodConfirmSheetTerm.setStatus(1);
            if (!SecurityUtils.isAdmin(SecurityUtils.getUserId())) {
                testMethodConfirmSheetTerm.setStatus(1);
            }
        });
        testMethodConfirmSheetTermService.saveBatch(testMethodConfirmSheetTerms);
        // 查询调度的参与人员
@@ -239,22 +248,22 @@
        // 查询项目组
        TProjectTeam projectTeam = projectTeamService.getById(projectTeamStaff.getTeamId());
        // 生成原始记录编号
        String format = new SimpleDateFormat("yyyyMMdd").format(new Date());
        String originalCode = projectTeam.getTeamName() + format.substring(2) + "-JL";
        for (TTestMethodConfirmSheetTerm testMethodConfirmSheetTerm : testMethodConfirmSheetTerms) {
            // 添加原始记录
            TTestMethodConfirmSheetOriginal testMethodConfirmSheetOriginal = new TTestMethodConfirmSheetOriginal();
            testMethodConfirmSheetOriginal.setTermId(testMethodConfirmSheetTerm.getId());
            // 查询上个项目课题方案的序号
            long count = testMethodConfirmSheetOriginalService.count(Wrappers.lambdaQuery(TTestMethodConfirmSheetOriginal.class)
                    .like(TTestMethodConfirmSheetOriginal::getOriginalCode, originalCode));
            originalCode = originalCode + String.format("%02d", count+1);
            testMethodConfirmSheetOriginal.setOriginalCode(originalCode);
            testMethodConfirmSheetOriginal.setStatus(1);
            testMethodConfirmSheetOriginalService.save(testMethodConfirmSheetOriginal);
        }
//        String format = new SimpleDateFormat("yyyyMMdd").format(new Date());
//        String originalCode = projectTeam.getTeamName() + format.substring(2) + "-JL";
//        for (TTestMethodConfirmSheetTerm testMethodConfirmSheetTerm : testMethodConfirmSheetTerms) {
//            // 添加原始记录
//            TTestMethodConfirmSheetOriginal testMethodConfirmSheetOriginal = new TTestMethodConfirmSheetOriginal();
//            testMethodConfirmSheetOriginal.setTermId(testMethodConfirmSheetTerm.getId());
//            // 查询上个项目课题方案的序号
//            long count = testMethodConfirmSheetOriginalService.count(Wrappers.lambdaQuery(TTestMethodConfirmSheetOriginal.class)
//                    .like(TTestMethodConfirmSheetOriginal::getOriginalCode, originalCode));
//            originalCode = originalCode + String.format("%02d", count+1);
//            testMethodConfirmSheetOriginal.setOriginalCode(originalCode);
//            testMethodConfirmSheetOriginal.setStatus(1);
//            testMethodConfirmSheetOriginalService.save(testMethodConfirmSheetOriginal);
//        }

        if (dto.getAuditStatus() != -1){
        if (dto.getAuditStatus() != null && dto.getAuditStatus() != -1){
            // MESSAGE 添加消息
            TProjectTeamStaff teamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)
                    .eq(TProjectTeamStaff::getTeamId, projectTeam.getId())
@@ -342,7 +351,7 @@
    }

    /**
     * 批量删除检验方法确认单
     * 检验方法确认单签字
     */
    //@PreAuthorize("@ss.hasPermi('system:testMethodConfirmSheet:sign')")
    @Log(title = "检验方法确认单信息-检验方法确认单签字", businessType = BusinessType.UPDATE)
@@ -358,8 +367,50 @@
                .set(TTestMethodConfirmSheet::getAuditPersonId, userId)
                .set(TTestMethodConfirmSheet::getAuditSign, testMethodConfirmSheetSign.getConfirmSign()));

        // MESSAGE 添加消息
        TTestMethodConfirmSheet testMethodConfirmSheet = testMethodConfirmSheetService.getById(testMethodConfirmSheetSign.getTestMethodConfirmSheetId());

        List<TTestMethodConfirmSheetTerm> testMethodConfirmSheetTerms = testMethodConfirmSheetTermService.list(Wrappers.lambdaQuery(TTestMethodConfirmSheetTerm.class)
                .eq(TTestMethodConfirmSheetTerm::getTestId, testMethodConfirmSheetSign.getTestMethodConfirmSheetId()));

        if(!CollectionUtils.isEmpty(testMethodConfirmSheetTerms)){
            // 查询调度的参与人员
            TExperimentDispatchParticipants experimentDispatchParticipant = experimentDispatchParticipantsService.getOne(Wrappers.lambdaQuery(TExperimentDispatchParticipants.class)
                    .eq(TExperimentDispatchParticipants::getDispatchId, testMethodConfirmSheet.getDispatchId())
                    .eq(TExperimentDispatchParticipants::getRoleType,3)
                    .last("LIMIT 1"));
            if(Objects.nonNull(experimentDispatchParticipant)){
                // 查询工艺工程师所在的项目组
                TProjectTeamStaff projectTeamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)
                        .eq(TProjectTeamStaff::getUserId, experimentDispatchParticipant.getUserId())
                        .eq(TProjectTeamStaff::getRoleType, 3)
                        .last("LIMIT 1"));
                // 通过当前用户查询项目组
                if(Objects.nonNull(projectTeamStaff)){
                    // 查询项目组
                    TProjectTeam projectTeam = projectTeamService.getById(projectTeamStaff.getTeamId());
                    // 生成原始记录编号
                    String format = new SimpleDateFormat("yyyyMMdd").format(new Date());
                    String originalCode = projectTeam.getTeamName() + format.substring(2) + "-JL";
                    for (TTestMethodConfirmSheetTerm testMethodConfirmSheetTerm : testMethodConfirmSheetTerms) {
                        // 添加原始记录
                        TTestMethodConfirmSheetOriginal testMethodConfirmSheetOriginal = new TTestMethodConfirmSheetOriginal();
                        testMethodConfirmSheetOriginal.setTermId(testMethodConfirmSheetTerm.getId());
                        // 查询上个项目课题方案的序号
                        long count = testMethodConfirmSheetOriginalService.count(Wrappers.lambdaQuery(TTestMethodConfirmSheetOriginal.class)
                                .like(TTestMethodConfirmSheetOriginal::getOriginalCode, originalCode));
                        originalCode = originalCode + String.format("%02d", count+1);
                        testMethodConfirmSheetOriginal.setOriginalCode(originalCode);
                        testMethodConfirmSheetOriginal.setStatus(1);
                        testMethodConfirmSheetOriginal.setCommitUserId(testMethodConfirmSheet.getCommitUserId());
                        testMethodConfirmSheetOriginalService.save(testMethodConfirmSheetOriginal);
                    }
                }
            }


        }

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

        return R.ok();