Merge branch 'master' of http://101.36.160.140:21044/depot-tianjin/depot-storage-tianjin

src/main/java/com/chinaitop/depot/risk/controller/ViolationWarningAlarmController.java

@@ -103,6 +103,7 @@ public class ViolationWarningAlarmController {
                     violationWarningAlarm.setCurrentStatus(1);
                 }
                 violationWarningAlarmService.updateDate(violationWarningAlarm);
+                return ResponseEntity.ok();
             }
         } catch (Exception e) {
             e.printStackTrace();

src/main/java/com/chinaitop/depot/risk/mapper/ViolationWarningAlarmMapper.xml

@@ -10,6 +10,7 @@
         <result column="detail" property="violationDetail" jdbcType="VARCHAR"/>
         <result column="disposer" property="disposer" jdbcType="VARCHAR"/>
         <result column="dispose_content" property="disposeContent" jdbcType="VARCHAR"/>
+        <result column="dispose_time" property="disposeTime" jdbcType="VARCHAR"/>
         <result column="subject_type" property="violationSubjectType" jdbcType="VARCHAR"/>
         <result column="status" property="currentStatus" jdbcType="INTEGER"/>
         <result column="org_id" property="orgId" jdbcType="INTEGER"/>
@@ -27,6 +28,7 @@
         detail as violationDetail,
         disposer as disposer,
         dispose_content as disposeContent,
+        dispose_time as disposeTime,
         subject_type as violationSubjectType,
         status as currentStatus,
         org_id as orgId,
@@ -77,6 +79,7 @@
         detail ,
         disposer ,
         dispose_content,
+        dispose_time,
         subject_type ,
         status ,
         org_id ,
@@ -100,7 +103,7 @@
                 library_point_name = #{involvingLibraryPoints,jdbcType=VARCHAR},
             </if>
             <if test="violationType != null">
-                "type" = #{violationType,jdbcType=VARCHAR},
+                violation_type = #{violationType,jdbcType=VARCHAR},
             </if>
             <if test="violationDetail != null">
                 detail = #{violationDetail,jdbcType=INTEGER},
@@ -111,6 +114,9 @@
             <if test="disposeContent != null">
                 dispose_content = #{disposeContent,jdbcType=VARCHAR},
             </if>
+            <if test="disposeTime != null">
+                dispose_time = #{disposeTime,jdbcType=VARCHAR},
+            </if>
             <if test="violationSubjectType != null">
                 subject_type = #{violationSubjectType,jdbcType=VARCHAR},
             </if>