From 256f758a45c9b00a9248b02345ee1d6f52869e08 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 05 十一月 2025 09:36:58 +0800
Subject: [PATCH] yys 1.导出接口开发 2.营销管理-回款登记-回款状态（回款完成，未完成） 3.采购管理-付款登记-加一个付款进度 4.采购管理-付款流水-采购合同号筛选 5.仓储物流-所有-查询条件加一个日期 6.仓储物流-入库管理-加一个库存预警数量字段 7.生产管控-生产订单-加一个订单状态-已完成、未完成 8.协同办公-通知公告-加一个时间限制，过时后状态改为已过期

---
 src/main/java/com/ruoyi/collaborativeApproval/pojo/RulesRegulationsManagement.java |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/collaborativeApproval/pojo/RulesRegulationsManagement.java b/src/main/java/com/ruoyi/collaborativeApproval/pojo/RulesRegulationsManagement.java
index 6f5ea51..cc32e10 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/pojo/RulesRegulationsManagement.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/pojo/RulesRegulationsManagement.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.approve.utils.ListToStringTypeHandler;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.apache.ibatis.type.JdbcType;
@@ -20,17 +21,20 @@
      * 鍒跺害缂栧彿
      */
     @ApiModelProperty("鍒跺害缂栧彿")
+    @Excel(name = "鍒跺害缂栧彿")
     private String regulationNum;
 
     /**
      * 鏍囬
      */
     @ApiModelProperty("鏍囬")
+    @Excel(name = "鏍囬")
     private String title;
     /**
      * 鍒跺害鍒嗙被
      */
     @ApiModelProperty("鍒跺害鍒嗙被")
+    @Excel(name = "鍒跺害鍒嗙被", readConverterExp = "finance=璐㈠姟鍒跺害,hr=浜轰簨鍒跺害,safety=瀹夊叏鍒跺害,tech=鎶�鏈埗搴�")
     private String category;
     /**
      * 鍒跺害鍐呭
@@ -59,16 +63,19 @@
      * 鐗堟湰
      */
     @ApiModelProperty("鐗堟湰")
+    @Excel(name = "鐗堟湰")
     private String version;
     /**
      * 鐘舵��
      */
     @ApiModelProperty("鐘舵��")
+    @Excel(name = "鐘舵��", readConverterExp = "repealed=宸插簾姝�,active=鐢熸晥涓�")
     private String status;
     /**
      * 宸茶浜烘暟
      */
     @ApiModelProperty("宸茶浜烘暟")
+    @Excel(name = "宸茶浜烘暟")
     private Integer readCount;
     /**
      * 鍒涘缓鑰�
@@ -80,6 +87,9 @@
      * 鍒涘缓鏃堕棿
      */
     @TableField(fill = FieldFill.INSERT)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "鍒涘缓鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;
     /**
      * 淇敼浜�
@@ -90,6 +100,8 @@
      * 淇敼鏃堕棿
      */
     @TableField(fill = FieldFill.INSERT_UPDATE)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime updateTime;
     /**
      * 绉熸埛ID

--
Gitblit v1.9.3