From 1747408292c9a3f1cdbd449ba65b52d5dd5cf389 Mon Sep 17 00:00:00 2001 From: mashuai Date: Sun, 13 Jul 2025 10:09:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9D=90=E6=96=99=E7=AB=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../clz/service/impl/MaterialLeaseInfoServiceImpl.java | 4 ++-- .../main/resources/mapper/material/clz/IwsTeamUserMapper.xml | 2 ++ .../resources/mapper/material/clz/MaterialLeaseInfoMapper.xml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) 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 7bfbbc77..b2d229c4 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 @@ -549,7 +549,7 @@ public class MaterialLeaseInfoServiceImpl implements MaterialLeaseInfoService { leaseApplyRequestVo.setLeaseApplyDetailsList(details); for (MaterialLeaseApplyDetails detail : details) { SelectDto selectDto = new SelectDto(); - selectDto.setProId(Long.valueOf(info.getProjectId())); + selectDto.setProId(info.getProId()); List list = mapper.getAgreementInfoBy(selectDto); // 先查第四层类型 List listL4 = new ArrayList<>(); @@ -831,7 +831,7 @@ public class MaterialLeaseInfoServiceImpl implements MaterialLeaseInfoService { tbTeam.setTeamName(leaseApplyRequestVo.getLeaseApplyInfo().getTeamName()); 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().toString()); + tbTeam.setProjectId(leaseApplyRequestVo.getLeaseApplyInfo().getProjectId()); tbTeam.setRelPhone(StringUtils.isNotBlank(leaseApplyRequestVo.getLeaseApplyInfo().getRelPhone()) ? leaseApplyRequestVo.getLeaseApplyInfo().getRelPhone() : null); // 班组类型固定传值 tbTeam.setTypeId(1731L); diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/IwsTeamUserMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/IwsTeamUserMapper.xml index c48de2dd..9b748fd1 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/IwsTeamUserMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/IwsTeamUserMapper.xml @@ -18,6 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select + DISTINCT bzgl_bz.id, bzgl_bz.bzmc as teamName, bzgl_bz.bzz_name as relName, bzgl_bz.bzz_idcard as teamLeaderIdCard, bzgl_bz.bz as remark, bzgl_bz.bz_status as teamStatus, bzgl_bz.project_id as projectId, bzgl_bz.project_name as projectName, bzgl_bz.bzz_idcard as teamLeaderIdCard, org_user.mobile as relPhone 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 d250865c..55511e6e 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 @@ -90,7 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" clz_lease_apply_info lai left join tm_task tt on lai.task_id = tt.task_id left join tm_task_agreement tta ON tt.task_id = tta.task_id - left join bm_agreement_info bai ON tta.agreement_id = bai.agreement_id + left join clz_bm_agreement_info bai ON tta.agreement_id = bai.agreement_id left join clz_lease_apply_details lad on lai.id = lad.parent_id left join bm_project bp on bp.pro_id = lai.project_id left join bm_unit bt on bt.unit_id = lai.team_id