From 904c01bdbdae05d2756c15e5fde69b8f2b52d84e Mon Sep 17 00:00:00 2001
From: my_ong <429426262@qq.com>
Date: Sat, 8 Mar 2025 21:34:29 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20=E5=87=BA=E5=85=A5=E5=BA=93=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/material/ApplyFormController.java   |  6 ++++--
 .../tech/riemann/ims/dto/response/ApplyDTO.java  | 16 ++++++++++++++++
 src/main/resources/mapper/ApplyFormMapper.xml    |  3 +++
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/main/java/tech/riemann/ims/controller/platform/material/ApplyFormController.java b/src/main/java/tech/riemann/ims/controller/platform/material/ApplyFormController.java
index 1ddec1f..ce876dd 100644
--- a/src/main/java/tech/riemann/ims/controller/platform/material/ApplyFormController.java
+++ b/src/main/java/tech/riemann/ims/controller/platform/material/ApplyFormController.java
@@ -44,7 +44,7 @@ public class ApplyFormController {
     private final IMaterialService materialService;
     private final IStocktakingScanDetailService stocktakingScanDetailService;
     private final IStocktakingScanExceptionalDataService stocktakingScanExceptionalDataService;
-
+    private final ITypeService typeService;
 
     @GetMapping("applies")
     @Operation(summary = "分页查询申请列表")
@@ -55,7 +55,9 @@ public class ApplyFormController {
             @Parameter(description = "物料类型") @RequestParam(name = "type", required = false) String type,
             @Parameter(description = "物料编码") @RequestParam(name = "code", required = false) String code,
             @Parameter(description = "物料名称") @RequestParam(name = "name", required = false) String name) {
-        return applyFormService.search(page, size, applyType, type, code, name);
+        IPage<ApplyDTO> result = applyFormService.search(page, size, applyType, type, code, name);
+        result.getRecords().forEach(item -> item.setTypeName(typeService.getTypeName(item.getType())));
+        return result;
     }
 
     @GetMapping("audit-applies")
diff --git a/src/main/java/tech/riemann/ims/dto/response/ApplyDTO.java b/src/main/java/tech/riemann/ims/dto/response/ApplyDTO.java
index 3722228..d8600bd 100644
--- a/src/main/java/tech/riemann/ims/dto/response/ApplyDTO.java
+++ b/src/main/java/tech/riemann/ims/dto/response/ApplyDTO.java
@@ -1,10 +1,13 @@
 package tech.riemann.ims.dto.response;
 
+import club.zhcs.lina.utils.enums.Codebook;
+import com.fasterxml.jackson.annotation.JsonGetter;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.nutz.json.JsonField;
 import tech.riemann.ims.enums.ApplyTypeEnum;
 
 /**
@@ -29,6 +32,9 @@ public class ApplyDTO {
     @Schema(description = "物料类型")
     private String type;
 
+    @Schema(description = "类型名称")
+    private String typeName;
+
     @Schema(description = "物料规格")
     private String spec;
 
@@ -47,4 +53,14 @@ public class ApplyDTO {
     @Schema(description = "备注")
     private String remark;
 
+
+    @JsonGetter
+    @JsonField
+    public Codebook getApplyTypeInfo() {
+        return applyType == null ? null : applyType.build();
+    }
+
+    public void setApplyTypeInfo(Codebook areaUnitInfo) {
+
+    }
 }
diff --git a/src/main/resources/mapper/ApplyFormMapper.xml b/src/main/resources/mapper/ApplyFormMapper.xml
index 0cafd3a..ef1778f 100644
--- a/src/main/resources/mapper/ApplyFormMapper.xml
+++ b/src/main/resources/mapper/ApplyFormMapper.xml
@@ -37,6 +37,9 @@
                 <when test="applyType == '1'">
                     and f.af_type in ('1', '2')
                 </when>
+                <when test="applyType == '3'">
+                    and f.af_type in ('3', '5')
+                </when>
                 <otherwise>
                     and f.af_type = #{applyType}
                 </otherwise>