From 257dffcad6622e62c89b0b26b0e042623c39db7f Mon Sep 17 00:00:00 2001
From: 1073413548 <14628403+gjb0917@user.noreply.gitee.com>
Date: Fri, 23 Aug 2024 15:01:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E6=AC=BE=E5=AE=A1=E6=89=B9=E9=80=9A?=
 =?UTF-8?q?=E8=BF=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/pusong/business/service/IPsTaskService.java    |  7 +++++++
 .../approver/impl/PayContractApproverServiceImpl.java  | 10 +++++++---
 .../business/service/impl/PsTaskServiceImpl.java       | 10 +++++++++-
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/IPsTaskService.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/IPsTaskService.java
index 06f2b8c..0b49530 100644
--- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/IPsTaskService.java
+++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/IPsTaskService.java
@@ -57,6 +57,13 @@ public interface IPsTaskService {
      * @return 公司及资料信息
      */
     PsTaskMainVo queryInfo(Long id);
+    /**
+     * 根据合同编码查询任务
+     *
+     * @param contractCode 合同编码
+     * @return
+     */
+    PsTaskMain queryByContractCode(String contractCode);
     /**
      * 根据主任务id查询进度
      *
diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/PayContractApproverServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/PayContractApproverServiceImpl.java
index fdfcc37..e683438 100644
--- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/PayContractApproverServiceImpl.java
+++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/PayContractApproverServiceImpl.java
@@ -54,11 +54,13 @@ public class PayContractApproverServiceImpl extends ApproverAbstractServiceImpl
         }
         update.setId(Long.valueOf(psApproverRecord.getBusinessId()));
         update.setPayStatus(PayStatusEnum.SUCCESS.getCode());
+        payService.updateById(update);
         List<PsContractPayVo> list = payService.queryListByContractCode(info.getContractCode(), PayBuinessStatusEnum.PAY.getCode(), PayStatusEnum.SUCCESS);
         //如果没有过回款记录初始化任务主表,并修改合同状态
         log.info("查询回款记录数量{}任务状态{}", list.size(),info.getContractStatus());
-        if(CollectionUtils.isEmpty(list) && StringUtils.equals(ContractStatusEnum.CREATE.getCode(),info.getContractStatus())){
-            log.info("合同未回款过，初始化任务主表");
+        PsTaskMain task = taskMainService.queryByContractCode(psApproverRecord.getContractCode());
+        if(task == null || task.getId() == null){
+            log.info("任务未初始化，初始化任务主表");
             PsTaskMain psTaskMain = new PsTaskMain();
             psTaskMain.setContractCode(psApproverRecord.getContractCode());
             psTaskMain.setTaskType(TaskTypeEnum.CONTRACT.getCode());
@@ -66,13 +68,15 @@ public class PayContractApproverServiceImpl extends ApproverAbstractServiceImpl
             psTaskMain.setCompanyId(info.getCompanyId());
             psTaskMain.setCustomId(info.getCustomId());
             taskMainService.insert(psTaskMain);
+        }
+        if(StringUtils.equals(ContractStatusEnum.CREATE.getCode(),info.getContractStatus())){
             log.info("修改合同状态");
             PsContractInfo updateInfo = new PsContractInfo();
             updateInfo.setContractCode(info.getContractCode());
             updateInfo.setContractStatus(ContractStatusEnum.RETURN.getCode());
             psContractInfoService.updateByCode(updateInfo);
         }
-        payService.updateById(update);
+
     }
 
     @Override
diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsTaskServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsTaskServiceImpl.java
index 4b09a39..617fa52 100644
--- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsTaskServiceImpl.java
+++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsTaskServiceImpl.java
@@ -162,7 +162,15 @@ public class PsTaskServiceImpl implements IPsTaskService {
         psTaskMainVo.setTaskMediaVoList(list);
         return psTaskMainVo;
     }
-
+    /**
+     * 根据合同编码查询任务
+     *
+     * @param contractCode 合同编码
+     * @return
+     */
+    public PsTaskMain queryByContractCode(String contractCode){
+        return baseMapper.selectOne(Wrappers.<PsTaskMain>lambdaQuery().eq(PsTaskMain::getContractCode, contractCode));
+    }
     /**
      * 上传资料和公司信息
      *