From c0efc5c91a514d32f1bfd6766386f444a857d322 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, 29 Aug 2025 16:27:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E5=85=81=E8=AE=B8=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E7=8F=AD=E7=BB=84=E5=85=A5=E5=9C=BA=E4=B8=80=E4=B8=AA=E5=B7=A5?=
 =?UTF-8?q?=E7=A8=8B=E5=A4=9A=E6=AC=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bonus/bmw/controller/PmSubTeamContractController.java   | 2 ++
 .../bmw/service/impl/PmSubTeamContractServiceImpl.java      | 6 ++++++
 .../main/resources/mapper/bmw/PmSubTeamContractMapper.xml   | 6 +++++-
 3 files changed, 13 insertions(+), 1 deletion(-)

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<PmSubTeamContract> 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 @@
         <if test="teamEinStatus!=null and teamEinStatus!= ''">
             and team_ein_status  LIKE CONCAT('%', #{teamEinStatus}, '%')
         </if>
-        <if test="teamId!=null and teamId!= ''">
+        <if test="teamId!=null ">
             and team_id =#{teamId}
         </if>
+        <if test="proId!=null ">
+            and pro_id =#{proId}
+        </if>
+
     </select>
     <select id="getSubTeamContractById" resultType="com.bonus.bmw.domain.po.PmSubTeamContract">
         select id,team_id,team_name,sub_id,sub_name,pro_id,pro_name,team_ein_time,team_ein_status,team_exit_time