线路预警

performance-api/src/main/java/com/clx/performance/param/pc/linewarn/PageLineWarnInfoParam.java

@@ -18,8 +18,8 @@ public class PageLineWarnInfoParam extends PageParam {
     @ApiModelProperty(value = "预警级别", example = "1")
     private Integer warnLevel;
 
-    @ApiModelProperty(value = "运单编号", example = "1000")
-    private String childNo;
+    @ApiModelProperty(value = "货单编号", example = "1000")
+    private String orderGoodsNo;
     @ApiModelProperty(value = "处理状态：1待处理 2已处理 3暂停预警", example = "1")
     private Integer status;
 

performance-api/src/main/java/com/clx/performance/vo/pc/linewarn/LineWarnInfoVO.java

@@ -30,7 +30,7 @@ public class LineWarnInfoVO {
     private Integer warnId;
     @ApiModelProperty(value = "预警名称", example = "超时")
     private String warnName;
-    @ApiModelProperty(value = "预警类型: 1到达货源地延误 2前往货源地超时 3到达目的地延误 4前往目的地超时 5停留超时 6敏感区停留 7装车超时 8卸车超时 9运单延误", example = "1")
+    @ApiModelProperty(value = "预警类型: 1接单预警 2装车预警 3卸车预警 4拥堵预警 5天气预警 6运单异常 7线路异常", example = "1")
     private Integer warnType;
     @ApiModelProperty(value = "预警类型", example = "1")
     private String warnTypeMsg;
@@ -61,10 +61,9 @@ public class LineWarnInfoVO {
     @ApiModelProperty(value = "运单状态", example = "1")
     private Integer childStatus;
 
-
     @ApiModelProperty(value = "预警时间", example = "")
     private String warnTime;
-    @ApiModelProperty(value = "预警暂停时间", example = "")
+    @ApiModelProperty(value = "暂停时间", example = "")
     private String suspendTime;
     @ApiModelProperty(value = "天气", example = "暴雨")
     private String weather;

performance-web/src/main/java/com/clx/performance/sqlProvider/linewarn/LineWarnInfoSqlProvider.java

@@ -20,7 +20,7 @@ public class LineWarnInfoSqlProvider {
             SELECT("*");
             FROM(TABLE);
             if (StringUtils.isNotBlank(param.getWarnName())) {WHERE("warn_name like CONCAT('%', #{param.warnName},'%')");}
-            if (StringUtils.isNotBlank(param.getChildNo())) {WHERE("child_no = #{param.childNo}");}
+            if (StringUtils.isNotBlank(param.getOrderGoodsNo())) {WHERE("order_goods_no = #{param.orderGoodsNo}");}
             if (Objects.nonNull(param.getWarnType())) {WHERE("warn_type = #{param.warnType}");}
             if (Objects.nonNull(param.getWarnLevel())) {WHERE("warn_level = #{param.warnLevel}");}
             if (Objects.nonNull(param.getStatus())) {
@@ -40,8 +40,8 @@ public class LineWarnInfoSqlProvider {
             if (StringUtils.isNotBlank(param.getSendAddress())) {WHERE("send_address like CONCAT('%',#{param.sendAddress},'%')");}
             if (StringUtils.isNotBlank(param.getReceiveAddress())) {WHERE("receive_address like CONCAT('%',#{param.receiveAddress},'%')");}
 
-            if (StringUtils.isNotBlank(param.getBeginTime())) {WHERE("create_time >= #{param.beginTime}");}
-            if (StringUtils.isNotBlank(param.getEndTime())) {WHERE("create_time <= #{param.endTime}");}
+            if (StringUtils.isNotBlank(param.getBeginTime())) {WHERE("warn_time >= #{param.beginTime}");}
+            if (StringUtils.isNotBlank(param.getEndTime())) {WHERE("warn_time <= #{param.endTime}");}
 
             ORDER_BY("id desc");
         }}.toString();