From 08f1b1f1804a8bd833d42f257908d80e88387b55 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 三月 2025 11:27:47 +0800
Subject: [PATCH] 3.5增加登录验证、修改密码、人员列表调整

---
 flower_city/src/main/java/com/dg/core/db/gen/entity/GuideRepairOrder.java |   73 ++++++++++++++++++++++++++++++++++--
 1 files changed, 69 insertions(+), 4 deletions(-)

diff --git a/flower_city/src/main/java/com/dg/core/db/gen/entity/GuideRepairOrder.java b/flower_city/src/main/java/com/dg/core/db/gen/entity/GuideRepairOrder.java
index e63a547..eabd2c6 100644
--- a/flower_city/src/main/java/com/dg/core/db/gen/entity/GuideRepairOrder.java
+++ b/flower_city/src/main/java/com/dg/core/db/gen/entity/GuideRepairOrder.java
@@ -100,9 +100,9 @@
     private String guideDepartmentId;
 
     /**
-     * 状态(1待分配  2 待办结 3 已办结 4 待评价 5 已取消 6 已超时   7超时未办结  8未解决  9已解决)
+     * 状态(1待分配  2 待办结 3 已办结 4 待评价 5 已取消)
      */
-    @ApiModelProperty("状态(1待分配  2 待办结 3 已办结 4 待评价 5 已取消 6 已超时   7超时未办结  8未解决  9已解决)")
+    @ApiModelProperty("状态(1待分配  2 待办结 3 已办结 4 待评价 5 已取消)")
     private String state;
 
     /**
@@ -136,6 +136,12 @@
     private String detailedAddress;
 
     /**
+     * 提交方式(1 小程序 2.门户网)
+     */
+    @ApiModelProperty("提交方式(1 小程序 2.门户网)")
+    private Integer  submitType;
+
+    /**
      * 创建时间
      */
     @ApiModelProperty("创建时间")
@@ -149,11 +155,14 @@
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime updateTime;
 
-    @TableField(exist = false)
     @ApiModelProperty(name = "images", value = "图片地址(用逗号分隔)")
     private String images;
 
+    @ApiModelProperty(name = "video", value = "视频地址")
+    private String video;
 
+    @ApiModelProperty(name = "isTimeout", value = "是否超时 (1 未超时   2已超时)")
+    private String isTimeout;
 
     @TableField(exist = false)
     @ApiModelProperty(name = "guideRepairOrderList", value = "工单处理进度")
@@ -166,9 +175,65 @@
     @ApiModelProperty(name = "suggest", value = "建议")
     private String suggest;
 
-    @ApiModelProperty(name = "evaluateState", value = "评价状态")
+    @ApiModelProperty(name = "evaluateState", value = "评价状态(1 满意  2不满意)")
     private String evaluateState;
 
+    @ApiModelProperty(name = "serviceState", value = "服务状态(1.已解决 2.未解决)")
+    private  Integer serviceState;
+
+    /**
+     * 超时时间
+     */
+    @ApiModelProperty("超时时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime timeoutTime;
+
+    /**
+     * 是否推送过(1 是 2 否)
+     */
+    @ApiModelProperty("是否推送过(1 是 2 否)")
+    private Integer isPush;
+
+
+    /**
+     * 是否提醒推送过(1 是 2 否)
+     */
+    @ApiModelProperty("是否提醒推送过(1 是 2 否)")
+    private Integer isRemindPush;
+
+    /**
+     * 是否隐藏评论(1 是 2 否)
+     */
+    @ApiModelProperty("是否隐藏评论(1 是 2 否)")
+    private Integer isHideComments;
+
+    @TableField(exist = false)
+    @ApiModelProperty(name = "sumClassifyName", value = "完整分类名称")
+    private String sumClassifyName;
+
+    @TableField(exist = false)
+    @ApiModelProperty(name = "consultUser", value = "咨询人姓名+电话")
+    private String consultUser;
+
+    @TableField(exist = false)
+    @ApiModelProperty(name = "submitUser", value = "提交人姓名+电话")
+    private String submitUser;
+
+    @TableField(exist = false)
+    @ApiModelProperty(name = "guideUser", value = "导办人姓名+电话")
+    private String guideUser;
+
+    @TableField(exist = false)
+    @ApiModelProperty(name = "organizationName", value = "创建部门")
+    private String organizationName;
+
+    @TableField(exist = false)
+    @ApiModelProperty(name = "guideDepartmentName", value = "导办部门")
+    private String guideDepartmentName;
+
+    @TableField(exist = false)
+    @ApiModelProperty(name = "areaName", value = "所属地区名字")
+    private String areaName;
 
     @Override
     public String toString() {

--
Gitblit v1.7.1