工艺文件维护

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;
 }

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 = service.listSearch(Condition.getPage(query), search);
-        IPage<AuditFileVO> pagesVO = AuditFileWrapper.build().pageVO(pages);
+//        IPage<AuditFileVO> pagesVO = AuditFileWrapper.build().pageVO(pages);
         pagesVO.getRecords()
                 .stream()
                 .peek(service::setVOValue)

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);
 

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 (

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);
 }

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));
     }