From cdd6551b190b981b807a3b95e9635c559ccc769d Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 19 五月 2025 09:45:07 +0800
Subject: [PATCH] git ch
---
server/service/src/main/java/com/doumee/dao/business/model/Notices.java | 64 +++++++++++++++++++++++++++----
1 files changed, 55 insertions(+), 9 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/Notices.java b/server/service/src/main/java/com/doumee/dao/business/model/Notices.java
index 7719473..c89243d 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/Notices.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/Notices.java
@@ -1,6 +1,9 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.core.model.LoginUserInfo;
+import com.doumee.core.utils.Constants;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -13,7 +16,7 @@
/**
* 绯荤粺娑堟伅淇℃伅琛�
* @author 姹熻箘韫�
- * @date 2024/01/15 15:07
+ * @date 2024/01/16 10:03
*/
@Data
@ApiModel("绯荤粺娑堟伅淇℃伅琛�")
@@ -31,7 +34,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -40,7 +43,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -69,15 +72,20 @@
@ApiModelProperty(value = "鍏宠仈瀵硅薄绫诲瀷")
@ExcelColumn(name="鍏宠仈瀵硅薄绫诲瀷")
- private String objType;
+ private Integer objType;
@ApiModelProperty(value = "鍏宠仈瀵硅薄鍚嶇О")
@ExcelColumn(name="鍏宠仈瀵硅薄鍚嶇О")
private String objName;
- @ApiModelProperty(value = "绫诲瀷 0骞冲彴娑堟伅 1浼佷笟娑堟伅")
- @ExcelColumn(name="绫诲瀷 0骞冲彴娑堟伅 1浼佷笟娑堟伅")
- private String type;
+ @ApiModelProperty(value = "绫诲瀷")
+ @ExcelColumn(name="绫诲瀷")
+ private Integer type;
+
+ @ApiModelProperty(value = "绫诲瀷鎻忚堪")
+ @TableField(exist = false)
+ private String typeDetail;
+
@ApiModelProperty(value = "鍏宠仈鍙傛暟1")
@ExcelColumn(name="鍏宠仈鍙傛暟1")
@@ -107,8 +115,12 @@
@ExcelColumn(name="鍏宠仈浼佷笟缂栫爜(鍏宠仈company锛�")
private Integer companyId;
- @ApiModelProperty(value = "骞冲彴 0骞冲彴娑堟伅 1浼佷笟娑堟伅", example = "1")
- @ExcelColumn(name="骞冲彴 0骞冲彴娑堟伅 1浼佷笟娑堟伅")
+ @ApiModelProperty(value = "鍏宠仈浼佷笟鍚嶇О")
+ @TableField(exist = false)
+ private String companyName;
+
+ @ApiModelProperty(value = "骞冲彴 0骞冲彴娑堟伅 1浼佷笟娑堟伅 2鍟嗘埛娑堟伅", example = "1")
+ @ExcelColumn(name="骞冲彴 0骞冲彴娑堟伅 1浼佷笟娑堟伅 2鍟嗘埛娑堟伅 ")
private Integer palt;
@ApiModelProperty(value = "鐘舵�� 0姝ｅ父 1宸插叧闂� ", example = "1")
@@ -118,5 +130,39 @@
@ApiModelProperty(value = "鏄惁宸茶 0鏈 1宸茶", example = "1")
@ExcelColumn(name="鏄惁宸茶 0鏈 1宸茶")
private Integer readed;
+ @ApiModelProperty(value = "鏌ヨ绫诲瀷 0鎶曚繚 1鍙戠エ 2鐞嗚禂", example = "1")
+ @TableField(exist = false)
+ private Integer queryType;
+
+ public Notices(){
+
+ }
+
+ /**
+ *
+ * @param noticeType 娑堟伅绫诲瀷
+ * @param palt 鏁版嵁骞冲彴 0骞冲彴娑堟伅 1浼佷笟娑堟伅 2鍟嗘埛娑堟伅
+ * @param objId 鍏宠仈瀵硅薄涓婚敭
+ * @param content 鏂规鍚嶇О/鍗曚綅鍚嶇О/寮�绁ㄩ噾棰�/鎶ユ浜�
+ * @param companyId 浼佷笟涓婚敭
+ */
+ public Notices(Constants.NoticeObjectType noticeObjectType,Integer palt, Integer objId, String content, Integer companyId,Constants.NoticeType noticeType){
+ this.createDate = new Date();
+ this.creator = userId ;
+ this.isdeleted = Constants.ZERO ;
+ this.title = noticeObjectType.getName();
+ this.objType = noticeObjectType.getKey();
+ this.objId = objId;
+ this.info = noticeObjectType.getInfo();
+ this.content = content;
+ this.status = Constants.ZERO;
+ this.readed = Constants.ZERO;
+ this.type = noticeType.getStatus();
+ this.companyId = companyId;
+ this.palt = palt ;
+ }
+
+
+
}
--
Gitblit v1.9.3