From 44c4bc30321a6696c1f47875de3a73970c0b6777 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com> Date: Fri, 26 Dec 2025 15:38:11 +0800 Subject: [PATCH] =?UTF-8?q?=E8=81=94=E8=B0=83=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../digital/controller/DayPlanController.java | 4 ++-- .../controller/InspectionStationController.java | 11 ++++++++--- .../digital/mapper/InspectionStationMapper.java | 2 ++ .../com/bonus/digital/service/DayPlanService.java | 2 +- .../digital/service/impl/DayPlanServiceImpl.java | 14 ++++++++++---- .../service/impl/InspectionStationServiceImpl.java | 8 ++++++++ .../resources/mapper/InspectionStationMapper.xml | 5 +++++ 7 files changed, 36 insertions(+), 10 deletions(-) diff --git a/bonus-business/src/main/java/com/bonus/digital/controller/DayPlanController.java b/bonus-business/src/main/java/com/bonus/digital/controller/DayPlanController.java index 82cb524..32d8f8d 100644 --- a/bonus-business/src/main/java/com/bonus/digital/controller/DayPlanController.java +++ b/bonus-business/src/main/java/com/bonus/digital/controller/DayPlanController.java @@ -48,9 +48,9 @@ public class DayPlanController extends BaseController { //新增日计划 @PreAuthorize("@ss.hasPermi('day:plan:add')") @PostMapping("/addDayPlan") - public AjaxResult addMonthlyPlan(@RequestBody DayPlanVo dayPlanVo) { + public AjaxResult addMonthlyPlan(@RequestBody List dayPlanVoList) { try { - int res = dayPlanService.addMonthlyPlan(dayPlanVo); + int res = dayPlanService.addMonthlyPlan(dayPlanVoList); if (res > 0) { return AjaxResult.success(); } else { diff --git a/bonus-business/src/main/java/com/bonus/digital/controller/InspectionStationController.java b/bonus-business/src/main/java/com/bonus/digital/controller/InspectionStationController.java index 1ef4da2..d487555 100644 --- a/bonus-business/src/main/java/com/bonus/digital/controller/InspectionStationController.java +++ b/bonus-business/src/main/java/com/bonus/digital/controller/InspectionStationController.java @@ -51,9 +51,12 @@ public class InspectionStationController extends BaseController { { try { int res = inspectionStationService.addInspectionStation(inspectionStationVo); - if (res > 0) { + if (res == 1) { return AjaxResult.success(); - }else { + } else if (res == 2) { + return AjaxResult.error("名称已经存在"); + } + else { return AjaxResult.error("新增失败"); } }catch (Exception e) { @@ -89,8 +92,10 @@ public class InspectionStationController extends BaseController { { try { int res = inspectionStationService.updateInspectionStation(inspectionStationVo); - if (res > 0) { + if (res == 1) { return AjaxResult.success(); + } else if (res == 2) { + return AjaxResult.error("名称已经存在"); }else { return AjaxResult.error("修改失败"); } diff --git a/bonus-business/src/main/java/com/bonus/digital/mapper/InspectionStationMapper.java b/bonus-business/src/main/java/com/bonus/digital/mapper/InspectionStationMapper.java index 75d59bc..0d0fc2a 100644 --- a/bonus-business/src/main/java/com/bonus/digital/mapper/InspectionStationMapper.java +++ b/bonus-business/src/main/java/com/bonus/digital/mapper/InspectionStationMapper.java @@ -26,4 +26,6 @@ public interface InspectionStationMapper { int updateInspectionStation(InspectionStationVo inspectionStationVo); InspectionStationVo getInspectionStationDetail(InspectionStationVo inspectionStationVo); + + InspectionStationVo getInspectionStation(InspectionStationVo inspectionStationVo); } diff --git a/bonus-business/src/main/java/com/bonus/digital/service/DayPlanService.java b/bonus-business/src/main/java/com/bonus/digital/service/DayPlanService.java index 489586a..8871cb8 100644 --- a/bonus-business/src/main/java/com/bonus/digital/service/DayPlanService.java +++ b/bonus-business/src/main/java/com/bonus/digital/service/DayPlanService.java @@ -13,7 +13,7 @@ import java.util.List; */ public interface DayPlanService { - int addMonthlyPlan(DayPlanVo dayPlanVo); + int addMonthlyPlan(List dayPlanVo); int delDayPlan(DayPlanVo dayPlanVo); diff --git a/bonus-business/src/main/java/com/bonus/digital/service/impl/DayPlanServiceImpl.java b/bonus-business/src/main/java/com/bonus/digital/service/impl/DayPlanServiceImpl.java index af40464..f663f32 100644 --- a/bonus-business/src/main/java/com/bonus/digital/service/impl/DayPlanServiceImpl.java +++ b/bonus-business/src/main/java/com/bonus/digital/service/impl/DayPlanServiceImpl.java @@ -7,6 +7,7 @@ import com.bonus.digital.dao.WorkloadSummaryExcelVo; import com.bonus.digital.mapper.DayPlanMapper; import com.bonus.digital.service.DayPlanService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.ArrayList; @@ -21,11 +22,16 @@ import java.util.List; public class DayPlanServiceImpl implements DayPlanService { @Resource private DayPlanMapper dayPlanMapper; + @Override - public int addMonthlyPlan(DayPlanVo dayPlanVo) { - dayPlanVo.setCreateUser(SecurityUtils.getUserId().toString()); - dayPlanVo.setCreateTime(new Date()); - return dayPlanMapper.addMonthlyPlan(dayPlanVo); + @Transactional + public int addMonthlyPlan(List dayPlanVo) { + for (DayPlanVo dayPlanVo1 : dayPlanVo) { + dayPlanVo1.setCreateUser(SecurityUtils.getUserId().toString()); + dayPlanVo1.setCreateTime(new Date()); + dayPlanMapper.addMonthlyPlan(dayPlanVo1); + } + return 1; } @Override diff --git a/bonus-business/src/main/java/com/bonus/digital/service/impl/InspectionStationServiceImpl.java b/bonus-business/src/main/java/com/bonus/digital/service/impl/InspectionStationServiceImpl.java index 0ae49a9..d3aea17 100644 --- a/bonus-business/src/main/java/com/bonus/digital/service/impl/InspectionStationServiceImpl.java +++ b/bonus-business/src/main/java/com/bonus/digital/service/impl/InspectionStationServiceImpl.java @@ -40,6 +40,10 @@ public class InspectionStationServiceImpl implements InspectionStationService { Long userId = SecurityUtils.getUserId(); inspectionStationVo.setCreateUser(userId.toString()); inspectionStationVo.setCreateTime(new Date()); + InspectionStationVo res = inspectionStationMapper.getInspectionStation(inspectionStationVo); + if (res != null) { + return 2; + } return inspectionStationMapper.addInspectionStation(inspectionStationVo); } @@ -59,6 +63,10 @@ public class InspectionStationServiceImpl implements InspectionStationService { Long userId = SecurityUtils.getUserId(); inspectionStationVo.setUpdateUser(userId.toString()); inspectionStationVo.setUpdateTime(new Date()); + InspectionStationVo res = inspectionStationMapper.getInspectionStation(inspectionStationVo); + if (res != null && inspectionStationVo.getInspectionStationId()!=res.getInspectionStationId()) { + return 2; + } return inspectionStationMapper.updateInspectionStation(inspectionStationVo); } } diff --git a/bonus-business/src/main/resources/mapper/InspectionStationMapper.xml b/bonus-business/src/main/resources/mapper/InspectionStationMapper.xml index dd726ab..330afed 100644 --- a/bonus-business/src/main/resources/mapper/InspectionStationMapper.xml +++ b/bonus-business/src/main/resources/mapper/InspectionStationMapper.xml @@ -40,4 +40,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select inspection_station_id,inspection_station_name,remark,category from tb_inspection_station where inspection_station_name = #{inspectionStationName} and is_active = '1' +