优化每年专项数据获取

heheng

2025-04-15 7be0d5b901b999d2347774df3cc1a64927838bb3

 src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckItemLogController.java

@@ -1,5 +1,6 @@
package com.ruoyi.project.tr.specialCheck.controller;

import com.ruoyi.common.utils.BeanCopyUtils;
import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportDangerInfo;
import com.ruoyi.doublePrevention.service.baseService.PreventCJReportDangerInfoService;
import com.ruoyi.doublePrevention.vo.ResultVO;
@@ -11,8 +12,11 @@
import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckItemDangerLogBO;
import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckItemDangerLogUpdateBO;
import com.ruoyi.project.tr.specialCheck.domin.DTO.TbSpecialCheckItemDangerLogDTO;
import com.ruoyi.project.tr.specialCheck.domin.DTO.TbSpecialCheckItemLogDTO;
import com.ruoyi.project.tr.specialCheck.domin.DTO.TbSpecialCheckScoreAndDangerLogDTO;
import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckItemDangerLog;
import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckItemLog;
import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckScoreAndDangerLog;
import com.ruoyi.project.tr.specialCheck.service.SpecialCheckItemDangerLogService;
import com.ruoyi.project.tr.specialCheck.service.TbBaseCheckService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -20,6 +24,9 @@
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.*;

import java.sql.Date;
import java.time.Instant;
import java.time.ZoneId;
import java.util.List;

/**
@@ -66,8 +73,21 @@
    {

        ResultVO<List<TbSpecialCheckItemLog>> resultVO = itemDangerLogService.selectSpecialCheckItemDangerLogPage(itemDangerLogBO);
        List<TbSpecialCheckItemLog> itemList = (List<TbSpecialCheckItemLog>) resultVO.getData();
        List<TbSpecialCheckItemDangerLogDTO> data = (List<TbSpecialCheckItemDangerLogDTO>) resultVO.getData();
        List<TbSpecialCheckItemLogDTO> tbSpecialCheckItemLogDTOS = BeanCopyUtils.copyBeanList(data, TbSpecialCheckItemLogDTO.class);
        for (TbSpecialCheckItemLogDTO item : tbSpecialCheckItemLogDTOS) {
            for (TbSpecialCheckItemLog datum : itemList) {
                if (datum.getId().equals(item.getId())){

                    Instant createDate = datum.getCreateDate().atZone(ZoneId.systemDefault()).toInstant();
                    item.setCreateDate(Date.from(createDate));

                    Instant updateDate = datum.getUpdateDate().atZone(ZoneId.systemDefault()).toInstant();
                    item.setUpdateDate(Date.from(updateDate));
                }
            }
        }

        TableDataInfo dataTable = getDataTable(data);
        dataTable.setTotal(resultVO.getCount());
@@ -109,7 +129,14 @@
    public String edit(@PathVariable("id") Long indexId, ModelMap mmap)
    {
        TbSpecialCheckItemLog specialCheckItem = itemDangerLogService.getSpecialCheckItemDangerLogByIndexId(indexId);
        mmap.put("specialCheckItem",specialCheckItem);
        TbSpecialCheckItemLogDTO data = BeanCopyUtils.copyBean(specialCheckItem, TbSpecialCheckItemLogDTO.class);

        Instant createDate = specialCheckItem.getCreateDate().atZone(ZoneId.systemDefault()).toInstant();
        data.setCreateDate(Date.from(createDate));
        Instant updateDate = specialCheckItem.getUpdateDate().atZone(ZoneId.systemDefault()).toInstant();
        data.setUpdateDate(Date.from(updateDate));

        mmap.put("specialCheckItem",data);

//        TbBaseCheckTaskBO tbBaseCheckTaskBO = new TbBaseCheckTaskBO();
//        ResultVO<List<TbBaseCheckTask>> listResultVO = tbBaseCheckService.selectTbBaseCheckTaskPage(tbBaseCheckTaskBO);