Merge remote-tracking branch 'origin/develop_master' into develop_3

adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml

@@ -6,4 +6,12 @@
             resultType="com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarBaseStandardInfo">
         select distinct STAND_ID as standard_id, STAND_NUMBER as standard_number, STAND_NAME as standard_name, STAND_TYPE as standard_type, INTERPRETATION_TIME from sar_interpretation_national_standard
     </select>
+
+    <update id="updateData">
+        update sar_interpretation_national_standard set risk_degree = #{find.riskDegree}
+        where sar_interpretation_national_standard.STAND_ID = #{find.standId}
+        and sar_interpretation_national_standard.STAND_NUMBER =#{find.standNumber}
+        and sar_interpretation_national_standard.STAND_NAME=#{find.standName}
+        and sar_interpretation_national_standard.INTERPRETATION_TIME = #{find.interpretationTime}
+    </update>
 </mapper>

adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandCompareHisEOMapper.xml

@@ -19,11 +19,12 @@
     <result column="modify_time" property="modifyTime" />
     <result column="new_file_type" property="newFileType" />
     <result column="new_sar_type" property="newSarType" />
+      <result column="compare_status" property="compareStatus"/>
   </resultMap>
 
   <!-- SAR_STAND_COMPARE_HIS table all fields -->
   <sql id="Base_Column_List" >
-     compare_type, id, old_stand_id, old_stand_num, old_stand_name, new_stand_id, new_stand_num, new_stand_name, old_file_type, old_sar_type, create_user, create_time, modify_user, modify_time, new_file_type, new_sar_type
+     compare_type, id, old_stand_id, old_stand_num, old_stand_name, new_stand_id, new_stand_num, new_stand_name, old_file_type, old_sar_type, create_user, create_time, modify_user, modify_time, new_file_type, new_sar_type ,compare_status
   </sql>
 
   <!-- 查询条件 -->
@@ -89,6 +90,9 @@
       </if>
       <if test="newSarType != null" >
         and new_sar_type ${newSarTypeOperator} #{newSarType}
+      </if>
+        <if test="compareStatus != null" >
+        and compare_status = #{compareStatus}
       </if>
         <if test="oldNumOrName != null" >
             and (old_stand_num like concat('%',#{oldNumOrName},'%') OR old_stand_name like concat('%',#{oldNumOrName},'%'))
@@ -105,7 +109,7 @@
         SELECT SEQ_SAR_STAND_COMPARE_HIS.NEXTVAL FROM DUAL
     </selectKey> -->
     insert into SAR_STAND_COMPARE_HIS(<include refid="Base_Column_List" />)
-    values (#{compareType, jdbcType=VARCHAR}, #{id, jdbcType=VARCHAR}, #{oldStandId, jdbcType=VARCHAR}, #{oldStandNum, jdbcType=VARCHAR}, #{oldStandName, jdbcType=VARCHAR}, #{newStandId, jdbcType=VARCHAR}, #{newStandNum, jdbcType=VARCHAR}, #{newStandName, jdbcType=VARCHAR}, #{oldFileType, jdbcType=VARCHAR}, #{oldSarType, jdbcType=VARCHAR}, #{createUser, jdbcType=VARCHAR}, #{createTime, jdbcType=TIMESTAMP}, #{modifyUser, jdbcType=VARCHAR}, #{modifyTime, jdbcType=TIMESTAMP}, #{newFileType, jdbcType=VARCHAR}, #{newSarType, jdbcType=VARCHAR})
+    values (#{compareType, jdbcType=VARCHAR}, #{id, jdbcType=VARCHAR}, #{oldStandId, jdbcType=VARCHAR}, #{oldStandNum, jdbcType=VARCHAR}, #{oldStandName, jdbcType=VARCHAR}, #{newStandId, jdbcType=VARCHAR}, #{newStandNum, jdbcType=VARCHAR}, #{newStandName, jdbcType=VARCHAR}, #{oldFileType, jdbcType=VARCHAR}, #{oldSarType, jdbcType=VARCHAR}, #{createUser, jdbcType=VARCHAR}, #{createTime, jdbcType=TIMESTAMP}, #{modifyUser, jdbcType=VARCHAR}, #{modifyTime, jdbcType=TIMESTAMP}, #{newFileType, jdbcType=VARCHAR}, #{newSarType, jdbcType=VARCHAR},#{compareStatus, jdbcType=VARCHAR})
   </insert>
 
   <!-- 动态插入记录 主键是序列 -->
@@ -131,6 +135,7 @@
                 <if test="modifyTime != null" >modify_time,</if>
                 <if test="newFileType != null" >new_file_type,</if>
                 <if test="newSarType != null" >new_sar_type,</if>
+                <if test="compareStatus != null" >compare_status,</if>
             </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
                 <if test="compareType != null" >#{compareType, jdbcType=VARCHAR},</if>
@@ -149,6 +154,7 @@
                 <if test="modifyTime != null" >#{modifyTime, jdbcType=TIMESTAMP},</if>
                 <if test="newFileType != null" >#{newFileType, jdbcType=VARCHAR},</if>
                 <if test="newSarType != null" >#{newSarType, jdbcType=VARCHAR},</if>
+                <if test="compareStatus != null" >#{compareStatus, jdbcType=VARCHAR},</if>
             </trim>
   </insert>
 
@@ -169,7 +175,8 @@
             modify_user = #{modifyUser},
             modify_time = #{modifyTime},
             new_file_type = #{newFileType},
-            new_sar_type = #{newSarType}
+            new_sar_type = #{newSarType},
+            compare_status = #{compareStatus}
      where  id = #{id}
   </update>
 
@@ -222,6 +229,9 @@
       <if test="newSarType != null" >
         new_sar_type = #{newSarType},
       </if>
+      <if test="compareStatus != null" >
+          compare_status = #{compareStatus},
+      </if>
     </set>
      where id = #{id}
   </update>