From 6b8b81591a61daed831f2882507cf7cd044759b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com> Date: Thu, 28 Aug 2025 10:08:01 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/bmw/domain/vo/PmMainProjectVo.java | 2 +- .../com/bonus/bmw/mapper/PmSubComMapper.java | 1 + .../com/bonus/bmw/mapper/PmSubTeamMapper.java | 2 ++ .../bmw/service/impl/PmSubComServiceImpl.java | 2 +- .../bmw/service/impl/PmSubTeamServiceImpl.java | 8 ++++++++ .../main/resources/mapper/bmw/PmOrgMapper.xml | 2 +- .../resources/mapper/bmw/PmPostTypeMapper.xml | 2 +- .../resources/mapper/bmw/PmProjectMapper.xml | 1 + .../main/resources/mapper/bmw/PmSubComMapper.xml | 16 +++++++++++++++- .../resources/mapper/bmw/PmSubTeamMapper.xml | 6 ++++++ 10 files changed, 37 insertions(+), 5 deletions(-) diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/PmMainProjectVo.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/PmMainProjectVo.java index 0a9b369..8ab07cb 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/PmMainProjectVo.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/PmMainProjectVo.java @@ -60,7 +60,7 @@ public class PmMainProjectVo { /** *工程状态 */ - @Excel(name = "工程状态") + @Excel(name = "工程状态",readConverterExp ="0=在建,1=停工,2=筹建,3=遗留收尾,4=完工") private String proStatus; /** diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmSubComMapper.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmSubComMapper.java index d63639a..66919ad 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmSubComMapper.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmSubComMapper.java @@ -30,4 +30,5 @@ public interface PmSubComMapper { */ int delSubCompany(PmSubCompany pmSubCompany); + List selectSubCompanyListAll(PmSubCompany pmSubCompany); } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmSubTeamMapper.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmSubTeamMapper.java index b529a0b..622338b 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmSubTeamMapper.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmSubTeamMapper.java @@ -27,4 +27,6 @@ public interface PmSubTeamMapper { int delSubTeam(PmSubTeam pmSubTeam); List selectSubTeamListAll(PmSubTeam pmSubTeam); + + PmSubTeam getSubTeamByName(PmSubTeam pmSubTeam); } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmSubComServiceImpl.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmSubComServiceImpl.java index 5beebbe..56e4a6c 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmSubComServiceImpl.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmSubComServiceImpl.java @@ -81,7 +81,7 @@ public class PmSubComServiceImpl implements PmSubComService { @Override public List selectSubCompanyListAll(PmSubCompany pmSubCompany) { - List pmSubCompanyList = pmSubComMapper.selectSubCompanyList(pmSubCompany); + List pmSubCompanyList = pmSubComMapper.selectSubCompanyListAll(pmSubCompany); if (pmSubCompanyList.size()>0){ //获取分公司下面的项目部 for (PmSubCompany pmSubCompanyNew: pmSubCompanyList) { diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmSubTeamServiceImpl.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmSubTeamServiceImpl.java index 41407fe..904e937 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmSubTeamServiceImpl.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmSubTeamServiceImpl.java @@ -36,13 +36,20 @@ public class PmSubTeamServiceImpl implements PmSubTeamService { */ @Override public int addOrUpdateSubTeam(PmSubTeam pmSubTeam) { + PmSubTeam pmSubTeamOld = pmSubTeamMapper.getSubTeamByName(pmSubTeam); //存在则删除后新增，不存在则新增 if(StringUtils.isNotNull(pmSubTeam.getId())){ + if (StringUtils.isNotNull(pmSubTeamOld) && !pmSubTeamOld.getId().equals(pmSubTeam.getId())){ + return 0; + } pmSubTeam.setUpdateUser(SecurityUtils.getLoginUser().getUsername()); pmSubTeam.setUpdateTime(new Date()); return pmSubTeamMapper.updateSubTeam(pmSubTeam); }else { + if (StringUtils.isNotNull(pmSubTeamOld)){ + return 0; + } pmSubTeam.setCreateUser(SecurityUtils.getLoginUser().getUsername()); pmSubTeam.setCreateTime(new Date()); pmSubTeam.setUpdateUser(SecurityUtils.getLoginUser().getUsername()); @@ -56,6 +63,7 @@ public class PmSubTeamServiceImpl implements PmSubTeamService { */ @Override public int delSubTeam(PmSubTeam pmSubTeam) { + return pmSubTeamMapper.delSubTeam(pmSubTeam); } diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmOrgMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmOrgMapper.xml index 8e13b9b..b445b95 100644 --- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmOrgMapper.xml +++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmOrgMapper.xml @@ -14,7 +14,7 @@ org_name=#{orgName}, - + is_enable=#{isEnable}, diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmPostTypeMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmPostTypeMapper.xml index a6dec9a..e3cc2e6 100644 --- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmPostTypeMapper.xml +++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmPostTypeMapper.xml @@ -43,7 +43,7 @@ + diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmSubTeamMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmSubTeamMapper.xml index b0f5e0a..cb8ed35 100644 --- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmSubTeamMapper.xml +++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmSubTeamMapper.xml @@ -62,4 +62,10 @@ and pst.sub_id=#{subId} +