From 19d0103e41777e6f687fdb337999a058e48eb790 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期四, 24 四月 2025 09:43:55 +0800
Subject: [PATCH] 钣金按部门统计时间
---
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessShopStat.java | 17 +++++++++--------
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessShopPlanStat.java | 19 +++++++++++++++++--
aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlateProcessShopStatController.java | 21 ++++++++++++---------
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateProcessShopStatServiceImpl.java | 1 -
4 files changed, 38 insertions(+), 20 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlateProcessShopStatController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlateProcessShopStatController.java
index 687fc25..d92e252 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlateProcessShopStatController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlateProcessShopStatController.java
@@ -9,6 +9,8 @@
import com.aps.common.security.annotation.RequiresPermissions;
import com.aps.core.domain.ApsPlateProcessShopStat;
import com.aps.core.service.IApsPlateProcessShopStatService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -22,9 +24,9 @@
* @date 2025-04-23
*/
-
+@Tag(name = "閽ｉ噾璁″垝澶ц〃", description = "閽ｉ噾璁″垝澶ц〃鎺ュ彛")
@RestController
-@RequestMapping("/ApsPlateProcessShopStat")
+@RequestMapping("/plateProcessShopStat")
public class ApsPlateProcessShopStatController extends BaseController
{
@Autowired
@@ -34,8 +36,8 @@
/**
* 瀵煎嚭閽ｉ噾杞﹂棿缁熻鍒楄〃
*/
-
- @RequiresPermissions("ApsPlateProcessShopStat:ApsPlateProcessShopStat:export")
+ @Operation(summary = "閽ｉ噾璁″垝澶ц〃", description = "瀵煎嚭鍔熻兘")
+ @RequiresPermissions("plateProcessShopStat:export")
@Log(title = "閽ｉ噾杞﹂棿缁熻", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, ApsPlateProcessShopStat apsPlateProcessShopStat)
@@ -50,10 +52,11 @@
* 淇敼閽ｉ噾杞﹂棿缁熻
*/
-
+ @Operation(summary = "閽ｉ噾璁″垝澶ц〃", description = "鏇存柊缁熻鏁版嵁")
@Log(title = "閽ｉ噾杞﹂棿缁熻", businessType = BusinessType.UPDATE)
+ @RequiresPermissions("plateProcessShopStat:update")
@PostMapping("/update")
- public AjaxResult update(@RequestBody ApsPlateProcessShopStat apsPlateProcessShopStat)
+ public AjaxResult update()
{
apsPlateProcessShopStatService.saveShopStat();
return toAjax(true);
@@ -62,10 +65,10 @@
/**
* 鏌ヨ閽ｉ噾杞﹂棿缁熻鍒楄〃
*/
-
-
+ @RequiresPermissions("plateProcessShopStat:list")
+ @Operation(summary = "閽ｉ噾璁″垝澶ц〃", description = "鑾峰彇缁熻鏁版嵁")
@GetMapping("/list")
- public AjaxResult list(ApsPlateProcessShopStat apsPlateProcessShopStat)
+ public AjaxResult list()
{
return apsPlateProcessShopStatService.getShopPlanStat();
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessShopPlanStat.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessShopPlanStat.java
index dbf0d80..b8a3b62 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessShopPlanStat.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessShopPlanStat.java
@@ -2,6 +2,7 @@
import com.aps.common.core.annotation.Excel;
import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serial;
@@ -12,56 +13,70 @@
import java.util.List;
@Data
+@Schema(description = "閽ｉ噾缁熻澶ц〃")
public class ApsPlateProcessShopPlanStat implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
+
/** 涓婚敭id */
+ @Schema(description = "涓婚敭id", type = "String")
private String id;
/** 涓讳欢鏂欏彿 */
+ @Schema(description = "涓讳欢鏂欏彿", type = "String")
@Excel(name = "涓讳欢鏂欏彿")
private String mainPartNumber;
/** 涓氬姟绫诲瀷 */
+ @Schema(description = "涓氬姟绫诲瀷", type = "String")
@Excel(name = "涓氬姟绫诲瀷")
private String businessType;
/** 鍗曟嵁鍙� */
+ @Schema(description = "鍗曟嵁鍙�", type = "String")
@Excel(name = "鍗曟嵁鍙�")
private String documentNumber;
/** 闇�姹傚垎绫� */
+ @Schema(description = "闇�姹傚垎绫�", type = "String")
@Excel(name = "闇�姹傚垎绫�")
private String requirementType;
/** 鍗曟嵁鐘舵�� */
+ @Schema(description = "鍗曟嵁鐘舵��", type = "String")
@Excel(name = "鍗曟嵁鐘舵��")
private String documentStatus;
/** 褰撳墠宸ュ簭 */
+ @Schema(description = "褰撳墠宸ュ簭", type = "String")
@Excel(name = "褰撳墠宸ュ簭")
private String workCenter;
/** 鏂欏彿 */
@Excel(name = "鏂欏彿")
+ @Schema(description = "鏂欏彿", type = "String")
private String itemNumber;
/** 鍥惧彿 */
+ @Schema(description = "鍥惧彿", type = "String")
@Excel(name = "鍥惧彿")
private String drawingNo;
/** 鐗堟湰鍙� */
+ @Schema(description = "鐗堟湰鍙�", type = "String")
@Excel(name = "鐗堟湰鍙�")
private String versionNumber;
/** 鐢熶骇鏁伴噺 */
+ @Schema(description = "鐢熶骇鏁伴噺", type = "String")
@Excel(name = "鐢熶骇鏁伴噺")
private BigDecimal productionQuantity;
/** 璁″垝瀹屽伐鏃� */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "璁″垝瀹屽伐鏃�", width = 30, dateFormat = "yyyy-MM-dd")
+ @Schema(description = "璁″垝瀹屽伐鏃�", type = "String")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "璁″垝瀹屽伐鏃�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date planEndDay;
private List<ApsPlateProcessShopStat> deptPlans=new ArrayList<>();
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessShopStat.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessShopStat.java
index 7ce2638..3347d05 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessShopStat.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessShopStat.java
@@ -1,5 +1,6 @@
package com.aps.core.domain;
+import io.swagger.v3.oas.annotations.media.Schema;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.aps.common.core.annotation.Excel;
@@ -13,42 +14,42 @@
* @author zhl
* @date 2025-04-23
*/
-//@ApiModel("閽ｉ噾杞﹂棿缁熻瀹炰綋绫�")
+@Schema(description = "閽ｉ噾杞﹂棿缁熻瀵硅薄")
public class ApsPlateProcessShopStat extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** $column.columnComment */
- //@ApiModelProperty("$column.columnComment")
+ @Schema(description = "涓婚敭id", type = "Long")
private Long id;
/** 鍗曟嵁鍙� */
@Excel(name = "鍗曟嵁鍙�")
- ///@ApiModelProperty("鍗曟嵁鍙�")
+ @Schema(description = "鍗曟嵁鍙�", type = "String")
private String docNo;
/** 杞﹂棿缂栫爜 */
@Excel(name = "杞﹂棿缂栫爜")
- //@ApiModelProperty("杞﹂棿缂栫爜")
+ @Schema(description = "杞﹂棿缂栫爜", type = "String")
private String shopCode;
/** 杞﹂棿鍚嶇О */
@Excel(name = "杞﹂棿鍚嶇О")
- //@ApiModelProperty("杞﹂棿鍚嶇О")
+ @Schema(description = "杞﹂棿鍚嶇О", type = "String")
private String shopName;
/** 璁″垝寮�濮嬫椂闂� */
@Excel(name = "璁″垝寮�濮嬫椂闂�")
- //@ApiModelProperty("璁″垝寮�濮嬫椂闂�")
+ @Schema(description = "璁″垝寮�濮嬫椂闂�", type = "String")
private String planStartDate;
/** 璁″垝缁撴潫鏃ユ湡 */
@Excel(name = "璁″垝缁撴潫鏃ユ湡")
- //@ApiModelProperty("璁″垝缁撴潫鏃ユ湡")
+ @Schema(description = "璁″垝缁撴潫鏃ユ湡", type = "String")
private String planEndDate;
/** 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛� */
- //@ApiModelProperty("鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛�")
+ @Schema(description = "鍒犻櫎鏍囧織", type = "String")
private String delFlag;
public void setId(Long id)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateProcessShopStatServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateProcessShopStatServiceImpl.java
index ddf4c6d..a46d13c 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateProcessShopStatServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateProcessShopStatServiceImpl.java
@@ -273,7 +273,6 @@
return shopPlanStat;
})
.toList();
-
// 鏋勫缓杩斿洖缁撴灉
AjaxResult success = AjaxResult.success(shopPlanStats);
success.put("shopNames", shopList);
--
Gitblit v1.9.3