diff --git a/src/main/java/com/glxp/api/controller/purchase/PurContractController.java b/src/main/java/com/glxp/api/controller/purchase/PurContractController.java index 6fc994640..2bf7cb60d 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurContractController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurContractController.java @@ -197,7 +197,7 @@ public class PurContractController { public BaseResponse importPlan(@RequestBody PurPlanEntity purPlanEntity) { if (purPlanEntity.getId() != null) { - purContractService.importPlan(purPlanEntity.getId()); + purContractService.importPlan(purPlanEntity.getId(),purPlanEntity.getPageType()); } else { return ResultVOUtils.error(999, "参数有误!"); } diff --git a/src/main/java/com/glxp/api/req/purchase/PurContractRequest.java b/src/main/java/com/glxp/api/req/purchase/PurContractRequest.java index 170d90a1e..5607d59da 100644 --- a/src/main/java/com/glxp/api/req/purchase/PurContractRequest.java +++ b/src/main/java/com/glxp/api/req/purchase/PurContractRequest.java @@ -1,5 +1,6 @@ package com.glxp.api.req.purchase; +import com.baomidou.mybatisplus.annotation.TableField; import com.glxp.api.util.page.ListPageRequest; import lombok.Data; @@ -39,4 +40,7 @@ public class PurContractRequest extends ListPageRequest { private Integer isGenerateOrder; private Boolean sysApprovalFlow; + + @TableField(value = "pageType") + private Integer pageType; } diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurContractService.java b/src/main/java/com/glxp/api/service/purchase/impl/PurContractService.java index e23d0ef32..21d32f1d5 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurContractService.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurContractService.java @@ -79,7 +79,7 @@ public class PurContractService extends ServiceImpl AND pc.contractDate #{purContractRequest.endDate} + + AND pc.pageType = #{purContractRequest.pageType} + order by id desc