bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

直转问题修复

This commit is contained in:
hongchao 2025-09-25 12:07:43 +08:00
parent cf935f714f
commit 78c1aaf908
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/SysWorkflowRecordHistoryServiceImpl.java
View File

@ -494,6 +494,7 @@ public class SysWorkflowRecordHistoryServiceImpl implements SysWorkflowRecordHis
backApplyInfo.setAgreementId(Long.valueOf(info.getBackAgreementId())); backApplyInfo.setAgreementId(Long.valueOf(info.getBackAgreementId()));
backApplyInfo.setBackPerson(info.getBackMan()); backApplyInfo.setBackPerson(info.getBackMan());
backApplyInfo.setPhone(info.getBackPhone()); backApplyInfo.setPhone(info.getBackPhone());
backApplyInfo.setDirectId(Long.valueOf(info.getId()));
} }
List<DirectApplyDetails> detailById = mapper.getDetailById(sltAgreementInfo); List<DirectApplyDetails> detailById = mapper.getDetailById(sltAgreementInfo);
List<DirectApplyDetails> list = mapper.selectDetails(sltAgreementInfo); List<DirectApplyDetails> list = mapper.selectDetails(sltAgreementInfo);
@ -541,6 +542,7 @@ public class SysWorkflowRecordHistoryServiceImpl implements SysWorkflowRecordHis
applyInfo.setPhone(info.getLeasePhone()); applyInfo.setPhone(info.getLeasePhone());
applyInfo.setCreateBy(SecurityUtils.getUsername()); applyInfo.setCreateBy(SecurityUtils.getUsername());
applyInfo.setCreateTime(DateUtils.getNowDate()); applyInfo.setCreateTime(DateUtils.getNowDate());
applyInfo.setDirectId(Long.valueOf(info.getId()));
/** 设置审批人为默认的董班长 --防止代码冲突 **/ /** 设置审批人为默认的董班长 --防止代码冲突 **/
int count = leaseApplyInfoMapper.insertLeaseApplyInfo(applyInfo); int count = leaseApplyInfoMapper.insertLeaseApplyInfo(applyInfo);
if (count > 0) { if (count > 0) {

4
bonus-modules/bonus-material/src/main/resources/mapper/material/ma/DirectRotationMapper.xml
View File

@ -97,7 +97,7 @@
SELECT DISTINCT SELECT DISTINCT
dai.id AS id, dai.id AS id,
dai.create_time AS createTime, dai.create_time AS createTime,
su.user_name AS createName, su.nick_name AS createName,
bui.unit_id AS backUnitId, bui.unit_id AS backUnitId,
bui.unit_name AS backUnitName, bui.unit_name AS backUnitName,
bpl.pro_id AS backProId, bpl.pro_id AS backProId,
@ -210,7 +210,7 @@
direct_apply_info dai direct_apply_info dai
LEFT JOIN direct_apply_details dad ON dai.id = dad.direct_id 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 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 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 mt ON mt.type_id = dad.type_id
LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id