update

liujie

2026-05-21 34fb8efd9fef8a6ed0d7cbaff74f37f06bf2db60

 admin-server/src/main/java/com/estate/expert/admin/service/impl/CheckServiceImpl.java

@@ -5,19 +5,23 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.estate.expert.admin.domain.business.check.Check;
import com.estate.expert.admin.domain.business.check.CheckVo;
import com.estate.expert.admin.domain.business.client.Client;
import com.estate.expert.admin.domain.common.request.AddCheckInfoRequest;
import com.estate.expert.admin.domain.common.request.EditCheckInfoRequest;
import com.estate.expert.admin.domain.common.request.OnDutyRequest;
import com.estate.expert.admin.domain.common.request.PageReq;
import com.estate.expert.admin.domain.common.response.PageRespMp;
import com.estate.expert.admin.domain.exam.task.check.CheckTask;
import com.estate.expert.admin.domain.repository.CheckMapper;
import com.estate.expert.admin.domain.user.User;
import com.estate.expert.admin.service.CheckService;
import com.estate.expert.admin.service.CheckTaskService;
import com.estate.expert.admin.service.ClientService;
import com.estate.expert.common.exception.BizException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.time.LocalDate;
import java.time.ZoneId;
import java.util.Date;
import java.util.List;
import java.util.Objects;
@@ -32,6 +36,12 @@
 */
@Service
public class CheckServiceImpl extends ServiceImpl<CheckMapper, Check> implements CheckService {

    @Autowired
    private CheckTaskService checkTaskService;

    @Autowired
    private ClientService clientService;

    @Override
    public List<CheckVo> pageList(Page<CheckVo> page, OnDutyRequest request) {
@@ -51,8 +61,9 @@
    }

    @Override
    public PageRespMp<Check> listCheckInfoRecords(Integer planId, Integer creatorId, PageReq pageReq) {
        Page<Check> page = lambdaQuery().eq(Check::getPlanId, planId).eq(Objects.nonNull(creatorId), Check::getCreatorId, creatorId)
    public PageRespMp<Check> listCheckInfoRecords(Integer checkTaskId, Integer creatorId, PageReq pageReq) {
        Page<Check> page = lambdaQuery().eq(Check::getCheckTaskId, checkTaskId).eq(Objects.nonNull(creatorId), Check::getCreatorId, creatorId)
                .orderByDesc(Check::getCreateTime)
                .page(new Page<>(pageReq.getPage(), pageReq.getSize()));
        // 将 Spring Data Page 转换为自定义 PageResp
        return PageRespMp.of(page);
@@ -64,6 +75,20 @@
    @Override
    @Transactional
    public void addCheckInfo(User creator, AddCheckInfoRequest request) {
        //1.校验任务id
        CheckTask checkTask = checkTaskService.get(request.getCheckTaskIdId());
        if (Objects.isNull(checkTask)) {
            throw new BizException("检查任务不存在");
        }
        Client client = clientService.get(checkTask.getProject().getClient().getId());
        if (Objects.isNull(client)) {
            throw new BizException("委托方不存在");
        }
        //校验是否已检查
        Long count = lambdaQuery().eq(Check::getCheckTaskId, request.getCheckTaskIdId()).count();
        if (count > 0) {
            throw new BizException("已检查不可重复上传");
        }
        // 1. 创建 Check 实体对象（MyBatis Plus 实体）
        Check check = new Check();

@@ -74,10 +99,10 @@
        check.setIntegrityNotification(request.getIntegrityNotification());

        // 3. 设置关联字段
        check.setPlanId(request.getPlanId());
        check.setProjectId(request.getProjectId());
        check.setClientId(request.getClientId());

        check.setCheckTaskId(request.getCheckTaskIdId());
        check.setPlanId(checkTask.getPlan().getId());
        check.setProjectId(checkTask.getProject().getId());
        check.setClientId(client.getId());
        // 4. 设置创建者ID（MyBatis Plus 使用 creatorId 字段）
        check.setCreatorId(creator.getId());

@@ -100,7 +125,7 @@
        // 1. 根据 id 查询现有的 Check 实体
        Check check = getById(request.getId());
        if (check == null) {
            throw new RuntimeException("检查信息不存在");
            throw new BizException("检查信息不存在");
        }

        // 2. 更新字段
@@ -122,4 +147,16 @@
        // 使用 MyBatis Plus 的批量删除方法（逻辑删除，因为 Check 实体有 @TableLogic 注解）
        removeByIds(ids);
    }

    @Override
    public List<CheckVo> exportList(OnDutyRequest request) {
        String sTime =null;
        String eTime =null;
        if(request.getTime()!=null && !request.getTime().isEmpty()){
            sTime = request.getTime().split(" - ")[0] + " 00:00:00";
            eTime = request.getTime().split(" - ")[1] + " 23:59:59";
        }
        List<CheckVo> list = this.baseMapper.exportList( request,sTime,eTime);
        return list;
    }
}