From b099235b488e62f4df66012a97168b6cc0445d53 Mon Sep 17 00:00:00 2001
From: syruan <321359594@qq.com>
Date: Wed, 13 Nov 2024 16:45:17 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=96=99=E7=AE=A1=E7=90=86--=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E4=BA=8B=E5=8A=A1=E3=80=81=E5=BC=82=E5=B8=B8=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/LeaseApplyInfoServiceImpl.java       | 26 ++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java
index 50922867..11bfa242 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java
@@ -24,6 +24,7 @@ import org.springframework.stereotype.Service;
 import com.bonus.material.lease.mapper.LeaseApplyInfoMapper;
 import com.bonus.material.lease.domain.LeaseApplyInfo;
 import com.bonus.material.lease.service.ILeaseApplyInfoService;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
@@ -140,6 +141,7 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService {
      * @param leaseApplyInfo 领料任务info
      */
     @Override
+    @Transactional
     public AjaxResult publish(LeaseApplyInfo leaseApplyInfo) {
         if (leaseApplyInfo.getId() == null) {
             return AjaxResult.error("ID为空,请完善后重新发布!");
@@ -150,16 +152,22 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService {
 
         leaseApplyInfo.setUpdateTime(DateUtils.getNowDate());
         leaseApplyInfo.setStatus(String.valueOf(PurchaseTaskStatusEnum.LEASE_TASK_PUBLISHED.getStatus()));
-        int result = leaseApplyInfoMapper.updateLeaseApplyInfo(leaseApplyInfo);
-        if (result > 0) {
-            // 同步修改tm_task任务状态
-            TmTask tmTask = new TmTask();
-            tmTask.setTaskId(leaseApplyInfo.getTaskId());
-            tmTask.setStatus(String.valueOf(PurchaseTaskStatusEnum.LEASE_TASK_PUBLISHED.getStatus()));
-            tmTaskMapper.updateTmTask(tmTask);
-            return AjaxResult.success("发布成功");
-        } else {
+        try {
+            int result = leaseApplyInfoMapper.updateLeaseApplyInfo(leaseApplyInfo);
+            if (result > 0) {
+                // 同步修改tm_task任务状态
+                TmTask tmTask = new TmTask();
+                tmTask.setTaskId(leaseApplyInfo.getTaskId());
+                tmTask.setStatus(String.valueOf(PurchaseTaskStatusEnum.LEASE_TASK_PUBLISHED.getStatus()));
+                tmTaskMapper.updateTmTask(tmTask);
+                return AjaxResult.success("发布成功");
+            }
             return AjaxResult.error("发布失败");
+        } catch (DataAccessException e) {
+            // 抛出异常、回滚数据
+            throw new RuntimeException();
+        } catch (Exception e) {
+            return AjaxResult.error("发布失败:" + e.getMessage());
         }
     }