bug--预警提示

purchase-admin/src/main/java/com/ozs/web/controller/pm/PmPurchaseExecutionController.java

@@ -677,7 +677,7 @@ public class PmPurchaseExecutionController extends BaseController {
             log.info("******** setting3 == " + setting3);
             //计划交付时间：根据数据阈值中设置的交付时间进行判断，进行预警
             int diff3 = DateUtils.differentDaysByMillisecond(pmDemand.getPlanDeliverTime(), DateUtils.parseDate(DateUtils.getDate()));
-            if (ObjectUtils.isEmpty(pmDemand.getRealDeliverTime()) && diff3 > 0 && diff3 >= setting3) {
+            if (ObjectUtils.isEmpty(pmDemand.getRealDeliverTime()) && diff3 > 0 && diff3 <= setting3) {
                 log.info("******** 计划交付预警: " + pmDemand.getProjectName());
                 pmDemandUpdate.setWarnStatus(WarnStatus.PLAN_DELIVER_WARNING.getCode());
             } else {

purchase-admin/src/main/java/com/ozs/web/controller/tool/PmTaskServer.java

@@ -52,7 +52,7 @@ public class PmTaskServer {
         list.forEach(item-> {
             //需求提报时间：根据数据阈值中设置的提报时间进行判断，进行预警
             int diff1 = DateUtils.differentDaysByMillisecond(item.getPlanDemandSubTime(), now);
-            if (ObjectUtils.isEmpty(item.getRealDemandCommitTime()) && diff1 > 0 && diff1 >= setting1) {
+            if (ObjectUtils.isEmpty(item.getRealDemandCommitTime()) && diff1 > 0 && diff1 <= setting1) {
                 log.info("******** 需求提报预警: " + item.getProjectName());
                 PmDemand pmDemand = new PmDemand();
                 pmDemand.setDemandId(item.getDemandId());
@@ -61,7 +61,7 @@ public class PmTaskServer {
             } else {
                 //采购完成时间：根据数据阈值中设置的采购完成时间进行判断，进行预警
                 int diff2 = DateUtils.differentDaysByMillisecond(item.getPlanPurchaseFinishTime(), now);
-                if (ObjectUtils.isEmpty(item.getRealPurchaseFinishTime()) && diff2 > 0 && diff2 >= setting2) {
+                if (ObjectUtils.isEmpty(item.getRealPurchaseFinishTime()) && diff2 > 0 && diff2 <= setting2) {
                     log.info("******** 采购完成预警: " + item.getProjectName());
                     PmDemand pmDemand = new PmDemand();
                     pmDemand.setDemandId(item.getDemandId());
@@ -70,7 +70,7 @@ public class PmTaskServer {
                 } else {
                     //计划交付时间：根据数据阈值中设置的交付时间进行判断，进行预警
                     int diff3 = DateUtils.differentDaysByMillisecond(item.getPlanDeliverTime(), now);
-                    if (ObjectUtils.isEmpty(item.getRealDeliverTime()) && diff3 > 0 && diff3 >= setting3) {
+                    if (ObjectUtils.isEmpty(item.getRealDeliverTime()) && diff3 > 0 && diff3 <= setting3) {
                         log.info("******** 计划交付预警: " + item.getProjectName());
                         PmDemand pmDemand = new PmDemand();
                         pmDemand.setDemandId(item.getDemandId());

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

@@ -823,7 +823,7 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
 
         //采购完成时间：根据数据阈值中设置的采购完成时间进行判断，进行预警
         int diff2 = DateUtils.differentDaysByMillisecond(pmDemand.getPlanPurchaseFinishTime(), DateUtils.parseDate(DateUtils.getDate()));
-        if (ObjectUtils.isEmpty(pmDemand.getRealPurchaseFinishTime()) && diff2 > 0 && diff2 >= setting2) {
+        if (ObjectUtils.isEmpty(pmDemand.getRealPurchaseFinishTime()) && diff2 > 0 && diff2 <= setting2) {
             log.info("******** 采购完成预警: " + pmDemand.getProjectName());
             pmDemandUpdate.setWarnStatus(WarnStatus.PURCHASE_FINISH_WARNING.getCode());
         } else {
@@ -1788,7 +1788,7 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
         log.info("******** setting1 == " + setting1);
         //需求提报时间：根据数据阈值中设置的提报时间进行判断，进行预警
         int diff1 = DateUtils.differentDaysByMillisecond(pmDemand.getPlanDemandSubTime(), DateUtils.parseDate(DateUtils.getDate()));
-        if (ObjectUtils.isEmpty(pmDemand.getRealDemandCommitTime()) && diff1 > 0 && diff1 >= setting1) {
+        if (ObjectUtils.isEmpty(pmDemand.getRealDemandCommitTime()) && diff1 > 0 && diff1 <= setting1) {
             PmDemand pmDemandUpdate = new PmDemand();
             pmDemandUpdate.setDemandId(demnadId);
             pmDemandUpdate.setWarnStatus(WarnStatus.DEMAND_COMMT_WARNING.getCode());