Browse Source

大屏展示优化

wudingsheng 2 days ago
parent
commit
b3d69f7773

+ 2 - 2
imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/impl/TaskServiceImpl.java

@@ -1968,7 +1968,7 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
                         // 已加工时长
                         int finalResult = (int) Math.round(result);
                         item.setProcessedTime(finalResult);
-                        item.setPoint(finalPoint);
+                        item.setPoint(finalPoint>=100?100:finalPoint);
                         item.setRemainTime();
                     }else{
                         double result = ((beforeUseTime) / (60));
@@ -1977,7 +1977,7 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
                         // 已加工时长
                         int finalResult = (int) Math.round(result);
                         item.setProcessedTime(finalResult);
-                        item.setPoint(finalPoint);
+                        item.setPoint(finalPoint>=100?100:finalPoint);
                         item.setRemainTime();
                     }
 

+ 1 - 1
imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/centralToolMagazine/dto/ChfTwoDatas.java

@@ -36,6 +36,6 @@ public class ChfTwoDatas {
     private int sumTime;
 
     public void setRemainTime() {
-        this.remainTime = sumTime-processedTime;
+        this.remainTime = sumTime-processedTime <= 0 ? 0 : sumTime-processedTime;
     }
 }