From 0989ec1e6b465141f99ed67e40fa2a0b928dce94 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 29 四月 2026 16:54:51 +0800
Subject: [PATCH] feat(production): 新增生产核算和生产工单功能模块 - 添加生产核算控制器、服务接口及实现类 - 实现生产核算分页查询和工人生产工资信息查询功能 - 添加生产工单控制器、服务接口及实现类 - 实现生产工单的增删改查和状态统计功能 - 集成工单流转卡下载和二维码生成功能 - 添加工单相关的数据传输对象和值对象 - 实现工单与用户关联的分配功能 - 完善工单附件图片处理和展示功能

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

diff --git a/src/main/java/com/ruoyi/collaborativeApproval/pojo/RulesRegulationsManagement.java b/src/main/java/com/ruoyi/collaborativeApproval/pojo/RulesRegulationsManagement.java
index 80dc338..f1abf11 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/pojo/RulesRegulationsManagement.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/pojo/RulesRegulationsManagement.java
@@ -3,7 +3,8 @@
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.approve.utils.ListToStringTypeHandler;
-import io.swagger.annotations.ApiModelProperty;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.apache.ibatis.type.JdbcType;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -19,23 +20,26 @@
     /**
      * 鍒跺害缂栧彿
      */
-    @ApiModelProperty("鍒跺害缂栧彿")
+    @Schema(description = "鍒跺害缂栧彿")
+    @Excel(name = "鍒跺害缂栧彿")
     private String regulationNum;
 
     /**
      * 鏍囬
      */
-    @ApiModelProperty("鏍囬")
+    @Schema(description = "鏍囬")
+    @Excel(name = "鏍囬")
     private String title;
     /**
      * 鍒跺害鍒嗙被
      */
-    @ApiModelProperty("鍒跺害鍒嗙被")
+    @Schema(description = "鍒跺害鍒嗙被")
+    @Excel(name = "鍒跺害鍒嗙被", readConverterExp = "finance=璐㈠姟鍒跺害,hr=浜轰簨鍒跺害,safety=瀹夊叏鍒跺害,tech=鎶�鏈埗搴�")
     private String category;
     /**
      * 鍒跺害鍐呭
      */
-    @ApiModelProperty("鍒跺害鍐呭")
+    @Schema(description = "鍒跺害鍐呭")
     private String content;
     /**
      * 鐢熸晥鏃堕棿
@@ -47,28 +51,31 @@
     /**
      * 閫傜敤鑼冨洿
      */
-    @ApiModelProperty("閫傜敤鑼冨洿")
+    @Schema(description = "閫傜敤鑼冨洿")
     @TableField(value = "scope",typeHandler = ListToStringTypeHandler.class,jdbcType = JdbcType.VARCHAR)
     private List<String> scope;
     /**
      * 鏄惁闇�瑕佺‘璁�
      */
-    @ApiModelProperty("鏄惁闇�瑕佺‘璁�")
+    @Schema(description = "鏄惁闇�瑕佺‘璁�")
     private Boolean requireConfirm;
     /**
      * 鐗堟湰
      */
-    @ApiModelProperty("鐗堟湰")
+    @Schema(description = "鐗堟湰")
+    @Excel(name = "鐗堟湰")
     private String version;
     /**
      * 鐘舵��
      */
-    @ApiModelProperty("鐘舵��")
+    @Schema(description = "鐘舵��")
+    @Excel(name = "鐘舵��", readConverterExp = "repealed=宸插簾姝�,active=鐢熸晥涓�")
     private String status;
     /**
      * 宸茶浜烘暟
      */
-    @ApiModelProperty("宸茶浜烘暟")
+    @Schema(description = "宸茶浜烘暟")
+    @Excel(name = "宸茶浜烘暟")
     private Integer readCount;
     /**
      * 鍒涘缓鑰�
@@ -82,6 +89,7 @@
     @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;
     /**
      * 淇敼浜�
@@ -100,4 +108,7 @@
      */
     @TableField(fill = FieldFill.INSERT)
     private Long tenantId;
+
+    @TableField(fill = FieldFill.INSERT)
+    private Long deptId;
 }

--
Gitblit v1.9.3