From f2f8241dd52ef12ec109f6f4f0f13042055338ac Mon Sep 17 00:00:00 2001 From: lyh <925863403@qq.com> Date: 星期五, 14 二月 2025 14:55:56 +0800 Subject: [PATCH] 修改指派设备 修改设备结构树权限 优化查询 优化排序 --- lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/request/DocInfoQueryRequest.java | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/request/DocInfoQueryRequest.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/request/DocInfoQueryRequest.java index 5040b66..a574652 100644 --- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/request/DocInfoQueryRequest.java +++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/request/DocInfoQueryRequest.java @@ -1,9 +1,11 @@ package org.jeecg.modules.dnc.request; +import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.NoArgsConstructor; +import org.jeecg.common.aspect.annotation.Dict; @Data @NoArgsConstructor @@ -15,15 +17,21 @@ private String attributionId; @ApiModelProperty(value = "鏂囨。鍒嗙被 NC=NC鏂囨。 OTHER=鍏朵粬鏂囨。 SEND=璁惧鍙戦�佹枃妗� REC=璁惧鎺ュ彈鏂囨。", example = "NC", required = true) private String docClassCode; - //鎺掑簭瀛楁 - @ApiModelProperty(value = "闄嶅簭鎺掑垪 鎺掑簭瀛楁涓烘暟鎹簱鍏蜂綋瀛楁鍚嶏紝闇�瑕佽В鏋愶紱 澶氫釜瀛楁浠ヨ嫳鏂囬�楀彿鍒嗛殧") - private String descStr; - @ApiModelProperty(value = "鍗囧簭鎺掑垪 鎺掑簭瀛楁涓烘暟鎹簱鍏蜂綋瀛楁鍚嶏紝闇�瑕佽В鏋愶紱 澶氫釜瀛楁浠ヨ嫳鏂囬�楀彿鍒嗛殧") - private String ascStr; @ApiModelProperty(value = "NC鏂囦欢鍚嶇О") private String docName; @ApiModelProperty(value = "涓婁紶鏃堕棿寮�濮�") private String startTime; @ApiModelProperty(value = "涓婁紶鏃堕棿缁撴潫") private String endTime; + //鎺掑簭瀛楁 + @ApiModelProperty(value = "鎺掑簭瀛楁") + private String column; + @ApiModelProperty(value = "鎺掑簭") + private String order; + @ApiModelProperty(value = "鏂囨。鐘舵��") + private String docStatus; + @ApiModelProperty(value = "鍑哄簱鐘舵��") + private String pullStatus; + @ApiModelProperty(value = "鍚屾鐘舵�� 1 鏈悓姝� 2 宸插悓姝�") + private Integer syncStatus; } -- Gitblit v1.9.3