Merge remote-tracking branch 'origin/dev' into dev

zhanghl

2025-05-06 d4e4029d2d6117404561e824bd602cbf82588972

Merge remote-tracking branch 'origin/dev' into dev

 aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipingRouteStatServiceImpl.java

@@ -699,10 +699,10 @@
                    }
                }
               if(stat.getProcessPlanStartDay()!=null){
                   Date processPlanStartDay = stat.getProcessPlanStartDay();
                   stat.setPlanStartYear(processPlanStartDay.getYear()+"");
                   stat.setPlanStartMonth(processPlanStartDay.getMonth()+"");
                   stat.setPlanStartDay(processPlanStartDay.getDay()+"");
                   String[] strNow = new SimpleDateFormat("yyyy-MM-dd").format(stat.getProcessPlanStartDay()).toString().split("-");
                   stat.setPlanStartYear(strNow[0]);
                   stat.setPlanStartMonth(strNow[1]);
                   stat.setPlanStartDay(strNow[2]);
               }
                last = stat;
                cptStateList.add(stat);