bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

测试问题项修改

This commit is contained in:
csyue 2024-05-29 16:44:47 +08:00
parent 27648f4e00
commit 41813e09e9
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java
View File

@ -704,7 +704,7 @@ public class TmTaskServiceImpl implements TmTaskService {
} }
} }
} }
} else if (deptId == deptId1) { //其他各分公司可以看到的数据权限 } else if (deptId == deptId1) { //其他各分公司可以看到的自己部门的数据
// 对领料任务集合查询具体详情 // 对领料任务集合查询具体详情
for (LeaseApplyInfo leaseApplyInfo : collect) { for (LeaseApplyInfo leaseApplyInfo : collect) {
if (leaseApplyInfo != null) { if (leaseApplyInfo != null) {
@ -764,6 +764,7 @@ public class TmTaskServiceImpl implements TmTaskService {
return tmTasks; return tmTasks;
} }
/** /**
* 获取审核列表 - App端 * 获取审核列表 - App端
*/ */
@ -1326,8 +1327,6 @@ public class TmTaskServiceImpl implements TmTaskService {
List<LeaseApplyInfo> leaseApplyInfoList2 = tmTaskMapper.getLeaseListByLeaseInfo(task); List<LeaseApplyInfo> leaseApplyInfoList2 = tmTaskMapper.getLeaseListByLeaseInfo(task);
tmTask.setLeaseApplyInfoList(leaseApplyInfoList); tmTask.setLeaseApplyInfoList(leaseApplyInfoList);
/* List<LeaseApplyInfo> leaseApplyInfos = new ArrayList<>();
leaseApplyInfos = ObjectUtil.clone(leaseApplyInfoList);*/
List<LeaseApplyDetails> listLeaseDetails = new ArrayList<>(); List<LeaseApplyDetails> listLeaseDetails = new ArrayList<>();
for (LeaseApplyInfo leaseApplyInfo : leaseApplyInfoList2) { for (LeaseApplyInfo leaseApplyInfo : leaseApplyInfoList2) {
if (leaseApplyInfo != null) { if (leaseApplyInfo != null) {

2
sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
View File

@ -615,7 +615,7 @@
LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id
LEFT JOIN ma_machine mm ON lad.type_id = mm.type_id LEFT JOIN ma_machine mm ON lad.type_id = mm.type_id
WHERE WHERE
lad.parennt_id = #{record.id} AND lad.company_id = #{record.companyId} lad.parennt_id = #{record.id}
GROUP BY GROUP BY
lad.id lad.id
</select> </select>