From 78c1aaf908d15929e0306506560e492968991a2c Mon Sep 17 00:00:00 2001 From: hongchao <3228015117@qq.com> Date: Thu, 25 Sep 2025 12:07:43 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=B4=E8=BD=AC=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SysWorkflowRecordHistoryServiceImpl.java | 2 ++ .../resources/mapper/material/ma/DirectRotationMapper.xml | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/SysWorkflowRecordHistoryServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/SysWorkflowRecordHistoryServiceImpl.java index 6134cc62..1150f508 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/SysWorkflowRecordHistoryServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/SysWorkflowRecordHistoryServiceImpl.java @@ -494,6 +494,7 @@ public class SysWorkflowRecordHistoryServiceImpl implements SysWorkflowRecordHis backApplyInfo.setAgreementId(Long.valueOf(info.getBackAgreementId())); backApplyInfo.setBackPerson(info.getBackMan()); backApplyInfo.setPhone(info.getBackPhone()); + backApplyInfo.setDirectId(Long.valueOf(info.getId())); } List detailById = mapper.getDetailById(sltAgreementInfo); List list = mapper.selectDetails(sltAgreementInfo); @@ -541,6 +542,7 @@ public class SysWorkflowRecordHistoryServiceImpl implements SysWorkflowRecordHis applyInfo.setPhone(info.getLeasePhone()); applyInfo.setCreateBy(SecurityUtils.getUsername()); applyInfo.setCreateTime(DateUtils.getNowDate()); + applyInfo.setDirectId(Long.valueOf(info.getId())); /** 设置审批人为默认的董班长 --防止代码冲突 **/ int count = leaseApplyInfoMapper.insertLeaseApplyInfo(applyInfo); if (count > 0) { diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/DirectRotationMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/DirectRotationMapper.xml index 61835fbf..4ba543ac 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/DirectRotationMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/DirectRotationMapper.xml @@ -97,7 +97,7 @@ SELECT DISTINCT dai.id AS id, dai.create_time AS createTime, - su.user_name AS createName, + su.nick_name AS createName, bui.unit_id AS backUnitId, bui.unit_name AS backUnitName, bpl.pro_id AS backProId, @@ -210,7 +210,7 @@ direct_apply_info dai LEFT JOIN direct_apply_details dad ON dai.id = dad.direct_id LEFT JOIN slt_agreement_info sai ON dai.back_agreement_id = sai.agreement_id - AND sai.type_id = dad.type_id + AND sai.type_id = dad.type_id and dad.ma_id <=> sai.ma_id LEFT JOIN lease_apply_info lai on lai.id=sai.lease_id LEFT JOIN ma_type mt ON mt.type_id = dad.type_id LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id