报废问题

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificSerivceImpl.java

@@ -1828,7 +1828,8 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
         List<Map<String, Object>> equipSpecificScrap = equipmentSpecificIndexMapper.getEquipSpecificScrap();
         equipSpecificScrap.forEach(e->{
             try {
-                int year = e.get("weExpiry") != null ? Integer.parseInt(e.get("weExpiry").toString())  : Integer.parseInt(e.get("wesExpiry").toString());
+                if(e.get("wesExpiry") != null) {
+                    int year =  Integer.parseInt(e.get("wesExpiry").toString());
                     Date productDate = DateUtils.dateParse(e.get("product").toString(),"yyyy-MM-dd'T'HH:mm");
                     Calendar calendar = Calendar.getInstance();
                     calendar.setTime(productDate);
@@ -1837,13 +1838,15 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
                     Date now = new Date();
                     String scrapTime = new SimpleDateFormat(DateUtils.DATE_TIME_PATTERN).format(calendar.getTime());
 
-                int i = -1;
-                while (now.after(calendar.getTime())) {
-                    calendar.add(Calendar.DAY_OF_MONTH,1);
-                    i++;
+                    long time1 = calendar.getTimeInMillis();
+                    calendar.setTime(now);
+                    long time2 = calendar.getTimeInMillis();
+                    long between_days=(time2-time1)/(10003600*24);
+                    int day = Integer.parseInt(String.valueOf(between_days));
+
+                    if(day < Integer.parseInt(equipmentScrapDay) && day > -1) {
+                        syncSystemctlMsg(e, scrapTime, day);
                     }
-                if(i < Integer.parseInt(equipmentScrapDay) && i > -1) {
-                    syncSystemctlMsg(e, scrapTime,i);
                 }
 
             } catch (ParseException parseException) {