fmea增加辨识人、辨识方法字段

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/Fmea.java

@@ -87,6 +87,12 @@ public class Fmea extends BasicEntity {
     @Column(name = "person_leader")
     private Integer personLeader;
 
+    @Column(name = "identify_user")
+    private Integer identifyUser;
+
+    @Column(name = "identify_method")
+    private String identifyMethod;
+
     public Fmea() {
     }
 
@@ -288,4 +294,20 @@ public class Fmea extends BasicEntity {
     public void setPersonLeader(Integer personLeader) {
         this.personLeader = personLeader;
     }
+
+    public Integer getIdentifyUser() {
+        return identifyUser;
+    }
+
+    public void setIdentifyUser(Integer identifyUser) {
+        this.identifyUser = identifyUser;
+    }
+
+    public String getIdentifyMethod() {
+        return identifyMethod;
+    }
+
+    public void setIdentifyMethod(String identifyMethod) {
+        this.identifyMethod = identifyMethod;
+    }
 }
\ No newline at end of file

YeeAmosFireAutoSysStart/src/main/resources/db/changelog/fas-1.0.2.xml

@@ -102,4 +102,28 @@
         </sql>
     </changeSet>
 
+    <changeSet author="tianbo" id="1582104676000-1">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="f_fmea" columnName="identify_user"/>
+            </not>
+        </preConditions>
+        <comment>f_fmea add column identify_user</comment>
+        <sql>
+            ALTER TABLE `f_fmea` ADD COLUMN `identify_user` int(11) DEFAULT NULL COMMENT '辨识人';
+        </sql>
+    </changeSet>
+
+    <changeSet author="tianbo" id="1582104676000-2">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="f_fmea" columnName="identify_method"/>
+            </not>
+        </preConditions>
+        <comment>f_fmea add column identify_method</comment>
+        <sql>
+            ALTER TABLE `f_fmea` ADD COLUMN `identify_method` varchar(255) DEFAULT NULL COMMENT '辨识方法';
+        </sql>
+    </changeSet>
+
 </databaseChangeLog>
\ No newline at end of file

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

@@ -50,7 +50,10 @@
 		    rf.`name` AS riskFactorName,
 		    fat.`name` AS accidentTypeName,
 		    fat.id AS accidentTypeId,
-		    concat(fems.influence,'-',fems.describe) as influence
+		    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
 		FROM
 		    (
 	        SELECT