统计日期调整

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/stat/IotStaticController.java

@@ -584,9 +584,9 @@ public class IotStaticController {
         List<String> lastSevenDays = DateUtils.getLastSevenDays();
         String first = lastSevenDays.get(0);
         String last = lastSevenDays.get(lastSevenDays.size() - 1);
-        LocalDateTime startOfDay = getStartOfDay(first);
-        LocalDateTime endOfDay = getEndOfDay(last);
-        LocalDateTime[] createTime = new LocalDateTime[]{endOfDay, startOfDay};
+        LocalDateTime startOfDay = getStartOfDay(last);
+        LocalDateTime endOfDay = getEndOfDay(first);
+        LocalDateTime[] createTime = new LocalDateTime[]{startOfDay, endOfDay};
 
         IotOpeationFillPageReqVO iotOpeationFillPageReqVO = new IotOpeationFillPageReqVO();
         iotOpeationFillPageReqVO.setCreateTime(createTime);
@@ -770,9 +770,9 @@ public class IotStaticController {
         List<String> lastSevenDays = DateUtils.getLastSevenDays();
         String first = lastSevenDays.get(0);
         String last = lastSevenDays.get(lastSevenDays.size() - 1);
-        LocalDateTime startOfDay = getStartOfDay(first);
-        LocalDateTime endOfDay = getEndOfDay(last);
-        LocalDateTime[] createTime = new LocalDateTime[]{endOfDay, startOfDay};
+        LocalDateTime startOfDay = getStartOfDay(last);
+        LocalDateTime endOfDay = getEndOfDay(first);
+        LocalDateTime[] createTime = new LocalDateTime[]{startOfDay, endOfDay};
 
         IotDeviceRunLogPageReqVO iotDeviceRunLogPageReqVO = new IotDeviceRunLogPageReqVO();
         iotDeviceRunLogPageReqVO.setCreateTime(createTime);
@@ -808,9 +808,9 @@ public class IotStaticController {
         List<String> lastSevenDays = DateUtils.getLastSevenDays();
         String first = lastSevenDays.get(0);
         String last = lastSevenDays.get(lastSevenDays.size() - 1);
-        LocalDateTime startOfDay = getStartOfDay(first);
-        LocalDateTime endOfDay = getEndOfDay(last);
-        LocalDateTime[] createTime = new LocalDateTime[]{endOfDay, startOfDay};
+        LocalDateTime startOfDay = getStartOfDay(last);
+        LocalDateTime endOfDay = getEndOfDay(first);
+        LocalDateTime[] createTime = new LocalDateTime[]{startOfDay, endOfDay};
 
         IotDeviceRunLogPageReqVO iotDeviceRunLogPageReqVO = new IotDeviceRunLogPageReqVO();
         iotDeviceRunLogPageReqVO.setCreateTime(createTime);

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/maintain/IotMaintainServiceImpl.java

@@ -240,6 +240,7 @@ public class IotMaintainServiceImpl implements IotMaintainService {
         //if ("out".equals(updateObj.getType())&&updateObj.getAuditStatus()==20){
             updateObj.setStatus("finished");
         //}
+        updateObj.setPic(JSON.toJSONString(updateReqVO.getMaintain().getPics()));
         iotMaintainMapper.updateById(updateObj);
         //删除工单bom及物料
         iotMaintainBomMapper.delete("maintain_id", String.valueOf(updateObj.getId()));