From d35162de7b979a222ebfe041e52ef4737b5aff96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com> Date: Tue, 18 Nov 2025 18:12:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E9=99=90=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PmMainProjectController.java | 20 +++++++- .../bmw/controller/PmProjectController.java | 10 ++++ .../bonus/bmw/controller/PmSubController.java | 18 ++++++++ .../bmw/controller/PmSubTeamController.java | 18 ++++++++ .../controller/ProStatisticsController.java | 13 ++++++ .../bmw/controller/SelectController.java | 46 ++++++++++++++----- .../controller/SubStatisticsController.java | 13 ++++++ .../com/bonus/bmw/domain/po/MapBeanPo.java | 2 + .../bonus/bmw/domain/po/PmMainProject.java | 20 ++++++-- .../java/com/bonus/bmw/domain/po/PmSub.java | 5 ++ .../com/bonus/bmw/domain/po/PmSubTeam.java | 5 ++ .../bonus/bmw/domain/vo/PmMainProjectVo.java | 14 ++++++ .../com/bonus/bmw/mapper/SelectMapper.java | 16 ++++++- .../com/bonus/bmw/service/SelectService.java | 16 ++++++- .../service/impl/HomePageSubServiceImpl.java | 4 +- .../bmw/service/impl/SelectServiceImpl.java | 21 ++++----- .../main/resources/mapper/bmw/PmComMapper.xml | 1 + .../mapper/bmw/PmMainProjectMapper.xml | 31 +++++++++---- .../resources/mapper/bmw/PmProjectMapper.xml | 3 ++ .../resources/mapper/bmw/PmSubComMapper.xml | 2 + .../main/resources/mapper/bmw/PmSubMapper.xml | 16 +++++-- .../resources/mapper/bmw/PmSubTeamMapper.xml | 3 ++ .../mapper/bmw/ProStatisticsMapper.xml | 3 ++ .../resources/mapper/bmw/SelectMapper.xml | 24 ++++++++++ .../mapper/bmw/SubStatisticsMapper.xml | 3 ++ 25 files changed, 284 insertions(+), 43 deletions(-) diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmMainProjectController.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmMainProjectController.java index 9ea1418..5d6e468 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmMainProjectController.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmMainProjectController.java @@ -20,6 +20,9 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.List; +import java.util.Map; + +import static com.bonus.bmw.utils.OwnPermissionUtil.dealWithPermission; /** * 总包工程 @@ -42,6 +45,11 @@ public class PmMainProjectController extends BaseController { @SysLog(title = "总包工程", businessType = OperaType.QUERY, logType = 0, module = "总包工程->总包工程列表") public TableDataInfo list(PmMainProject pmMainProject) { try { + Map map = dealWithPermission(); + if(!map.isEmpty()){ + // 3. 将 map 中的值复制到 o 对象中 + org.apache.commons.beanutils.BeanUtils.populate(pmMainProject, map); + } startPage(); List list = pmMainProjectService.selectMainProjectList(pmMainProject); return getDataTable(list); @@ -63,7 +71,7 @@ public class PmMainProjectController extends BaseController { if (res>0){ return toAjax(res); }else { - return error("总包工程重复"); + return error("总包工程已经在别的分包商下，请重新命名!"); } } catch (Exception e) { @@ -101,6 +109,11 @@ public class PmMainProjectController extends BaseController { @SysLog(title = "总包工程", businessType = OperaType.QUERY, logType = 0, module = "总包工程->总包工程下拉框") public TableDataInfo listAll(PmMainProject pmMainProject) { try { + Map map = dealWithPermission(); + if(!map.isEmpty()){ + // 3. 将 map 中的值复制到 o 对象中 + org.apache.commons.beanutils.BeanUtils.populate(pmMainProject, map); + } List list = pmMainProjectService.selectMainProjectListAll(pmMainProject); return getDataTable(list); } catch (Exception e) { @@ -116,6 +129,11 @@ public class PmMainProjectController extends BaseController { @SysLog(title = "总包工程", businessType = OperaType.EXPORT, logType = 0, module = "总包工程->导出总包工程") public void export(HttpServletResponse response, PmMainProject pmMainProject) { try { + Map map = dealWithPermission(); + if(!map.isEmpty()){ + // 3. 将 map 中的值复制到 o 对象中 + org.apache.commons.beanutils.BeanUtils.populate(pmMainProject, map); + } List list = pmMainProjectService.selectMainProjectList(pmMainProject); ExcelUtil util = new ExcelUtil(PmMainProjectVo.class); util.exportExcel(response, list, "总包工程"); 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 d4b182f..5c5dd55 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 @@ -124,6 +124,11 @@ public class PmProjectController extends BaseController { @SysLog(title = "标段工程", businessType = OperaType.EXPORT, module = "标段工程->导出标段工程") public void export(HttpServletResponse response, PmProject pmProject) { try { + Map map = dealWithPermission(); + if(!map.isEmpty()){ + // 3. 将 map 中的值复制到 o 对象中 + org.apache.commons.beanutils.BeanUtils.populate(pmProject, map); + } List list = pmProjectService.selectProjectList(pmProject); ExcelUtil util = new ExcelUtil(PmProjectVo.class); util.exportExcel(response, list, "标段工程"); @@ -139,6 +144,11 @@ public class PmProjectController extends BaseController { @SysLog(title = "标段工程", businessType = OperaType.QUERY, module = "标段工程->标段工程列表") public TableDataInfo listAll(PmProject pmProject) { try { + Map map = dealWithPermission(); + if(!map.isEmpty()){ + // 3. 将 map 中的值复制到 o 对象中 + org.apache.commons.beanutils.BeanUtils.populate(pmProject, map); + } List list = pmProjectService.selectProjectListAll(pmProject); return getDataTable(list); } catch (Exception e) { diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmSubController.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmSubController.java index b9f9d01..07b71ca 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmSubController.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmSubController.java @@ -25,6 +25,9 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.List; +import java.util.Map; + +import static com.bonus.bmw.utils.OwnPermissionUtil.dealWithPermission; /** * 分包商 @@ -47,6 +50,11 @@ public class PmSubController extends BaseController { @SysLog(title = "分包商管理", businessType = OperaType.QUERY, logType = 0, module = "分包商管理->分包商列表") public TableDataInfo list(PmSub pmSub) { try { + Map map = dealWithPermission(); + if(!map.isEmpty()){ + // 3. 将 map 中的值复制到 o 对象中 + org.apache.commons.beanutils.BeanUtils.populate(pmSub, map); + } startPage(); List list = pmSubService.selectSubList(pmSub); return getDataTable(list); @@ -108,6 +116,11 @@ public class PmSubController extends BaseController { @SysLog(title = "分包商管理", businessType = OperaType.QUERY, logType = 0, module = "分包商管理->分包商列表") public TableDataInfo listAll(PmSub pmSub) { try { + Map map = dealWithPermission(); + if(!map.isEmpty()){ + // 3. 将 map 中的值复制到 o 对象中 + org.apache.commons.beanutils.BeanUtils.populate(pmSub, map); + } List list = pmSubService.selectSubListAll(pmSub); return getDataTable(list); } catch (Exception e) { @@ -123,6 +136,11 @@ public class PmSubController extends BaseController { @SysLog(title = "分包商管理", businessType = OperaType.EXPORT, logType = 0, module = "分包商管理->导出分包商") public void export(HttpServletResponse response, PmSub pmSub) { try { + Map map = dealWithPermission(); + if(!map.isEmpty()){ + // 3. 将 map 中的值复制到 o 对象中 + org.apache.commons.beanutils.BeanUtils.populate(pmSub, map); + } List list = pmSubService.selectSubList(pmSub); ExcelUtil util = new ExcelUtil(PmSub.class); util.exportExcel(response, list, "分包商"); diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmSubTeamController.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmSubTeamController.java index ea4ae46..d420a3c 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmSubTeamController.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmSubTeamController.java @@ -19,6 +19,9 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.List; +import java.util.Map; + +import static com.bonus.bmw.utils.OwnPermissionUtil.dealWithPermission; /** * 分包班组 @@ -41,6 +44,11 @@ public class PmSubTeamController extends BaseController { @SysLog(title = "分包班组信息管理", businessType = OperaType.QUERY, logType = 0, module = "分包班组信息管理->分包班组信息列表") public TableDataInfo list(PmSubTeam pmSubTeam) { try { + Map map = dealWithPermission(); + if(!map.isEmpty()){ + // 3. 将 map 中的值复制到 o 对象中 + org.apache.commons.beanutils.BeanUtils.populate(pmSubTeam, map); + } startPage(); List list = pmSubTeamService.selectSubTeamList(pmSubTeam); return getDataTable(list); @@ -99,6 +107,11 @@ public class PmSubTeamController extends BaseController { @SysLog(title = "分包班组信息", businessType = OperaType.EXPORT, logType = 0, module = "分包班组信息->导出分包班组信息") public void export(HttpServletResponse response, PmSubTeam pmSubTeam) { try { + Map map = dealWithPermission(); + if(!map.isEmpty()){ + // 3. 将 map 中的值复制到 o 对象中 + org.apache.commons.beanutils.BeanUtils.populate(pmSubTeam, map); + } List list = pmSubTeamService.selectSubTeamList(pmSubTeam); ExcelUtil util = new ExcelUtil(PmSubTeam.class); util.exportExcel(response, list, "分包班组信息"); @@ -114,6 +127,11 @@ public class PmSubTeamController extends BaseController { @SysLog(title = "分包班组信息管理", businessType = OperaType.QUERY, logType = 0, module = "分包班组信息管理->分包班组信息列表") public TableDataInfo listAll(PmSubTeam pmSubTeam) { try { + Map map = dealWithPermission(); + if(!map.isEmpty()){ + // 3. 将 map 中的值复制到 o 对象中 + org.apache.commons.beanutils.BeanUtils.populate(pmSubTeam, map); + } List list = pmSubTeamService.selectSubTeamListAll(pmSubTeam); return getDataTable(list); } catch (Exception e) { diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/ProStatisticsController.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/ProStatisticsController.java index 84d5f2b..c8aafaf 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/ProStatisticsController.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/ProStatisticsController.java @@ -29,6 +29,9 @@ import java.io.OutputStream; import java.net.URLEncoder; import java.util.ArrayList; import java.util.List; +import java.util.Map; + +import static com.bonus.bmw.utils.OwnPermissionUtil.dealWithPermission; /** * 工程统计 @@ -53,6 +56,11 @@ public class ProStatisticsController extends BaseController { @SysLog(title = "工程统计", businessType = OperaType.QUERY, logType = 0, module = "工程统计->工程统计", details = "工程统计") public TableDataInfo getProStatisticsTable(HomePagePo o) { try { + Map map = dealWithPermission(); + if(!map.isEmpty()){ + // 3. 将 map 中的值复制到 o 对象中 + org.apache.commons.beanutils.BeanUtils.populate(o, map); + } startPage(); List list = service.getProStatisticsTable(o); return getDataTable(list); @@ -71,6 +79,11 @@ public class ProStatisticsController extends BaseController { @SysLog(title = "工程统计", businessType = OperaType.QUERY, logType = 0, module = "工程统计->工程统计", details = "工程统计") public void exportWorkerStatisticsTable(HttpServletResponse response, HomePagePo o) { try { + Map map = dealWithPermission(); + if(!map.isEmpty()){ + // 3. 将 map 中的值复制到 o 对象中 + org.apache.commons.beanutils.BeanUtils.populate(o, map); + } ExcelUtil util = new ExcelUtil<>(HomePageSubProVo.class); List list = service.getProStatisticsTable(o); if (list.size()>0){ diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/SelectController.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/SelectController.java index 8646555..383683c 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/SelectController.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/SelectController.java @@ -1,27 +1,20 @@ package com.bonus.bmw.controller; import com.bonus.bmw.domain.po.MapBeanPo; -import com.bonus.bmw.domain.po.PmOrg; import com.bonus.bmw.domain.vo.MapBeanVo; -import com.bonus.bmw.domain.vo.PmOrgVo; -import com.bonus.bmw.service.PmOrgService; import com.bonus.bmw.service.SelectService; -import com.bonus.common.core.utils.poi.ExcelUtil; import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.domain.AjaxResult; -import com.bonus.common.core.web.page.TableDataInfo; import com.bonus.common.log.annotation.SysLog; import com.bonus.common.log.enums.OperaType; -import com.bonus.common.security.annotation.InnerAuth; -import com.bonus.common.security.annotation.RequiresPermissions; -import com.bonus.common.security.annotation.RequiresPermissionsOrInnerAuth; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; import java.util.List; /** @@ -84,4 +77,35 @@ public class SelectController extends BaseController { } + /** + * 查询分公司下拉框 + */ + @PostMapping(" /selectSubCom") + @SysLog(title = "分公司查询", businessType = OperaType.UPDATE, logType = 0, module = "下拉选公用类->分公司") + public AjaxResult selectSubCom(@Validated @RequestBody MapBeanPo po) { + try { + List list = service.selectSubCom(po); + return new AjaxResult(200,"查询成功",list); + } catch (Exception e) { + logger.error(e.toString(), e); + } + return error("系统异常,请联系管理员"); + } + + /** + * 查询分公司下拉框 + */ + @PostMapping("/selectOrg") + @SysLog(title = "分公司查询", businessType = OperaType.UPDATE, logType = 0, module = "下拉选公用类->分公司") + public AjaxResult selectOrg(@Validated @RequestBody MapBeanPo po) { + try { + List list = service.selectOrg(po); + return new AjaxResult(200,"查询成功",list); + } catch (Exception e) { + logger.error(e.toString(), e); + } + return error("系统异常,请联系管理员"); + } + + } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/SubStatisticsController.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/SubStatisticsController.java index e3c63cd..556310a 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/SubStatisticsController.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/SubStatisticsController.java @@ -29,6 +29,9 @@ import java.io.OutputStream; import java.net.URLEncoder; import java.util.ArrayList; import java.util.List; +import java.util.Map; + +import static com.bonus.bmw.utils.OwnPermissionUtil.dealWithPermission; /** * 分包统计 @@ -52,6 +55,11 @@ public class SubStatisticsController extends BaseController { @SysLog(title = "分包统计列表", businessType = OperaType.QUERY, logType = 0, module = "分包统计->分包统计列表", details = "分包统计列表") public TableDataInfo getSubStatisticsTable(HomePagePo homePagePo) { try { + Map map = dealWithPermission(); + if(!map.isEmpty()){ + // 3. 将 map 中的值复制到 o 对象中 + org.apache.commons.beanutils.BeanUtils.populate(homePagePo, map); + } startPage(); List list = subStatisticsService.getSubStatisticsTable(homePagePo); return getDataTable(list); @@ -70,6 +78,11 @@ public class SubStatisticsController extends BaseController { @SysLog(title = "工程统计", businessType = OperaType.QUERY, logType = 0, module = "工程统计->工程统计", details = "工程统计") public void exportWorkerStatisticsTable(HttpServletResponse response, HomePagePo homePagePo) { try { + Map map = dealWithPermission(); + if(!map.isEmpty()){ + // 3. 将 map 中的值复制到 o 对象中 + org.apache.commons.beanutils.BeanUtils.populate(homePagePo, map); + } List list = subStatisticsService.getSubStatisticsTable(homePagePo); List PmSubExportList = new ArrayList<>(); for (PmSub dto : list) { diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/po/MapBeanPo.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/po/MapBeanPo.java index f9ef49a..8c3ddea 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/po/MapBeanPo.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/po/MapBeanPo.java @@ -19,6 +19,8 @@ public class MapBeanPo { private Integer workerId; + private Integer comId; + public MapBeanPo(Integer id, String name) { this.id = id; this.name = name; diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/po/PmMainProject.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/po/PmMainProject.java index 283b9fc..97237ec 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/po/PmMainProject.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/po/PmMainProject.java @@ -1,12 +1,9 @@ package com.bonus.bmw.domain.po; -import com.bonus.bmw.domain.vo.PmProjectVo; -import com.bonus.common.core.annotation.Excel; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.util.Date; -import java.util.List; /** * @author 马三炮 @@ -66,4 +63,21 @@ public class PmMainProject { *关键字搜索 */ private String keyWord; + + /** + * 分公司id + */ + private String subComId; + + + /** + * 分公司名称 + */ + private String subComName; + + /** + * 项目部id + */ + private String orgId; + } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/po/PmSub.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/po/PmSub.java index 896af48..34cec17 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/po/PmSub.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/po/PmSub.java @@ -130,4 +130,9 @@ public class PmSub { * 在场人数 */ private Integer einNum; + + /** + * 分公司id + */ + private String subComId; } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/po/PmSubTeam.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/po/PmSubTeam.java index 5f5c7ac..6c329e6 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/po/PmSubTeam.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/po/PmSubTeam.java @@ -84,4 +84,9 @@ public class PmSubTeam { * 关键字 */ private String keyWord; + + /** + * 分公司id + */ + private Integer subComId; } 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 8ab07cb..a95ffeb 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 @@ -67,4 +67,18 @@ public class PmMainProjectVo { * 标段工程 */ private List pmProjectVoList; + + /** + * 分公司id + */ + private String subComId; + + /** + * 分公司名称 + */ + private String subComName; + /** + * 项目部id + */ + private String orgId; } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/SelectMapper.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/SelectMapper.java index ab975c2..7f2f61a 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/SelectMapper.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/SelectMapper.java @@ -1,9 +1,7 @@ package com.bonus.bmw.mapper; import com.bonus.bmw.domain.po.MapBeanPo; -import com.bonus.bmw.domain.po.PmOrg; import com.bonus.bmw.domain.vo.MapBeanVo; -import com.bonus.bmw.domain.vo.PmOrgVo; import java.util.List; @@ -30,4 +28,18 @@ public interface SelectMapper { * @return */ List selectTeam(MapBeanPo po); + + /** + * 查询分公司列表 + * @param po + * @return + */ + List selectSubCom(MapBeanPo po); + + /** + * 查询项目部列表 + * @param po + * @return + */ + List selectOrg(MapBeanPo po); } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/SelectService.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/SelectService.java index 86b43c3..56a15e8 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/SelectService.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/SelectService.java @@ -1,9 +1,7 @@ package com.bonus.bmw.service; import com.bonus.bmw.domain.po.MapBeanPo; -import com.bonus.bmw.domain.po.PmOrg; import com.bonus.bmw.domain.vo.MapBeanVo; -import com.bonus.bmw.domain.vo.PmOrgVo; import java.util.List; @@ -29,4 +27,18 @@ public interface SelectService { * @return */ List selectTeam(MapBeanPo po); + + /** + * 分公司下拉框 + * @param po + * @return + */ + List selectSubCom(MapBeanPo po); + + /** + * 项目部下拉框 + * @param po + * @return + */ + List selectOrg(MapBeanPo po); } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/HomePageSubServiceImpl.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/HomePageSubServiceImpl.java index 2f52381..a434b81 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/HomePageSubServiceImpl.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/HomePageSubServiceImpl.java @@ -74,7 +74,9 @@ public class HomePageSubServiceImpl implements HomePageSubService { HomePagePmWorkerVo worker = mapper.getWorkerMsgById(o); if (worker.getId() != null) { List faceFile = fileUploadUtils.getFileList("", worker.getId().toString(), Constants.FILE_UPLOAD_WORKER, ""); - worker.setFacePhoto(faceFile.get(0).getLsUrl()); + if(faceFile.size()>0){ + worker.setFacePhoto(faceFile.get(0).getLsUrl()); + } } if (worker.getContractId() != null) { List contractFile = fileUploadUtils.getFileList("", worker.getContractId().toString(), Constants.FILE_UPLOAD_CONTRACT, ""); diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/SelectServiceImpl.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/SelectServiceImpl.java index 0dfeb84..6b3b9b7 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/SelectServiceImpl.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/SelectServiceImpl.java @@ -1,24 +1,13 @@ package com.bonus.bmw.service.impl; import com.bonus.bmw.domain.po.MapBeanPo; -import com.bonus.bmw.domain.po.PmOrg; -import com.bonus.bmw.domain.po.PmProject; import com.bonus.bmw.domain.vo.MapBeanVo; -import com.bonus.bmw.domain.vo.PmOrgVo; -import com.bonus.bmw.domain.vo.PmProjectVo; -import com.bonus.bmw.mapper.PmOrgMapper; -import com.bonus.bmw.mapper.PmProjectMapper; import com.bonus.bmw.mapper.SelectMapper; -import com.bonus.bmw.service.PmOrgService; import com.bonus.bmw.service.SelectService; -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.Collections; -import java.util.Date; import java.util.List; /** @@ -47,4 +36,14 @@ public class SelectServiceImpl implements SelectService { public List selectTeam(MapBeanPo po) { return mapper.selectTeam(po); } + + @Override + public List selectSubCom(MapBeanPo po) { + return mapper.selectSubCom(po); + } + + @Override + public List selectOrg(MapBeanPo po) { + return mapper.selectOrg(po); + } } diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmComMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmComMapper.xml index 7cdd9c7..901badc 100644 --- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmComMapper.xml +++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmComMapper.xml @@ -33,6 +33,7 @@ and company_name LIKE CONCAT('%', #{companyName}, '%') + order by create_time desc - select id,main_pro_name,vol_level,create_user,update_user,create_time,update_time,pro_status - from pm_main_project where is_active='1' + select pmp.id,pmp.main_pro_name,pmp.vol_level,pmp.create_user,pmp.update_user,pmp.create_time, + pmp.update_time,pmp.pro_status,pmp.sub_com_id,psc.sub_company_name as subComName + from pm_main_project pmp + left join pm_sub_company psc on pmp.sub_com_id = psc.id + where pmp.is_active='1' - and main_pro_name LIKE CONCAT('%', #{mainProName}, '%') + and pmp.main_pro_name LIKE CONCAT('%', #{mainProName}, '%') + + + and pmp.sub_com_id=#{subComId} and ( - main_pro_name like concat('%', #{keyWord}, '%') - or vol_level like concat('%', #{keyWord}, '%') + pmp.main_pro_name like concat('%', #{keyWord}, '%') + or pmp.vol_level like concat('%', #{keyWord}, '%') ) + order by pmp.create_time desc diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmProjectMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmProjectMapper.xml index c585886..e32c95c 100644 --- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmProjectMapper.xml +++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmProjectMapper.xml @@ -199,6 +199,9 @@ pp.pro_name as proName from pm_project pp where pp.is_active = '1' + + and pp.sub_com_id = #{subComId} + diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmSubMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmSubMapper.xml index 3d71fad..426e7ab 100644 --- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmSubMapper.xml +++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmSubMapper.xml @@ -3,9 +3,9 @@ insert into pm_sub (sub_name, legal_person, legal_person_phone,sub_address,business_license,electronic_seal,id_card_front, - id_card_reverse,corporate_seal,sub_ein_status,create_user, update_user, create_time, update_time) + id_card_reverse,corporate_seal,sub_ein_status,create_user, update_user, create_time, update_time,sub_com_id) values (#{subName}, #{legalPerson},#{legalPersonPhone},#{subAddress},#{businessLicense},#{electronicSeal},#{idCardFront}, - #{idCardReverse},#{corporateSeal},#{subEinStatus},#{createUser}, #{updateUser}, #{createTime}, #{updateTime}) + #{idCardReverse},#{corporateSeal},#{subEinStatus},#{createUser}, #{updateUser}, #{createTime}, #{updateTime},#{subComId}) update pm_sub @@ -46,6 +46,9 @@ update_time=#{updateTime}, + + sub_com_id=#{subComId}, + where id = #{id} @@ -65,8 +68,12 @@ id_card_front as idCardFront, id_card_reverse as idCardReverse, corporate_seal as corporateSeal, - sub_ein_status as subEinStatus + sub_ein_status as subEinStatus, + sub_com_id as subComId from pm_sub where is_active='1' + + and sub_com_id=#{subComId} + and ( sub_name like concat('%', #{keyWord}, '%') @@ -84,6 +91,9 @@ diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/SelectMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/SelectMapper.xml index 35411c3..1e4dff4 100644 --- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/SelectMapper.xml +++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/SelectMapper.xml @@ -66,4 +66,28 @@ + + diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/SubStatisticsMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/SubStatisticsMapper.xml index 675a76a..7728773 100644 --- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/SubStatisticsMapper.xml +++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/SubStatisticsMapper.xml @@ -21,6 +21,9 @@ and ps.id =#{subId} + + AND ps.sub_com_id = #{subComId} + GROUP BY ps.id