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/home/dto/ProductionProgressDto.java | 28 ++++++++++++----------------
1 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/ruoyi/home/dto/ProductionProgressDto.java b/src/main/java/com/ruoyi/home/dto/ProductionProgressDto.java
index 99d9e61..852bbf8 100644
--- a/src/main/java/com/ruoyi/home/dto/ProductionProgressDto.java
+++ b/src/main/java/com/ruoyi/home/dto/ProductionProgressDto.java
@@ -1,25 +1,21 @@
package com.ruoyi.home.dto;
-
-import com.ruoyi.production.dto.ProductOrderDto;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
-import java.math.BigDecimal;
import java.util.List;
@Data
-@ApiModel
+@Schema
public class ProductionProgressDto {
- @ApiModelProperty("鎬昏鍗曟暟")
- private Integer totalOrderCount;
+ @Schema(description = "鎬昏鍗曟暟")
+ private Long totalOrderCount;
- @ApiModelProperty("宸插畬鎴愯鍗曟暟")
- private Integer completedOrderCount;
- @ApiModelProperty("鏈畬鎴愯鍗曟暟")
- private Integer uncompletedOrderCount;
- @ApiModelProperty("鎬讳綋瀹屾垚杩涘害")
- private BigDecimal completedProgressCount;
- @ApiModelProperty("璁㈠崟璇︽儏")
- private List<ProductOrderDto> completedOrderDetails;
+ @Schema(description = "宸插畬鎴愯鍗曟暟")
+ private Long completedOrderCount;
+ @Schema(description = "鏈畬鎴愯鍗曟暟")
+ private Long uncompletedOrderCount;
+ @Schema(description = "閮ㄥ垎瀹屾垚璁㈠崟鏁�")
+ private Long partialCompletedOrderCount;
+ @Schema(description = "璁㈠崟璇︽儏")
+ private List<ProductionProgressOrderDto> completedOrderDetails;
}
--
Gitblit v1.9.3