From e61f7590df1152f70ac146f9aec36174f04e9da0 Mon Sep 17 00:00:00 2001 From: bonus <1203338439@qq.com> Date: Sat, 27 Sep 2025 14:54:37 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=83=A8=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../clz/controller/MaterialMachineController.java | 12 ++++++++++++ .../java/com/bonus/material/clz/domain/BmTeam.java | 4 ++++ .../clz/domain/lease/MaterialLeaseApplyInfo.java | 3 +++ .../domain/vo/MaterialRetainedEquipmentInfo.java | 6 +++++- .../material/clz/mapper/MaterialMachineMapper.java | 2 ++ .../clz/service/MaterialMachineService.java | 2 ++ .../service/impl/MaterialLeaseInfoServiceImpl.java | 14 ++++++++++++-- .../service/impl/MaterialMachineServiceImpl.java | 5 +++++ .../resources/mapper/material/clz/BmTeamMapper.xml | 4 +++- .../material/clz/MaterialLeaseInfoMapper.xml | 2 ++ .../mapper/material/clz/MaterialMachineMapper.xml | 12 +++++++++++- 11 files changed, 61 insertions(+), 5 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/controller/MaterialMachineController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/controller/MaterialMachineController.java index d30e4dc5..39f22841 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/controller/MaterialMachineController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/controller/MaterialMachineController.java @@ -398,6 +398,18 @@ public class MaterialMachineController extends BaseController { return AjaxResult.success(list); } + /** + * 获取领料项目部下拉选 + * @param bean + * @return + */ + @ApiOperation(value = "获取领料项目部下拉选") + @GetMapping("/getPickDepartList") + public AjaxResult getPickDepartList(MaterialRetainedEquipmentInfo bean) { + List list = materialMachineService.getPickDepartList(bean); + return AjaxResult.success(list); + } + /** * 获取工程下拉选 * @param bean diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/BmTeam.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/BmTeam.java index d0c44131..84711e9b 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/BmTeam.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/BmTeam.java @@ -34,6 +34,10 @@ public class BmTeam { * 所属项目部id */ private Long departId; + /** + * 所属分公司id + */ + private Long deptId; /** * 所属项目部 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/lease/MaterialLeaseApplyInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/lease/MaterialLeaseApplyInfo.java index a0b26f43..541a2f5c 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/lease/MaterialLeaseApplyInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/lease/MaterialLeaseApplyInfo.java @@ -332,4 +332,7 @@ public class MaterialLeaseApplyInfo extends BaseEntity { @ApiModelProperty(value = "是否人为修改：0：否，1：是") private Integer isUpdate; + + @ApiModelProperty(value = "领料类型：0：班组，1：项目部") + private String pickType; } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/vo/MaterialRetainedEquipmentInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/vo/MaterialRetainedEquipmentInfo.java index c6ca131b..c9c10d28 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/vo/MaterialRetainedEquipmentInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/vo/MaterialRetainedEquipmentInfo.java @@ -46,8 +46,12 @@ public class MaterialRetainedEquipmentInfo { @Excel(name = "项目部", width = 25) private String departName; + @ApiModelProperty(value = "项目部id") + @Excel(name = "项目部id", width = 40) + private String departId; + @ApiModelProperty(value = "工程名称") - @Excel(name = "工程名称", width = 40) + @Excel(name = "工程名称", width = 100) private String proName; @ApiModelProperty(value = "分包单位") diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/mapper/MaterialMachineMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/mapper/MaterialMachineMapper.java index 61f14e5a..08e4e76c 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/mapper/MaterialMachineMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/mapper/MaterialMachineMapper.java @@ -260,4 +260,6 @@ public interface MaterialMachineMapper { * @return */ List getStoreNumAndUseList(MaterialRetainedEquipmentInfo bean); + + List getPickDepartList(MaterialRetainedEquipmentInfo bean); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/MaterialMachineService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/MaterialMachineService.java index 62f9f667..f5f61aa6 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/MaterialMachineService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/MaterialMachineService.java @@ -182,4 +182,6 @@ public interface MaterialMachineService { * @return */ List getStoreNumAndUseList(MaterialRetainedEquipmentInfo bean); + + List getPickDepartList(MaterialRetainedEquipmentInfo bean); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialLeaseInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialLeaseInfoServiceImpl.java index 479dd30b..767fc45b 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialLeaseInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialLeaseInfoServiceImpl.java @@ -938,6 +938,7 @@ public class MaterialLeaseInfoServiceImpl implements MaterialLeaseInfoService { } leaseApplyRequestVo.getLeaseApplyInfo().setCreateTime(DateUtils.getNowDate()); String createBy = SecurityUtils.getLoginUser().getSysUser().getNickName(); + Long deptId = SecurityUtils.getLoginUser().getSysUser().getDeptId(); leaseApplyRequestVo.getLeaseApplyInfo().setCreateBy(createBy); try { int thisMonthMaxOrder = tmTaskMapper.getMonthMaxOrderByDate(DateUtils.getCurrentYear(), DateUtils.getCurrentMonth(), TmTaskTypeEnum.TM_TASK_MATERIAL_LEASE.getTaskTypeId()); @@ -968,9 +969,18 @@ public class MaterialLeaseInfoServiceImpl implements MaterialLeaseInfoService { tbTeam.setRelName(StringUtils.isNotBlank(leaseApplyRequestVo.getLeaseApplyInfo().getRelName()) ? leaseApplyRequestVo.getLeaseApplyInfo().getRelName() : null); tbTeam.setIdCard(StringUtils.isNotBlank(leaseApplyRequestVo.getLeaseApplyInfo().getTeamLeaderIdCard()) ? leaseApplyRequestVo.getLeaseApplyInfo().getTeamLeaderIdCard() : null); tbTeam.setProjectId(leaseApplyRequestVo.getLeaseApplyInfo().getProjectId()); + tbTeam.setDeptId(deptId); tbTeam.setRelPhone(StringUtils.isNotBlank(leaseApplyRequestVo.getLeaseApplyInfo().getRelPhone()) ? leaseApplyRequestVo.getLeaseApplyInfo().getRelPhone() : null); - // 班组类型固定传值 - tbTeam.setTypeId(1731L); + + String pickType = leaseApplyRequestVo.getLeaseApplyInfo().getPickType(); + if("1".equals(pickType)){ + // 项目部类型固定传值 + tbTeam.setTypeId(36L); + }else{ + // 班组类型固定传值 + tbTeam.setTypeId(1731L); + } + BmTeam bmTeam = bmTeamMapper.selectByName(tbTeam); if (bmTeam == null) { // 新增班组 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialMachineServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialMachineServiceImpl.java index 3cbbbeec..e1cda8d4 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialMachineServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialMachineServiceImpl.java @@ -1192,6 +1192,11 @@ public class MaterialMachineServiceImpl implements MaterialMachineService { return recordList; } + @Override + public List getPickDepartList(MaterialRetainedEquipmentInfo bean) { + return materialMachineMapper.getPickDepartList(bean); + } + /** * 设置分公司名称（如果有） * @param impUnit diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/BmTeamMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/BmTeamMapper.xml index b8c1348a..94c06e4f 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/BmTeamMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/BmTeamMapper.xml @@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" unit_name, depart_id, + dept_id, link_man, telphone, create_time, @@ -20,6 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{teamName}, #{departId}, + #{deptId}, #{relName}, #{relPhone}, NOW(), @@ -117,4 +119,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and bu.unit_id is not null GROUP BY bu.unit_name - \ No newline at end of file + diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialLeaseInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialLeaseInfoMapper.xml index 57aae401..b34a8e8b 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialLeaseInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialLeaseInfoMapper.xml @@ -160,6 +160,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" team_id, project_id, lease_style, + pick_type, sub_unit_name, @@ -190,6 +191,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{teamId}, #{proId}, #{leaseStyle}, + #{pickType}, #{subUnitName}, diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml index 922f6cca..5d1cadef 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml @@ -1642,7 +1642,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND sp.`name` LIKE CONCAT('%', #{departName}, '%') - AND bp.external_id in + in #{item} @@ -1935,4 +1935,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" subquery1.proId +