From cb13c23829768b94ab980635a4f1ce5e48457be4 Mon Sep 17 00:00:00 2001 From: ZQN <364596817@qq.com> Date: 星期二, 25 六月 2024 16:53:56 +0800 Subject: [PATCH] 用户类型修改 --- project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceOrderQueryBo.java | 81 +++++++++++++++++++++++++++------------- 1 files changed, 55 insertions(+), 26 deletions(-) diff --git a/project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceOrderQueryBo.java b/project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceOrderQueryBo.java index 3acd37a..b86c265 100644 --- a/project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceOrderQueryBo.java +++ b/project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceOrderQueryBo.java @@ -1,5 +1,6 @@ package com.project.enforce.domain.bo.queryBo; +import com.fasterxml.jackson.annotation.JsonFormat; import com.project.common.core.domain.BaseQuery; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -8,7 +9,7 @@ import java.math.BigDecimal; import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; +import java.util.List; /** * 鎵ф硶鍗曞垎椤垫煡璇㈠璞� enforce_order @@ -61,30 +62,46 @@ /** 鎵�灞炲尯鍩� */ @ApiModelProperty("鎵�灞炲尯鍩�") private String regionName; - /** 鎵ф硶鍘熷洜 */ - @ApiModelProperty("鎵ф硶鍘熷洜") + + @ApiModelProperty("鎵ф硶鍐呭") + private String enforceContent; + + + @ApiModelProperty("鎵ф硶涓婚") private String enforceReason; + + @ApiModelProperty("鎵ф硶绫诲瀷") + private String enforceType; + /** 鐢宠浜篿d */ @ApiModelProperty("鐢宠浜篿d") private Long applyId; /** 鐢宠浜� */ @ApiModelProperty("鐢宠浜�") - private Long applyUser; + private String applyUser; /** 鐢宠浜虹數璇� */ @ApiModelProperty("鐢宠浜虹數璇�") - private Long applyPhone; + private String applyPhone; /** 鐢宠浜哄崟浣� */ @ApiModelProperty("鐢宠浜哄崟浣�") private Long applyDeptId; /** 鐢宠浜哄崟浣� */ @ApiModelProperty("鐢宠浜哄崟浣�") - private Long applyDeptName; + private String applyDeptName; /** 鐢宠鏃堕棿 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("鐢宠鏃堕棿") private Date applyTime; - /** 鎵ф硶闃熷憳鏁伴噺 */ - @ApiModelProperty("鎵ф硶闃熷憳鏁伴噺") + + @ApiModelProperty("璁″垝鎵ф硶鏃堕棿") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date planTime; + + @ApiModelProperty("鎵爜鍏ュ満鏃堕棿") + private Date inTime; + + /** 鎵ф硶闃熷憳浜烘暟 */ + @ApiModelProperty("鎵ф硶闃熷憳浜烘暟") private Integer userNum; /** 棰勮鐘舵�侊細0姝e父锛�1棰勮 */ @ApiModelProperty("棰勮鐘舵�侊細0姝e父锛�1棰勮") @@ -93,48 +110,42 @@ @ApiModelProperty("棰勮鍘熷洜") private String warnReason; /** 璁㈠崟鐘舵�侊細-1鎾ゅ洖锛�0寰呮彁浜わ紝1宸叉彁浜わ紝2寰呮墽琛岋紝3宸叉墽琛岋紝4宸茶瘎浠� */ - @ApiModelProperty("璁㈠崟鐘舵�侊細-1鎾ゅ洖锛�0寰呮彁浜わ紝1宸叉彁浜わ紝2寰呮墽琛岋紝3宸叉墽琛岋紝4宸茶瘎浠�") + @ApiModelProperty("璁㈠崟鐘舵�侊細-1鎷掔粷锛�0寰呮彁浜わ紝1宸叉彁浜わ紝2宸插鎵瑰緟鎵ц锛�3宸叉墽琛屽緟涓婃姤锛�4宸蹭笂鎶�") private Integer orderStatus; - /** 瀹℃壒浜篿d */ - @ApiModelProperty("瀹℃壒浜篿d") - private Long checkId; - /** 瀹℃壒浜� */ - @ApiModelProperty("瀹℃壒浜�") - private Long checkUser; - /** 瀹℃壒浜虹數璇� */ - @ApiModelProperty("瀹℃壒浜虹數璇�") - private Long checkPhone; /** 瀹℃壒浜哄崟浣� */ @ApiModelProperty("瀹℃壒浜哄崟浣�") private Long checkDeptId; /** 瀹℃壒浜哄崟浣� */ @ApiModelProperty("瀹℃壒浜哄崟浣�") - private Long checkDeptName; - /** 瀹℃壒鏃堕棿 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @ApiModelProperty("瀹℃壒鏃堕棿") - private Date checkTime; + private String checkDeptName; /** 璁㈠崟鐘舵�侊細-1鎷掔粷锛�0寰呭鎵癸紝1瀹℃壒涓紝2閫氳繃 */ @ApiModelProperty("璁㈠崟鐘舵�侊細-1鎷掔粷锛�0寰呭鎵癸紝1瀹℃壒涓紝2閫氳繃") private Integer checkStatus; /** 瀹℃壒鍘熷洜 */ @ApiModelProperty("瀹℃壒鍘熷洜") private String checkReason; + /** 褰撳墠瀹℃壒灞傜骇: */ + @ApiModelProperty("褰撳墠瀹℃壒灞傜骇:") + private Integer checkLevel; + + @ApiModelProperty("褰撳墠瀹℃壒浜篿ds") + private String checkIds; + /** 鎵ц浜篿d */ @ApiModelProperty("鎵ц浜篿d") private Long executeId; /** 鎵ц浜� */ @ApiModelProperty("鎵ц浜�") - private Long executeUser; + private String executeUser; /** 鎵ц浜虹數璇� */ @ApiModelProperty("鎵ц浜虹數璇�") - private Long executePhone; + private String executePhone; /** 鎵ц浜哄崟浣� */ @ApiModelProperty("鎵ц浜哄崟浣�") private Long executeDeptId; /** 鎵ц浜哄崟浣� */ @ApiModelProperty("鎵ц浜哄崟浣�") - private Long executeDeptName; + private String executeDeptName; /** 鎵ц鏃堕棿 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("鎵ц鏃堕棿") @@ -164,4 +175,22 @@ @ApiModelProperty("璇勪环鎬诲緱鍒�") private BigDecimal totalScore; + /** 鏄惁鎶曡瘔锛�0鍚︼紝1鏄� */ + @ApiModelProperty("鏄惁鎶曡瘔锛�0鍚︼紝1鏄�") + private Integer isComplaint; + + /** 鎶曡瘔鍐呭 */ + @ApiModelProperty("鎶曡瘔鍐呭") + private String complaintReason; + + /** 鎶曡瘔绫诲瀷 */ + @ApiModelProperty("鎶曡瘔绫诲瀷") + private String complaintType; + + @ApiModelProperty("鐢宠閮ㄩ棬ids") + private List<Long> applyDeptIds; + + + + } -- Gitblit v1.9.1