Merge remote-tracking branch 'origin/dev'

王彪总
2 parents 34be953d a140089e
Showing 4 changed files with 34 additions and 4 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanDetailServiceImpl.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanDetailServiceImpl.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/materialinventoryin/MaterialInventoryInServiceImpl.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/materialinventoryout/MaterialInventoryOutServiceImpl.java
@@ -21,6 +21,7 @@ import org.springframework.validation.annotation.Validated;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
 import java.util.Arrays;
 import java.util.List;
@@ -111,8 +112,10 @@ public class InspectionPlanDetailServiceImpl implements InspectionPlanDetailServ
     public void updateExpiredInspectionPlanDetails() {
         // 更新过期的计划明细状态为过期(3)
         LocalDateTime localDateTime = LocalDate.now().atStartOfDay(); //00:00:00
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS");
+        String formattedTime = localDateTime.format(formatter);
         LambdaUpdateWrapper<InspectionPlanDetailDO> updateWrapper = new LambdaUpdateWrapper<>();
-        updateWrapper.lt(InspectionPlanDetailDO::getEndTime, localDateTime)
+        updateWrapper.lt(InspectionPlanDetailDO::getEndTime, formattedTime)
                 .set(InspectionPlanDetailDO::getFinishState, FinishStateEnum.EXPIRED.getStatus()) // 设置为过期状态
                 .eq(InspectionPlanDetailDO::getFinishState,  FinishStateEnum.NOT_FINISHED.getStatus());
         inspectionPlanDetailMapper.update(null, updateWrapper);
@@ -30,6 +30,7 @@ import org.springframework.validation.annotation.Validated;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -154,14 +155,40 @@ public class MaintainPlanDetailServiceImpl implements MaintainPlanDetailService 
     public void updateExpiredMaintainPlanDetails() {
         // 更新过期的计划明细状态为过期(3)
         LocalDateTime localDateTime = LocalDate.now().atStartOfDay(); //00:00:00
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS");
+        String formattedTime = localDateTime.format(formatter);
         LambdaUpdateWrapper<MaintainPlanDetailDO> updateWrapper = new LambdaUpdateWrapper<>();
-        updateWrapper.lt(MaintainPlanDetailDO::getEndTime, localDateTime)
+        updateWrapper.lt(MaintainPlanDetailDO::getEndTime, formattedTime)
                 .set(MaintainPlanDetailDO::getFinishState, FinishStateEnum.EXPIRED.getStatus()) // 设置为过期状态
                 .eq(MaintainPlanDetailDO::getFinishState,  FinishStateEnum.NOT_FINISHED.getStatus());
         maintainPlanDetailMapper.update(updateWrapper);
     }
+    public static void main(String[] args) {
+        // 获取当天0点的LocalDateTime对象
+        LocalDateTime localDateTime = LocalDate.now().atStartOfDay();
+
+        // 1. 直接打印对象（默认toString格式）
+        System.out.println("默认toString格式: " + localDateTime);
+        // 输出示例（假设当前日期是2026-01-16）：2026-01-16T00:00
+
+        // 2. 自定义格式输出（更易读）
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS");
+        String formattedTime = localDateTime.format(formatter);
+        System.out.println("自定义格式: " + formattedTime);
+        // 输出示例：2026-01-16 00:00:00.000
+
+        // 3. 拆解查看各部分值
+        System.out.println("年: " + localDateTime.getYear());        // 2026
+        System.out.println("月: " + localDateTime.getMonthValue()); // 1
+        System.out.println("日: " + localDateTime.getDayOfMonth()); // 16
+        System.out.println("时: " + localDateTime.getHour());      // 0
+        System.out.println("分: " + localDateTime.getMinute());    // 0
+        System.out.println("秒: " + localDateTime.getSecond());    // 0
+        System.out.println("纳秒: " + localDateTime.getNano());    // 0
+    }
+
     @Override
     public void updateExpiredMaintainPlans() {
         // 更新过期的计划状态为过期(3)
@@ -144,7 +144,7 @@ public class MaterialInventoryInServiceImpl implements MaterialInventoryInServic
         if (null == materialInventoryIn) {
             throw exception(MATERIAL_INVENTORY_IN_NOT_EXISTS);
         }
-        MaterialInventoryDO inventory = materialInventoryService.selectMaterialInventoryByMaterialId(materialInventoryIn.getMaterialId(),getCompanyId());
+        MaterialInventoryDO inventory = materialInventoryService.selectMaterialInventoryByMaterialId(materialInventoryIn.getMaterialId(),materialInventoryIn.getBelongCompanyId());
         if(null == inventory){
             throw exception0(BAD_REQUEST.getCode(),"参数错误");
         }
@@ -108,7 +108,7 @@ public class MaterialInventoryOutServiceImpl implements MaterialInventoryOutServ
             throw exception(MATERIAL_INVENTORY_OUT_NOT_EXISTS);
         }
-        MaterialInventoryDO inventory = materialInventoryService.selectMaterialInventoryByMaterialId(materialInventoryOut.getMaterialId(),getCompanyId());
+        MaterialInventoryDO inventory = materialInventoryService.selectMaterialInventoryByMaterialId(materialInventoryOut.getMaterialId(),materialInventoryOut.getBelongCompanyId());
         if(null == inventory){
             throw exception0(BAD_REQUEST.getCode(),"参数错误");
         }