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

工地直转退料领料信息中增加直转id

This commit is contained in:
hayu 2025-09-25 16:56:20 +08:00
parent e835da5e30
commit e8d6125f70
2 changed files with 3 additions and 1 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/ma/service/impl/DirectRotationImpl.java
View File

@ -374,6 +374,7 @@ public class DirectRotationImpl implements DirectRotationService {
backApplyInfo.setCode(codes); backApplyInfo.setCode(codes);
backApplyInfo.setCreateBy(SecurityUtils.getUsername()); backApplyInfo.setCreateBy(SecurityUtils.getUsername());
backApplyInfo.setCreateTime(DateUtils.getNowDate()); backApplyInfo.setCreateTime(DateUtils.getNowDate());
backApplyInfo.setDirectId(Long.valueOf(id));
// 保存退料信息到 tm_task 表中 // 保存退料信息到 tm_task 表中
int result = 0; int result = 0;
result = taskMapper.insertTmTask(task); result = taskMapper.insertTmTask(task);
@ -408,6 +409,7 @@ public class DirectRotationImpl implements DirectRotationService {
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.setDeptId(Long.valueOf(id));
/** 设置审批人为默认的董班长 --防止代码冲突 **/ /** 设置审批人为默认的董班长 --防止代码冲突 **/
int count = leaseApplyInfoMapper.insertLeaseApplyInfo(applyInfo); int count = leaseApplyInfoMapper.insertLeaseApplyInfo(applyInfo);
if (count > 0) { if (count > 0) {

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

@ -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 dad.ma_id = sai.ma_id AND sai.type_id = dad.type_id and IFNULL(dad.ma_id,0)=IFNULL(sai.ma_id,0)
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