From d9a621d6a74e483f2ab2dc3d624e484aa02a6057 Mon Sep 17 00:00:00 2001 From: zyh <2066096076@qq.com> Date: Mon, 9 Feb 2026 21:46:12 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=AC=E5=9C=BA=E6=95=B0=E6=8D=AE=E5=88=86?= =?UTF-8?q?=E7=A6=BBbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ScTransitionInfoController.java | 23 ++++-- .../mapper/ScTransitionInfoMapper.java | 2 +- .../service/IScTransitionInfoService.java | 2 +- .../impl/ScTransitionInfoServiceImpl.java | 58 +++++++++----- .../manage_sheep/ScTransitionInfoMapper.xml | 79 ++++++++++--------- 5 files changed, 95 insertions(+), 69 deletions(-) diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/controller/ScTransitionInfoController.java b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/controller/ScTransitionInfoController.java index fe5e615..43f1dd4 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/controller/ScTransitionInfoController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/controller/ScTransitionInfoController.java @@ -68,20 +68,27 @@ public class ScTransitionInfoController extends BaseController { /** * 新增转场 */ +// @PreAuthorize("@ss.hasPermi('produce:transition_info:add')") +// @Log(title = "转场", businessType = BusinessType.INSERT) +// @PostMapping +// public AjaxResult add(@RequestBody ScTransitionInfo scTransitionInfo) { +// scTransitionInfo.setUserId(getUserId()); +// scTransitionInfo.setDeptId(getDeptId()); +// return toAjax(scTransitionInfoService.insertScTransitionInfo(scTransitionInfo)); +// } + + //批量添加转场 @PreAuthorize("@ss.hasPermi('produce:transition_info:add')") @Log(title = "转场", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody ScTransitionInfo scTransitionInfo) { - scTransitionInfo.setUserId(getUserId()); - scTransitionInfo.setDeptId(getDeptId()); - return toAjax(scTransitionInfoService.insertScTransitionInfo(scTransitionInfo)); - } - - //批量添加 @PostMapping("/batch") public AjaxResult addBatch(@RequestBody List transitionInfoList) { Long userId = getUserId(); Long deptId = getDeptId(); + + for (ScTransitionInfo info : transitionInfoList) { + info.setUserId(userId); + info.setDeptId(deptId); + } return toAjax(scTransitionInfoService.insertScTransitionInfoBatch(transitionInfoList)); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/mapper/ScTransitionInfoMapper.java b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/mapper/ScTransitionInfoMapper.java index af07511..45b5b61 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/mapper/ScTransitionInfoMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/mapper/ScTransitionInfoMapper.java @@ -35,7 +35,7 @@ public interface ScTransitionInfoMapper * @param scTransitionInfo 转场 * @return 结果 */ - public int insertScTransitionInfo(ScTransitionInfo scTransitionInfo); +// public int insertScTransitionInfo(ScTransitionInfo scTransitionInfo); /** * 修改转场 diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/IScTransitionInfoService.java b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/IScTransitionInfoService.java index d4c85ea..f986ba5 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/IScTransitionInfoService.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/IScTransitionInfoService.java @@ -33,7 +33,7 @@ public interface IScTransitionInfoService { * @param scTransitionInfo 转场 * @return 结果 */ - public int insertScTransitionInfo(ScTransitionInfo scTransitionInfo); + // public int insertScTransitionInfo(ScTransitionInfo scTransitionInfo); /** * 修改转场 diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScTransitionInfoServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScTransitionInfoServiceImpl.java index 73067fe..4c73612 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScTransitionInfoServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScTransitionInfoServiceImpl.java @@ -67,26 +67,35 @@ public class ScTransitionInfoServiceImpl implements IScTransitionInfoService * @param scTransitionInfo 转场 * @return 结果 */ - @Override - @Transactional(rollbackFor = Exception.class) - public int insertScTransitionInfo(ScTransitionInfo scTransitionInfo) { - // 根据耳号查询羊只信息 - String manageTags = scTransitionInfo.getManageTags(); - if (StringUtils.isNotBlank(manageTags)) { - BasSheep sheep = basSheepService.selectBasSheepByManageTags(manageTags.trim()); - if (sheep == null) { - throw new RuntimeException("耳号不存在，请检查输入"); - } - scTransitionInfo.setSheepId(sheep.getId().intValue()); - scTransitionInfo.setVarietyId(sheep.getVarietyId()); - } else { - throw new RuntimeException("耳号不能为空"); - } - - scTransitionInfo.setStatus(0); - scTransitionInfo.setCreateTime(DateUtils.getNowDate()); - return scTransitionInfoMapper.insertScTransitionInfo(scTransitionInfo); - } +// @Override +// @Transactional(rollbackFor = Exception.class) +// public int insertScTransitionInfo(ScTransitionInfo scTransitionInfo) { +// // 根据耳号查询羊只信息 +// String manageTags = scTransitionInfo.getManageTags(); +// if (StringUtils.isNotBlank(manageTags)) { +// BasSheep sheep = basSheepService.selectBasSheepByManageTags(manageTags.trim()); +// if (sheep == null) { +// throw new RuntimeException("耳号不存在，请检查输入"); +// } +// scTransitionInfo.setSheepId(sheep.getId().intValue()); +// scTransitionInfo.setVarietyId(sheep.getVarietyId()); +// if (scTransitionInfo.getSheepfoldId() == null && sheep.getSheepfoldId() != null) { +// scTransitionInfo.setSheepfoldId(sheep.getSheepfoldId()); +// } +// if (StringUtils.isBlank(scTransitionInfo.getTransFrom()) && sheep.getRanchId() != null) { +// DaRanch ranch = daRanchService.selectDaRanchById(sheep.getRanchId()); +// if (ranch != null) { +// scTransitionInfo.setTransFrom(ranch.getRanch()); +// } +// } +// } else { +// throw new RuntimeException("耳号不能为空"); +// } +// +// scTransitionInfo.setStatus(0); +// scTransitionInfo.setCreateTime(DateUtils.getNowDate()); +// return scTransitionInfoMapper.insertScTransitionInfo(scTransitionInfo); +// } /** @@ -141,6 +150,15 @@ public class ScTransitionInfoServiceImpl implements IScTransitionInfoService } info.setSheepId(sheep.getId().intValue()); info.setVarietyId(sheep.getVarietyId()); + if (info.getSheepfoldId() == null && sheep.getSheepfoldId() != null) { + info.setSheepfoldId(sheep.getSheepfoldId()); + } + if (StringUtils.isBlank(info.getTransFrom()) && sheep.getRanchId() != null) { + DaRanch ranch = daRanchService.selectDaRanchById(sheep.getRanchId()); + if (ranch != null) { + info.setTransFrom(ranch.getRanch()); + } + } } else { throw new RuntimeException("耳号不能为空"); } diff --git a/zhyc-module/src/main/resources/mapper/produce/manage_sheep/ScTransitionInfoMapper.xml b/zhyc-module/src/main/resources/mapper/produce/manage_sheep/ScTransitionInfoMapper.xml index 4b5fcfa..103a98d 100644 --- a/zhyc-module/src/main/resources/mapper/produce/manage_sheep/ScTransitionInfoMapper.xml +++ b/zhyc-module/src/main/resources/mapper/produce/manage_sheep/ScTransitionInfoMapper.xml @@ -91,53 +91,54 @@ WHERE t.id = #{id} - - insert into sc_transition_info - - sheep_id, - variety_id, - trans_to, - trans_from, - event_type, - trans_type, - transition_date, - technician, - status, - comment, - create_by, - create_time, - user_id, - dept_id, - - - #{sheepId}, - #{varietyId}, - #{transTo}, - #{transFrom}, - #{eventType}, - #{transType}, - #{transitionDate}, - #{technician}, - #{status}, - #{comment}, - #{createBy}, - #{createTime}, - #{userId}, - #{deptId}, - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + INSERT INTO sc_transition_info ( - sheep_id, variety_id, trans_to, trans_from, + sheep_id,sheepfold_id, variety_id, trans_to, trans_from, event_type,trans_type, transition_date, technician, status, comment, - create_by, create_time + create_by, create_time,user_id,dept_id ) VALUES ( - #{item.sheepId}, #{item.varietyId}, #{item.transTo}, #{item.transFrom}, #{item.eventType}, + #{item.sheepId},#{item.sheepfoldId}, #{item.varietyId}, #{item.transTo}, #{item.transFrom}, #{item.eventType}, #{item.transType},#{item.transitionDate}, #{item.technician}, #{item.status}, #{item.comment}, - #{item.createBy}, now() + #{item.createBy}, now(), #{item.userId}, + #{item.deptId} )