kongdeqiang
2025-04-02 286e7ec66098f4f7deeae806781d6faab5ad0d21
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceDemandPlanController.java
@@ -14,6 +14,7 @@
import com.by4cloud.platformx.device.entity.Device;
import com.by4cloud.platformx.device.entity.DeviceDemandPlan;
import com.by4cloud.platformx.device.entity.DeviceDemandSub;
import com.by4cloud.platformx.device.entity.DeviceDemandTotal;
import com.by4cloud.platformx.device.service.*;
import com.by4cloud.platformx.device.util.NumUtils;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -63,7 +64,14 @@
      wrapper.eq(deviceDemandPlan.getYear() !=null,DeviceDemandPlan::getYear,deviceDemandPlan.getYear());
      wrapper.eq(DeviceDemandPlan::getType2,0);
      wrapper.orderByDesc(DeviceDemandPlan::getCreateTime);
        return R.ok(deviceDemandPlanService.pageByScope(page, wrapper));
      Page<DeviceDemandPlan> page1 = deviceDemandPlanService.pageByScope(page, wrapper);
      for (DeviceDemandPlan record : page1.getRecords()) {
         LambdaQueryWrapper<DeviceDemandTotal> totalWrapper = Wrappers.lambdaQuery();
         totalWrapper.eq(DeviceDemandTotal::getPlanId,record.getId());
         List<DeviceDemandTotal> list = deviceDemandTotalService.list(totalWrapper);
         record.setTotalList(list);
      }
      return R.ok(page1);
    }
   /**