From cec8d6aad293becb30d93115b3d8c22c388826c2 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, 14 Aug 2025 14:34:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E7=A7=8D=E7=B1=BB=E5=9E=8B=E7=AE=A1?= =?UTF-8?q?=E7=90=86=EF=BC=8C=E5=85=AC=E5=8F=B8=E7=AE=A1=E7=90=86=EF=BC=8C?= =?UTF-8?q?=E5=88=86=E5=85=AC=E5=8F=B8=E7=AE=A1=E7=90=86=EF=BC=8C=E6=80=BB?= =?UTF-8?q?=E5=8C=85=E5=B7=A5=E7=A8=8B=EF=BC=8C=E6=A0=87=E6=AE=B5=E5=B7=A5?= =?UTF-8?q?=E7=A8=8B=EF=BC=8C=E9=A1=B9=E7=9B=AE=E9=83=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...nyController.java => PmComController.java} | 19 ++-- .../bmw/controller/PmProjectController.java | 1 + ...ontroller.java => PmSubComController.java} | 31 ++++-- .../com/bonus/bmw/domain/po/PmSubCompany.java | 7 +- ...{PmCompanyMapper.java => PmComMapper.java} | 2 +- .../com/bonus/bmw/mapper/PmOrgMapper.java | 12 +++ ...CompanyMapper.java => PmSubComMapper.java} | 3 +- ...mCompanyService.java => PmComService.java} | 3 +- .../com/bonus/bmw/service/PmOrgService.java | 7 ++ ...mpanyService.java => PmSubComService.java} | 5 +- ...ServiceImpl.java => PmComServiceImpl.java} | 26 ++--- .../bmw/service/impl/PmOrgServiceImpl.java | 7 ++ .../bmw/service/impl/PmSubComServiceImpl.java | 94 +++++++++++++++++++ .../service/impl/PmSubCompanyServiceImpl.java | 69 -------------- .../{PmCompanyMapper.xml => PmComMapper.xml} | 2 +- .../main/resources/mapper/bmw/PmOrgMapper.xml | 3 + .../resources/mapper/bmw/PmProjectMapper.xml | 11 ++- ...buCompanyMapper.xml => PmSubComMapper.xml} | 3 +- 18 files changed, 194 insertions(+), 111 deletions(-) rename bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/{PmCompanyController.java => PmComController.java} (84%) rename bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/{PmSubCompanyController.java => PmSubComController.java} (72%) rename bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/{PmCompanyMapper.java => PmComMapper.java} (95%) rename bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/{PmSubCompanyMapper.java => PmSubComMapper.java} (94%) rename bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/{PmCompanyService.java => PmComService.java} (90%) rename bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/{PmSubCompanyService.java => PmSubComService.java} (78%) rename bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/{PmCompanyServiceImpl.java => PmComServiceImpl.java} (70%) create mode 100644 bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmSubComServiceImpl.java delete mode 100644 bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmSubCompanyServiceImpl.java rename bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/{PmCompanyMapper.xml => PmComMapper.xml} (96%) rename bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/{PmSbuCompanyMapper.xml => PmSubComMapper.xml} (97%) diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmCompanyController.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmComController.java similarity index 84% rename from bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmCompanyController.java rename to bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmComController.java index b2f4bc1..bb202de 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmCompanyController.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmComController.java @@ -1,7 +1,7 @@ package com.bonus.bmw.controller; import com.bonus.bmw.domain.po.PmCompany; -import com.bonus.bmw.service.PmCompanyService; +import com.bonus.bmw.service.PmComService; import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.core.web.page.TableDataInfo; @@ -20,15 +20,15 @@ import java.util.List; /** * @author 马三炮 - * @date 2025/8/12 + * @date 2025/8/14 */ @Slf4j @RestController @RequestMapping("/company") -public class PmCompanyController extends BaseController { +public class PmComController extends BaseController { @Resource - private PmCompanyService pmCompanyService; + private PmComService pmComService; /** * 公司列表 @@ -39,7 +39,7 @@ public class PmCompanyController extends BaseController { public TableDataInfo list(PmCompany pmCompany) { try { startPage(); - List list = pmCompanyService.selectCompanyList(pmCompany); + List list = pmComService.selectCompanyList(pmCompany); return getDataTable(list); } catch (Exception e) { log.error(e.toString(), e); @@ -50,12 +50,12 @@ public class PmCompanyController extends BaseController { /** * 新增和修改公司 */ - /* @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("pm:company:edit"))*/ + /* @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("pm:company:edit"))*/ @PostMapping("/addOrUpdateCompany") @SysLog(title = "公司管理", businessType = OperaType.UPDATE, logType = 0, module = "公司管理->新增和修改公司") public AjaxResult addOrUpdateCompany(@Validated @RequestBody PmCompany pmCompany) { try { - int res = pmCompanyService.addOrUpdateCompany(pmCompany); + int res = pmComService.addOrUpdateCompany(pmCompany); if (res>0){ return toAjax(res); }else { @@ -76,7 +76,7 @@ public class PmCompanyController extends BaseController { @SysLog(title = "公司管理", businessType = OperaType.UPDATE, logType = 0, module = "公司管理->删除公司") public AjaxResult delCompany(@Validated @RequestBody PmCompany pmCompany) { try { - int res = pmCompanyService.delCompany(pmCompany); + int res = pmComService.delCompany(pmCompany); if (res>0){ return toAjax(res); }else { @@ -98,12 +98,11 @@ public class PmCompanyController extends BaseController { @SysLog(title = "公司管理", businessType = OperaType.QUERY, logType = 0, module = "公司管理->公司列表全部") public TableDataInfo listAll(PmCompany pmCompany) { try { - List list = pmCompanyService.selectCompanyList(pmCompany); + List list = pmComService.selectCompanyList(pmCompany); return getDataTable(list); } catch (Exception e) { log.error(e.toString(), e); } return getDataTableError(new ArrayList<>()); } - } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmProjectController.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmProjectController.java index 5cda3a8..c40a90a 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmProjectController.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmProjectController.java @@ -24,6 +24,7 @@ import java.util.ArrayList; import java.util.List; /** + * 标段工程 * @author 马三炮 * @date 2025/8/13 */ diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmSubCompanyController.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmSubComController.java similarity index 72% rename from bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmSubCompanyController.java rename to bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmSubComController.java index ac50642..3befe37 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmSubCompanyController.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmSubComController.java @@ -1,7 +1,9 @@ package com.bonus.bmw.controller; +import com.bonus.bmw.domain.po.PmOrg; import com.bonus.bmw.domain.po.PmSubCompany; -import com.bonus.bmw.service.PmSubCompanyService; +import com.bonus.bmw.domain.vo.PmOrgVo; +import com.bonus.bmw.service.PmSubComService; import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.core.web.page.TableDataInfo; @@ -20,15 +22,15 @@ import java.util.List; /** * @author 马三炮 - * @date 2025/8/12 + * @date 2025/8/14 */ @Slf4j @RestController @RequestMapping("/subCompany") -public class PmSubCompanyController extends BaseController { +public class PmSubComController extends BaseController { @Resource - private PmSubCompanyService pmSubCompanyService; + private PmSubComService pmSubComService; /** * 分公司列表 @@ -39,7 +41,7 @@ public class PmSubCompanyController extends BaseController { public TableDataInfo list(PmSubCompany pmSubCompany) { try { startPage(); - List list = pmSubCompanyService.selectSubCompanyList(pmSubCompany); + List list = pmSubComService.selectSubCompanyList(pmSubCompany); return getDataTable(list); } catch (Exception e) { log.error(e.toString(), e); @@ -55,7 +57,7 @@ public class PmSubCompanyController extends BaseController { @SysLog(title = "分公司管理", businessType = OperaType.UPDATE, logType = 0, module = "分公司管理->新增和修改分公司") public AjaxResult addOrUpdateSubCompany(@Validated @RequestBody PmSubCompany pmSubCompany) { try { - return toAjax(pmSubCompanyService.addOrUpdateSubCompany(pmSubCompany)); + return toAjax(pmSubComService.addOrUpdateSubCompany(pmSubCompany)); } catch (Exception e) { logger.error(e.toString(), e); } @@ -70,7 +72,7 @@ public class PmSubCompanyController extends BaseController { @SysLog(title = "分公司管理", businessType = OperaType.UPDATE, logType = 0, module = "分公司管理->删除分公司") public AjaxResult delSubCompany(@Validated @RequestBody PmSubCompany pmSubCompany) { try { - int res = pmSubCompanyService.delSubCompany(pmSubCompany); + int res = pmSubComService.delSubCompany(pmSubCompany); if (res>0){ return toAjax(res); }else { @@ -83,4 +85,19 @@ public class PmSubCompanyController extends BaseController { return error("系统异常,请联系管理员"); } + /** + * 获取分公司和项目部列表 + */ + @GetMapping("/listAll") + @SysLog(title = "分公司管理", businessType = OperaType.QUERY, logType = 0, module = "分公司管理->获取分公司和项目部列表") + public TableDataInfo listAll(PmSubCompany pmSubCompany) { + try { + List list = pmSubComService.selectSubCompanyListAll(pmSubCompany); + return getDataTable(list); + } catch (Exception e) { + log.error(e.toString(), e); + } + return getDataTableError(new ArrayList<>()); + } + } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/po/PmSubCompany.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/po/PmSubCompany.java index 1cae0b7..cd605a0 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/po/PmSubCompany.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/po/PmSubCompany.java @@ -1,9 +1,11 @@ package com.bonus.bmw.domain.po; +import com.bonus.bmw.domain.vo.PmOrgVo; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.util.Date; +import java.util.List; /** * @author 马三炮 @@ -64,5 +66,8 @@ public class PmSubCompany { */ private Integer isActive; - + /** + * 项目部列表 + */ + private List pmOrgList; } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmCompanyMapper.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmComMapper.java similarity index 95% rename from bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmCompanyMapper.java rename to bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmComMapper.java index d4c3010..d19da49 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmCompanyMapper.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmComMapper.java @@ -4,7 +4,7 @@ import com.bonus.bmw.domain.po.PmCompany; import java.util.List; -public interface PmCompanyMapper { +public interface PmComMapper { /** * 公司列表 */ diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmOrgMapper.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmOrgMapper.java index 00fa708..9aafc85 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmOrgMapper.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmOrgMapper.java @@ -11,11 +11,23 @@ public interface PmOrgMapper { */ List selectPmOrgList(PmOrg pmOrg); + /** + * 根明项目部名称查询项目部项目部 + */ PmOrg selectPmOrgByOrgName(PmOrg pmOrg); + /** + * 修改项目部 + */ int updatePmOrg(PmOrg pmOrg); + /** + * 新增项目部 + */ int addPmOrg(PmOrg pmOrg); + /** + * 删除项目部 + */ int delPmOrg(PmOrg pmOrg); } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmSubCompanyMapper.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmSubComMapper.java similarity index 94% rename from bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmSubCompanyMapper.java rename to bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmSubComMapper.java index e2abc48..d63639a 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmSubCompanyMapper.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmSubComMapper.java @@ -4,7 +4,7 @@ import com.bonus.bmw.domain.po.PmSubCompany; import java.util.List; -public interface PmSubCompanyMapper { +public interface PmSubComMapper { /** * 分公司列表 */ @@ -29,4 +29,5 @@ public interface PmSubCompanyMapper { * 删除分公司 */ int delSubCompany(PmSubCompany pmSubCompany); + } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/PmCompanyService.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/PmComService.java similarity index 90% rename from bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/PmCompanyService.java rename to bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/PmComService.java index a4dd290..84fc301 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/PmCompanyService.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/PmComService.java @@ -4,8 +4,7 @@ import com.bonus.bmw.domain.po.PmCompany; import java.util.List; -public interface PmCompanyService { - +public interface PmComService { /** * 公司列表 */ diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/PmOrgService.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/PmOrgService.java index 83f08e5..c0455c4 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/PmOrgService.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/PmOrgService.java @@ -11,7 +11,14 @@ public interface PmOrgService { */ List selectPmOrgList(PmOrg pmOrg); + + /** + * 新增和修改项目部 + */ int addOrUpdatePmOrg(PmOrg pmOrg); + /** + * 删除项目部 + */ int delPmOrg(PmOrg pmOrg); } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/PmSubCompanyService.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/PmSubComService.java similarity index 78% rename from bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/PmSubCompanyService.java rename to bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/PmSubComService.java index 964c6ff..82fa550 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/PmSubCompanyService.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/PmSubComService.java @@ -4,7 +4,8 @@ import com.bonus.bmw.domain.po.PmSubCompany; import java.util.List; -public interface PmSubCompanyService { +public interface PmSubComService { + /** * 分公司列表 */ @@ -19,4 +20,6 @@ public interface PmSubCompanyService { * 删除分公司 */ int delSubCompany(PmSubCompany pmSubCompany); + + List selectSubCompanyListAll(PmSubCompany pmSubCompany); } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmCompanyServiceImpl.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmComServiceImpl.java similarity index 70% rename from bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmCompanyServiceImpl.java rename to bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmComServiceImpl.java index c73a737..7893fc8 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmCompanyServiceImpl.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmComServiceImpl.java @@ -2,9 +2,9 @@ package com.bonus.bmw.service.impl; import com.bonus.bmw.domain.po.PmCompany; import com.bonus.bmw.domain.po.PmSubCompany; -import com.bonus.bmw.mapper.PmCompanyMapper; -import com.bonus.bmw.mapper.PmSubCompanyMapper; -import com.bonus.bmw.service.PmCompanyService; +import com.bonus.bmw.mapper.PmComMapper; +import com.bonus.bmw.mapper.PmSubComMapper; +import com.bonus.bmw.service.PmComService; import com.bonus.common.core.utils.StringUtils; import com.bonus.common.security.utils.SecurityUtils; import lombok.extern.slf4j.Slf4j; @@ -16,24 +16,24 @@ import java.util.List; /** * @author 马三炮 - * @date 2025/8/12 + * @date 2025/8/14 */ @Service @Slf4j -public class PmCompanyServiceImpl implements PmCompanyService { +public class PmComServiceImpl implements PmComService { @Resource - private PmCompanyMapper pmCompanyMapper; + private PmComMapper pmComMapper; @Resource - private PmSubCompanyMapper pmSubCompanyMapper; + private PmSubComMapper pmSubComMapper; /** * 公司列表 */ @Override public List selectCompanyList(PmCompany pmCompany) { - return pmCompanyMapper.selectCompanyList(pmCompany); + return pmComMapper.selectCompanyList(pmCompany); } /** @@ -41,7 +41,7 @@ public class PmCompanyServiceImpl implements PmCompanyService { */ @Override public int addOrUpdateCompany(PmCompany pmCompany) { - PmCompany pmCompanyOld = pmCompanyMapper.getPmCompanyByCompanyName(pmCompany); + PmCompany pmCompanyOld = pmComMapper.getPmCompanyByCompanyName(pmCompany); //存在则删除后新增，不存在则新增 if(StringUtils.isNotNull(pmCompany.getId())){ if (StringUtils.isNotNull(pmCompanyOld) && !pmCompanyOld.getId().equals(pmCompany.getId())){ @@ -49,7 +49,7 @@ public class PmCompanyServiceImpl implements PmCompanyService { } pmCompany.setUpdateUser(SecurityUtils.getUsername()); pmCompany.setUpdateTime(new Date()); - return pmCompanyMapper.updatePmCompany(pmCompany); + return pmComMapper.updatePmCompany(pmCompany); }else { if (StringUtils.isNotNull(pmCompanyOld)){ return 0; @@ -58,7 +58,7 @@ public class PmCompanyServiceImpl implements PmCompanyService { pmCompany.setCreateTime(new Date()); pmCompany.setUpdateUser(SecurityUtils.getUsername()); pmCompany.setUpdateTime(new Date()); - return pmCompanyMapper.addPmCompany(pmCompany); + return pmComMapper.addPmCompany(pmCompany); } } @@ -70,10 +70,10 @@ public class PmCompanyServiceImpl implements PmCompanyService { //查看当前公司下面是否有分公司 PmSubCompany pmSubCompany = new PmSubCompany(); pmSubCompany.setComId(pmCompany.getId()); - List pmSubCompanyList = pmSubCompanyMapper.selectSubCompanyList(pmSubCompany); + List pmSubCompanyList = pmSubComMapper.selectSubCompanyList(pmSubCompany); if (pmSubCompanyList.size()>0){ return 0; } - return pmCompanyMapper.delCompany(pmCompany); + return pmComMapper.delCompany(pmCompany); } } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmOrgServiceImpl.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmOrgServiceImpl.java index 5615a41..35c5cfc 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmOrgServiceImpl.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmOrgServiceImpl.java @@ -48,6 +48,10 @@ public class PmOrgServiceImpl implements PmOrgService { return pmOrgVoList; } + + /** + * 新增和修改项目部 + */ @Override public int addOrUpdatePmOrg(PmOrg pmOrg) { @@ -72,6 +76,9 @@ public class PmOrgServiceImpl implements PmOrgService { } } + /** + * 删除项目部 + */ @Override public int delPmOrg(PmOrg pmOrg) { //查看当前项目部下是否有标段工程 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 new file mode 100644 index 0000000..9244c0b --- /dev/null +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmSubComServiceImpl.java @@ -0,0 +1,94 @@ +package com.bonus.bmw.service.impl; + +import com.bonus.bmw.domain.po.PmOrg; +import com.bonus.bmw.domain.po.PmSubCompany; +import com.bonus.bmw.domain.vo.PmOrgVo; +import com.bonus.bmw.mapper.PmOrgMapper; +import com.bonus.bmw.mapper.PmSubComMapper; +import com.bonus.bmw.service.PmSubComService; +import com.bonus.common.core.utils.StringUtils; +import com.bonus.common.security.utils.SecurityUtils; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Date; +import java.util.List; + +/** + * @author 马三炮 + * @date 2025/8/14 + */ +@Service +@Slf4j +public class PmSubComServiceImpl implements PmSubComService { + + @Resource + private PmSubComMapper pmSubComMapper; + + @Resource + private PmOrgMapper pmOrgMapper; + + /** + * 分公司列表 + */ + @Override + public List selectSubCompanyList(PmSubCompany pmSubCompany) { + List pmSubCompanyList = pmSubComMapper.selectSubCompanyList(pmSubCompany); + return pmSubCompanyList; + } + + /** + * 新增和修改公司 + */ + @Override + public int addOrUpdateSubCompany(PmSubCompany pmSubCompany) { + PmSubCompany pmSubCompanyOld = pmSubComMapper.getSubCompanyByCompanyName(pmSubCompany); + //存在则删除后新增，不存在则新增 + if(StringUtils.isNotNull(pmSubCompany.getId())){ + if (StringUtils.isNotNull(pmSubCompanyOld) && !pmSubCompanyOld.getId().equals(pmSubCompany.getId())){ + return 0; + } + pmSubCompany.setUpdateUser(SecurityUtils.getUsername()); + pmSubCompany.setUpdateTime(new Date()); + return pmSubComMapper.updateSubCompany(pmSubCompany); + }else { + if (StringUtils.isNotNull(pmSubCompanyOld)){ + return 0; + } + pmSubCompany.setCreateUser(SecurityUtils.getUsername()); + pmSubCompany.setCreateTime(new Date()); + pmSubCompany.setUpdateUser(SecurityUtils.getUsername()); + pmSubCompany.setUpdateTime(new Date()); + return pmSubComMapper.addSubCompany(pmSubCompany); + } + } + + /** + * 删除分公司 + */ + @Override + public int delSubCompany(PmSubCompany pmSubCompany) { + //查看当前分公司公司下面是否有项目部 + PmOrg pmOrg = new PmOrg(); + pmOrg.setSubComId(pmSubCompany.getId()); + List pmOrgList = pmOrgMapper.selectPmOrgList(pmOrg); + if (pmOrgList.size()>0){ + return 0; + } + return pmSubComMapper.delSubCompany(pmSubCompany); + } + + @Override + public List selectSubCompanyListAll(PmSubCompany pmSubCompany) { + List pmSubCompanyList = pmSubComMapper.selectSubCompanyList(pmSubCompany); + //获取分公司下面的项目部 + for (PmSubCompany pmSubCompanyNew: pmSubCompanyList) { + PmOrg pmOrg = new PmOrg(); + pmOrg.setSubComId(pmSubCompanyNew.getId()); + List pmOrgList = pmOrgMapper.selectPmOrgList(pmOrg); + pmSubCompanyNew.setPmOrgList(pmOrgList); + } + return pmSubCompanyList; + } +} diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmSubCompanyServiceImpl.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmSubCompanyServiceImpl.java deleted file mode 100644 index b9cdd92..0000000 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmSubCompanyServiceImpl.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.bonus.bmw.service.impl; - -import com.bonus.bmw.domain.po.PmSubCompany; -import com.bonus.bmw.mapper.PmSubCompanyMapper; -import com.bonus.bmw.service.PmSubCompanyService; -import com.bonus.common.core.utils.StringUtils; -import com.bonus.common.security.utils.SecurityUtils; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.util.Date; -import java.util.List; - -/** - * @author 马三炮 - * @date 2025/8/12 - */ -@Service -@Slf4j -public class PmSubCompanyServiceImpl implements PmSubCompanyService { - - @Resource - private PmSubCompanyMapper pmSubCompanyMapper; - - /** - * 分公司列表 - */ - @Override - public List selectSubCompanyList(PmSubCompany pmSubCompany) { - List pmSubCompanyList = pmSubCompanyMapper.selectSubCompanyList(pmSubCompany); - return pmSubCompanyList; - } - - /** - * 新增和修改公司 - */ - @Override - public int addOrUpdateSubCompany(PmSubCompany pmSubCompany) { - PmSubCompany pmSubCompanyOld = pmSubCompanyMapper.getSubCompanyByCompanyName(pmSubCompany); - //存在则删除后新增，不存在则新增 - if(StringUtils.isNotNull(pmSubCompany.getId())){ - if (StringUtils.isNotNull(pmSubCompanyOld) && !pmSubCompanyOld.getId().equals(pmSubCompany.getId())){ - return 0; - } - pmSubCompany.setUpdateUser(SecurityUtils.getUsername()); - pmSubCompany.setUpdateTime(new Date()); - return pmSubCompanyMapper.updateSubCompany(pmSubCompany); - }else { - if (StringUtils.isNotNull(pmSubCompanyOld)){ - return 0; - } - pmSubCompany.setCreateUser(SecurityUtils.getUsername()); - pmSubCompany.setCreateTime(new Date()); - pmSubCompany.setUpdateUser(SecurityUtils.getUsername()); - pmSubCompany.setUpdateTime(new Date()); - return pmSubCompanyMapper.addSubCompany(pmSubCompany); - } - } - - /** - * 删除分公司 - */ - @Override - public int delSubCompany(PmSubCompany pmSubCompany) { - - return pmSubCompanyMapper.delSubCompany(pmSubCompany); - } -} diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmCompanyMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmComMapper.xml similarity index 96% rename from bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmCompanyMapper.xml rename to bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmComMapper.xml index 1610bcf..e4e1d4a 100644 --- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmCompanyMapper.xml +++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmComMapper.xml @@ -1,6 +1,6 @@ - + insert into pm_company (company_name, is_enable, create_user, update_user, create_time, update_time) values (#{companyName}, #{isEnable}, #{createUser}, #{updateUser}, #{createTime}, #{updateTime}) 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 03285c8..eb6d2a6 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 @@ -44,6 +44,9 @@ or po.org_name like concat('%', #{keyWord}, '%') ) + + and po.sub_com_id = #{subComId} + diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmSbuCompanyMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmSubComMapper.xml similarity index 97% rename from bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmSbuCompanyMapper.xml rename to bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmSubComMapper.xml index fc4513f..c8d28b8 100644 --- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmSbuCompanyMapper.xml +++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmSubComMapper.xml @@ -1,6 +1,6 @@ - + insert into pm_sub_company (com_id,sub_company_name, is_enable, create_user, update_user, create_time, update_time) values (#{comId},#{subCompanyName}, #{isEnable}, #{createUser}, #{updateUser}, #{createTime}, #{updateTime}) @@ -61,4 +61,5 @@ left join pm_company pc on psc.com_id = pc.id where pc.is_active = '1' and psc.sub_company_name =#{subCompanyName} +