From 6acee0d1d79a05f7a3a3c386e9df02e9a741f544 Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期五, 21 六月 2024 17:21:16 +0800
Subject: [PATCH] 执法单节点添加，审批修改
---
project-enforce/src/main/java/com/project/enforce/domain/EnforceOrder.java | 88 ++++++++++++++++++++++++++-----------------
1 files changed, 53 insertions(+), 35 deletions(-)
diff --git a/project-enforce/src/main/java/com/project/enforce/domain/EnforceOrder.java b/project-enforce/src/main/java/com/project/enforce/domain/EnforceOrder.java
index 01209fc..b867b25 100644
--- a/project-enforce/src/main/java/com/project/enforce/domain/EnforceOrder.java
+++ b/project-enforce/src/main/java/com/project/enforce/domain/EnforceOrder.java
@@ -1,16 +1,16 @@
package com.project.enforce.domain;
-import com.baomidou.mybatisplus.annotation.*;
-import com.project.common.core.domain.BaseDomain;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+import java.util.Date;
/**
* 鎵ф硶鍗曞璞� enforce_order
*
@@ -21,7 +21,7 @@
@Accessors(chain = true)
@TableName("enforce_order")
@ApiModel("鎵ф硶鍗曞疄浣撳璞�")
-public class EnforceOrder extends BaseDomain {
+public class EnforceOrder {
private static final long serialVersionUID=1L;
@@ -70,17 +70,20 @@
@ApiModelProperty("鎵ф硶鍘熷洜")
private String enforceReason;
+ @ApiModelProperty("鎵ф硶绫诲瀷")
+ private String enforceType;
+
@ApiModelProperty("鐢宠浜篿d")
private Long applyId;
@ApiModelProperty("鐢宠浜�")
- private Long applyUser;
+ private String applyUser;
@ApiModelProperty("鐢宠浜虹數璇�")
- private Long applyPhone;
+ private String applyPhone;
@ApiModelProperty("鐢宠浜哄崟浣�")
@@ -88,14 +91,22 @@
@ApiModelProperty("鐢宠浜哄崟浣�")
- private Long applyDeptName;
+ private String applyDeptName;
@ApiModelProperty("鐢宠鏃堕棿")
private Date applyTime;
- @ApiModelProperty("鎵ф硶闃熷憳鏁伴噺")
+ @ApiModelProperty("璁″垝鎵ф硶鏃堕棿")
+ private Date planTime;
+
+ @ApiModelProperty("鎵爜鍏ュ満鏃堕棿")
+ private Date inTime;
+
+
+ @ApiModelProperty("鎵ф硶闃熷憳浜烘暟")
private Integer userNum;
+
@ApiModelProperty("棰勮鐘舵�侊細0姝ｅ父锛�1棰勮")
private Integer warnStatus;
@@ -105,20 +116,8 @@
private String warnReason;
- @ApiModelProperty("璁㈠崟鐘舵�侊細-1鎾ゅ洖锛�0寰呮彁浜わ紝1宸叉彁浜わ紝2寰呮墽琛岋紝3宸叉墽琛岋紝4宸茶瘎浠�")
+ @ApiModelProperty("璁㈠崟鐘舵�侊細-1鎾ゅ洖锛�0寰呮彁浜わ紝1宸叉彁浜わ紝2宸插鎵瑰緟鎵ц锛�3宸叉墽琛屽緟涓婃姤锛�4宸蹭笂鎶�")
private Integer orderStatus;
-
-
- @ApiModelProperty("瀹℃壒浜篿d")
- private Long checkId;
-
-
- @ApiModelProperty("瀹℃壒浜�")
- private Long checkUser;
-
-
- @ApiModelProperty("瀹℃壒浜虹數璇�")
- private Long checkPhone;
@ApiModelProperty("瀹℃壒浜哄崟浣�")
@@ -126,11 +125,7 @@
@ApiModelProperty("瀹℃壒浜哄崟浣�")
- private Long checkDeptName;
-
-
- @ApiModelProperty("瀹℃壒鏃堕棿")
- private Date checkTime;
+ private String checkDeptName;
@ApiModelProperty("璁㈠崟鐘舵�侊細-1鎷掔粷锛�0寰呭鎵癸紝1瀹℃壒涓紝2閫氳繃")
@@ -141,16 +136,23 @@
private String checkReason;
+ @ApiModelProperty("褰撳墠瀹℃壒灞傜骇:")
+ private Integer checkLevel;
+
+ @ApiModelProperty("褰撳墠瀹℃壒浜篿ds")
+ private String checkIds;
+
+
@ApiModelProperty("鎵ц浜篿d")
private Long executeId;
@ApiModelProperty("鎵ц浜�")
- private Long executeUser;
+ private String executeUser;
@ApiModelProperty("鎵ц浜虹數璇�")
- private Long executePhone;
+ private String executePhone;
@ApiModelProperty("鎵ц浜哄崟浣�")
@@ -158,7 +160,7 @@
@ApiModelProperty("鎵ц浜哄崟浣�")
- private Long executeDeptName;
+ private String executeDeptName;
@ApiModelProperty("鎵ц鏃堕棿")
@@ -196,6 +198,22 @@
@ApiModelProperty("璇勪环鎬诲緱鍒�")
private BigDecimal totalScore;
+ /** 鏄惁鎶曡瘔锛�0鍚︼紝1鏄� */
+ @ApiModelProperty("鏄惁鎶曡瘔锛�0鍚︼紝1鏄�")
+ private Integer isComplaint;
+ /** 鎶曡瘔绫诲瀷 */
+ @ApiModelProperty("鎶曡瘔绫诲瀷")
+ private String complaintType;
+
+ /** 鎶曡瘔鍐呭 */
+ @ApiModelProperty("鎶曡瘔鍐呭")
+ private String complaintReason;
+
+ /**
+ * 閫昏緫鍒犻櫎鐘舵��
+ */
+ @TableLogic(value = "0",delval = "1")
+ private Integer delFlag;
}
--
Gitblit v1.9.1