From 9ab109b9ee96e7ff2bf2b935a044aee5842a3ddc Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期日, 28 九月 2025 10:08:09 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Category.java | 59 +++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 43 insertions(+), 16 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Category.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Category.java
index a66a19d..1710745 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Category.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Category.java
@@ -1,15 +1,17 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
+
import java.util.Date;
+import java.util.List;
/**
* 鍒嗙被淇℃伅琛�
@@ -23,55 +25,80 @@
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭")
- @ExcelColumn(name="涓婚敭")
+ //@ExcelColumn(name="涓婚敭")
private Integer id;
@ApiModelProperty(value = "鍒涘缓浜虹紪鐮�")
- @ExcelColumn(name="鍒涘缓浜虹紪鐮�")
+ //@ExcelColumn(name="鍒涘缓浜虹紪鐮�")
private Integer creator;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @ExcelColumn(name="鍒涘缓鏃堕棿")
+ //@ExcelColumn(name="鍒涘缓鏃堕棿")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�")
- @ExcelColumn(name="鏇存柊浜虹紪鐮�")
+ //@ExcelColumn(name="鏇存柊浜虹紪鐮�")
private Integer editor;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
- @ExcelColumn(name="鏇存柊鏃堕棿")
+ //@ExcelColumn(name="鏇存柊鏃堕棿")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�")
- @ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
+ //@ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
private Integer isdeleted;
@ApiModelProperty(value = "鍚嶇О")
- @ExcelColumn(name="鍚嶇О")
+ @ExcelColumn(name="浜岀骇鍒嗙被鍚嶇О",index = 2,width = 12)
private String name;
@ApiModelProperty(value = "澶囨敞")
- @ExcelColumn(name="澶囨敞")
+ //@ExcelColumn(name="澶囨敞")
private String remark;
@ApiModelProperty(value = "鐘舵�� 0鍚敤 1绂佺敤")
- @ExcelColumn(name="鐘舵�� 0鍚敤 1绂佺敤")
+ //@ExcelColumn(name="鐘舵�� 0鍚敤 1绂佺敤")
private Integer status;
@ApiModelProperty(value = "鎺掑簭鐮�")
- @ExcelColumn(name="鎺掑簭鐮�")
+ //@ExcelColumn(name="鎺掑簭鐮�")
private Integer sortnum;
@ApiModelProperty(value = "鍥炬爣")
- @ExcelColumn(name="鍥炬爣")
+ //@ExcelColumn(name="鍥炬爣")
private String imgurl;
- @ApiModelProperty(value = "绫诲瀷 0鍏徃绫诲瀷")
- @ExcelColumn(name="绫诲瀷 0鍏徃绫诲瀷")
+ @ApiModelProperty(value = "绫诲瀷 0鍏徃绫诲瀷 1杞﹁締绫诲瀷 2璧勬枡鍒嗙被 3閽ュ寵鏌滅粓绔箍鍛� 4浜ゆ帶涓荤嚎璺�")
+ //@ExcelColumn(name="绫诲瀷 0鍏徃绫诲瀷 1杞﹁締绫诲瀷")
private Integer type;
+ @ApiModelProperty(value = "涓氬姟绫诲瀷 " +
+ "0=璁垮杞﹁締-璁垮杞﹁締 ;" +
+ "1=wms鎺ㄩ�佺殑鐗╂祦杞﹁締锛堥潪鑷湁杞︼級锛氳揣杩愯溅杈�-澶栧崗杩愯緭杞﹁締 ;" +
+ "2=甯傚叕鍙哥殑棰勭害鍏ュ洯杞﹁締锛氳揣杩愯溅杈�-甯傚叕鍙稿嵏璐ц溅杈�;" +
+ "3=瀹夋嘲鐨勯绾﹀叆鍥溅杈嗭細璐ц繍杞﹁締-鍔犲伐鐑熷嵏璐ц溅杈� ;" +
+ "4=瀹夋嘲鍏姟杞︼細鍏姟杞�-瀹夋嘲鐗╂祦鍏姟鐢ㄨ溅;" +
+ "5=瀹夋嘲鑷湁杞︼細璐ц繍杞﹁締-瀹夋嘲鐗╂祦璐ц繍杞﹁締 ")
+ @ExcelColumn(name="涓氬姟绫诲瀷",index = 4,width = 16,valueMapping = "0=璁垮杞﹁締;1=澶栧崗杩愯緭杞﹁締;2=甯傚叕鍙稿嵏璐ц溅杈�;3=鍔犲伐鐑熷嵏璐ц溅杈�;4=瀹夋嘲鐗╂祦鍏姟鐢ㄨ溅;5=瀹夋嘲鐗╂祦璐ц繍杞﹁締;6=鏈煡杞﹁締;")
+ private Integer bizType;
@ApiModelProperty(value = "鐖剁骇缂栫爜锛堣嚜鍏宠仈锛�")
- @ExcelColumn(name="鐖剁骇缂栫爜锛堣嚜鍏宠仈锛�")
+ //@ExcelColumn(name="鐖剁骇缂栫爜锛堣嚜鍏宠仈锛�")
private Integer parentId;
+ @ApiModelProperty(value = "鐖剁骇鍚嶇О ")
+ @TableField(exist = false)
+ @ExcelColumn(name="涓�绾у垎绫诲悕绉�",index = 1,width = 12)
+ private String parentName;
+ @ApiModelProperty(value = "缁勫悎鍚嶇О ")
+ @TableField(exist = false)
+ @ExcelColumn(name="缁勫悎鍚嶇О",index = 3,width = 20)
+ private String groupName;
+ @ApiModelProperty(value = "瀹屾暣鍥剧墖鍦板潃 ")
+ @TableField(exist = false)
+ private String imgurlFull;
+
+ @ApiModelProperty(value = "瀛愰泦鍒嗙被")
+ @TableField(exist = false)
+ private List<Category> childCategoryList;
+
}
--
Gitblit v1.9.3