From bbdf70526760e6c4378486b89764493b52e9afd2 Mon Sep 17 00:00:00 2001 From: gt-fuwuqi <3272660260@qq.com> Date: 星期二, 05 十一月 2024 13:40:45 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/controller/OrderController.java | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java index 695f9c8..a688989 100644 --- a/src/main/java/com/zy/asrs/controller/OrderController.java +++ b/src/main/java/com/zy/asrs/controller/OrderController.java @@ -14,11 +14,13 @@ import com.zy.asrs.service.*; import com.zy.common.model.DetlDto; import com.zy.common.web.BaseController; +import io.swagger.models.auth.In; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; +import javax.print.Doc; import java.util.*; @RestController @@ -43,6 +45,26 @@ @Autowired private WrkMastLogService wrkMastLogService; + + @RequestMapping(value = "/order/list/pda/page/auth") + @ManagerAuth + public R pdaPageList(@RequestParam(required = true)Long tagId, + @RequestParam(defaultValue = "1")Integer curr, + @RequestParam(defaultValue = "10")Integer limit){ + List<DocType> docTypes = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakin", 1)); + ArrayList<Integer> arrayList = new ArrayList<>(); + docTypes.forEach(docType -> { + arrayList.add(docType.getDocId().intValue()); + }); + EntityWrapper<Order> wrapper = new EntityWrapper<>(); +// wrapper.eq("tag_id", tagId); + wrapper.in("doc_type", arrayList); + wrapper.in("settle",1,2); + wrapper.orderBy("create_time", false); + Page<Order> orderPage = orderService.selectPage(new Page<>(curr, limit), wrapper); + return R.ok().add(orderPage); + } + @RequestMapping(value = "/order/nav/list/auth") @ManagerAuth public R navList(@RequestParam(required = false) String orderNo){ -- Gitblit v1.9.1