diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysMaterialProcurementOrderService.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysMaterialProcurementOrderService.java index f5ee023..00cf72b 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysMaterialProcurementOrderService.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysMaterialProcurementOrderService.java @@ -2,7 +2,9 @@ package jnpf.service; import jnpf.model.yysmaterialprocurementorder.*; import jnpf.entity.*; + import java.util.*; + import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -16,7 +18,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; public interface YysMaterialProcurementOrderService extends IService { List getList(YysMaterialProcurementOrderPagination yysMaterialProcurementOrderPagination); - List getTypeList(YysMaterialProcurementOrderPagination yysMaterialProcurementOrderPagination,String dataType); + List getTypeList(YysMaterialProcurementOrderPagination yysMaterialProcurementOrderPagination, String dataType); YysMaterialProcurementOrderEntity getInfo(String id); @@ -28,14 +30,23 @@ public interface YysMaterialProcurementOrderService extends IService queryList(YysMaterialProcurementOrderPagination queryBody); } diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysMaterialProcurementOrderServiceImpl.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysMaterialProcurementOrderServiceImpl.java index e365077..75401d5 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysMaterialProcurementOrderServiceImpl.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysMaterialProcurementOrderServiceImpl.java @@ -404,6 +404,18 @@ public class YysMaterialProcurementOrderServiceImpl extends ServiceImpl queryList(YysMaterialProcurementOrderPagination queryBody) { + log.info("查询采购协同列表-app"); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + if (ObjectUtil.isNotEmpty(queryBody.getOrderNumber())) { + wrapper.eq(YysMaterialProcurementOrderEntity::getOrderNumber, queryBody.getOrderNumber()); + } + wrapper.eq(YysMaterialProcurementOrderEntity::getOrderStatus, queryBody.getOrderStatus()); + wrapper.isNull(YysMaterialProcurementOrderEntity::getDeleteMark); + return this.list(wrapper); + } + private int getNewNum() { String currentDate = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd")); LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysMaterialProcurementOrderController.java b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysMaterialProcurementOrderController.java index d1fec82..dcbe43a 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysMaterialProcurementOrderController.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysMaterialProcurementOrderController.java @@ -405,4 +405,9 @@ public class YysMaterialProcurementOrderController { return ActionResult.fail(result); } + @Operation(summary = "采购协同列表-App") + @PostMapping("/list") + public ActionResult queryList(@RequestBody YysMaterialProcurementOrderPagination queryBody) { + return ActionResult.success(yysMaterialProcurementOrderService.queryList(queryBody)); + } }