From b6767bccd9602637d95c10fd79a846eb7e01f0a3 Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Mon, 23 Oct 2023 14:05:32 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=AD=E5=BB=BA=E8=B5=84=E9=87=91=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/GovProjectCollectionController.java |  7 +++++
 .../pmapi/gov/convert/ProjectConvert.java          |  6 ++---
 .../scheduler/task/SynProjectCollectionTask.java   | 30 ++++++++++++++++++++--
 3 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/controller/GovProjectCollectionController.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/controller/GovProjectCollectionController.java
index a50d629..610b943 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/gov/controller/GovProjectCollectionController.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/controller/GovProjectCollectionController.java
@@ -163,4 +163,11 @@ public class GovProjectCollectionController {
     public void stagingConvertPdf2(@RequestParam(required = false) String projId) {
         collectionTask.stagingConvertPdf2(projId);
     }
+
+    @PostMapping("/staging-convert-pdf3")
+    @ApiOperation("把库存的项目归集的文件 都转换成PDF文件存入字段 采购")
+    @WebLog("主动转换库存的文件都为PDF文件 采购")
+    public void stagingConvertPdf3(@RequestParam(required = false) String projId) {
+        collectionTask.stagingConvertPdf3(projId);
+    }
 }
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/convert/ProjectConvert.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/convert/ProjectConvert.java
index 26e986a..9f0a55a 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/gov/convert/ProjectConvert.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/convert/ProjectConvert.java
@@ -109,11 +109,11 @@ public class ProjectConvert {
                 .map(p -> {
                     ProjectProcureReq r = BeanUtil.copyProperties(p, ProjectProcureReq.class);
                     r.setBiddingFile(StringUtils.isNotBlank(p.getBiddingFilePdf()) ? p.getBiddingFilePdf() :
-                            p.getBiddingFile());
+                            null);
                     r.setPurchaseFile(StringUtils.isNotBlank(p.getPurchaseFilePdf()) ? p.getPurchaseFilePdf() :
-                            p.getPurchaseFile());
+                            null);
                     r.setPurchaseContract(StringUtils.isNotBlank(p.getPurchaseContractPdf()) ? p.getPurchaseContractPdf() :
-                            p.getPurchaseContract());
+                            null);
                     r.setBaseWinningBidTime(ProjectCollectionUtil.convertLocalDateTime(p.getBaseWinningBidTime()));
                     r.setBasePaymentTime(ProjectCollectionUtil.convertLocalDateTime(p.getBasePaymentTime()));
                     return r;
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/SynProjectCollectionTask.java b/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/SynProjectCollectionTask.java
index 9c64cec..b070be1 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/SynProjectCollectionTask.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/SynProjectCollectionTask.java
@@ -181,6 +181,34 @@ public class SynProjectCollectionTask {
         log.info("项目归集库存转换PDF任务2结束====={}s",stopWatch.getTotalTimeSeconds());
     }
 
+    public void stagingConvertPdf3(String projId) {
+        log.info("项目归集库存转换PDF任务3开始=====");
+
+        StopWatch stopWatch = new StopWatch();
+        stopWatch.start();
+        ProjectListReq req = new ProjectListReq();
+        req.setPageNumber(1);
+        req.setPageSize(BizConst.MAX_EXPORT_COUNT);
+        List<GovBizProjectProcure> procures = procureService.list(Wrappers.lambdaQuery(GovBizProjectProcure.class)
+                .eq(GovBizProjectProcure::getDeleted,Boolean.FALSE)
+                .eq(StringUtils.isNotBlank(projId),GovBizProjectProcure::getBaseProjId,projId)
+                .isNotNull(GovBizProjectProcure::getPurchaseContract)
+                .isNull(GovBizProjectProcure::getPurchaseContractPdf));
+
+        if(CollUtil.isEmpty(procures)){
+            log.info("没有项目归集 采购信息 任务终止");
+            return;
+        }
+
+        for(GovBizProjectProcure procure : procures){
+            //开始转换PDF
+            convertPdfVo(procure.getBaseProjId());
+        }
+
+        stopWatch.stop();
+        log.info("项目归集库存转换PDF任务3结束====={}s",stopWatch.getTotalTimeSeconds());
+    }
+
     //开始转换PDF
     private void convertPdfVo(String baseProjId) {
         convertPdfApply(baseProjId);
@@ -381,6 +409,4 @@ public class SynProjectCollectionTask {
             procureService.updateById(procure);
         }
     }
-
-
 }