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

问题修改

This commit is contained in:
hayu 2025-08-06 20:47:10 +08:00
parent 487bc5047a
commit daa2861f0d
3 changed files with 6 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/clz/domain/vo/MaterialRetainedTeamVo.java
View File

@ -63,4 +63,6 @@ public class MaterialRetainedTeamVo {
@ApiModelProperty(value = "领料ID") @ApiModelProperty(value = "领料ID")
private Long leaseId; private Long leaseId;
private String unitName;
} }

3
bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialLeaseInfoMapper.xml
View File

@ -813,7 +813,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
bp.external_id as externalId, bp.external_id as externalId,
bp.pro_name as projectName, bp.pro_name as projectName,
lai.lease_person as leasePerson, lai.lease_person as leasePerson,
lod.create_by as outPerson, su.nick_name as outPerson,
lai.`code` as code, lai.`code` as code,
bp.imp_unit as impUnit, bp.imp_unit as impUnit,
bt.bzz_idcard as idCard bt.bzz_idcard as idCard
@ -828,6 +828,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN clz_lease_apply_info lai ON lod.parent_id = lai.id LEFT JOIN clz_lease_apply_info lai ON lod.parent_id = lai.id
LEFT JOIN bm_unit bt on lai.team_id = bt.unit_id LEFT JOIN bm_unit bt on lai.team_id = bt.unit_id
LEFT JOIN bm_project bp ON lai.project_id = bp.pro_id LEFT JOIN bm_project bp ON lai.project_id = bp.pro_id
LEFT JOIN sys_user su on su.user_id=lod.create_by
WHERE WHERE
lod.is_finished = '1' lod.is_finished = '1'
<if test="startTime != null and startTime != '' and endTime != null and endTime != ''"> <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">

3
bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml
View File

@ -798,7 +798,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
lai.code AS code, lai.code AS code,
lai.lease_person AS leasePerson, lai.lease_person AS leasePerson,
mt.manage_type AS manageType, mt.manage_type AS manageType,
sai.agreement_id AS agreementId sai.agreement_id AS agreementId,
mt.unit_name as unitName
FROM FROM
clz_slt_agreement_info sai clz_slt_agreement_info sai
LEFT JOIN ma_type mt ON mt.type_id = sai.type_id LEFT JOIN ma_type mt ON mt.type_id = sai.type_id