diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmSubTeamContractController.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmSubTeamContractController.java index 9feed1b..cb62cc4 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmSubTeamContractController.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmSubTeamContractController.java @@ -70,6 +70,8 @@ public class PmSubTeamContractController extends BaseController { return toAjax(res); } else if (res==2) { return error("班组下还有人员未出场"); + }else if (res==3) { + return error("班组已入场该工程"); }else { return error("班组信息已存在"); } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmSubTeamContractServiceImpl.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmSubTeamContractServiceImpl.java index 91f5b96..b983e68 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmSubTeamContractServiceImpl.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmSubTeamContractServiceImpl.java @@ -75,6 +75,12 @@ public class PmSubTeamContractServiceImpl implements PmSubTeamContractService { fileUploadUtils.uploadFile(fileBasicMsgDto.getFiles(), Constants.PM_SUB_TEAM_CONTRACT, pmSubTeamContract.getId().toString(), type,"", ""); } }else { + //查看班组是否已经如果这个工程 + + List PmSubTeamContractList = pmSubTeamContractMapper.selectSubTeamContractList(pmSubTeamContract); + if (PmSubTeamContractList.size()>0){ + return 3; + } pmSubTeamContract.setCreateUser(SecurityUtils.getLoginUser().getUsername()); pmSubTeamContract.setCreateTime(new Date()); pmSubTeamContract.setUpdateUser(SecurityUtils.getLoginUser().getUsername()); diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmSubTeamContractMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmSubTeamContractMapper.xml index 6ec7692..3da7075 100644 --- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmSubTeamContractMapper.xml +++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmSubTeamContractMapper.xml @@ -41,9 +41,13 @@ and team_ein_status LIKE CONCAT('%', #{teamEinStatus}, '%') - + and team_id =#{teamId} + + and pro_id =#{proId} + +