2023-09-28，设备和质量修改

src/main/java/com/xujie/sys/modules/pms/data/EamKnowledgeBaseData.java

@@ -27,7 +27,7 @@ public class EamKnowledgeBaseData extends QueryPage {
     // 故障编码
     private String defectId;
     // 故障原因
-    private String defectReason;
+    private String defectDesc;
     // 故障描述
     private String defectDescribe;
     // 处置措施
@@ -125,12 +125,12 @@ public class EamKnowledgeBaseData extends QueryPage {
         this.defectId = defectId;
     }
 
-    public String getDefectReason() {
-        return defectReason;
+    public String getDefectDesc() {
+        return defectDesc;
     }
 
-    public void setDefectReason(String defectReason) {
-        this.defectReason = defectReason;
+    public void setDefectDesc(String defectDesc) {
+        this.defectDesc = defectDesc;
     }
 
     public String getDefectDescribe() {

src/main/resources/mapper/pms/EamKnowledgeBaseMapper.xml

@@ -12,7 +12,7 @@
             eo.ObjectDesc as objectName,
             ekb.file_type,
             ekb.defect_id,
-            ekb.defect_reason,
+            ed.DefectDesc,
             ekb.defect_describe,
             ekb.disposal_measures,
             ekb.file_id,
@@ -24,16 +24,18 @@
             ekb.order_no,
             ekb.update_by
         FROM eam_knowledge_base as ekb
-        LEFT JOIN eam_object as eo ON ekb.object_id = eo.ObjectID and ekb.site = eo.site
+        LEFT JOIN eam_object as eo on ekb.site = eo.site and ekb.object_id = eo.ObjectID
+        LEFT JOIN eam_defect as ed on ekb.defect_id = ed.DefectID
         <where>
+            ekb.site = #{query.site}
             <if test = "query.objectId != null and query.objectId != ''">
-                ekb.object_id LIKE '%' + #{query.objectId}+'%'
+                and ekb.object_id LIKE '%' + #{query.objectId}+'%'
             </if>
             <if test = "query.defectId != null and query.defectId != ''">
                 AND ekb.defect_id LIKE '%' + #{query.defectId}+'%'
             </if>
-            <if test = "query.defectReason != null and query.defectReason != ''">
-                AND ekb.defect_reason LIKE '%' + #{query.defectReason}+'%'
+            <if test = "query.defectDesc != null and query.defectDesc != ''">
+                AND ed.DefectDesc LIKE '%' + #{query.defectDesc}+'%'
             </if>
             <if test = "query.defectDescribe != null and query.defectDescribe != ''">
                 AND ekb.defect_describe = #{query.defectDescribe}
@@ -55,18 +57,16 @@
         SELECT
             eod.ObjectID as objectId,
             eod.DefectID as defectId,
-            ed.DefectDesc as defectReason
+            ed.DefectDesc as defectDesc
         FROM eam_object_defect as eod
-        LEFT JOIN eam_defect as ed
-        ON eod.DefectID = ed.DefectID
-        WHERE eod.ObjectID = #{objectId}
-        AND eod.Active = 'Y'
+        LEFT JOIN eam_defect as ed ON eod.DefectID = ed.DefectID
+        WHERE eod.ObjectID = #{objectId} and eod.Active = 'Y'
     </select>
 
     <!-- 新增知识库文件 -->
     <insert id="saveKnowledgeBase" parameterType="EamKnowledgeBaseData">
-        INSERT INTO eam_knowledge_base (num, file_type, defect_describe, disposal_measures, file_id, file_name, remark, create_date, create_by, object_id, defect_id, defect_reason, site)
-        VALUES ((select 'zs'+ Right('0000000000' + convert(VARCHAR(10), isnull(max(convert(INT, SUBSTRING(num, 3, 10))), 0) + 1), 8) from eam_knowledge_base where site = #{site}), #{fileType}, #{defectDescribe}, #{disposalMeasures}, #{fileId}, #{fileName}, #{remark}, getDate(), #{createBy}, #{objectId}, #{defectId}, #{defectReason}, #{site})
+        INSERT INTO eam_knowledge_base (num, file_type, defect_describe, disposal_measures, file_id, file_name, remark, create_date, create_by, object_id, defect_id, site)
+        VALUES ((select 'zs'+ Right('0000000000' + convert(VARCHAR(10), isnull(max(convert(INT, SUBSTRING(num, 3, 10))), 0) + 1), 8) from eam_knowledge_base where site = #{site}), #{fileType}, #{defectDescribe}, #{disposalMeasures}, #{fileId}, #{fileName}, #{remark}, getDate(), #{createBy}, #{objectId}, #{defectId}, #{site})
     </insert>
 
     <!-- 修改知识库文件 -->
@@ -74,7 +74,6 @@
         UPDATE eam_knowledge_base
         SET object_id = #{objectId},
             defect_id = #{defectId},
-            defect_reason = #{defectReason},
             file_type = #{fileType},
             defect_describe = #{defectDescribe},
             disposal_measures = #{disposalMeasures},

src/main/resources/mapper/pms/EamMapper.xml

@@ -2118,7 +2118,7 @@
     <!-- 新增设备知识库记录 -->
     <insert id="saveKnowledgeRecord" parameterType="EamWorkOrderInData">
         INSERT INTO eam_knowledge_base
-        (site, num, file_type, defect_describe, disposal_measures, create_date, create_by, object_id, defect_id, defect_reason, order_no)
-        VALUES (#{site}, (select 'zs'+ Right('0000000000' + convert(VARCHAR(10), isnull(max(convert(INT, SUBSTRING(num, 3, 10))), 0) + 1), 8) from eam_knowledge_base where site = #{site}), '维修', #{planDesc}, #{disposalMeasures}, getDate(), #{createBy}, #{objectID}, #{defectID}, #{remark}, #{orderNo})
+        (site, num, file_type, defect_describe, disposal_measures, create_date, create_by, object_id, defect_id, order_no)
+        VALUES (#{site}, (select 'zs'+ Right('0000000000' + convert(VARCHAR(10), isnull(max(convert(INT, SUBSTRING(num, 3, 10))), 0) + 1), 8) from eam_knowledge_base where site = #{site}), '维修', #{planDesc}, #{disposalMeasures}, getDate(), #{createBy}, #{objectID}, #{defectID}, #{orderNo})
     </insert>
 </mapper>