From 7be0d5b901b999d2347774df3cc1a64927838bb3 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期二, 15 四月 2025 10:10:35 +0800
Subject: [PATCH] 优化每年专项数据获取

---
 src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportCheckTaskFromWorkDTO.java |  223 ++++++++++++++++++++++---------------------------------
 1 files changed, 91 insertions(+), 132 deletions(-)

diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportCheckTaskFromWorkDTO.java b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportCheckTaskFromWorkDTO.java
index 6eeee58..126c254 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportCheckTaskFromWorkDTO.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportCheckTaskFromWorkDTO.java
@@ -1,132 +1,91 @@
-package com.ruoyi.doublePrevention.entity.CJReport.CJdto.HandlerDO;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.io.Serializable;
-import java.util.Date;
-
-//@TableName("prevent_cj_report_check_task_from_work")
-public class CJReportCheckTaskFromWorkDTO implements Serializable {
-    /**
-     * 主键
-     */
-    private String id;
-    /**
-     * 公司编码
-     */
-    private String companyCode;
-    /**
-     * 删除标志:0-有效,1-删除
-     */
-    private String deleted;
-    /**
-     * 创建时间
-     */
-    private String createDate;
-    /**
-     * 创建人
-     */
-    private String createBy;
-    /**
-     * 最后修改时间
-     */
-    private String updateDate;
-    /**
-     * 修改人
-     */
-    private String updateBy;
-    /**
-     * 管控措施UUID
-     */
-    private String riskMeasureId;
-    /**
-     * 巡检周期
-     */
-    private Integer checkCycle;
-    /**
-     * 巡检周期单位 小时,日,月,年
-     */
-    private String checkCycleUnit;
-
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getCompanyCode() {
-        return companyCode;
-    }
-
-    public void setCompanyCode(String companyCode) {
-        this.companyCode = companyCode;
-    }
-
-    public String getDeleted() {
-        return deleted;
-    }
-
-    public void setDeleted(String deleted) {
-        this.deleted = deleted;
-    }
-
-    public String getCreateBy() {
-        return createBy;
-    }
-
-    public void setCreateBy(String createBy) {
-        this.createBy = createBy;
-    }
-
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-    public String getUpdateDate() {
-        return updateDate;
-    }
-
-    public void setUpdateDate(String updateDate) {
-        this.updateDate = updateDate;
-    }
-
-    public String getUpdateBy() {
-        return updateBy;
-    }
-
-    public void setUpdateBy(String updateBy) {
-        this.updateBy = updateBy;
-    }
-
-    public String getRiskMeasureId() {
-        return riskMeasureId;
-    }
-
-    public void setRiskMeasureId(String riskMeasureId) {
-        this.riskMeasureId = riskMeasureId;
-    }
-
-    public Integer getCheckCycle() {
-        return checkCycle;
-    }
-
-    public void setCheckCycle(Integer checkCycle) {
-        this.checkCycle = checkCycle;
-    }
-
-    public String getCheckCycleUnit() {
-        return checkCycleUnit;
-    }
-
-    public void setCheckCycleUnit(String checkCycleUnit) {
-        this.checkCycleUnit = checkCycleUnit;
-    }
-}
-
+package com.ruoyi.doublePrevention.entity.CJReport.CJdto.HandlerDO;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+@Data
+public class CJReportCheckTaskFromWorkDTO implements Serializable {
+    /**
+     * 主键
+     */
+    private String id;
+    /**
+     * 公司编码
+     */
+    private String companyCode;
+    /**
+     * 管控措施UUID
+     */
+    private String riskMeasureId;
+    /**
+     * 隐患排查内容
+     */
+    private String troubleshootContent;
+    /**
+     * 巡检周期
+     */
+    private Integer checkCycle;
+    /**
+     * 巡检周期单位 小时,日,月,年
+     */
+    private String checkCycleUnit;
+
+    /**
+     *任务开始时间
+     * 指该任 务首次开始执行的时间,必填
+     */
+    private String taskStartTime;
+    /**
+     *当巡检周期是小时的时候为必填
+     */
+    private String workStartTime;
+    /**
+     *当巡检周期是小时的时候为必填
+     */
+    private String workEndTime;
+    /**
+     *工作日类型(每天:0;法定工作日(除法定
+     * 放假以外的所有):1 ;非法定工作日(除了放假的时候):2)
+     */
+    private String workDayType;
+    /**
+     *任务类型 任务类型(日常任务: 0;主要负责人
+     * 任务:1 ;技术负责人任务:2;操作负责人任务:3;) 默认为日常任务:
+     * 0
+     */
+    private String workType;
+    /**
+     *包保任务对应项 当任务类型为主要负责人任务、
+     * 技术负责人任务、操作负责人任务时,此项为必填。
+     */
+    private String taskNum;
+
+
+    /**
+     * 删除标志:0-有效,1-删除
+     */
+    private String deleted;
+    /**
+     * 创建时间
+     */
+    private String createDate;
+    /**
+     * 创建人
+     */
+    private String createBy;
+    /**
+     * 最后修改时间
+     */
+    private String updateDate;
+    /**
+     * 修改人
+     */
+    private String updateBy;
+
+
+}
+

--
Gitblit v1.9.2