From 9e9fb2da605f6d9b0d7cad6cf9cd8b13bee46bec Mon Sep 17 00:00:00 2001 From: mashuai Date: Thu, 18 Apr 2024 18:14:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8D=E7=A7=B0=E9=87=8D=E5=A4=8D=E6=80=A7?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sgzb/base/controller/BmProjectInfoController.java | 3 +-- .../sgzb/base/controller/BmProjectLotController.java | 4 +--- .../com/bonus/sgzb/base/mapper/BmProjectInfoMapper.java | 2 ++ .../com/bonus/sgzb/base/mapper/BmProjectLotMapper.java | 2 ++ .../bonus/sgzb/base/service/BmProjectInfoService.java | 3 ++- .../com/bonus/sgzb/base/service/BmProjectLotService.java | 3 ++- .../sgzb/base/service/impl/BmProjectInfoServiceImpl.java | 9 +++++++-- .../sgzb/base/service/impl/BmProjectLotServiceImpl.java | 9 +++++++-- .../main/resources/mapper/base/BmProjectInfoMapper.xml | 9 +++++++-- .../main/resources/mapper/base/BmProjectLotMapper.xml | 6 ++++++ 10 files changed, 37 insertions(+), 13 deletions(-) diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/BmProjectInfoController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/BmProjectInfoController.java index 9a0bbe10..e17988bc 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/BmProjectInfoController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/BmProjectInfoController.java @@ -1,6 +1,5 @@ package com.bonus.sgzb.base.controller; - import com.bonus.sgzb.base.domain.BmProjectInfo; import com.bonus.sgzb.base.service.BmProjectInfoService; import com.bonus.sgzb.common.core.utils.poi.ExcelUtil; @@ -89,7 +88,7 @@ public class BmProjectInfoController extends BaseController{ @PostMapping public AjaxResult projectInfoAdd(@Validated @RequestBody BmProjectInfo bmProjectInfo) { - return toAjax(bmProjectInfoService.projectInfoAdd(bmProjectInfo)); + return bmProjectInfoService.projectInfoAdd(bmProjectInfo); } /** diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/BmProjectLotController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/BmProjectLotController.java index 54028220..2b732253 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/BmProjectLotController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/BmProjectLotController.java @@ -1,7 +1,5 @@ package com.bonus.sgzb.base.controller; - -import com.bonus.sgzb.base.domain.BmProjectInfo; import com.bonus.sgzb.base.domain.BmProjectLot; import com.bonus.sgzb.base.service.BmProjectLotService; import com.bonus.sgzb.common.core.utils.poi.ExcelUtil; @@ -65,7 +63,7 @@ public class BmProjectLotController extends BaseController { @Log(title = "参数管理", businessType = BusinessType.INSERT) @PostMapping public AjaxResult projectLotAdd(@Validated @RequestBody BmProjectLot bmProjectLot) { - return toAjax(bmProjectLotService.projectLotAdd(bmProjectLot)); + return bmProjectLotService.projectLotAdd(bmProjectLot); } /** diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/BmProjectInfoMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/BmProjectInfoMapper.java index e5a20abe..ff976035 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/BmProjectInfoMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/BmProjectInfoMapper.java @@ -20,4 +20,6 @@ public interface BmProjectInfoMapper { public int updateBmProjectInfo(BmProjectInfo bmProjectInfo); public int deleteProjectInfoById(Long proId); + + int selectByName(String proName); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/BmProjectLotMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/BmProjectLotMapper.java index 90596429..624700c7 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/BmProjectLotMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/BmProjectLotMapper.java @@ -19,4 +19,6 @@ public interface BmProjectLotMapper { public int updateBmProjectLot(BmProjectLot bmProjectLot); public int deleteProjectLotById(Long lotId); + + int selectByName(String lotName); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/BmProjectInfoService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/BmProjectInfoService.java index b90c425d..1c5419e0 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/BmProjectInfoService.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/BmProjectInfoService.java @@ -1,6 +1,7 @@ package com.bonus.sgzb.base.service; import com.bonus.sgzb.base.domain.BmProjectInfo; +import com.bonus.sgzb.common.core.web.domain.AjaxResult; import java.util.List; @@ -11,7 +12,7 @@ public interface BmProjectInfoService { public List getProjectLot(); - public int projectInfoAdd(BmProjectInfo bmProjectInfo); + public AjaxResult projectInfoAdd(BmProjectInfo bmProjectInfo); public void remove(Long[] proIds); diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/BmProjectLotService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/BmProjectLotService.java index 7a4480cc..f5cb18f4 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/BmProjectLotService.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/BmProjectLotService.java @@ -2,6 +2,7 @@ package com.bonus.sgzb.base.service; import com.bonus.sgzb.base.domain.BmProjectLot; +import com.bonus.sgzb.common.core.web.domain.AjaxResult; import java.util.List; @@ -10,7 +11,7 @@ public interface BmProjectLotService { public List getProjectLot(BmProjectLot bmProjectLot); - public int projectLotAdd(BmProjectLot bmProjectLot); + public AjaxResult projectLotAdd(BmProjectLot bmProjectLot); public void remove(Long[] proIds); diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/BmProjectInfoServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/BmProjectInfoServiceImpl.java index e283faf4..4d622035 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/BmProjectInfoServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/BmProjectInfoServiceImpl.java @@ -5,6 +5,7 @@ import com.bonus.sgzb.base.mapper.BmProjectInfoMapper; import com.bonus.sgzb.base.service.BmProjectInfoService; import com.bonus.sgzb.common.core.exception.ServiceException; import com.bonus.sgzb.common.core.utils.StringUtils; +import com.bonus.sgzb.common.core.web.domain.AjaxResult; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -32,8 +33,12 @@ public class BmProjectInfoServiceImpl implements BmProjectInfoService { } @Override - public int projectInfoAdd(BmProjectInfo bmProjectInfo) { - return bmProjectInfoMapper.projectInfoAdd(bmProjectInfo); + public AjaxResult projectInfoAdd(BmProjectInfo bmProjectInfo) { + int count = bmProjectInfoMapper.selectByName(bmProjectInfo.getProName()); + if (count != 0) { + return AjaxResult.error("新增工程项目名称重复，请重新提交！！！"); + } + return AjaxResult.success(bmProjectInfoMapper.projectInfoAdd(bmProjectInfo)); } @Override diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/BmProjectLotServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/BmProjectLotServiceImpl.java index fe483dd3..c73f4371 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/BmProjectLotServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/BmProjectLotServiceImpl.java @@ -4,6 +4,7 @@ package com.bonus.sgzb.base.service.impl; import com.bonus.sgzb.base.domain.BmProjectLot; import com.bonus.sgzb.base.mapper.BmProjectLotMapper; import com.bonus.sgzb.base.service.BmProjectLotService; +import com.bonus.sgzb.common.core.web.domain.AjaxResult; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -28,8 +29,12 @@ public class BmProjectLotServiceImpl implements BmProjectLotService { } @Override - public int projectLotAdd(BmProjectLot bmProjectLot) { - return bmProjectLotMapper.projectLotAdd(bmProjectLot); + public AjaxResult projectLotAdd(BmProjectLot bmProjectLot) { + int count = bmProjectLotMapper.selectByName(bmProjectLot.getLotName()); + if (count != 0) { + return AjaxResult.error("新增标段工程名称重复，请重新提交！！！"); + } + return AjaxResult.success(bmProjectLotMapper.projectLotAdd(bmProjectLot)); } @Override diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/BmProjectInfoMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/BmProjectInfoMapper.xml index 64bda9c7..d1a39e7c 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/BmProjectInfoMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/BmProjectInfoMapper.xml @@ -138,9 +138,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and a.company_id = #{companyId} - + + - insert into bm_project_info ( pro_name, diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/BmProjectLotMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/BmProjectLotMapper.xml index be43a75a..a0079479 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/BmProjectLotMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/BmProjectLotMapper.xml @@ -86,6 +86,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ORDER BY a.lot_id DESC + insert into bm_project_lot ( lot_name,