From 28f6c716269ce5435b103137dd7ec1f1f9ab19ba Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期一, 26 六月 2023 09:16:56 +0800
Subject: [PATCH] 临时提交-已经与app端对接完成

---
 src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportCheckTaskFromWorkDTO.java |  143 +++++++++++++++++------------------------------
 1 files changed, 51 insertions(+), 92 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..06b91e8 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,11 +1,13 @@
 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;
 
-//@TableName("prevent_cj_report_check_task_from_work")
+
+@Data
 public class CJReportCheckTaskFromWorkDTO implements Serializable {
     /**
      * 主键
@@ -15,6 +17,54 @@
      * 公司编码
      */
     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-删除
      */
@@ -35,98 +85,7 @@
      * 修改人
      */
     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;
-    }
 }
 

--
Gitblit v1.9.2