From 0045746422da5968ec8e48d24f0097b9c1f70ac6 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, 18 Sep 2025 09:07:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E9=99=90=E7=AE=A1=E7=90=86=EF=BC=8C?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bmw/controller/PmAttDeviceController.java | 9 ++++++++ .../bonus/bmw/controller/PmOrgController.java | 9 ++++++++ .../bmw/controller/PmProjectController.java | 4 ++-- .../bonus/bmw/controller/PmSubController.java | 16 ++++++++++++++ .../PmSubTeamContractController.java | 17 +++++++++++++- .../com/bonus/bmw/domain/po/PmAttDevice.java | 1 - .../bonus/bmw/domain/vo/PmAttDeviceVo.java | 10 +++++++++ .../com/bonus/bmw/mapper/PmSubMapper.java | 2 ++ .../bmw/mapper/PmSubTeamContractMapper.java | 2 ++ .../com/bonus/bmw/service/PmSubService.java | 2 ++ .../bmw/service/PmSubTeamContractService.java | 2 ++ .../bmw/service/impl/PmSubServiceImpl.java | 5 +++++ .../impl/PmSubTeamContractServiceImpl.java | 5 +++++ .../bonus/bmw/utils/OwnPermissionUtil.java | 2 +- .../mapper/bmw/PmAttDeviceMapper.xml | 22 ++++++++++++++----- .../main/resources/mapper/bmw/PmSubMapper.xml | 6 +++++ .../mapper/bmw/PmSubTeamContractMapper.xml | 4 ++++ 17 files changed, 107 insertions(+), 11 deletions(-) diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmAttDeviceController.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmAttDeviceController.java index a15e469..3cb25a4 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmAttDeviceController.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmAttDeviceController.java @@ -13,12 +13,16 @@ 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.apache.commons.beanutils.BeanUtils; import org.springframework.web.bind.annotation.*; 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 +45,11 @@ public class PmAttDeviceController extends BaseController { @SysLog(title = "考勤机", businessType = OperaType.QUERY, logType = 0, module = "考勤机->考勤机列表") public TableDataInfo list(PmAttDevice pmAttDevice) { try { + Map map = dealWithPermission(); + if(!map.isEmpty()){ + // 3. 将 map 中的值复制到 o 对象中 + BeanUtils.populate(pmAttDevice, map); + } startPage(); List list = pmAttDeviceService.selectPmAttDeviceList(pmAttDevice); return getDataTable(list); diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmOrgController.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmOrgController.java index 773bf0b..dfcb0a2 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmOrgController.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmOrgController.java @@ -13,6 +13,7 @@ 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.apache.commons.beanutils.BeanUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -20,6 +21,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 +46,11 @@ public class PmOrgController extends BaseController { @SysLog(title = "项目部管理", businessType = OperaType.QUERY, logType = 0, module = "项目部管理->项目部列表") public TableDataInfo list(PmOrg pmOrg) { try { + Map map = dealWithPermission(); + if(!map.isEmpty()){ + // 3. 将 map 中的值复制到 o 对象中 + BeanUtils.populate(pmOrg, map); + } startPage(); List list = pmOrgService.selectPmOrgList(pmOrg); return getDataTable(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 9de6d77..d5247be 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 @@ -14,7 +14,7 @@ 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.beans.BeanUtils; +import org.apache.commons.beanutils.BeanUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -50,7 +50,7 @@ public class PmProjectController extends BaseController { Map map = dealWithPermission(); if(!map.isEmpty()){ // 3. 将 map 中的值复制到 o 对象中 - BeanUtils.copyProperties(map, pmProject); + BeanUtils.populate(pmProject, map); } startPage(); List list = pmProjectService.selectProjectList(pmProject); 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 b87fdf3..b9f9d01 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 @@ -2,6 +2,7 @@ package com.bonus.bmw.controller; import com.bonus.bmw.domain.dto.FileBasicMsgDto; import com.bonus.bmw.domain.dto.WebFileDto; +import com.bonus.bmw.domain.po.BmSubContract; import com.bonus.bmw.domain.po.PmSub; import com.bonus.bmw.service.PmSubService; import com.bonus.common.core.utils.encryption.Sm4Utils; @@ -129,4 +130,19 @@ public class PmSubController extends BaseController { logger.error(e.toString(), e); } } + + /** + * 根据工程查询分包商下拉框 + */ + @GetMapping("/getSublistByProId") + @SysLog(title = "分包商管理", businessType = OperaType.QUERY, logType = 0, module = "分包商管理->分包商列表") + public TableDataInfo getSublistByProId(BmSubContract bmSubContract) { + try { + List list = pmSubService.getSublistByProId(bmSubContract); + 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/PmSubTeamContractController.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmSubTeamContractController.java index ef03bbb..d3bbe80 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 @@ -115,7 +115,7 @@ public class PmSubTeamContractController extends BaseController { logger.error(e.toString(), e); } } - + /** * 获取班组人员出入场信息 */ @@ -132,4 +132,19 @@ public class PmSubTeamContractController extends BaseController { return error("系统异常,请联系管理员"); } + /** + * 根据工程和分包商获取所有班组 + */ + @GetMapping("/getSubTeamContractList") + @SysLog(title = "分包班组入场信息", businessType = OperaType.UPDATE, logType = 0, module = "分包班组入场信息->获取班组人员出入场信息") + public AjaxResult getSubTeamContractList(PmSubTeamContract pmSubTeamContract) { + try { + List res = pmSubTeamContractService.getSubTeamContractList(pmSubTeamContract); + return success(res); + } catch (Exception e) { + logger.error(e.toString(), e); + } + return error("系统异常,请联系管理员"); + } + } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/po/PmAttDevice.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/po/PmAttDevice.java index 8a0eec7..fe26bbe 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/po/PmAttDevice.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/po/PmAttDevice.java @@ -78,5 +78,4 @@ public class PmAttDevice { * 在线状态 */ private String onLine; - } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/PmAttDeviceVo.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/PmAttDeviceVo.java index 486b93a..b46036b 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/PmAttDeviceVo.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/PmAttDeviceVo.java @@ -80,4 +80,14 @@ public class PmAttDeviceVo { * 在线状态 */ private String onLine; + + /** + * 分包商id + */ + private Integer subId; + + /** + * 班组id + */ + private Integer teamId; } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmSubMapper.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmSubMapper.java index e808695..793450b 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmSubMapper.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmSubMapper.java @@ -1,5 +1,6 @@ package com.bonus.bmw.mapper; +import com.bonus.bmw.domain.po.BmSubContract; import com.bonus.bmw.domain.po.PmSub; import java.util.List; @@ -43,4 +44,5 @@ public interface PmSubMapper { List selectSubListAll(PmSub pmSub); + List getSublistByProId(BmSubContract bmSubContract); } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmSubTeamContractMapper.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmSubTeamContractMapper.java index 25552e0..26027b5 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmSubTeamContractMapper.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmSubTeamContractMapper.java @@ -31,4 +31,6 @@ public interface PmSubTeamContractMapper { List getPmWorkerByTeamId(Integer id); Integer countProNum(PmSubTeamContract pmSubTeamContract); + + List getSubTeamContractList(PmSubTeamContract pmSubTeamContract); } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/PmSubService.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/PmSubService.java index d8082e5..ceef662 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/PmSubService.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/PmSubService.java @@ -1,6 +1,7 @@ package com.bonus.bmw.service; import com.bonus.bmw.domain.dto.FileBasicMsgDto; +import com.bonus.bmw.domain.po.BmSubContract; import com.bonus.bmw.domain.po.PmSub; import java.util.List; @@ -35,4 +36,5 @@ public interface PmSubService { */ List selectSubListAll(PmSub pmSub); + List getSublistByProId(BmSubContract bmSubContract); } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/PmSubTeamContractService.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/PmSubTeamContractService.java index 52ed5ba..4af457c 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/PmSubTeamContractService.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/PmSubTeamContractService.java @@ -24,4 +24,6 @@ public interface PmSubTeamContractService { PmSubTeamContract getSubTeamContractById(PmSubTeamContract pmSubTeamContract); Map getPeoNum(PmSubTeamContract pmSubTeamContract); + + List getSubTeamContractList(PmSubTeamContract pmSubTeamContract); } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmSubServiceImpl.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmSubServiceImpl.java index 15de18b..2320c3d 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmSubServiceImpl.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmSubServiceImpl.java @@ -135,4 +135,9 @@ public class PmSubServiceImpl implements PmSubService { public List selectSubListAll(PmSub pmSub) { return pmSubMapper.selectSubListAll(pmSub); } + + @Override + public List getSublistByProId(BmSubContract bmSubContract) { + return pmSubMapper.getSublistByProId(bmSubContract); + } } 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 b983e68..9b12dec 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 @@ -109,4 +109,9 @@ public class PmSubTeamContractServiceImpl implements PmSubTeamContractService { map.put("perNum",perNum); return map; } + + @Override + public List getSubTeamContractList(PmSubTeamContract pmSubTeamContract) { + return pmSubTeamContractMapper.getSubTeamContractList(pmSubTeamContract); + } } 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 f62f6b8..4bd1323 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 @@ -12,7 +12,7 @@ public class OwnPermissionUtil { Map map=new HashMap<>(); SysUser sysUser = SecurityUtils.getLoginUser().getSysUser(); if("公司级".equals(sysUser.getRoleLevel())){ - + map.put("comId",sysUser.getCompanyId().toString()); }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 2e5cba9..d257316 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 @@ -3,15 +3,15 @@ insert into pm_att_device (device_code, device_name,serial_number, pro_id,create_user, update_user, - create_time, update_time,dev_model,on_line) + create_time, update_time,dev_model,on_line,sub_id,team_id) values (#{deviceCode}, #{deviceName},#{serialNumber},#{proId}, #{createUser}, #{updateUser}, - #{createTime}, #{updateTime},#{devModel},#{onLine}) + #{createTime}, #{updateTime},#{devModel},#{onLine},#{subId},#{teamId}) insert into pm_att_device_his (device_code, device_name,serial_number, pro_id,create_user, update_user, - create_time, update_time) + create_time, update_time,sub_id,team_id) values (#{deviceCode}, #{deviceName},#{serialNumber},#{proId}, #{createUser}, #{updateUser}, - #{createTime}, #{updateTime}) + #{createTime}, #{updateTime},#{subId},#{teamId}) update pm_att_device set pro_id = #{proId},update_time = #{updateTime},update_user = #{updateUser} @@ -29,7 +29,9 @@ pp.pro_name as proName, pp.is_shanghai as isShanghai, pad2.update_user as updateUser, - pad2.update_time as updateTime + pad2.update_time as updateTime, + pad2.sub_id as subId, + pad2.team_id as teamId from pm_att_device pad2 left join pm_project pp on pp.id = pad2.pro_id where pad2.is_active = '1' @@ -48,13 +50,21 @@ and pp.is_shanghai LIKE CONCAT('%', #{isShanghai}, '%') + + and pp.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/PmSubMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmSubMapper.xml index 9673894..fe2e2ff 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 @@ -85,4 +85,10 @@ select id,sub_name from pm_sub where is_active='1' + 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 3da7075..1b55a62 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 @@ -61,4 +61,8 @@ +