农资统计

tangzy

2022-06-01 cc7985b67c900c2673aa92d6d5317a85d69bb01a

 src/main/java/org/springblade/modules/remote/controller/RemoteController.java

@@ -27,6 +27,8 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.desk.entity.Notice;
import org.springblade.modules.remote.wrapper.RemoteWrapper;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestParam;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -34,6 +36,9 @@
import org.springblade.modules.remote.vo.RemoteVO;
import org.springblade.modules.remote.service.IRemoteService;
import org.springblade.core.boot.ctrl.BladeController;
import springfox.documentation.annotations.ApiIgnore;

import java.util.Map;

/**
 *  控制器
@@ -66,9 +71,10 @@
   @GetMapping("/list")
   @ApiOperationSupport(order = 2)
   @ApiOperation(value = "分页", notes = "传入remote")
   public R<IPage<Remote>> list(Remote remote, Query query) {
      IPage<Remote> pages = remoteService.page(Condition.getPage(query), Condition.getQueryWrapper(remote));
      return R.data(pages);
   public R<IPage<RemoteVO>> list(@ApiIgnore @RequestParam Map<String, Object> remote, Query query) {
      //IPage<Remote> pages = remoteService.page(Condition.getPage(query), Condition.getQueryWrapper(remote));
      IPage<Remote> pages = remoteService.page(Condition.getPage(query), Condition.getQueryWrapper(remote, Remote.class));
      return R.data(RemoteWrapper.build().pageVO(pages));
   }

   /**