Merge remote-tracking branch 'origin/master'

xiangpei

2024-12-12 2330e34c1d0f8a3c58a729eaee8e9987f612d83d

 business/src/main/java/com/ycl/service/impl/ProjectPlanInfoServiceImpl.java

@@ -202,16 +202,28 @@
                .set(ProjectPlanInfo::getStartTime, request.getStartTime())
                .set(ProjectPlanInfo::getEndTime, request.getEndTime())
                .update();
        // 查询出原来的审核记录
        ProjectPlanExamineRecord item = new LambdaQueryChainWrapper<>(projectPlanExamineRecordMapper)
                .eq(ProjectPlanExamineRecord::getProjectPlanInfoId, request.getId())
                .eq(ProjectPlanExamineRecord::getProjectPlanRecordId, request.getProjectPlanRecordId())
                .ne(ProjectPlanExamineRecord::getEventType, 2)
                .eq(ProjectPlanExamineRecord::getDeleted, 0) // 未删除
                .orderByDesc(ProjectPlanExamineRecord::getGmtCreate)
                .last("LIMIT 1")
                .one();
        // 新增一条审核记录
        ProjectPlanExamineRecord item = new ProjectPlanExamineRecord();
        item.setProjectPlanRecordId(request.getProjectPlanRecordId().longValue());
        item.setProjectPlanInfoId(request.getId().longValue());
//        item.setId(null);
//        item.setEventType(1);
//        item.setDelayStartTime(request.getStartTime());
//        item.setDelayEndTime(request.getEndTime());
//        item.setGmtCreate(null);
//        item.setGmtUpdate(null);
//        projectPlanExamineRecordMapper.insertOne(item);
        // 更新原来的审核记录
        item.setEventType(1);
        item.setDelayStartTime(request.getStartTime());
        item.setDelayEndTime(request.getEndTime());
        item.setGmtCreate(new Date());
        item.setDeleted(0);
        projectPlanExamineRecordMapper.insertOne(item);
        projectPlanExamineRecordMapper.updateById(item);
        return Result.ok("延期成功");
    }

@@ -231,11 +243,9 @@
        item.setProjectPlanRecordId(form.getProjectPlanRecordId().longValue());
        item.setProjectPlanInfoId(form.getId().longValue());
        item.setEventType(0); // 计划上报
        item.setDelayStartTime(form.getStartTime());
        item.setDelayEndTime(form.getEndTime());
        item.setGmtCreate(new Date());
        item.setDeleted(0); // 未删除
        projectPlanExamineRecordMapper.insertOne(item);
        projectPlanExamineRecordMapper.insert(item);
        return Result.ok("重新上报成功");
    }
}