From 9e91b0bbc3cc7784359bb9b90c0c866a84dcbc3c Mon Sep 17 00:00:00 2001
From: maxiangong <298222784@qq.com>
Date: Thu, 28 May 2026 11:40:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E6=96=87=E4=BB=B6=E7=BB=B4?=
 =?UTF-8?q?=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../springblade/desk/quality/pojo/vo/AuditFileVO.java |  3 +++
 .../desk/quality/controller/AuditFileController.java  |  4 ++--
 .../desk/quality/mapper/AuditFileMapper.java          |  2 +-
 .../desk/quality/mapper/AuditFileMapper.xml           | 11 +++++++++--
 .../desk/quality/service/IAuditFileService.java       |  2 +-
 .../quality/service/impl/AuditFileServiceImpl.java    |  2 +-
 6 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/AuditFileVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/AuditFileVO.java
index 69b442872..2203825d0 100644
--- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/AuditFileVO.java
+++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/AuditFileVO.java
@@ -25,4 +25,7 @@ public class AuditFileVO extends AuditFile {
 
     @Schema(description = "base")
     private BaseEntityVO base;
+
+    @Schema(description = "工艺能力")
+    private String caName;
 }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/AuditFileController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/AuditFileController.java
index f7f340a54..a5e4c647b 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/AuditFileController.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/AuditFileController.java
@@ -85,8 +85,8 @@ public class AuditFileController extends BladeController {
                                       Query query) {
         // QueryWrapper<AuditFile> qw = Condition.getQueryWrapper(map, AuditFile.class);
         AuditFileSearch search = BeanUtil.toBeanIgnoreError(map, AuditFileSearch.class);
-        IPage<AuditFile> pages = service.listSearch(Condition.getPage(query), search);
-        IPage<AuditFileVO> pagesVO = AuditFileWrapper.build().pageVO(pages);
+        IPage<AuditFileVO> pagesVO = service.listSearch(Condition.getPage(query), search);
+//        IPage<AuditFileVO> pagesVO = AuditFileWrapper.build().pageVO(pages);
         pagesVO.getRecords()
                 .stream()
                 .peek(service::setVOValue)
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/AuditFileMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/AuditFileMapper.java
index 190248582..72905273a 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/AuditFileMapper.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/AuditFileMapper.java
@@ -39,7 +39,7 @@ public interface AuditFileMapper extends BaseMapper<AuditFile> {
 	 */
 	List<AuditFileExcel> exportAuditFile(@Param("ew") Wrapper<AuditFile> queryWrapper);
 
-    List<AuditFile> listSearch(IPage page, @Param("q") AuditFileSearch search);
+    List<AuditFileVO> listSearch(IPage page, @Param("q") AuditFileSearch search);
 
 	AuditFile getByPpsId(Long ppsId);
 
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/AuditFileMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/AuditFileMapper.xml
index 25214b9f5..989123cb6 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/AuditFileMapper.xml
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/AuditFileMapper.xml
@@ -18,6 +18,10 @@
         <result column="CA_ID" property="caId"/>
     </resultMap>
 
+    <resultMap id="auditFileVOResultMap" type="org.springblade.desk.quality.pojo.vo.AuditFileVO" extends="auditFileResultMap">
+        <result column="CA_NAME" property="caName"/>
+    </resultMap>
+
     <select id="selectAuditFilePage" resultMap="auditFileResultMap">
         SELECT *
         FROM QA_AUDIT_FILE
@@ -29,7 +33,7 @@
         FROM QA_AUDIT_FILE ${ew.customSqlSegment}
     </select>
 
-    <select id="listSearch" resultMap="auditFileResultMap">
+    <select id="listSearch" resultMap="auditFileVOResultMap">
         SELECT DISTINCT f.ID,
             f.CREATE_USER,
             f.CREATE_TIME,
@@ -47,8 +51,11 @@
             f.PAPERS,
             f.SORT,
             f.REMARK,
-            f.PROD_APPLY_AREA
+            f.PROD_APPLY_AREA,
+            f.CA_ID,
+            ca.CA_NAME
         FROM QA_AUDIT_FILE f
+        LEFT JOIN BS_CRAFT_ABILITY ca ON f.ca_id = ca.id
         LEFT JOIN BLADE_USER u
         ON (f.CREATE_USER = u.ID OR f.UPDATE_USER = u.ID)
         WHERE (
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IAuditFileService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IAuditFileService.java
index bfeaad70e..8e20cbadc 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IAuditFileService.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IAuditFileService.java
@@ -44,7 +44,7 @@ public interface IAuditFileService extends EnBaseService<AuditFile> {
      */
 	void setVOValue(AuditFileVO vo);
 
-    IPage<AuditFile> listSearch(IPage<AuditFile> page, AuditFileSearch search);
+    IPage<AuditFileVO> listSearch(IPage<AuditFileVO> page, AuditFileSearch search);
 
 	R upgradeVer(AuditFile find);
 }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/AuditFileServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/AuditFileServiceImpl.java
index d8b19bde9..74bb611c4 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/AuditFileServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/AuditFileServiceImpl.java
@@ -68,7 +68,7 @@ public class AuditFileServiceImpl extends EnBaseServiceImpl<AuditFileMapper, Aud
     }
 
     @Override
-    public IPage<AuditFile> listSearch(IPage<AuditFile> page, AuditFileSearch search) {
+    public IPage<AuditFileVO> listSearch(IPage<AuditFileVO> page, AuditFileSearch search) {
         return page.setRecords(baseMapper.listSearch(page, search));
     }