secure-producting-business/src/main/java/com/customs/cq/datacenter/business/controller/DangerCheckFormController.java

@@ -106,6 +106,24 @@ public class DangerCheckFormController extends BasicController {
         return this.service.get(id);
     }
 
+    /**
+     * 停用[隐患检查表]
+     * @author lin.liu
+     */
+    @PostMapping(value = "stop/{id}")
+    public ExecutedResult<String> stop(@PathVariable Long id) {
+        return this.service.stop(id);
+    }
+
+    /**
+     * 启用[隐患检查表]
+     * @author lin.liu
+     */
+    @PostMapping(value = "enable/{id}")
+    public ExecutedResult<String> enable(@PathVariable Long id) {
+        return this.service.enable(id);
+    }
+
     /**
      * 根据id批量获取[隐患检查表]
      * @author lin.liu

secure-producting-business/src/main/java/com/customs/cq/datacenter/business/domain/CheckFormGridCyclePO.java

@@ -39,37 +39,47 @@ public class CheckFormGridCyclePO {
 	/**
 	 * 主键
 	 */
+	@TableId
 	private Long id;
 	/**
 	 * 关联检查表
 	 */
+	@TableField(value = "CHECK_FORM_ID")
 	private Long checkFormId;
 	/**
 	 * 检查表名称
 	 */
+	@TableField(value = "CHECK_FORM_NAME")
 	private String checkFormName;
 	/**
 	 * 关联网格
 	 */
+	@TableField(value = "GRID_ID")
 	private Long gridId;
 	/**
 	 * 网格名称
 	 */
+	@TableField(value = "GRID_NAME")
 	private String gridName;
 	/**
 	 * 检查频率 ECheckCycle
 	 */
+	@TableField(value = "CHECK_CYCLE")
 	private Integer checkCycle;
 	/**
 	 * 数据创建时间
 	 */
+	@TableField(value = "CREATE_TIME")
 	private Long createTime;
 	/**
 	 * 最后更新时间
 	 */
+	@TableField(value = "UPDATE_TIME")
 	private Timestamp updateTime;
 	/**
 	 * 是否删除(逻辑删除)
 	 */
+	@TableLogic
+	@TableField(value = "IS_DELETE")
 	private Integer isDelete;
 }

secure-producting-business/src/main/java/com/customs/cq/datacenter/business/domain/CheckRecordItemPO.java

@@ -43,97 +43,122 @@ public class CheckRecordItemPO {
 	/**
 	 * 所属检查记录
 	 */
+	@TableField(value = "CHECK_RECORD_ID")
 	private Long checkRecordId;
 	/**
 	 * 所属网格
 	 */
+	@TableField(value = "GRID_ID")
 	private Long gridId;
 	/**
 	 * 所属检查表
 	 */
+	@TableField(value = "CHECK_FORM_ID")
 	private Long checkFormId;
 	/**
 	 * 检查表名称
 	 */
+	@TableField(value = "CHECK_FORM_NAME")
 	private String checkFormName;
 	/**
 	 * 所属部门
 	 */
+	@TableField(value = "DEPARTMENT")
 	private String department;
 	/**
 	 * 部门名称
 	 */
+	@TableField(value = "DEPARTMENT_NAME")
 	private String departmentName;
 	/**
 	 * 所属关区
 	 */
+	@TableField(value = "CUSTOMS")
 	private String customs;
 	/**
 	 * 关区名称
 	 */
+	@TableField(value = "CUSTOMS_NAME")
 	private String customsName;
 	/**
 	 * 检查项
 	 */
+	@TableField(value = "ITEM_NAME")
 	private String itemName;
 	/**
 	 * 检查时间
 	 */
+	@TableField(value = "CHECK_TIME")
 	private Long checkTime;
 	/**
 	 * 检查人员
 	 */
+	@TableField(value = "CHECK_PERSON")
 	private String checkPerson;
 	/**
 	 * 检查结果 ECheckResult
 	 */
+	@TableField(value = "CHECK_RESULT")
 	private Integer checkResult;
 	/**
 	 * 整改措施
 	 */
+	@TableField(value = "RECTIFY_PLAN")
 	private String rectifyPlan;
 	/**
 	 * 整改措施提交时间
 	 */
+	@TableField(value = "RECTIFY_SUBMIT_TIME")
 	private Long rectifySubmitTime;
 	/**
 	 * 整改期限
 	 */
+	@TableField(value = "RECTIFY_DEADLINE")
 	private Long rectifyDeadline;
 	/**
 	 * 整改状态 ERectifyStatus
 	 */
+	@TableField(value = "RECTIFY_STATUS")
 	private Integer rectifyStatus;
 	/**
 	 * 实际整改完成时间
 	 */
+	@TableField(value = "RECTIFY_TIME")
 	private Long rectifyTime;
 	/**
 	 * 是否准时完成整改
 	 */
+	@TableField(value = "IS_ON_TIME")
 	private Integer isOnTime;
 	/**
 	 * 整改执行人
 	 */
+	@TableField(value = "RECTIFY_PERSON")
 	private String rectifyPerson;
 	/**
 	 * 整改执行人名称
 	 */
+	@TableField(value = "RECTIFY_PERSON_NAME")
 	private String rectifyPersonName;
 	/**
 	 * 附件列表
 	 */
+	@TableField(value = "ATTACHMENT_LIST")
 	private String attachmentList;
 	/**
 	 * 数据创建时间
 	 */
+	@TableField(value = "CREATE_TIME")
 	private Long createTime;
 	/**
 	 * 最后更新时间
 	 */
+	@TableField(value = "UPDATE_TIME")
 	private Timestamp updateTime;
 	/**
 	 * 是否删除(逻辑删除)
 	 */
+	@TableLogic
+	@TableField(value = "IS_DELETE")
 	private Integer isDelete;
 }

secure-producting-business/src/main/java/com/customs/cq/datacenter/business/domain/CheckRecordPO.java

@@ -39,105 +39,132 @@ public class CheckRecordPO {
 	/**
 	 * 主键
 	 */
+	@TableId
 	private Long id;
 	/**
 	 * 检查单号
 	 */
+	@TableField(value = "CHECK_FORM_NO")
 	private String checkFormNo;
 	/**
 	 * 所属网格
 	 */
+	@TableField(value = "GRID_ID")
 	private Long gridId;
 	/**
 	 * 所属检查表
 	 */
+	@TableField(value = "CHECK_FORM_ID")
 	private Long checkFormId;
 	/**
 	 * 检查表名称
 	 */
+	@TableField(value = "CHECK_FORM_NAME")
 	private String checkFormName;
 	/**
 	 * 所属部门
 	 */
+	@TableField(value = "DEPARTMENT")
 	private String department;
 	/**
 	 * 部门名称
 	 */
+	@TableField(value = "DEPARTMENT_NAME")
 	private String departmentName;
 	/**
 	 * 所属关区
 	 */
+	@TableField(value = "CUSTOMS")
 	private String customs;
 	/**
 	 * 关区名称
 	 */
+	@TableField(value = "CUSTOMS_NAME")
 	private String customsName;
 	/**
 	 * 检查时间
 	 */
+	@TableField(value = "CHECK_TIME")
 	private Long checkTime;
 	/**
 	 * 检查人员
 	 */
+	@TableField(value = "CHECK_PERSON")
 	private String checkPerson;
 	/**
 	 * 联系方式
 	 */
+	@TableField(value = "CONTACT_INFO")
 	private String contactInfo;
 	/**
 	 * 网格类型
 	 */
+	@TableField(value = "GRID_CATEGORY")
 	private Long gridCategory;
 	/**
 	 * 隐患分类
 	 */
+	@TableField(value = "DANGER_CATEGORY")
 	private Long dangerCategory;
 	/**
 	 * 是否有隐患
 	 */
+	@TableField(value = "HAS_DANGER")
 	private Integer hasDanger;
 	/**
 	 * 是否已提供整改措施
 	 */
+	@TableField(value = "HAS_RECTIFY_PLAN")
 	private Integer hasRectifyPlan;
 	/**
 	 * 整改措施提交时间
 	 */
+	@TableField(value = "RECTIFY_SUBMIT_TIME")
 	private Long rectifySubmitTime;
 	/**
 	 * 整改期限
 	 */
+	@TableField(value = "RECTIFY_DEADLINE")
 	private Long rectifyDeadline;
 	/**
 	 * 状态 ECheckFormStatus
 	 */
+	@TableField(value = "STATUS")
 	private Integer status;
 	/**
 	 * 数据创建时间
 	 */
+	@TableField(value = "CREATE_TIME")
 	private Long createTime;
 	/**
 	 * 最后更新时间
 	 */
+	@TableField(value = "UPDATE_TIME")
 	private Timestamp updateTime;
 	/**
 	 * 数据创建人
 	 */
+	@TableField(value = "CREATE_BY")
 	private String createBy;
 	/**
 	 * 数据创建人名称
 	 */
+	@TableField(value = "CREATE_BY_NAME")
 	private String createByName;
 	/**
 	 * 最后更新人
 	 */
+	@TableField(value = "UPDATE_BY")
 	private String updateBy;
 	/**
 	 * 最后更新人名称
 	 */
+	@TableField(value = "UPDATE_BY_NAME")
 	private String updateByName;
 	/**
 	 * 是否删除(逻辑删除)
 	 */
+	@TableLogic
+	@TableField(value = "IS_DELETE")
 	private Integer isDelete;
 }

secure-producting-business/src/main/java/com/customs/cq/datacenter/business/domain/CheckRectifyDelayPO.java

@@ -39,73 +39,92 @@ public class CheckRectifyDelayPO {
 	/**
 	 * 主键
 	 */
+	@TableId
 	private Long id;
 	/**
 	 * 所属检查记录
 	 */
+	@TableField(value = "CHECK_RECORD_ID")
 	private Long checkRecordId;
 	/**
 	 * 所属检查记录-检查项
 	 */
+	@TableField(value = "CHECK_ITEM_ID")
 	private Long checkItemId;
 	/**
 	 * 所属网格
 	 */
+	@TableField(value = "GRID_ID")
 	private Long gridId;
 	/**
 	 * 所属隐患检查表
 	 */
+	@TableField(value = "CHECK_FORM_ID")
 	private Long checkFormId;
 	/**
 	 * 检查表名称
 	 */
+	@TableField(value = "CHECK_FORM_NAME")
 	private String checkFormName;
 	/**
 	 * 申请人
 	 */
+	@TableField(value = "APPLY_USER")
 	private String applyUser;
 	/**
 	 * 申请人名称
 	 */
+	@TableField(value = "APPLY_USER_NAME")
 	private String applyUserName;
 	/**
 	 * 申请整改期限
 	 */
+	@TableField(value = "APPLY_DEADLINE")
 	private String applyDeadline;
 	/**
 	 * 审核人
 	 */
+	@TableField(value = "AUDITOR")
 	private String auditor;
 	/**
 	 * 审核人名称
 	 */
+	@TableField(value = "AUDITOR_NAME")
 	private String auditorName;
 	/**
 	 * 审核结果
 	 */
+	@TableField(value = "AUDIT_RESULT")
 	private Integer auditResult;
 	/**
 	 * 审核时间
 	 */
+	@TableField(value = "AUDIT_TIME")
 	private Long auditTime;
 	/**
 	 * 审核意见
 	 */
+	@TableField(value = "AUDIT_COMMENT")
 	private String auditComment;
 	/**
 	 * 状态 EAuditStatus
 	 */
+	@TableField(value = "STATUS")
 	private Integer status;
 	/**
 	 * 数据创建时间
 	 */
+	@TableField(value = "CREATE_TIME")
 	private Long createTime;
 	/**
 	 * 最后更新时间
 	 */
+	@TableField(value = "UPDATE_TIME")
 	private Timestamp updateTime;
 	/**
 	 * 是否删除(逻辑删除)
 	 */
+	@TableLogic
+	@TableField(value = "IS_DELETE")
 	private Integer isDelete;
 }

secure-producting-business/src/main/java/com/customs/cq/datacenter/business/domain/CheckRectifyProgressPO.java

@@ -40,57 +40,72 @@ public class CheckRectifyProgressPO {
 	/**
 	 * 主键
 	 */
+	@TableId
 	private Long id;
 	/**
 	 * 所属检查记录
 	 */
+	@TableField(value = "CHECK_RECORD_ID")
 	private Long checkRecordId;
 	/**
 	 * 所属检查记录-检查项
 	 */
+	@TableField(value = "CHECK_ITEM_ID")
 	private Long checkItemId;
 	/**
 	 * 所属网格
 	 */
+	@TableField(value = "GRID_ID")
 	private Long gridId;
 	/**
 	 * 所属检查表
 	 */
+	@TableField(value = "CHECK_FORM_ID")
 	private Long checkFormId;
 	/**
 	 * 检查表名称
 	 */
+	@TableField(value = "CHECK_FORM_NAME")
 	private String checkFormName;
 	/**
 	 * 检查项
 	 */
+	@TableField(value = "ITEM_NAME")
 	private String itemName;
 	/**
 	 * 进度更新人
 	 */
+	@TableField(value = "SUBMIT_USER")
 	private String submitUser;
 	/**
 	 * 进度更新人名称
 	 */
+	@TableField(value = "SUBMIT_USER_NAME")
 	private String submitUserName;
 	/**
 	 * 完成进度
 	 */
+	@TableField(value = "PROGRESS")
 	private BigDecimal progress;
 	/**
 	 * 整改状态 ERectifyStatus
 	 */
+	@TableField(value = "STATUS")
 	private Integer status;
 	/**
 	 * 数据创建时间
 	 */
+	@TableField(value = "CREATE_TIME")
 	private Long createTime;
 	/**
 	 * 最后更新时间
 	 */
+	@TableField(value = "UPDATE_TIME")
 	private Timestamp updateTime;
 	/**
 	 * 是否删除(逻辑删除)
 	 */
+	@TableLogic
+	@TableField(value = "IS_DELETE")
 	private Integer isDelete;
 }

secure-producting-business/src/main/java/com/customs/cq/datacenter/business/domain/CheckRevokePO.java

@@ -39,65 +39,82 @@ public class CheckRevokePO {
 	/**
 	 * 主键
 	 */
+	@TableId
 	private Long id;
 	/**
 	 * 所属检查记录
 	 */
+	@TableField(value = "CHECK_RECORD_ID")
 	private Long checkRecordId;
 	/**
 	 * 所属网格
 	 */
+	@TableField(value = "GRID_ID")
 	private Long gridId;
 	/**
 	 * 所属隐患检查表
 	 */
+	@TableField(value = "CHECK_FORM_ID")
 	private Long checkFormId;
 	/**
 	 * 检查表名称
 	 */
+	@TableField(value = "CHECK_FORM_NAME")
 	private String checkFormName;
 	/**
 	 * 申请人
 	 */
+	@TableField(value = "APPLY_USER")
 	private String applyUser;
 	/**
 	 * 申请人名称
 	 */
+	@TableField(value = "APPLY_USER_NAME")
 	private String applyUserName;
 	/**
 	 * 审核人
 	 */
+	@TableField(value = "AUDITOR")
 	private String auditor;
 	/**
 	 * 审核人名称
 	 */
+	@TableField(value = "AUDITOR_NAME")
 	private String auditorName;
 	/**
 	 * 审核结果
 	 */
+	@TableField(value = "AUDIT_RESULT")
 	private Integer auditResult;
 	/**
 	 * 审核时间
 	 */
+	@TableField(value = "AUDIT_TIME")
 	private Long auditTime;
 	/**
 	 * 审核意见
 	 */
+	@TableField(value = "AUDIT_COMMENT")
 	private String auditComment;
 	/**
 	 * 状态 EAuditStatus
 	 */
+	@TableField(value = "STATUS")
 	private Integer status;
 	/**
 	 * 数据创建时间
 	 */
+	@TableField(value = "CREATE_TIME")
 	private Long createTime;
 	/**
 	 * 最后更新时间
 	 */
+	@TableField(value = "UPDATE_TIME")
 	private Timestamp updateTime;
 	/**
 	 * 是否删除(逻辑删除)
 	 */
+	@TableLogic
+	@TableField(value = "IS_DELETE")
 	private Integer isDelete;
 }

secure-producting-business/src/main/java/com/customs/cq/datacenter/business/domain/DangerCategoryPO.java

@@ -39,49 +39,62 @@ public class DangerCategoryPO {
 	/**
 	 * 主键
 	 */
+	@TableId
 	private Long id;
 	/**
 	 * 类别名称
 	 */
+	@TableField(value = "CATEGORY_NAME")
 	private String categoryName;
 	/**
 	 * 检查频率 ECheckCycle
 	 */
+	@TableField(value = "CHECK_CYCLE")
 	private Integer checkCycle;
 	/**
 	 * 描述
 	 */
+	@TableField(value = "DESCRIPTION")
 	private String description;
 	/**
 	 * 状态 EState
 	 */
+	@TableField(value = "STATUS")
 	private Integer status;
 	/**
 	 * 数据创建时间
 	 */
+	@TableField(value = "CREATE_TIME")
 	private Long createTime;
 	/**
 	 * 最后更新时间
 	 */
+	@TableField(value = "UPDATE_TIME")
 	private Timestamp updateTime;
 	/**
 	 * 数据创建人
 	 */
+	@TableField(value = "CREATE_BY")
 	private String createBy;
 	/**
 	 * 数据创建人名称
 	 */
+	@TableField(value = "CREATE_BY_NAME")
 	private String createByName;
 	/**
 	 * 最后更新人
 	 */
+	@TableField(value = "UPDATE_BY")
 	private String updateBy;
 	/**
 	 * 最后更新人名称
 	 */
+	@TableField(value = "UPDATE_BY_NAME")
 	private String updateByName;
 	/**
 	 * 是否删除(逻辑删除)
 	 */
+	@TableLogic
+	@TableField(value = "IS_DELETE")
 	private Integer isDelete;
 }

secure-producting-business/src/main/java/com/customs/cq/datacenter/business/domain/DangerCheckFormPO.java

@@ -39,57 +39,72 @@ public class DangerCheckFormPO {
 	/**
 	 * 主键
 	 */
+	@TableId
 	private Long id;
 	/**
 	 * 检查表名称
 	 */
+	@TableField(value = "NAME")
 	private String name;
 	/**
 	 * 隐患分类
 	 */
+	@TableField(value = "DANGER_CATEGORY")
 	private Long dangerCategory;
 	/**
 	 * 检查频率 ECheckCycle
 	 */
+	@TableField(value = "CHECK_CYCLE")
 	private Integer checkCycle;
 	/**
 	 * 检查次数(周期内)
 	 */
+	@TableField(value = "CHECK_TIMES")
 	private Integer checkTimes;
 	/**
 	 * 描述
 	 */
+	@TableField(value = "DESCRIPTION")
 	private String description;
 	/**
 	 * 状态 EState
 	 */
+	@TableField(value = "STATUS")
 	private Integer status;
 	/**
 	 * 数据创建时间
 	 */
+	@TableField(value = "CREATE_TIME")
 	private Long createTime;
 	/**
 	 * 最后更新时间
 	 */
+	@TableField(value = "UPDATE_TIME")
 	private Timestamp updateTime;
 	/**
 	 * 数据创建人
 	 */
+	@TableField(value = "CREATE_BY")
 	private String createBy;
 	/**
 	 * 数据创建人名称
 	 */
+	@TableField(value = "CREATE_BY_NAME")
 	private String createByName;
 	/**
 	 * 最后更新人
 	 */
+	@TableField(value = "UPDATE_BY")
 	private String updateBy;
 	/**
 	 * 最后更新人名称
 	 */
+	@TableField(value = "UPDATE_BY_NAME")
 	private String updateByName;
 	/**
 	 * 是否删除(逻辑删除)
 	 */
+	@TableLogic
+	@TableField(value = "IS_DELETE")
 	private Integer isDelete;
 }

secure-producting-business/src/main/java/com/customs/cq/datacenter/business/domain/DangerCheckItemPO.java

@@ -39,29 +39,37 @@ public class DangerCheckItemPO {
 	/**
 	 * 主键
 	 */
+	@TableId
 	private Long id;
 	/**
 	 * 所属隐患检查表
 	 */
+	@TableField(value = "CHECK_FORM_ID")
 	private Long checkFormId;
 	/**
 	 * 检查项名称
 	 */
+	@TableField(value = "ITEM_NAME")
 	private String itemName;
 	/**
 	 * 描述 判断有无隐患的标准等信息
 	 */
+	@TableField(value = "DESCRIPTION")
 	private String description;
 	/**
 	 * 数据创建时间
 	 */
+	@TableField(value = "CREATE_TIME")
 	private Long createTime;
 	/**
 	 * 最后更新时间
 	 */
+	@TableField(value = "UPDATE_TIME")
 	private Timestamp updateTime;
 	/**
 	 * 是否删除(逻辑删除)
 	 */
+	@TableLogic
+	@TableField(value = "IS_DELETE")
 	private Integer isDelete;
 }

secure-producting-business/src/main/java/com/customs/cq/datacenter/business/domain/DrillTaskPO.java

@@ -39,53 +39,67 @@ public class DrillTaskPO {
 	/**
 	 * 主键
 	 */
+	@TableId
 	private Long id;
 	/**
 	 * 任务名称
 	 */
+	@TableField(value = "TASK_NAME")
 	private String taskName;
 	/**
 	 * 任务描述
 	 */
+	@TableField(value = "DESCRIPTION")
 	private String description;
 	/**
 	 * 设计部门数量
 	 */
+	@TableField(value = "DEPARTMENT_COUNT")
 	private Integer departmentCount;
 	/**
 	 * 已完成部门数量
 	 */
+	@TableField(value = "FINISHED_COUNT")
 	private Integer finishedCount;
 	/**
 	 * 状态 ETaskStatus
 	 */
+	@TableField(value = "STATUS")
 	private Integer status;
 	/**
 	 * 数据创建时间
 	 */
+	@TableField(value = "CREATE_TIME")
 	private Long createTime;
 	/**
 	 * 最后更新时间
 	 */
+	@TableField(value = "UPDATE_TIME")
 	private Timestamp updateTime;
 	/**
 	 * 数据创建人
 	 */
+	@TableField(value = "CREATE_BY")
 	private String createBy;
 	/**
 	 * 数据创建人名称
 	 */
+	@TableField(value = "CREATE_BY_NAME")
 	private String createByName;
 	/**
 	 * 最后更新人
 	 */
+	@TableField(value = "UPDATE_BY")
 	private String updateBy;
 	/**
 	 * 最后更新人名称
 	 */
+	@TableField(value = "UPDATE_BY_NAME")
 	private String updateByName;
 	/**
 	 * 是否删除(逻辑删除)
 	 */
+	@TableLogic
+	@TableField(value = "IS_DELETE")
 	private Integer isDelete;
 }

secure-producting-business/src/main/java/com/customs/cq/datacenter/business/domain/DrillTaskProgressPO.java

@@ -39,45 +39,57 @@ public class DrillTaskProgressPO {
 	/**
 	 * 主键
 	 */
+	@TableId
 	private Long id;
 	/**
 	 * 所属培训任务
 	 */
+	@TableField(value = "TASK_ID")
 	private Long taskId;
 	/**
 	 * 所属部门
 	 */
+	@TableField(value = "DEPARTMENT")
 	private String department;
 	/**
 	 * 部门名称
 	 */
+	@TableField(value = "DEPARTMENT_NAME")
 	private String departmentName;
 	/**
 	 * 进度更新人
 	 */
+	@TableField(value = "SUBMIT_USER")
 	private String submitUser;
 	/**
 	 * 进度更新人名称
 	 */
+	@TableField(value = "SUBMIT_USER_NAME")
 	private String submitUserName;
 	/**
 	 * 完成时间
 	 */
+	@TableField(value = "FINISHED_TIME")
 	private Long finishedTime;
 	/**
 	 * 状态 ETaskStatus
 	 */
+	@TableField(value = "STATUS")
 	private Integer status;
 	/**
 	 * 数据创建时间
 	 */
+	@TableField(value = "CREATE_TIME")
 	private Long createTime;
 	/**
 	 * 最后更新时间
 	 */
+	@TableField(value = "UPDATE_TIME")
 	private Timestamp updateTime;
 	/**
 	 * 是否删除(逻辑删除)
 	 */
+	@TableLogic
+	@TableField(value = "IS_DELETE")
 	private Integer isDelete;
 }

secure-producting-business/src/main/java/com/customs/cq/datacenter/business/domain/GridCategoryPO.java

@@ -39,45 +39,57 @@ public class GridCategoryPO {
 	/**
 	 * 主键
 	 */
+	@TableId
 	private Long id;
 	/**
 	 * 类别名称
 	 */
+	@TableField(value = "CATEGORY_NAME")
 	private String categoryName;
 	/**
 	 * 描述
 	 */
+	@TableField(value = "DESCRIPTION")
 	private String description;
 	/**
 	 * 状态 EState
 	 */
+	@TableField(value = "STATUS")
 	private Integer status;
 	/**
 	 * 数据创建时间
 	 */
+	@TableField(value = "CREATE_TIME")
 	private Long createTime;
 	/**
 	 * 最后更新时间
 	 */
+	@TableField(value = "UPDATE_TIME")
 	private Timestamp updateTime;
 	/**
 	 * 数据创建人
 	 */
+	@TableField(value = "CREATE_BY")
 	private String createBy;
 	/**
 	 * 数据创建人名称
 	 */
+	@TableField(value = "CREATE_BY_NAME")
 	private String createByName;
 	/**
 	 * 最后更新人
 	 */
+	@TableField(value = "UPDATE_BY")
 	private String updateBy;
 	/**
 	 * 最后更新人名称
 	 */
+	@TableField(value = "UPDATE_BY_NAME")
 	private String updateByName;
 	/**
 	 * 是否删除(逻辑删除)
 	 */
+	@TableLogic
+	@TableField(value = "IS_DELETE")
 	private Integer isDelete;
 }

secure-producting-business/src/main/java/com/customs/cq/datacenter/business/domain/GridInfoPO.java

@@ -39,61 +39,77 @@ public class GridInfoPO {
 	/**
 	 * 主键
 	 */
+	@TableId
 	private Long id;
 	/**
 	 * 网格名称
 	 */
+	@TableField(value = "GRID_NAME")
 	private String gridName;
 	/**
 	 * 所属部门
 	 */
+	@TableField(value = "DEPARTMENT")
 	private String department;
 	/**
 	 * 部门名称
 	 */
+	@TableField(value = "DEPARTMENT_NAME")
 	private String departmentName;
 	/**
 	 * 网格类型
 	 */
+	@TableField(value = "GRID_CATEGORY")
 	private Long gridCategory;
 	/**
 	 * 隐患分类
 	 */
+	@TableField(value = "DANGER_CATEGORY")
 	private Long dangerCategory;
 	/**
 	 * 网格员职责
 	 */
+	@TableField(value = "GRID_PERSON_DUTY")
 	private String gridPersonDuty;
 	/**
 	 * 状态 EState
 	 */
+	@TableField(value = "STATUS")
 	private Integer status;
 	/**
 	 * 数据创建时间
 	 */
+	@TableField(value = "CREATE_TIME")
 	private Long createTime;
 	/**
 	 * 最后更新时间
 	 */
+	@TableField(value = "UPDATE_TIME")
 	private Timestamp updateTime;
 	/**
 	 * 数据创建人
 	 */
+	@TableField(value = "CREATE_BY")
 	private String createBy;
 	/**
 	 * 数据创建人名称
 	 */
+	@TableField(value = "CREATE_BY_NAME")
 	private String createByName;
 	/**
 	 * 最后更新人
 	 */
+	@TableField(value = "UPDATE_BY")
 	private String updateBy;
 	/**
 	 * 最后更新人名称
 	 */
+	@TableField(value = "UPDATE_BY_NAME")
 	private String updateByName;
 	/**
 	 * 是否删除(逻辑删除)
 	 */
+	@TableLogic
+	@TableField(value = "IS_DELETE")
 	private Integer isDelete;
 }

secure-producting-business/src/main/java/com/customs/cq/datacenter/business/domain/GridPersonPO.java

@@ -39,65 +39,82 @@ public class GridPersonPO {
 	/**
 	 * 主键
 	 */
+	@TableId
 	private Long id;
 	/**
 	 * 所属部门
 	 */
+	@TableField(value = "DEPARTMENT")
 	private String department;
 	/**
 	 * 部门名称
 	 */
+	@TableField(value = "DEPARTMENT_NAME")
 	private String departmentName;
 	/**
 	 * 所属网格
 	 */
+	@TableField(value = "GRID_ID")
 	private Long gridId;
 	/**
 	 * 姓名
 	 */
+	@TableField(value = "REAL_NAME")
 	private String realName;
 	/**
 	 * 联系方式
 	 */
+	@TableField(value = "CONTACT_INFO")
 	private String contactInfo;
 	/**
 	 * 是否网格管理员
 	 */
+	@TableField(value = "IS_ADMIN")
 	private Integer isAdmin;
 	/**
 	 * 是否联络员
 	 */
+	@TableField(value = "IS_LIAISON")
 	private Integer isLiaison;
 	/**
 	 * 状态 EState
 	 */
+	@TableField(value = "STATUS")
 	private Integer status;
 	/**
 	 * 数据创建时间
 	 */
+	@TableField(value = "CREATE_TIME")
 	private Long createTime;
 	/**
 	 * 最后更新时间
 	 */
+	@TableField(value = "UPDATE_TIME")
 	private Timestamp updateTime;
 	/**
 	 * 数据创建人
 	 */
+	@TableField(value = "CREATE_BY")
 	private String createBy;
 	/**
 	 * 数据创建人名称
 	 */
+	@TableField(value = "CREATE_BY_NAME")
 	private String createByName;
 	/**
 	 * 最后更新人
 	 */
+	@TableField(value = "UPDATE_BY")
 	private String updateBy;
 	/**
 	 * 最后更新人名称
 	 */
+	@TableField(value = "UPDATE_BY_NAME")
 	private String updateByName;
 	/**
 	 * 是否删除(逻辑删除)
 	 */
+	@TableLogic
+	@TableField(value = "IS_DELETE")
 	private Integer isDelete;
 }

secure-producting-business/src/main/java/com/customs/cq/datacenter/business/domain/PolicyCategoryPO.java

@@ -39,25 +39,32 @@ public class PolicyCategoryPO {
 	/**
 	 * 主键
 	 */
+	@TableId
 	private Long id;
 	/**
 	 * 分类名称
 	 */
+	@TableField(value = "CATEGORY_NAME")
 	private String categoryName;
 	/**
 	 * 描述
 	 */
+	@TableField(value = "REMARK")
 	private String remark;
 	/**
 	 * 数据创建时间
 	 */
+	@TableField(value = "CREATE_TIME")
 	private Long createTime;
 	/**
 	 * 最后更新时间
 	 */
+	@TableField(value = "UPDATE_TIME")
 	private Timestamp updateTime;
 	/**
 	 * 是否删除(逻辑删除)
 	 */
+	@TableLogic
+	@TableField(value = "IS_DELETE")
 	private Integer isDelete;
 }

secure-producting-business/src/main/java/com/customs/cq/datacenter/business/domain/PolicyPublishPO.java

@@ -39,57 +39,72 @@ public class PolicyPublishPO {
 	/**
 	 * 主键
 	 */
+	@TableId
 	private Long id;
 	/**
 	 * 所属分类
 	 */
+	@TableField(value = "CATEGORY_ID")
 	private Long categoryId;
 	/**
 	 * 所属分类名称
 	 */
+	@TableField(value = "CATEGORY_NAME")
 	private String categoryName;
 	/**
 	 * 标题
 	 */
+	@TableField(value = "TITLE")
 	private String title;
 	/**
 	 * 政策文件路径
 	 */
+	@TableField(value = "FILE_PATH")
 	private String filePath;
 	/**
 	 * 政策文件转pdf路径
 	 */
+	@TableField(value = "FILE_PDF_PATH")
 	private String filePdfPath;
 	/**
 	 * 备注
 	 */
+	@TableField(value = "REMARK")
 	private String remark;
 	/**
 	 * 数据创建时间
 	 */
+	@TableField(value = "CREATE_TIME")
 	private Long createTime;
 	/**
 	 * 最后更新时间
 	 */
+	@TableField(value = "UPDATE_TIME")
 	private Timestamp updateTime;
 	/**
 	 * 数据创建人
 	 */
+	@TableField(value = "CREATE_BY")
 	private String createBy;
 	/**
 	 * 数据创建人名称
 	 */
+	@TableField(value = "CREATE_BY_NAME")
 	private String createByName;
 	/**
 	 * 最后更新人
 	 */
+	@TableField(value = "UPDATE_BY")
 	private String updateBy;
 	/**
 	 * 最后更新人名称
 	 */
+	@TableField(value = "UPDATE_BY_NAME")
 	private String updateByName;
 	/**
 	 * 是否删除(逻辑删除)
 	 */
+	@TableLogic
+	@TableField(value = "IS_DELETE")
 	private Integer isDelete;
 }

secure-producting-business/src/main/java/com/customs/cq/datacenter/business/domain/vo/DangerCheckFormVO.java

@@ -24,6 +24,7 @@ package com.customs.cq.datacenter.business.domain.vo;
 
 import com.customs.cq.datacenter.business.entity.request.dangercheckitem.ReqCreateDangerCheckItem;
 import com.customs.cq.datacenter.common.enums.ECheckCycle;
+import com.customs.cq.datacenter.common.enums.EState;
 import lombok.Data;
 
 import com.customs.cq.datacenter.common.utils.LocalDateTimeUtil;
@@ -68,7 +69,11 @@ public class DangerCheckFormVO extends DangerCheckFormPO implements BasicVO {
      */
     private String dangerCategoryTxt;
 
-    public String getDangerCategoryTxt() {
+    public String getCheckCycleTxt() {
         return ECheckCycle.getByValue(this.getCheckCycle()).getDesc();
     }
+
+    public String getStatusTxt() {
+        return EState.getByValue(this.getStatus()).getDesc();
+    }
 }

secure-producting-business/src/main/java/com/customs/cq/datacenter/business/entity/search/SearchGridInfo.java

@@ -1,13 +1,30 @@
 package com.customs.cq.datacenter.business.entity.search;
 
 import com.customs.cq.datacenter.common.model.SearchBasicDTO;
+import lombok.Data;
+
+import java.util.List;
 
 /**
  * 网格信息
  * @author lin.liu
  * @description 网格信息
  */
+@Data
 public class SearchGridInfo extends SearchBasicDTO {
+	/**
+	 * 部门列表
+	 */
+	private List<String> listDepartment;
+	/**
+	 * 网格类型
+	 */
+	private List<String> listGridCategory;
+	/**
+	 * 隐患分类
+	 */
+	private List<String> listDangerCategory;
+
 	@Override
 	public String toString() {
 		return "SearchGridInfo{" + "'" +

secure-producting-business/src/main/java/com/customs/cq/datacenter/business/mapper/impl/DangerCategoryMapperImpl.java

@@ -109,7 +109,7 @@ public class DangerCategoryMapperImpl extends BasicMapper<DangerCategoryPO> {
     public List<NameValueDto> listAllSelect() {
         List<String> listColumn = new ArrayList<>();
         listColumn.add("id");
-        listColumn.add("category_name");
+        listColumn.add("CATEGORY_NAME");
 
         LambdaQueryWrapper<DangerCategoryPO> queryWrapper = this.getQuery();
         queryWrapper.select(DangerCategoryPO.class, c -> listColumn.contains(c.getColumn()));

secure-producting-business/src/main/java/com/customs/cq/datacenter/business/mapper/impl/DangerCheckFormMapperImpl.java

@@ -1,19 +1,20 @@
 package com.customs.cq.datacenter.business.mapper.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.customs.cq.datacenter.business.domain.DangerCheckFormPO;
+import com.customs.cq.datacenter.business.entity.search.SearchDangerCheckForm;
+import com.customs.cq.datacenter.business.mapper.DangerCheckFormMapper;
+import com.customs.cq.datacenter.common.core.mapper.BasicMapper;
 import com.customs.cq.datacenter.common.enums.EOrderBy;
 import com.customs.cq.datacenter.common.enums.EYesOrNo;
-import com.customs.cq.datacenter.common.utils.ListUtil;
-import com.customs.cq.datacenter.common.utils.NumericUtil;
-import com.customs.cq.datacenter.common.core.mapper.BasicMapper;
 import com.customs.cq.datacenter.common.model.OrderByDTO;
 import com.customs.cq.datacenter.common.model.SearchBasicDTO;
+import com.customs.cq.datacenter.common.utils.ListUtil;
+import com.customs.cq.datacenter.common.utils.NumericUtil;
 import org.springframework.stereotype.Repository;
-import com.customs.cq.datacenter.business.entity.search.SearchDangerCheckForm;
-import com.customs.cq.datacenter.business.domain.DangerCheckFormPO;
-import com.customs.cq.datacenter.business.mapper.DangerCheckFormMapper;
 
 /**
  * 隐患检查表
@@ -97,4 +98,21 @@ public class DangerCheckFormMapperImpl extends BasicMapper<DangerCheckFormPO> {
         }
         return mapper.selectPage(new Page<>(search.getPage(), search.getLimit()), queryWrapper);
     }
+
+    /**
+     * 根据隐患分类获取隐患检查表数量
+     * @param dangerCategory 隐患分类
+     */
+    public Long count4DangerCategory(Long dangerCategory) {
+        LambdaQueryWrapper<DangerCheckFormPO> where = this.getQuery();
+        where.eq(DangerCheckFormPO::getDangerCategory, dangerCategory);
+        return mapper.selectCount(where);
+    }
+
+    public void updateCheckCycle(Long dangerCategory, Integer checkCycle) {
+        UpdateWrapper<DangerCheckFormPO> where = this.getUpdate();
+        where.set("CHECK_CYCLE", checkCycle);
+        where.eq("DANGER_CATEGORY", dangerCategory);
+        mapper.update(null, where);
+    }
 }

secure-producting-business/src/main/java/com/customs/cq/datacenter/business/mapper/impl/DangerCheckItemMapperImpl.java

@@ -101,13 +101,20 @@ public class DangerCheckItemMapperImpl extends BasicMapper<DangerCheckItemPO> {
         return mapper.selectPage(new Page<>(search.getPage(), search.getLimit()), queryWrapper);
     }
 
+    /**
+     * 根据隐患检查表id删除所有检查项
+     * @param formId 隐患检查表id
+     */
     public int removeByCheckForm(Long formId) {
-        UpdateWrapper<DangerCheckItemPO> update = this.getUpdate();
-        update.set("IS_DELETE", EYesOrNo.YES.getValue());
-        update.eq("CHECK_FORM_ID", formId);
-        return mapper.update(null, update);
+        LambdaQueryWrapper<DangerCheckItemPO> update = this.getQuery();
+        update.eq(DangerCheckItemPO::getCheckFormId, formId);
+        return mapper.delete(update);
     }
 
+    /**
+     * 根据隐患检查表id获取所有检查项
+     * @param formId 隐患检查表id
+     */
     public List<DangerCheckItemPO> list4CheckForm(Long formId) {
         LambdaQueryWrapper<DangerCheckItemPO> where = this.getQuery();
         where.eq(DangerCheckItemPO::getCheckFormId, formId);

secure-producting-business/src/main/java/com/customs/cq/datacenter/business/mapper/impl/GridCategoryMapperImpl.java

@@ -106,7 +106,7 @@ public class GridCategoryMapperImpl extends BasicMapper<GridCategoryPO> {
     public List<NameValueDto> listAllSelect() {
         List<String> listColumn = new ArrayList<>();
         listColumn.add("id");
-        listColumn.add("category_name");
+        listColumn.add("CATEGORY_NAME");
 
         LambdaQueryWrapper<GridCategoryPO> queryWrapper = this.getQuery();
         queryWrapper.select(GridCategoryPO.class, c -> listColumn.contains(c.getColumn()));

secure-producting-business/src/main/java/com/customs/cq/datacenter/business/mapper/impl/GridInfoMapperImpl.java

@@ -10,6 +10,7 @@ import com.customs.cq.datacenter.common.utils.NumericUtil;
 import com.customs.cq.datacenter.common.core.mapper.BasicMapper;
 import com.customs.cq.datacenter.common.model.OrderByDTO;
 import com.customs.cq.datacenter.common.model.SearchBasicDTO;
+import com.customs.cq.datacenter.common.utils.StringUtil;
 import org.springframework.stereotype.Repository;
 import com.customs.cq.datacenter.business.entity.search.SearchGridInfo;
 import com.customs.cq.datacenter.business.domain.GridInfoPO;
@@ -40,20 +41,33 @@ public class GridInfoMapperImpl extends BasicMapper<GridInfoPO> {
         // 状态非逻辑删除
         queryWrapper.eq(GridInfoPO::getIsDelete, EYesOrNo.NO.getValue());
         // 状态
-        //queryWrapper.eq(NumericUtil.tryParseInt(search.getStatus()).compareTo(0) > 0, GridInfoPO::getState, search.getStatus());
+        queryWrapper.eq(NumericUtil.tryParseInt(search.getStatus()).compareTo(0) > 0, GridInfoPO::getStatus, search.getStatus());
         // 状态列表
-        //queryWrapper.in(ListUtil.isNotNullOrEmpty(search.getListStatus()), GridInfoPO::getState, search.getListStatus());
+        queryWrapper.in(ListUtil.isNotNullOrEmpty(search.getListStatus()), GridInfoPO::getStatus, search.getListStatus());
         // 数据创建时间-起始
         queryWrapper.ge(NumericUtil.tryParseLong(search.getCreateTimeStart()).compareTo(0L) > 0, GridInfoPO::getCreateTime, search.getCreateTimeStart());
         // 数据创建时间-截止
         queryWrapper.le(NumericUtil.tryParseLong(search.getCreateTimeEnd()).compareTo(0L) > 0, GridInfoPO::getCreateTime, search.getCreateTimeEnd());
+        // 网格类型
+        queryWrapper.in(ListUtil.isNotNullOrEmpty(search.getListGridCategory()), GridInfoPO::getGridCategory, search.getListGridCategory());
+        // 隐患分类
+        queryWrapper.in(ListUtil.isNotNullOrEmpty(search.getListDangerCategory()), GridInfoPO::getDangerCategory, search.getListDangerCategory());
         // 关键字
-        //if (StringUtil.isNotNullOrEmpty(search.getKeywords())) {
-        //    queryWrapper.and(q ->
-        //        q.like(GridInfoPO::getRealName, search.getKeywords())
-        //        .or().like(GridInfoPO::getContactPhone, search.getKeywords())
-        //    );
-        //}
+        if (StringUtil.isNotNullOrEmpty(search.getKeywords())) {
+            queryWrapper.and(q ->
+                q.like(GridInfoPO::getGridName, search.getKeywords())
+                .or().like(GridInfoPO::getDepartmentName, search.getKeywords())
+            );
+        }
+        // 部门列表
+        if (ListUtil.isNotNullOrEmpty(search.getListDepartment())) {
+            queryWrapper.and(q -> {
+                for (String dept : search.getListDepartment()) {
+                    q.or().like(GridInfoPO::getDepartment, "#" + dept + "#");
+                }
+            });
+        }
+
         // 排序处理
         if (ListUtil.isNotNullOrEmpty(search.getOrderBy())) {
             for (OrderByDTO item : search.getOrderBy()) {

secure-producting-business/src/main/java/com/customs/cq/datacenter/business/mapper/impl/PolicyCategoryMapperImpl.java

@@ -104,7 +104,7 @@ public class PolicyCategoryMapperImpl extends BasicMapper<PolicyCategoryPO> {
     public List<NameValueDto> listAllSelect() {
         List<String> listColumn = new ArrayList<>();
         listColumn.add("id");
-        listColumn.add("category_name");
+        listColumn.add("CATEGORY_NAME");
 
         LambdaQueryWrapper<PolicyCategoryPO> queryWrapper = this.getQuery();
         queryWrapper.select(PolicyCategoryPO.class, c -> listColumn.contains(c.getColumn()));

secure-producting-business/src/main/java/com/customs/cq/datacenter/business/service/DangerCategoryService.java

@@ -29,6 +29,7 @@ import com.customs.cq.datacenter.business.entity.request.dangercategory.ReqCreat
 import com.customs.cq.datacenter.business.entity.request.dangercategory.ReqModifyDangerCategory;
 import com.customs.cq.datacenter.business.entity.search.SearchDangerCategory;
 import com.customs.cq.datacenter.business.mapper.impl.DangerCategoryMapperImpl;
+import com.customs.cq.datacenter.business.mapper.impl.DangerCheckFormMapperImpl;
 import com.customs.cq.datacenter.common.ExecutedResult;
 import com.customs.cq.datacenter.common.PagerResult;
 import com.customs.cq.datacenter.common.core.domain.model.LoginUser;
@@ -56,6 +57,8 @@ import java.util.Objects;
 public class DangerCategoryService extends BasicService {
     @Autowired
     private DangerCategoryMapperImpl dao;
+    @Autowired
+    private DangerCheckFormMapperImpl checkFormMapper;
 
     public ExecutedResult<Long> create(ReqCreateDangerCategory request) {
         // 转换po
@@ -101,6 +104,10 @@ public class DangerCategoryService extends BasicService {
         if (result != 1) {
             return ExecutedResult.failed("编辑[隐患类别]失败。");
         }
+        // 更新隐患检查表的检查频率
+        ThreadPoolUtil.getDefaultPool().execute(() -> {
+            checkFormMapper.updateCheckCycle(request.getId(), request.getCheckCycle());
+        });
         return ExecutedResult.success();
     }
 

secure-producting-business/src/main/java/com/customs/cq/datacenter/business/service/DangerCheckFormService.java

@@ -73,6 +73,10 @@ public class DangerCheckFormService extends BasicService {
     
     public ExecutedResult<Long> create(ReqCreateDangerCheckForm request) {
         DangerCategoryPO dangerCategory = dangerCategoryService.check4IdExc(request.getDangerCategory());
+        Long checkExists = dao.count4DangerCategory(request.getDangerCategory());
+        if (NumericUtil.tryParseLong(checkExists, 0L).compareTo(0L) > 0) {
+            return ExecutedResult.failed("该隐患分类已存在检查表，请添加其他分类");
+        }
         // 转换po
         DangerCheckFormPO item = CopierUtil.mapTo(request, DangerCheckFormPO.class);
         // 设置主键
@@ -117,6 +121,12 @@ public class DangerCheckFormService extends BasicService {
         if (checkExists.isFailed()) {
             return ExecutedResult.failed(checkExists.getMsg());
         }
+        if (!Objects.equals(checkExists.getData().getDangerCategory(), request.getDangerCategory())) {
+            Long checkExistsCategory = dao.count4DangerCategory(request.getDangerCategory());
+            if (NumericUtil.tryParseLong(checkExistsCategory, 0L).compareTo(0L) > 0) {
+                return ExecutedResult.failed("该隐患分类已存在检查表，请添加其他分类");
+            }
+        }
         // 转换po
         DangerCheckFormPO item = CopierUtil.mapTo(request, DangerCheckFormPO.class);
         // 检查频率

secure-producting-vue/src/api/form/DangerCheckForm.js

@@ -34,3 +34,19 @@ export function modify(data) {
     data: data
   })
 }
+
+// 停用[隐患检查表]
+export function stop(id) {
+  return request({
+    url: '/dangerCheckForm/stop/' + id,
+    method: 'post'
+  })
+}
+
+// 启用[隐患检查表]
+export function enable(id) {
+  return request({
+    url: '/dangerCheckForm/enable/' + id,
+    method: 'post'
+  })
+}

secure-producting-vue/src/views/form/DangerCheckForm.vue

@@ -95,22 +95,38 @@
       <el-table-column label="检查表名称" align="center" prop="name" />
       <el-table-column label="隐患分类" align="center" prop="dangerCategoryTxt" />
       <el-table-column label="检查频率" align="center" prop="checkCycleTxt" />
-      <el-table-column label="创建时间" align="center" prop="createTimeView" />
-      <el-table-column label="隐患分类" align="center" prop="dangerCategoryTxt" />
+      <el-table-column label="状态" align="center" prop="statusTxt" />
       <el-table-column label="数据创建人" align="center" prop="createByName" />
-      <el-table-column label="操作" align="center" width="150" fixed="right" class-name="small-padding fixed-width">
+      <el-table-column label="创建时间" align="center" prop="createTimeView" />
+      <el-table-column label="最后更新时间" align="center" prop="updateTimeView" />
+      <el-table-column label="操作" align="center" width="300" fixed="right" class-name="small-padding fixed-width">
         <template #default="scope">
           <el-button
             link
             type="primary"
+            icon="View"
             @click="handleDetail(scope.row)"
           >详情</el-button>
           <el-button
             link
-            type="primary"
+            type="info"
             icon="Edit"
             @click="handleUpdate(scope.row)"
           >修改</el-button>
+          <el-button :disabled="scope.row.status === 2"
+            link
+            type="danger"
+            icon="Remove"
+            :loading="disableLoading"
+            @click="handleDisable(scope.row)"
+          >停用</el-button>
+          <el-button :disabled="scope.row.status === 1"
+            link
+            type="success"
+            icon="Refresh"
+            :loading="enableLoading"
+            @click="handleEnable(scope.row)"
+          >启用</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -300,7 +316,7 @@
 <script setup name="DangerCheckForm">
 import { listEnumValue } from "@/api/system/base"
 import { listAllDangerCategory } from "@/api/danger/DangerCategory";
-import { detail, modify, create, search } from "@/api/form/DangerCheckForm";
+import { detail, modify, create, search, stop, enable } from "@/api/form/DangerCheckForm";
 
 const { proxy } = getCurrentInstance();
 
@@ -314,6 +330,9 @@ const dialogOpenCreate = ref(false);
 const modifyLoading = ref(false);
 const dialogOpenModify = ref(false);
 
+const disableLoading = ref(false);
+const enableLoading = ref(false);
+
 const total = ref(0);
 const dateRangeCreateTime = ref([]);
 const ids = ref([]);
@@ -520,14 +539,14 @@ function submitModify() {
       modifyLoading.value = true;
 
       modify(formModify.value)
-        .then((response) => {
-          proxy.$modal.msgSuccess("修改成功");
-          dialogOpenModify.value = false;
-          getList();
-        })
-        .finally(() => {
-          modifyLoading.value = false;
-        });
+      .then((response) => {
+        proxy.$modal.msgSuccess("修改成功");
+        dialogOpenModify.value = false;
+        getList();
+      })
+      .finally(() => {
+        modifyLoading.value = false;
+      });
     }
   });
 }
@@ -561,6 +580,52 @@ function handleRemovePoint(type, item) {
 }
 
 
+/** 停用 */
+function handleDisable(row) {
+  const id = row.id || ids.value[0];
+  proxy.$modal.confirm('确认停用吗？')
+  .then(() => {
+    disableLoading.value = true;
+
+    stop(id)
+    .then((response) => {
+      proxy.$modal.msgSuccess("操作成功");
+      getList();
+    })
+    .finally(() => {
+      disableLoading.value = false;
+    });
+  })
+  .catch((action) => {
+    if (action === 'cancel') {
+    proxy.$modal.msg('取消操作');
+    }
+  });
+}
+/** 启用 */
+function handleEnable(row) {
+  const id = row.id || ids.value[0];
+  proxy.$modal.confirm('确认启用吗？')
+  .then(() => {
+    enableLoading.value = true;
+
+    enable(id)
+    .then((response) => {
+      proxy.$modal.msgSuccess("操作成功");
+      getList();
+    })
+    .finally(() => {
+      enableLoading.value = false;
+    });
+  })
+  .catch((action) => {
+    if (action === 'cancel') {
+    proxy.$modal.msg('取消操作');
+    }
+  });
+}
+
+
 
 /** 获取检查频率下拉框枚举值列表 */
 function getCheckCycleList() {

secure-producting-vue/src/views/grid/GridIndex.vue

@@ -1,132 +1,161 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryRef" :inline="true">
-      <el-form-item label="关键字" prop="keywords">
-        <el-input
-          v-model="queryParams.keywords"
-          placeholder="请输入关键字"
-          clearable
-          style="width: 200px"
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="所属部门" prop="department">
-        <el-tree-select
-          v-model="queryParams.department"
-          :data="deptOptions"
-          :props="{ value: 'id', label: 'label', children: 'children' }"
-          value-key="id"
-          placeholder="请选择所属部门"
-          check-strictly
-        />
-      </el-form-item>
-      <el-form-item label="网格类型" prop="listGridCategory">
-        <el-select
-          v-model="queryParams.listGridCategory"
-          multiple
-          collapse-tags
-          collapse-tags-tooltip
-          placeholder="请选择"
-          style="width: 240px"
-        >
-          <el-option
-            v-for="item in gridCategoryList"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="隐患分类" prop="listDangerCategory">
-        <el-select
-          v-model="queryParams.listDangerCategory"
-          multiple
-          collapse-tags
-          collapse-tags-tooltip
-          placeholder="请选择"
-          style="width: 240px"
-        >
-          <el-option
-            v-for="item in dangerCategoryList"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
+    <el-row>
+      <el-col :span="4">
+        <el-row>
+          <el-button
+            style="margin:0 0 10px 10px;"
+            type="primary"
+            size="small"
+            plain
+            icon="Close"
+            @click="proxy.$refs['treeDepartment'].setCheckedKeys([])"
+          >清空</el-button>
+        </el-row>
+        <el-row>
+          <el-tree
+            ref="treeDepartment"
+            style="max-width: 600px"
+            clearable
+            show-checkbox
+            check-strictly
+            :data="deptOptions"
+            :props="{ value: 'id', label: 'label', children: 'children' }"
+            node-key="id"
+            @node-click="handleNodeClick"
           />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="创建时间">
-        <el-date-picker
-          v-model="dateRangeCreateTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          range-separator="-"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[
-            new Date(2000, 1, 1, 0, 0, 0),
-            new Date(2000, 1, 1, 23, 59, 59),
-          ]"
-        ></el-date-picker>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="search" @click="handleQuery"
-          >搜索</el-button
-        >
-        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="Plus"
-          @click="handleAdd"
-          >新增</el-button
-        >
+        </el-row>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="Edit"
-          :disabled="single"
-          @click="handleUpdate"
-          >修改</el-button
+
+      <el-col :span="20">
+        <el-form :model="queryParams" ref="queryRef" :inline="true">
+          <el-form-item label="关键字" prop="keywords">
+            <el-input
+              v-model="queryParams.keywords"
+              placeholder="请输入关键字"
+              clearable
+              style="width:180px"
+              @keyup.enter="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="网格类型" prop="listGridCategory">
+            <el-select
+              v-model="queryParams.listGridCategory"
+              clearable
+              multiple
+              collapse-tags
+              collapse-tags-tooltip
+              placeholder="请选择"
+              style="width:200px"
+            >
+              <el-option
+                v-for="item in gridCategoryList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="隐患分类" prop="listDangerCategory">
+            <el-select
+              v-model="queryParams.listDangerCategory"
+              clearable
+              multiple
+              collapse-tags
+              collapse-tags-tooltip
+              placeholder="请选择"
+              style="width:200px"
+            >
+              <el-option
+                v-for="item in dangerCategoryList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" icon="search" @click="handleQuery"
+              >搜索</el-button
+            >
+            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+          </el-form-item>
+          <el-collapse>
+          <el-collapse-item name="1">
+            <template #title>
+              <span style="position:absolute;right:45px;">更多条件</span>
+            </template>
+            <el-form-item label="创建时间">
+              <el-date-picker
+                style="width:220px"
+                v-model="dateRangeCreateTime"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                type="daterange"
+                range-separator="-"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                :default-time="[
+                  new Date(2000, 1, 1, 0, 0, 0),
+                  new Date(2000, 1, 1, 23, 59, 59),
+                ]"
+              ></el-date-picker>          
+            </el-form-item>
+          </el-collapse-item>
+          </el-collapse>
+        </el-form>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button
+              type="primary"
+              plain
+              icon="Plus"
+              @click="handleAdd"
+              >新增</el-button
+            >
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="success"
+              plain
+              icon="Edit"
+              :disabled="single"
+              @click="handleUpdate"
+              >修改</el-button
+            >
+          </el-col>
+        </el-row>
+        <el-table
+          :height="500"
+          :data="dataList"
+          @selection-change="handleSelectionChange"
+          @row-dblclick="handleDetail"
         >
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column label="网格名称" align="center" prop="gridName" />
+          <el-table-column label="所属部门" align="center" prop="departmentName" />
+          <el-table-column label="网格类型" align="center" prop="gridCategoryTxt" />
+          <el-table-column label="隐患分类" align="center" prop="dangerCategoryTxt" />
+          <el-table-column label="创建时间" align="center" prop="createTimeView" />
+          <el-table-column label="数据创建人" align="center" prop="createByName" />
+          <el-table-column label="操作" align="center" width="150" fixed="right" class-name="small-padding fixed-width">
+            <template #default="scope">
+              <el-button
+                link
+                type="primary"
+                @click="handleDetail(scope.row)"
+              >详情</el-button>
+              <el-button
+                link
+                type="primary"
+                icon="Edit"
+                @click="handleUpdate(scope.row)"
+              >修改</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
       </el-col>
     </el-row>
-
-    <el-table
-      :data="dataList"
-      @selection-change="handleSelectionChange"
-      @row-dblclick="handleDetail"
-    >
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="网格名称" align="center" prop="gridName" />
-      <el-table-column label="所属部门" align="center" prop="departmentName" />
-      <el-table-column label="网格类型" align="center" prop="gridCategoryTxt" />
-      <el-table-column label="隐患分类" align="center" prop="dangerCategoryTxt" />
-      <el-table-column label="创建时间" align="center" prop="createTimeView" />
-      <el-table-column label="数据创建人" align="center" prop="createByName" />
-      <el-table-column label="操作" align="center" width="150" fixed="right" class-name="small-padding fixed-width">
-        <template #default="scope">
-          <el-button
-            link
-            type="primary"
-            @click="handleDetail(scope.row)"
-          >详情</el-button>
-          <el-button
-            link
-            type="primary"
-            icon="Edit"
-            @click="handleUpdate(scope.row)"
-          >修改</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
+    
     <pagination
       v-show="total > 0"
       :total="total"
@@ -313,6 +342,7 @@ const queryParams = ref({
   keywords: undefined,
   listStatus: undefined,
   createTime: undefined,
+  listDepartment: [],
   listGridCategory: [],
   listDangerCategory: [],
 });
@@ -367,6 +397,7 @@ function getList() {
   ) {
     queryParams.value.createTimeRange = dateRangeCreateTime.value.join(" ~ ");
   }
+  queryParams.value.listDepartment = proxy.$refs['treeDepartment'] ? proxy.$refs['treeDepartment'].getCheckedKeys() : [];
   search(queryParams.value).then((response) => {
     for(let i=0; i<response.data.list.length; i++) {
       let item = response.data.list[i];