临时提交

16639036659

2024-06-19 fbb309a90ce4184cfad6c439cc5a6515a085e44b

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

@@ -13,8 +13,10 @@
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;
@@ -71,8 +73,21 @@
    {

        ResultVO<List<TbSpecialCheckItemLog>> resultVO = itemDangerLogService.selectSpecialCheckItemDangerLogPage(itemDangerLogBO);
        List<TbSpecialCheckItemDangerLog> itemList = (List<TbSpecialCheckItemDangerLog>) resultVO.getData();
        List<TbSpecialCheckItemDangerLogDTO> data = (List<TbSpecialCheckItemDangerLogDTO>) resultVO.getData();
        List<TbSpecialCheckItemLogDTO> tbSpecialCheckItemLogDTOS = BeanCopyUtils.copyBeanList(data, TbSpecialCheckItemLogDTO.class);
        for (TbSpecialCheckItemLogDTO item : tbSpecialCheckItemLogDTOS) {
            for (TbSpecialCheckItemDangerLog 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());