From 861dae546a01cfd4e3a5740f4c9cdb450faeba36 Mon Sep 17 00:00:00 2001
From: zyh <2066096076@qq.com>
Date: Tue, 19 Aug 2025 18:01:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=AC=E7=BE=A4=E5=8A=9F=E8=83=BD=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ScTransGroupController.java    |  8 +++----
 .../service/impl/ScTransGroupServiceImpl.java | 24 +++++++++++++++----
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/controller/ScTransGroupController.java b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/controller/ScTransGroupController.java
index 9fe5a2f..24518d4 100644
--- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/controller/ScTransGroupController.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/controller/ScTransGroupController.java
@@ -101,8 +101,8 @@ public class ScTransGroupController extends BaseController {
     /**
      * 审批转群记录
      */
-    @PutMapping("/approve")
-    public AjaxResult approve(@RequestBody ScTransGroup scTransGroup) {
-        return toAjax(scTransGroupService.approveScTransGroup(scTransGroup));
-    }
+//    @PutMapping("/approve")
+//    public AjaxResult approve(@RequestBody ScTransGroup scTransGroup) {
+//        return toAjax(scTransGroupService.approveScTransGroup(scTransGroup));
+//    }
 }
diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScTransGroupServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScTransGroupServiceImpl.java
index e52185e..d68d112 100644
--- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScTransGroupServiceImpl.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScTransGroupServiceImpl.java
@@ -73,11 +73,21 @@ public class ScTransGroupServiceImpl implements IScTransGroupService {
      */
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public int insertScTransGroup(ScTransGroup scTransGroup) {
         scTransGroup.setStatus(0);
         scTransGroup.setCreateTime(DateUtils.getNowDate());
         scTransGroup.setCreateBy(SecurityUtils.getUsername());
-        return scTransGroupMapper.insertScTransGroup(scTransGroup);
+        int rows = scTransGroupMapper.insertScTransGroup(scTransGroup);
+        if (rows > 0) {
+            try {
+                updateSheepFold(scTransGroup);
+            } catch (Exception e) {
+                throw new RuntimeException("新增转群记录后更新羊舍失败：" + e.getMessage(), e);
+            }
+        }
+        return rows;
+//        return scTransGroupMapper.insertScTransGroup(scTransGroup);
     }
 
     /**
@@ -133,9 +143,15 @@ public class ScTransGroupServiceImpl implements IScTransGroupService {
      * 更新羊只所在羊舍
      */
     private void updateSheepFold(ScTransGroup transGroup) {
-        Long foldTo = Long.valueOf(transGroup.getFoldTo());
-        if (foldTo == null) {
-            throw new RuntimeException("转入羊舍不能为空");
+        Object foldToObj = transGroup.getFoldTo();
+        if (foldToObj == null) {
+            throw new RuntimeException("转入羊舍ID为空，请检查前端提交的foldTo参数");
+        }
+        Long foldTo;
+        try {
+            foldTo = Long.valueOf(foldToObj.toString());
+        } catch (NumberFormatException e) {
+            throw new RuntimeException("转入羊舍ID格式错误，应为数字，实际值：" + foldToObj);
         }
 
         String manageTags = transGroup.getManageTags();