From 5e393ab5ab9ad59c9dfa384127df1f1232ace608 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Mon, 13 May 2024 18:10:49 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96-0513-=E7=94=B3=E8=B4=AD=E3=80=81=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E3=80=81=E5=90=88=E5=90=8C=E3=80=81=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E5=A4=8D=E5=88=B6=E5=88=B0=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../glxp/api/controller/purchase/PurContractController.java   | 2 +-
 .../java/com/glxp/api/req/purchase/PurContractRequest.java    | 4 ++++
 .../glxp/api/service/purchase/impl/PurContractService.java    | 3 ++-
 .../resources/mybatis/mapper/purchase/PurContractMapper.xml   | 3 +++
 4 files changed, 10 insertions(+), 2 deletions(-)

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<PurContractMapper, PurContra
      *
      * @param id
      */
-    public void importPlan(Long id) {
+    public void importPlan(Long id,Integer pageType) {
         PurPlanEntity purPlanEntity = purPlanDao.selectById(id);
         PurPlanDetailRequest purApplyDetailRequest = new PurPlanDetailRequest();
         purApplyDetailRequest.setOrderIdFk(String.valueOf(id));
@@ -97,6 +97,7 @@ public class PurContractService extends ServiceImpl<PurContractMapper, PurContra
         String code = gennerOrderUtils.createScOrderNo(new OrderNoTypeBean("HT", "yyyyMMdd"));
         purContractEntity.setCode(code);
         purContractEntity.setId(null);
+        purContractEntity.setPageType(pageType);
         purContractMapper.insert(purContractEntity);
         Long newId = purContractEntity.getId();
 
diff --git a/src/main/resources/mybatis/mapper/purchase/PurContractMapper.xml b/src/main/resources/mybatis/mapper/purchase/PurContractMapper.xml
index 9eee36987..a86e3f406 100644
--- a/src/main/resources/mybatis/mapper/purchase/PurContractMapper.xml
+++ b/src/main/resources/mybatis/mapper/purchase/PurContractMapper.xml
@@ -144,6 +144,9 @@
       <if test="purContractRequest.endDate != null and purContractRequest.endDate != ''">
         AND pc.contractDate <![CDATA[<=]]> #{purContractRequest.endDate}
       </if>
+      <if test="purContractRequest.pageType != null ">
+        AND pc.pageType =  #{purContractRequest.pageType}
+      </if>
       order by  id desc
     </where>