修改bug

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/RequestData.java

@@ -38,8 +38,11 @@ public class RequestData {
     private String address;
 
     @ApiModelProperty(value = "灾情状态")
-    private int status =0;
+    private Integer status ;
 
     @ApiModelProperty(value = "灾情ID")
     private Long alertId ;
+
+    @ApiModelProperty(value = "类型code")
+    private String alertTypeCode;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/AlertCalledMapper.xml

@@ -55,6 +55,11 @@
             and a.address like CONCAT('%',#{par.address},'%') ||  a.alert_type like CONCAT('%',#{par.address},'%')
         </if>
 
+        <if test='par.alertTypeCode!=null and  par.alertTypeCode!="" '>
+            and  a.alert_type_code = #{par.alertTypeCode}
+        </if>
+
+
         <if test='par.whether24!=false'>
             and a.call_time &gt;= (NOW() - interval 24 hour)
         </if>
@@ -81,6 +86,9 @@
         <if test='par.address!=null and  par.address!="" '>
             and a.address like CONCAT('%',#{par.address},'%')
         </if>
+        <if test='par.alertTypeCode!=null and  par.alertTypeCode!="" '>
+            and  a.alert_type_code = #{par.alertTypeCode}
+        </if>
         <if test='par.whether24!=false'>
             and a.call_time &gt;= (NOW() - interval 24 hour)
         </if>

amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/src/main/java/com/yeejoin/amos/boot/module/command/biz/controller/CommandController.java

@@ -170,7 +170,10 @@ public class CommandController extends BaseController {
     @GetMapping(value = "history/list")
     @ApiOperation(httpMethod = "GET", value = "警情列表查询", notes = "警情列表查询")
     public ResponseModel<Page<AlertCalledZhDto>> listhistoryPage(Integer pageNum, Integer pageSize,RequestData par) {
-        par.setStatus(1);
+
+        if(par.getStatus()==null){
+            par.setStatus(1);
+        }
         if (null == pageNum || null == pageSize) {
             pageNum = 1;
             pageSize = Integer.MAX_VALUE;