危险因素列表添加字段

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_fmea.xml

@@ -32,6 +32,7 @@
 			fems.coefficient AS evaluationS,
 			femo.coefficient AS evaluationO,
 			femd.coefficient AS evaluationD,
+			femo1.coefficient AS newEvaluationO,
 		    fm.rpni,
 			fm.rpn,
 		    fm.engineering,
@@ -54,7 +55,8 @@
 		    concat(fems.influence,'-',fems.describe) as influence,
 		    fm.identify_user as identifyUser,
 		    (select name from s_user where id = fm.identify_user) as identifyUserName,
-		    fm.identify_method as identifyMethod
+		    fm.identify_method as identifyMethod,
+			fr.name AS level
 		FROM
 		    (
 	        SELECT
@@ -68,8 +70,10 @@
 	    LEFT JOIN f_evaluation_model fems ON fems.id = fm.evaluation_sid
 		LEFT JOIN f_evaluation_model femo ON femo.id = fm.evaluation_oid
 		LEFT JOIN f_evaluation_model femd ON femd.id = fm.evaluation_did
+		LEFT JOIN f_evaluation_model femo1 ON femo1.id = fm.new_evaluation_oid
 		LEFT JOIN f_risk_factor rf ON rf.id = fm.risk_factors_id
 		LEFT JOIN f_accident_type fat ON fat.id = rf.accident_type_id
+		LEFT JOIN f_risk_level fr ON fm.rpn BETWEEN fr.down_limit and fr.top_limit
 		order by fm.id desc
 		<choose>
          <when test="pageSize==-1"></when>