电子档案

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/AuditFileVO.java

@@ -28,4 +28,7 @@ public class AuditFileVO extends AuditFile {
 
     @Schema(description = "工艺能力")
     private String caName;
+
+    @Schema(description = "工序名称")
+    private String ppsName;
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/AuditFileMapper.xml

@@ -20,6 +20,7 @@
 
     <resultMap id="auditFileVOResultMap" type="org.springblade.desk.quality.pojo.vo.AuditFileVO" extends="auditFileResultMap">
         <result column="CA_NAME" property="caName"/>
+        <result column="PPS_NAME" property="ppsName"/>
     </resultMap>
 
     <select id="selectAuditFilePage" resultMap="auditFileResultMap">
@@ -53,9 +54,11 @@
             f.REMARK,
             f.PROD_APPLY_AREA,
             f.CA_ID,
-            ca.CA_NAME
+            ca.CA_NAME,
+            ps.NAME as PPS_NAME
         FROM QA_AUDIT_FILE f
         LEFT JOIN BS_CRAFT_ABILITY ca ON f.ca_id = ca.id
+        LEFT JOIN BS_PROCESS_SET ps on f.pps_id = ps.id
         LEFT JOIN BLADE_USER u
         ON (f.CREATE_USER = u.ID OR f.UPDATE_USER = u.ID)
         WHERE (
@@ -86,6 +89,7 @@
         from QA_AUDIT_FILE a
         INNER JOIN BS_PROD_MARK b ON a.PQ_ID = b.ID
         where a.IS_DELETED = 0
+        and a.STATUS = 1
         and a.PPS_ID = #{ppsId}
         and a.WC_ID = #{wcId}
         and a.PROD_APPLY_AREA = #{prodApplyArea}
@@ -98,6 +102,7 @@
         from QA_AUDIT_FILE a
         INNER JOIN BS_PROD_MARK b ON a.PQ_ID = b.ID
         where a.IS_DELETED = 0
+          and a.STATUS = 1
           and a.PPS_ID = #{ppsId}
           and a.WC_ID = #{wcId}
           and b.NAME = #{prodIdent}