From cfe3528d824946ef713115d5e143fa6a8d8ea62c 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, 10 Oct 2025 14:30:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=8C=85=E7=BB=9F=E8=AE=A1=E5=92=8Cbu?= =?UTF-8?q?g=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SubStatisticsController.java | 166 +++++++++++ .../java/com/bonus/bmw/domain/po/PmSub.java | 15 + .../bonus/bmw/domain/vo/HomePageSubProVo.java | 13 + .../bonus/bmw/mapper/SubStatisticsMapper.java | 96 +++++++ .../bmw/service/SubStatisticsService.java | 60 ++++ .../service/impl/PmAttDeviceServiceImpl.java | 4 +- .../service/impl/PmProjectServiceImpl.java | 9 +- .../impl/SubStatisticsServiceImpl.java | 193 +++++++++++++ .../bonus/bmw/utils/OwnPermissionUtil.java | 2 +- .../mapper/bmw/PmAttDeviceMapper.xml | 5 +- .../mapper/bmw/SubStatisticsMapper.xml | 260 ++++++++++++++++++ 11 files changed, 816 insertions(+), 7 deletions(-) create mode 100644 bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/SubStatisticsController.java create mode 100644 bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/SubStatisticsMapper.java create mode 100644 bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/SubStatisticsService.java create mode 100644 bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/SubStatisticsServiceImpl.java create mode 100644 bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/SubStatisticsMapper.xml 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 new file mode 100644 index 0000000..cdce8eb --- /dev/null +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/SubStatisticsController.java @@ -0,0 +1,166 @@ +package com.bonus.bmw.controller; + +import com.bonus.bmw.domain.po.HomePagePo; +import com.bonus.bmw.domain.po.PmAttDevice; +import com.bonus.bmw.domain.po.PmSub; +import com.bonus.bmw.domain.vo.HomePageSubProVo; +import com.bonus.bmw.service.SubStatisticsService; +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 org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +/** + * 分包统计 + * @author 马三炮 + * @date 2025/10/9 + */ +@RestController +@RequestMapping("/subStatistics") +public class SubStatisticsController extends BaseController { + + @Resource + private SubStatisticsService subStatisticsService; + + /** + * 分包统计列表 + * @param homePagePo + * @return + */ + @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("sub:statistics:query")) + @GetMapping("/getSubStatisticsTable") + @SysLog(title = "分包统计列表", businessType = OperaType.QUERY, logType = 0, module = "分包统计->分包统计列表", details = "分包统计列表") + public TableDataInfo getSubStatisticsTable(HomePagePo homePagePo) { + try { + startPage(); + List list = subStatisticsService.getSubStatisticsTable(homePagePo); + return getDataTable(list); + } catch (Exception e) { + logger.error(e.toString(), e); + } + return getDataTableError(new ArrayList<>()); + } + + /** + * 分包统计-数据概览 + * @param homePagePo + * @return + */ + @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("sub:statistics:query")) + @GetMapping("/getSubDataOverview") + @SysLog(title = "数据概览", businessType = OperaType.QUERY, logType = 0, module = "分包统计->数据概览", details = "数据概览") + public AjaxResult getDataOverview(HomePagePo homePagePo) { + try { + return subStatisticsService.getProDataOverview(homePagePo); + } catch (Exception e) { + logger.error(e.toString(), e); + } + return error("系统异常,请联系管理员"); + } + + /** + * 分包工程信息 + * @param homePagePo + * @return + */ + @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("sub:statistics:query")) + @GetMapping("/getSubProMsg") + @SysLog(title = "分包工程信息", businessType = OperaType.QUERY, logType = 0, module = "分包统计->分包工程信息", details = "分包工程信息") + public TableDataInfo getSubProMsg(HomePagePo homePagePo) { + try { + startPage(); + List list = subStatisticsService.getSubProMsg(homePagePo); + return getDataTable(list); + } catch (Exception e) { + logger.error(e.toString(), e); + } + return getDataTableError(new ArrayList<>()); + } + + /** + * 班组信息 + * @param homePagePo + * @return + */ + @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("sub:statistics:query")) + @GetMapping("/getSubTeamMsg") + @SysLog(title = "班组信息", businessType = OperaType.QUERY, logType = 0, module = "分包统计->班组信息", details = "班组信息") + public TableDataInfo getSubTeamMsg(HomePagePo homePagePo) { + try { + startPage(); + List list = subStatisticsService.getSubTeamMsg(homePagePo); + return getDataTable(list); + } catch (Exception e) { + logger.error(e.toString(), e); + } + return getDataTableError(new ArrayList<>()); + } + + /** + * 考勤机信息 + * @param homePagePo + * @return + */ + @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("sub:statistics:query")) + @GetMapping("/getSubDeviceMsg") + @SysLog(title = "考勤机信息", businessType = OperaType.QUERY, logType = 0, module = "分包统计->考勤机信息", details = "考勤机信息") + public TableDataInfo getSubDeviceMsg(HomePagePo homePagePo) { + try { + startPage(); + List list = subStatisticsService.getSubDeviceMsg(homePagePo); + return getDataTable(list); + } catch (Exception e) { + logger.error(e.toString(), e); + } + return getDataTableError(new ArrayList<>()); + } + + /** + * 出入场信息 + * @param homePagePo + * @return + */ + @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("sub:statistics:query")) + @GetMapping("/getSubInOutMsg") + @SysLog(title = "出入场信息", businessType = OperaType.QUERY, logType = 0, module = "分包统计->出入场信息", details = "出入场信息") + public TableDataInfo getSubInOutMsg(HomePagePo homePagePo) { + try { + startPage(); + List list = subStatisticsService.getSubInOutMsg(homePagePo); + return getDataTable(list); + } catch (Exception e) { + logger.error(e.toString(), e); + } + return getDataTableError(new ArrayList<>()); + } + + /** + * 考勤信息 + * @param homePagePo + * @return + */ + @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("sub:statistics:query")) + @GetMapping("/getSubAttMsg") + @SysLog(title = "考勤信息", businessType = OperaType.QUERY, logType = 0, module = "分包统计->考勤信息", details = "考勤信息") + public TableDataInfo getSubAttMsg(HomePagePo homePagePo) { + try { + startPage(); + List list = subStatisticsService.getSubAttMsg(homePagePo); + return getDataTable(list); + } catch (Exception e) { + logger.error(e.toString(), e); + } + return getDataTableError(new ArrayList<>()); + } +} 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 af7308f..896af48 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 @@ -115,4 +115,19 @@ public class PmSub { * 删除文件id集合 */ List fileIdList; + + /** + * 项目数量 + */ + private Integer proNum; + + /** + * 班组数量 + */ + private Integer teamNum; + + /** + * 在场人数 + */ + private Integer einNum; } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/HomePageSubProVo.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/HomePageSubProVo.java index b7695d6..bf319f4 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/HomePageSubProVo.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/HomePageSubProVo.java @@ -1,7 +1,10 @@ package com.bonus.bmw.domain.vo; +import com.bonus.system.api.model.UploadFileVo; import lombok.Data; +import java.util.List; + @Data public class HomePageSubProVo { @@ -65,4 +68,14 @@ public class HomePageSubProVo { private String teamExitTime; private Long attNumHis; private Long repairNumHis; + + /** + * 分包合同编号 + */ + private Integer subContractId; + + /** + * 文件列表 + */ + List contractFile; } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/SubStatisticsMapper.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/SubStatisticsMapper.java new file mode 100644 index 0000000..942de07 --- /dev/null +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/SubStatisticsMapper.java @@ -0,0 +1,96 @@ +package com.bonus.bmw.mapper; + +import com.bonus.bmw.domain.po.HomePagePo; +import com.bonus.bmw.domain.po.PmAttDevice; +import com.bonus.bmw.domain.po.PmSub; +import com.bonus.bmw.domain.vo.HomePageSubProVo; +import com.bonus.bmw.domain.vo.ProStatisticsPo; + +import java.util.List; + +public interface SubStatisticsMapper { + + /** + * 分包统计列表 + * @param homePagePo + * @return + */ + List getSubStatisticsTable(HomePagePo homePagePo); + + /** + * 分包统计-累计入场 + * @param homePagePo + * @return + */ + ProStatisticsPo getEinNumByHis(HomePagePo homePagePo); + + /** + * 分包统计-在场灯状态 + * @param homePagePo + * @return + */ + ProStatisticsPo getEinWorkerLight(HomePagePo homePagePo); + + /** + * 分包统计-考勤 + * @param homePagePo + * @return + */ + ProStatisticsPo getWorkerAttAndRepair(HomePagePo homePagePo); + + /** + * 分包统计-申请补卡次数 + * @param homePagePo + * @return + */ + int getProRepairNum(HomePagePo homePagePo); + + /** + * 分包统计-工资 + * @param homePagePo + * @return + */ + ProStatisticsPo getWorkerWage(HomePagePo homePagePo); + + /** + * 分包统计-发放工资人数 + * @param homePagePo + * @return + */ + int getWorkerSalaryNum(HomePagePo homePagePo); + + /** + * 分包工程信息 + * @param homePagePo + * @return + */ + List getSubProMsg(HomePagePo homePagePo); + + /** + * 班组信息 + * @param homePagePo + * @return + */ + List getSubTeamMsg(HomePagePo homePagePo); + + /** + * 考勤机信息 + * @param homePagePo + * @return + */ + List getSubDeviceMsg(HomePagePo homePagePo); + + /** + * 出入场信息 + * @param homePagePo + * @return + */ + List getSubInOutMsg(HomePagePo homePagePo); + + /** + * 考勤信息 + * @param homePagePo + * @return + */ + List getSubAttMsg(HomePagePo homePagePo); +} diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/SubStatisticsService.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/SubStatisticsService.java new file mode 100644 index 0000000..0851283 --- /dev/null +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/SubStatisticsService.java @@ -0,0 +1,60 @@ +package com.bonus.bmw.service; + +import com.bonus.bmw.domain.po.HomePagePo; +import com.bonus.bmw.domain.po.PmAttDevice; +import com.bonus.bmw.domain.po.PmSub; +import com.bonus.bmw.domain.vo.HomePageSubProVo; +import com.bonus.common.core.web.domain.AjaxResult; + +import java.util.List; + +public interface SubStatisticsService { + /** + * 分包统计列表 + * @param homePagePo + * @return + */ + List getSubStatisticsTable(HomePagePo homePagePo); + + /** + * 分包统计-数据概览 + * @param homePagePo + * @return + */ + AjaxResult getProDataOverview(HomePagePo homePagePo); + + /** + * 分包工程信息 + * @param homePagePo + * @return + */ + List getSubProMsg(HomePagePo homePagePo); + + /** + * 班组信息 + * @param homePagePo + * @return + */ + List getSubTeamMsg(HomePagePo homePagePo); + + /** + * 考勤机信息 + * @param homePagePo + * @return + */ + List getSubDeviceMsg(HomePagePo homePagePo); + + /** + * 出入场信息 + * @param homePagePo + * @return + */ + List getSubInOutMsg(HomePagePo homePagePo); + + /** + * 考勤信息 + * @param homePagePo + * @return + */ + List getSubAttMsg(HomePagePo homePagePo); +} diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmAttDeviceServiceImpl.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmAttDeviceServiceImpl.java index 5e687f6..ffce058 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmAttDeviceServiceImpl.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmAttDeviceServiceImpl.java @@ -38,13 +38,13 @@ public class PmAttDeviceServiceImpl implements PmAttDeviceService { @Override public List selectPmAttDeviceList(PmAttDevice pmAttDevice) { List pmAttDeviceVoList = pmAttDeviceMapper.selectPmAttDeviceList(pmAttDevice); - if (pmAttDeviceVoList.size()>0){ + /*if (pmAttDeviceVoList.size()>0){ //获取缓存中设备状态 for (PmAttDeviceVo pmAttDeviceVo:pmAttDeviceVoList) { String onLine = redisService.getCacheObject("att_dev:status:"+pmAttDeviceVo.getDeviceCode()); pmAttDeviceVo.setOnLine(onLine); } - } + }*/ return pmAttDeviceVoList; } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmProjectServiceImpl.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmProjectServiceImpl.java index a7a5dec..a2e9d49 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmProjectServiceImpl.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmProjectServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * @author 马三炮 @@ -48,7 +49,6 @@ public class PmProjectServiceImpl implements PmProjectService { @Resource private RepairCardApplyService repairCardApplyService; - @Resource private FileUploadUtils fileUploadUtils; @@ -224,7 +224,12 @@ public class PmProjectServiceImpl implements PmProjectService { */ @Override public List getUserWagePayList(UserWagePayVo userWagePayVo) { - return pmProjectMapper.getUserWagePayList(userWagePayVo); + List list = pmProjectMapper.getUserWagePayList(userWagePayVo); + // 过滤掉attendanceNum为0的元素 + List filteredList = list.stream() + .filter(vo -> vo.getAttendanceNum() != 0) + .collect(Collectors.toList()); + return filteredList; } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/SubStatisticsServiceImpl.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/SubStatisticsServiceImpl.java new file mode 100644 index 0000000..468c880 --- /dev/null +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/SubStatisticsServiceImpl.java @@ -0,0 +1,193 @@ +package com.bonus.bmw.service.impl; + +import com.bonus.bmw.domain.po.HomePagePo; +import com.bonus.bmw.domain.po.PmAttDevice; +import com.bonus.bmw.domain.po.PmSub; +import com.bonus.bmw.domain.vo.HomePageSubProVo; +import com.bonus.bmw.domain.vo.ProStatisticsPo; +import com.bonus.bmw.mapper.SubStatisticsMapper; +import com.bonus.bmw.service.SubStatisticsService; +import com.bonus.common.core.constant.Constants; +import com.bonus.common.core.web.domain.AjaxResult; +import com.bonus.system.api.model.UploadFileVo; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @author 马三炮 + * @date 2025/10/9 + */ +@Service +@Slf4j +public class SubStatisticsServiceImpl implements SubStatisticsService { + + @Resource + private SubStatisticsMapper subStatisticsMapper; + + @Resource + private FileUploadUtils fileUploadUtils; + + /** + * 分包统计列表 + * @param homePagePo + * @return + */ + @Override + public List getSubStatisticsTable(HomePagePo homePagePo) { + List pmSubList = subStatisticsMapper.getSubStatisticsTable(homePagePo); + if (pmSubList.size()>0){ + for (PmSub pmSubRes:pmSubList) { + List contractFile = fileUploadUtils.getFileList("", pmSubRes.getId().toString(), Constants.PM_SUB, ""); + pmSubRes.setContractFile(contractFile); + } + } + return pmSubList; + } + + /** + * 分包统计-数据概览 + * @param homePagePo + * @return + */ + @Override + public AjaxResult getProDataOverview(HomePagePo homePagePo) { + Map map = new HashMap<>(); + List list = subStatisticsMapper.getSubStatisticsTable(homePagePo); + if(list != null && !list.isEmpty()){ + map.put("proNum",list.get(0).getProNum()); + map.put("teamNum",list.get(0).getTeamNum()); + map.put("einNum",list.get(0).getEinNum()); + }else{ + map.put("proNum",0); + map.put("teamNum",0); + map.put("einNum",0); + } + //累计入场 + ProStatisticsPo einNum = subStatisticsMapper.getEinNumByHis(homePagePo); + if(einNum != null){ + map.put("einNumHis",einNum.getEinNumHis()); + map.put("exitNum",einNum.getEinNumHis() - Long.parseLong((String) map.get("einNum")) ); + map.put("einTime",einNum.getEinTime()); + map.put("exitTime",einNum.getExitTime()); + map.put("exitUploadFile",einNum.getExitUploadFile()); + map.put("noExitUploadFile",einNum.getNoExitUploadFile()); + }else{ + map.put("einNumHis",0); + map.put("exitNum",0); + map.put("einTime",""); + map.put("exitTime",""); + map.put("exitUploadFile",0); + map.put("noExitUploadFile",0); + } + //在场灯状态 + ProStatisticsPo lightStatus = subStatisticsMapper.getEinWorkerLight(homePagePo); + if(lightStatus != null){ + map.put("yellowNum",lightStatus.getYellowNum()); + map.put("greenNum",lightStatus.getGreenNum()); + map.put("yellowThanSevenDayNum",lightStatus.getYellowThanSevenDayNum()); + }else{ + map.put("yellowNum",0); + map.put("greenNum",0); + map.put("yellowThanSevenDayNum",0); + } + //考勤 + ProStatisticsPo attAndRepair = subStatisticsMapper.getWorkerAttAndRepair(homePagePo); + if(attAndRepair != null){ + map.put("attNumHis",attAndRepair.getAttNumHis()); + map.put("repairPersonNum",attAndRepair.getRepairPersonNum()); + map.put("repairNumHis",attAndRepair.getRepairNumHis()); + }else{ + map.put("attNumHis",0); + map.put("repairPersonNum",0); + map.put("repairNumHis",0); + } + //申请补卡次数 + int proRepairNum = subStatisticsMapper.getProRepairNum(homePagePo); + map.put("proRepairNum",proRepairNum); + //工资 + ProStatisticsPo workerWage = subStatisticsMapper.getWorkerWage(homePagePo); + if(workerWage != null){ + map.put("salaryMoneyNum",workerWage.getSalaryMoneyNum()); + map.put("payrollNum",workerWage.getPayrollNum()); + map.put("payrollWorkerTime",workerWage.getPayrollWorkerTime()); + }else{ + map.put("salaryMoneyNum",0); + map.put("payrollNum",0); + map.put("payrollWorkerTime",0); + } + //发放工资人数 + int workerSalaryNum = subStatisticsMapper.getWorkerSalaryNum(homePagePo); + map.put("workerSalaryNum",workerSalaryNum); + + return AjaxResult.success(map); + } + + /** + * 分包工程信息 + * @param homePagePo + * @return + */ + @Override + public List getSubProMsg(HomePagePo homePagePo) { + List pmSubList = subStatisticsMapper.getSubProMsg(homePagePo); + if (pmSubList.size()>0){ + for (HomePageSubProVo pmSubRes:pmSubList) { + List contractFile = fileUploadUtils.getFileList("", pmSubRes.getSubContractId().toString(), Constants.BM_SUB_CONTRACT, ""); + pmSubRes.setContractFile(contractFile); + } + } + return pmSubList; + } + + /** + * 班组信息 + * @param homePagePo + * @return + */ + @Override + public List getSubTeamMsg(HomePagePo homePagePo) { + List PmSubTeamContractList = subStatisticsMapper.getSubTeamMsg(homePagePo); + if (PmSubTeamContractList.size()>0){ + for (HomePageSubProVo homePageSubProVo:PmSubTeamContractList) { + List contractFile = fileUploadUtils.getFileList("", homePageSubProVo.getTeamId(), Constants.PM_SUB_TEAM_CONTRACT, ""); + homePageSubProVo.setContractFile(contractFile); + } + } + return PmSubTeamContractList; + } + + /** + * 考勤机信息 + * @param homePagePo + * @return + */ + @Override + public List getSubDeviceMsg(HomePagePo homePagePo) { + return subStatisticsMapper.getSubDeviceMsg(homePagePo); + } + + /** + * 出入场信息 + * @param homePagePo + * @return + */ + @Override + public List getSubInOutMsg(HomePagePo homePagePo) { + return subStatisticsMapper.getSubInOutMsg(homePagePo); + } + + /** + * 考勤信息 + * @param homePagePo + * @return + */ + @Override + public List getSubAttMsg(HomePagePo homePagePo) { + return subStatisticsMapper.getSubAttMsg(homePagePo); + } +} diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/utils/OwnPermissionUtil.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/utils/OwnPermissionUtil.java index d7b1433..f267bdd 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/utils/OwnPermissionUtil.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/utils/OwnPermissionUtil.java @@ -13,7 +13,7 @@ public class OwnPermissionUtil { SysUser sysUser = SecurityUtils.getLoginUser().getSysUser(); if("公司级".equals(sysUser.getRoleLevel())){ // map.put("comId",sysUser.getCompanyId().toString()); - map.put("comId",""); + // map.put("comId",""); }else if("分公司级".equals(sysUser.getRoleLevel())){ map.put("subComId", sysUser.getBandId()); }else if("项目部级".equals(sysUser.getRoleLevel())){ diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmAttDeviceMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmAttDeviceMapper.xml index 8aa96e2..1ef528d 100644 --- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmAttDeviceMapper.xml +++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmAttDeviceMapper.xml @@ -33,7 +33,8 @@ pad2.sub_id as subId, pad2.team_id as teamId, ps.sub_name as subName, - pst.team_name as teamName + pst.team_name as teamName, + pad2.on_line as onLine from pm_att_device pad2 left join pm_project pp on pp.id = pad2.pro_id left join pm_sub ps on ps.id = pad2.sub_id @@ -55,7 +56,7 @@ and pp.is_shanghai LIKE CONCAT('%', #{isShanghai}, '%') - and pp.on_line = #{onLine} + and pad2.on_line = #{onLine} and (pad2.pro_id = #{proId} or pad2.pro_id is null) 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 new file mode 100644 index 0000000..ecb7ed2 --- /dev/null +++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/SubStatisticsMapper.xml @@ -0,0 +1,260 @@ + + + + + + + + + + + + + + + + +