临时提交

16639036659

2024-06-13 352c5c4c62875306ef7db8d61688bf7fc8a6e842

临时提交

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

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

import com.ruoyi.common.utils.BeanCopyUtils;
import com.ruoyi.doublePrevention.entity.PreventRiskControlMeasure;
import com.ruoyi.doublePrevention.entity.dto.req.PreventRiskControlMeasureDeleteReqDTO;
import com.ruoyi.doublePrevention.vo.ResultVO;
@@ -8,12 +9,14 @@
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.project.tr.report.domain.Danger;
import com.ruoyi.project.tr.riskList.domain.RiskList;
import com.ruoyi.project.tr.riskList.service.IRiskListService;
import com.ruoyi.project.tr.specialCheck.domin.BO.TbBaseCheckTaskBO;
import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckTaskLogBO;
import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckTaskLogUpdateBO;
import com.ruoyi.project.tr.specialCheck.domin.DTO.TbSpecialCheckTaskLogDTO;
import com.ruoyi.project.tr.specialCheck.domin.DTO.TbSpecialCheckTaskLogDateDTO;
import com.ruoyi.project.tr.specialCheck.domin.TbBaseCheckTask;
import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckTaskLog;
import com.ruoyi.project.tr.specialCheck.service.SpecialCheckTaskService;
@@ -23,6 +26,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;

/**
@@ -104,8 +110,12 @@
    @GetMapping("/edit/{indexId}")
    public String edit(@PathVariable("indexId") Long indexId, ModelMap mmap)
    {
        TbSpecialCheckTaskLog specialCheckTaskLogByIndexId = specialCheckTaskService.getSpecialCheckTaskLogByIndexId(indexId);
        mmap.put("specialCheckTaskLog",specialCheckTaskLogByIndexId);
        TbSpecialCheckTaskLog specialCheckTaskLog = specialCheckTaskService.getSpecialCheckTaskLogByIndexId(indexId);

        TbSpecialCheckTaskLogDateDTO tbSpecialCheckTaskLogDateDTO = BeanCopyUtils.copyBean(specialCheckTaskLog, TbSpecialCheckTaskLogDateDTO.class);
        Instant instant = specialCheckTaskLog.getCheckDate().atZone(ZoneId.systemDefault()).toInstant();
        tbSpecialCheckTaskLogDateDTO.setCheckDate(Date.from(instant));
        mmap.put("specialCheckTaskLog",tbSpecialCheckTaskLogDateDTO);
        List<RiskList> riskList = riskListService.listHazardSource();
        mmap.put("hazardList", riskList);
        List<TbBaseCheckTask> listResult = tbBaseCheckService.listTbBaseCheckTask();

 src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbSpecialCheckTaskLogDateDTO.java

对比新文件
@@ -0,0 +1,43 @@
package com.ruoyi.project.tr.specialCheck.domin.DTO;



import com.fasterxml.jackson.annotation.JsonFormat;

import lombok.Data;



import java.time.LocalDateTime;

import java.util.Date;



@Data

public class TbSpecialCheckTaskLogDateDTO {





    private Long indexId;



    private String id;



    private String companyCode;



    private String hazardCode;

    private String hazardSource;



    private String taskId;



    private String checkType;



    private Date checkDate;



    private String resultStatus;



    private Byte deleted;



    private String createBy;



    private Date createDate;



    private String updateBy;



    private Date updateDate;



    private Date reportTime;



    private Byte reportStatus;

}