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

@@ -48,7 +48,7 @@ public class ViolationWarningAlarmController {
             @ApiImplicitParam(name = "startDate", value = "开始日期", paramType = "query"),
             @ApiImplicitParam(name = "endDate", value = "结束日期", paramType = "query")
     })
-    public ResponseEntity<PageInfo<ViolationWarningAlarm>> listPage(Integer pageNum, Integer pageSize, Integer orgId,String violationType, String startDate, String endDate){
+    public ResponseEntity<PageInfo<ViolationWarningAlarm>> listPage(Integer pageNum, Integer pageSize, Integer orgId,Integer violationType, String startDate, String endDate){
 
         if (orgId == null) {
             return ResponseEntity.failed("组织机构ID不能为空！");
@@ -63,7 +63,7 @@ public class ViolationWarningAlarmController {
         if (StringUtils.isNotBlank(endDate)) {
             queryMap.put("endDate", ParameterUtil.string2datetime(endDate));
         }
-        if (StringUtils.isNotBlank(violationType)) {
+        if (violationType != null) {
             queryMap.put("violationType", violationType);
         }
         queryMap.put("orgId", orgId);

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

@@ -6,7 +6,7 @@
         <result column="publish_time" property="alarmPublishTime" jdbcType="TIMESTAMP"/>
         <result column="offender" property="offender" jdbcType="VARCHAR"/>
         <result column="library_point_name" property="involvingLibraryPoints" jdbcType="VARCHAR"/>
-        <result column="violation_type" property="violationType" jdbcType="VARCHAR"/>
+        <result column="violation_type" property="violationType" jdbcType="INTEGER"/>
         <result column="detail" property="violationDetail" jdbcType="VARCHAR"/>
         <result column="disposer" property="disposer" jdbcType="VARCHAR"/>
         <result column="dispose_content" property="disposeContent" jdbcType="VARCHAR"/>
@@ -46,6 +46,7 @@
         <if test="violationType != null" >
             and violation_type = #{violationType}
         </if>
+        order by publish_time desc
     </select>
 
     <insert id="insert">
@@ -60,7 +61,7 @@
         #{alarmPublishTime,jdbcType=TIMESTAMP},
         #{offender,jdbcType=VARCHAR},
         #{involvingLibraryPoints,jdbcType=VARCHAR},
-        #{violationType,jdbcType=VARCHAR},
+        #{violationType,jdbcType=INTEGER},
         #{violationDetail,jdbcType=VARCHAR},
         #{disposer,jdbcType=VARCHAR},
         #{disposeContent,jdbcType=VARCHAR},
@@ -106,7 +107,7 @@
                 library_point_name = #{involvingLibraryPoints,jdbcType=VARCHAR},
             </if>
             <if test="violationType != null">
-                violation_type = #{violationType,jdbcType=VARCHAR},
+                violation_type = #{violationType,jdbcType=INTEGER},
             </if>
             <if test="violationDetail != null">
                 detail = #{violationDetail,jdbcType=INTEGER},

src/main/java/com/chinaitop/depot/risk/model/ViolationWarningAlarm.java

@@ -42,7 +42,7 @@ public class ViolationWarningAlarm {
     /**
      * 违规类型
      */
-    private String violationType;
+    private Integer violationType;
     /**
      * 违规详情
      */

src/main/java/com/chinaitop/depot/risk/request/dto/ViolationWarningAlarmDto.java

@@ -27,7 +27,7 @@ public class ViolationWarningAlarmDto {
     /**
      * 违规类型
      */
-    private String violationType;
+    private Integer violationType;
     /**
      * 违规详情
      */