From f6a63d4009196a0af7739ff692b5545b60d6ace8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com>
Date: Mon, 6 Sep 2021 17:49:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E5=85=A5=E5=90=88=E5=90=8C=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E9=A1=B9=E7=9B=AE=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PayIncomeContractController.java          |  8 ++--
 .../service/IPayIncomeContractService.java    |  4 +-
 .../impl/PayIncomeContractServiceImpl.java    | 42 ++++++++++---------
 3 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java
index 1380e56e..bc70b8a5 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java
@@ -227,16 +227,16 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
 	/**
 	*  归档
 	*
-	* @param payIncomeContract 收入合同
+	* @param payIncomeContractAudit 审核记录
 	*/
 	@AutoLog(value = "收入合同-归档")
 	@ApiOperation(value="收入合同-归档", notes="收入合同-归档")
 	@PostMapping(value = "/archive")
-	public Result<?> archive(@RequestBody PayIncomeContract payIncomeContract) {
-		if(StringUtils.isBlank(payIncomeContract.getId())){
+	public Result<?> archive(@RequestBody PayIncomeContractAudit payIncomeContractAudit) {
+		if(StringUtils.isBlank(payIncomeContractAudit.getContractId())){
 			return Result.error("id不能为空!");
 		}
-		payIncomeContractService.updateArchive(payIncomeContract.getId());
+		payIncomeContractService.updateArchive(payIncomeContractAudit);
 		return Result.OK("归档成功!");
 	}
 	
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPayIncomeContractService.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPayIncomeContractService.java
index e1f5d965..5be6f598 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPayIncomeContractService.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPayIncomeContractService.java
@@ -99,11 +99,11 @@ public interface IPayIncomeContractService extends IService<PayIncomeContract> {
     * @Description 归档
     * @Author  lqt
     * @Date   2021/9/5
-    * @Param id 合同id
+    * @Param payIncomeContractAudit 审核记录
     * @Return
     * @Exception
     */
-    void updateArchive(String id);
+    void updateArchive(PayIncomeContractAudit payIncomeContractAudit);
     /**
     * @Description 删除
     * @Author  lqt
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java
index 90902abe..352c0f8c 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java
@@ -425,10 +425,6 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
     @Override
     public void submitAudit(PayIncomeContract payIncomeContract) {
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        StringBuilder msgPayIncomeContractAudit = ValidUtil.validateAll(payIncomeContract);
-        if(!StringUtils.isBlank(msgPayIncomeContractAudit)){
-            throw new JeroBootException(msgPayIncomeContractAudit.toString());
-        }
         if(StringUtils.isBlank(payIncomeContract.getId())){
             throw new JeroBootException("合同id不能为空！");
         }
@@ -436,11 +432,17 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
         if(Objects.isNull(payIncomeContractNew)){
             throw new JeroBootException("合同不存在！");
         }
+        // 验证合同状态是否为草稿或者未通过
+        if(!Objects.equals(payIncomeContract.getStatus(),PayIncomeContractCommon.STATUS2)
+               || (!Objects.equals(payIncomeContractNew.getStatus(),PayIncomeContractCommon.STATUS1)
+                        && !Objects.equals(payIncomeContractNew.getStatus(),PayIncomeContractCommon.STATUS4))){
+            throw new JeroBootException("收入合同审核状态不正确！");
+        }
         LambdaUpdateWrapper<PayIncomeContract> updatePayIncomeContract = new LambdaUpdateWrapper<>();
         updatePayIncomeContract.set(PayIncomeContract::getUpdateBy,sysUser.getUsername());
         updatePayIncomeContract.set(PayIncomeContract::getUpdateTime,new Date());
         updatePayIncomeContract.eq(PayIncomeContract::getId,payIncomeContract.getId());
-        updatePayIncomeContract.set(PayIncomeContract::getStatus,PayIncomeContractCommon.STATUS3);
+        updatePayIncomeContract.set(PayIncomeContract::getStatus,PayIncomeContractCommon.STATUS2);
         payIncomeContractService.update(updatePayIncomeContract);
     }
 
@@ -484,24 +486,25 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
             throw new JeroBootException("收入合同不存在！");
         }
         // 校验合同状态是否为待审核
-        if(!Objects.equals(payIncomeContractStatus.getStatus(),PayIncomeContractCommon.STATUS2)){
-            throw new JeroBootException("收入合同不可审核！");
-        }
-        if(Objects.isNull(payIncomeContractAudit.getContractStatus()) ||
-                (!Objects.equals(payIncomeContractAudit.getContractStatus(),PayIncomeContractCommon.STATUS3)
-                && !Objects.equals(payIncomeContractAudit.getContractStatus(),PayIncomeContractCommon.STATUS4))){
-            throw new JeroBootException("收入合同审核状态不正确！");
+        if(Objects.isNull(payIncomeContractAudit.getContractStatus()) || !Objects.equals(payIncomeContractStatus.getStatus(),PayIncomeContractCommon.STATUS2)
+        || (!Objects.equals(payIncomeContractAudit.getContractStatus(),PayIncomeContractCommon.STATUS3) && !Objects.equals(payIncomeContractAudit.getContractStatus(),PayIncomeContractCommon.STATUS4))){
+            throw new JeroBootException("收入合同状态不正确！");
         }
+
         if(Objects.equals(payIncomeContractAudit.getContractStatus(),PayIncomeContractCommon.STATUS4)
             && StringUtils.isBlank(payIncomeContractAudit.getExplainRemarks())){
             throw new JeroBootException("请输入拒绝说明！");
         }
+        if(Objects.equals(payIncomeContractAudit.getContractStatus(),PayIncomeContractCommon.STATUS3)){
+            payIncomeContractAudit.setExplainRemarks("");
+        }
+
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         LambdaUpdateWrapper<PayIncomeContract> update = new LambdaUpdateWrapper();
         update.set(PayIncomeContract::getUpdateBy,sysUser.getUsername());
         update.set(PayIncomeContract::getUpdateTime,new Date());
-        update.set(PayIncomeContract::getId,payIncomeContractAudit.getContractId());
-        update.eq(PayIncomeContract::getStatus, payIncomeContractAudit.getContractStatus());
+        update.eq(PayIncomeContract::getId,payIncomeContractAudit.getContractId());
+        update.set(PayIncomeContract::getStatus, payIncomeContractAudit.getContractStatus());
         payIncomeContractService.update(update);
         // 添加审核记录
         payIncomeContractAuditService.save(payIncomeContractAudit);
@@ -509,8 +512,8 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
 
     @Override
     @Transactional
-    public void updateArchive(String id) {
-        PayIncomeContract payIncomeContractStatus = payIncomeContractService.getById(id);
+    public void updateArchive(PayIncomeContractAudit payIncomeContractAudit) {
+        PayIncomeContract payIncomeContractStatus = payIncomeContractService.getById(payIncomeContractAudit.getContractId());
         if(Objects.isNull(payIncomeContractStatus)){
             throw new JeroBootException("收入合同不存在！");
         }
@@ -518,16 +521,17 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
         if(!Objects.equals(payIncomeContractStatus.getStatus(),PayIncomeContractCommon.STATUS3)){
             throw new JeroBootException("收入合同不可归档！");
         }
+        if(Objects.isNull(payIncomeContractAudit.getContractStatus()) || !Objects.equals(payIncomeContractAudit.getContractStatus(),PayIncomeContractCommon.STATUS5)){
+            throw new JeroBootException("收入合同状态不正确！");
+        }
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         LambdaUpdateWrapper<PayIncomeContract> update = new LambdaUpdateWrapper();
         update.set(PayIncomeContract::getUpdateBy,sysUser.getUsername());
         update.set(PayIncomeContract::getUpdateTime,new Date());
-        update.eq(PayIncomeContract::getId,id);
+        update.eq(PayIncomeContract::getId,payIncomeContractAudit.getContractId());
         update.set(PayIncomeContract::getStatus, PayIncomeContractCommon.STATUS5);
         payIncomeContractService.update(update);
         // 添加归档记录
-        PayIncomeContractAudit payIncomeContractAudit = new PayIncomeContractAudit();
-        payIncomeContractAudit.setContractId(id);
         payIncomeContractAudit.setContractStatus(PayIncomeContractCommon.STATUS5);
         payIncomeContractAuditService.save(payIncomeContractAudit);
     }