增加预警类型

purchase-system/src/main/java/com/ozs/pm/doman/vo/requestVo/PmDemandReqVo.java

@@ -42,6 +42,10 @@ public class PmDemandReqVo extends PageVo
     @ApiModelProperty("项目状态(4:需求待填制，5:需求待提交，6:需求待审核，7:任务待下达，8:任务已下达，9:中标信息待填制，10:中标信息已填制，11:合同待填制，12:合同已填制，13:项目建设中，14:项目建设完成)")
     private Long projectStatus;
 
+    /** 预警状态(0:正常，1:需求提报预警，2:采购完成预警,3:计划交付预警 */
+    @ApiModelProperty("预警状态(0:正常，1:需求提报预警，2:采购完成预警,3:计划交付预警")
+    private String warnStatus;
+
     /** 是否为超限额计划(0:未超额，1:超额) */
     @ApiModelProperty("是否为超限额计划(0:未超额，1:超额)")
     private Integer isExcess;

purchase-system/src/main/java/com/ozs/pm/service/impl/PmDemandServiceImpl.java

@@ -415,10 +415,13 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
         if (!StringUtils.isBlank(pmDemandReqVo.getPurchaseServices())) {
             lw.eq(PmDemand::getPurchaseServices, pmDemandReqVo.getPurchaseServices());
         }
-        if (pmDemandReqVo.getProjectStatus() != null) {
+        if (!ObjectUtils.isEmpty(pmDemandReqVo.getProjectStatus() )) {
             lw.eq(PmDemand::getProjectStatus, pmDemandReqVo.getProjectStatus());
         }
-        if (pmDemandReqVo.getIsExcess() != null) {
+        if (!ObjectUtils.isEmpty(pmDemandReqVo.getWarnStatus() )) {
+            lw.eq(PmDemand::getWarnStatus, pmDemandReqVo.getWarnStatus());
+        }
+        if (!ObjectUtils.isEmpty(pmDemandReqVo.getIsExcess() )) {
             lw.eq(PmDemand::getIsExcess, pmDemandReqVo.getIsExcess());
         }
         if (!StringUtils.isBlank(pmDemandReqVo.getBeginDate())) {