Merge branch 'xjchen' into 'develop'

加入影响因素字段20230811

See merge request !30

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/RiskPlanExistingList.java

@@ -156,6 +156,12 @@ public class RiskPlanExistingList extends BaseEntity {
     @TableField("evaluation_item_ids")
     private String evaluationItemIds;
 
+    /**
+     * 影响因素
+     */
+    @TableField("factor_items")
+    private String factorItems;
+
     /**
      * 楼栋ID
      */

censoft-rongtong/src/main/resources/mapper/system/RiskPlanExistingListMapper.xml

@@ -33,10 +33,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="update_time"    />
         <result property="remark"    column="remark"    />
         <result property="evaluationItemIds"    column="evaluation_item_ids"  />
+        <result property="factorItems"    column="factor_items"  />
     </resultMap>
 
     <sql id="selectRiskPlanExistingListVo">
-        select id, user_id, inherent_id, plan_id, room_id, name, factor, type, level, presence_location, picture_file_ids, measures_project, measures_project_file_ids, measures_administration, measures_dept_name, measures_user_name, measures_user_phone, measures_administration_file_ids, measures_emergency, measures_emergency_file_ids, reference_basis, del_flag, create_by, create_time, update_by, update_time, remark,evaluationItemIds from risk_plan_existing_list
+        select id, user_id, inherent_id, plan_id, room_id, name, factor, type, level, presence_location, picture_file_ids, measures_project, measures_project_file_ids, measures_administration, measures_dept_name, measures_user_name, measures_user_phone, measures_administration_file_ids, measures_emergency, measures_emergency_file_ids, reference_basis, del_flag, create_by, create_time, update_by, update_time, remark,evaluationItemIds,factor_items from risk_plan_existing_list
     </sql>
 
     <select id="selectRiskPlanExistingListList" parameterType="com.censoft.censoftrongtong.domain.RiskPlanExistingList" resultMap="RiskPlanExistingListResult">
@@ -74,7 +75,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         rpil.update_by,
         rpil.update_time,
         rpil.remark,
-        rpil.evaluation_item_ids
+        rpil.evaluation_item_ids,
+        rpil.factor_items
         FROM
         risk_plan_existing_list rpil
         LEFT JOIN ledger_room lr ON lr.id = rpil.room_id
@@ -142,6 +144,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null">remark,</if>
             <if test="evaluationItemIds != null">evaluation_item_ids,</if>
+            <if test="factorItems != null">factor_items,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="userId != null">#{userId},</if>
@@ -171,6 +174,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
             <if test="evaluationItemIds != null">#{evaluationItemIds},</if>
+            <if test="factorItems != null">#{factorItems},</if>
         </trim>
     </insert>
 
@@ -204,6 +208,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="evaluationItemIds != null">evaluation_item_ids = #{evaluationItemIds},</if>
+            <if test="factorItems != null">factor_items = #{factorItems},</if>
         </trim>
         where id = #{id}
     </update>
@@ -251,7 +256,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             rpil.measures_emergency_file_ids AS measuresEmergencyFileIds,
             rpil.reference_basis AS referenceBasis,
             rpil.create_time,
-            rpil.evaluation_item_ids
+            rpil.evaluation_item_ids,
+            rpil.factor_items
         FROM
             risk_plan_existing_list rpil
                 LEFT JOIN sys_user su ON su.user_id = rpil.user_id