双重预防项目-国泰新华二开定制版
16639036659
2024-06-18 16dc9b71a91fa8ca5bb85285a5d54cb3e28eb60f
时间处理
已修改2个文件
已添加2个文件
137 ■■■■■ 文件已修改
src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckItemLogController.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckScoreAndDangerLogController.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbSpecialCheckItemLogDTO.java 55 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbSpecialCheckScoreAndDangerLogDTO.java 67 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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,6 +12,7 @@
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.TbSpecialCheckItemDangerLog;
import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckItemLog;
import com.ruoyi.project.tr.specialCheck.service.SpecialCheckItemDangerLogService;
@@ -109,7 +111,9 @@
    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);
        mmap.put("specialCheckItem",data);
//        TbBaseCheckTaskBO tbBaseCheckTaskBO = new TbBaseCheckTaskBO();
//        ResultVO<List<TbBaseCheckTask>> listResultVO = tbBaseCheckService.selectTbBaseCheckTaskPage(tbBaseCheckTaskBO);
src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckScoreAndDangerLogController.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;
@@ -10,6 +11,7 @@
import com.ruoyi.project.tr.riskList.service.IRiskListService;
import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckItemDangerLogUpdateBO;
import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckScoreAndDangerLogQueryBO;
import com.ruoyi.project.tr.specialCheck.domin.DTO.TbSpecialCheckScoreAndDangerLogDTO;
import com.ruoyi.project.tr.specialCheck.domin.DTO.TbSpecialCheckScoreAndDangerLogRespDTO;
import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckItemDangerLog;
import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckScoreAndDangerLog;
@@ -62,9 +64,9 @@
        ResultVO<List<TbSpecialCheckScoreAndDangerLog>> resultVO = scoreAndDangerDangerLogService.selectSpecialCheckScoreAndDangerLogPage(scoreAndDangerLogBO);
        List<TbSpecialCheckScoreAndDangerLogRespDTO> data = (List<TbSpecialCheckScoreAndDangerLogRespDTO>) resultVO.getData();
        List<TbSpecialCheckScoreAndDangerLogDTO> tbSpecialCheckScoreAndDangerLogDTOS = BeanCopyUtils.copyBeanList(data, TbSpecialCheckScoreAndDangerLogDTO.class);
        TableDataInfo dataTable = getDataTable(data);
        TableDataInfo dataTable = getDataTable(tbSpecialCheckScoreAndDangerLogDTOS);
        dataTable.setTotal(resultVO.getCount());
        return dataTable;
@@ -104,8 +106,9 @@
    public String edit(@PathVariable("id") Long indexId, ModelMap mmap)
    {
        TbSpecialCheckScoreAndDangerLog specialCheckItem = scoreAndDangerDangerLogService.getSpecialCheckScoreAndDangerLogByIndexId(indexId);
        mmap.put("specialCheckItem",specialCheckItem);
        TbSpecialCheckScoreAndDangerLogDTO data = BeanCopyUtils.copyBean(specialCheckItem, TbSpecialCheckScoreAndDangerLogDTO.class);
        mmap.put("specialCheckItem",data);
//        TbBaseCheckTaskBO tbBaseCheckTaskBO = new TbBaseCheckTaskBO();
//        ResultVO<List<TbBaseCheckTask>> listResultVO = tbBaseCheckService.selectTbBaseCheckTaskPage(tbBaseCheckTaskBO);
//        Object data = listResultVO.getData();
src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbSpecialCheckItemLogDTO.java
对比新文件
@@ -0,0 +1,55 @@
package com.ruoyi.project.tr.specialCheck.domin.DTO;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.time.LocalDateTime;
import java.util.Date;
@Data
public class TbSpecialCheckItemLogDTO {
    private Long indexId;
    private String id;
    private String companyCode;
    private String taskId;
    private String checkItemId;
    private String checkName;
    private String checkContent;
    private String checkWay;
    private String checkBasis;
    private String applicablePlace;
    private Byte deleted;
    private String createBy;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createDate;
    private String updateBy;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date updateDate;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date reportTime;
    private Byte reportStatus;
}
src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbSpecialCheckScoreAndDangerLogDTO.java
对比新文件
@@ -0,0 +1,67 @@
package com.ruoyi.project.tr.specialCheck.domin.DTO;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.time.LocalDateTime;
import java.util.Date;
@Data
public class TbSpecialCheckScoreAndDangerLogDTO {
    private Long indexId;
    private String id;
    private String companyCode;
    private String dangerId;
    private String dangerName;
    private String taskId;
    private String checkType;
    private String checkItemId;
    private String checkScoreId;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date checkDate;
    private String checkPay;
    private String harmType;
    private String isReject;
    private String deductPoint;
    private String deductIllustrate;
    private Byte deleted;
    private String createBy;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createDate;
    private String updateBy;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date updateDate;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date reportTime;
    private Byte reportStatus;
}