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

测试问题项修改

This commit is contained in:
csyue 2024-05-27 20:45:12 +08:00
parent dd31e09009
commit f766d1ae97
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -618,12 +618,15 @@ public class TmTaskServiceImpl implements TmTaskService {
public List<TmTask> getLeaseAuditManageList(TmTask record) { public List<TmTask> getLeaseAuditManageList(TmTask record) {
Set<String> roles = SecurityUtils.getLoginUser().getRoles(); Set<String> roles = SecurityUtils.getLoginUser().getRoles();
Long deptId = SecurityUtils.getLoginUser().getSysUser().getDeptId(); Long deptId = SecurityUtils.getLoginUser().getSysUser().getDeptId();
if (roles.contains("fgs")) { List<TmTask> tmTaskList = new ArrayList<>();
if (roles.contains("fgs") && roles.contains("sgb")) {
record.setCompanyId(101);
tmTaskList = tmTaskMapper.getAuditManageListByLeaseTmTask(record);
} else if (roles.contains("fgs")) {
record.setDeptId(deptId); record.setDeptId(deptId);
tmTaskList = tmTaskMapper.getAuditManageListByLeaseTmTask(record);
} }
List<TmTask> tmTaskList = tmTaskMapper.getAuditManageListByLeaseTmTask(record);
Long companyId = SecurityUtils.getLoginUser().getSysUser().getCompanyId(); Long companyId = SecurityUtils.getLoginUser().getSysUser().getCompanyId();
for (TmTask tmTask : tmTaskList) { for (TmTask tmTask : tmTaskList) {
int count = 0; int count = 0;
if (tmTask != null) { if (tmTask != null) {
@ -651,6 +654,11 @@ public class TmTaskServiceImpl implements TmTaskService {
} }
} }
} }
// 存入领料任务实体集合
tmTask.setLeaseApplyInfoList(collect);
if (collect.size() > 0) {
tmTask.setRemark(collect.get(0).getRemark());
}
} }
//施管部只能看到机具分公司（101）的数据 //施管部只能看到机具分公司（101）的数据
if (roles.contains("jjfgs") || roles.contains("sgb") || deptId == 101) { if (roles.contains("jjfgs") || roles.contains("sgb") || deptId == 101) {

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

@ -561,6 +561,9 @@
<if test="record.deptId != null and record.deptId != '' "> <if test="record.deptId != null and record.deptId != '' ">
AND su.dept_id = #{record.deptId} AND su.dept_id = #{record.deptId}
</if> </if>
<if test="record.companyId != null ">
AND lai.company_id = #{record.companyId}
</if>
<if test="record.taskId != null and record.taskId != '' "> <if test="record.taskId != null and record.taskId != '' ">
AND tt.task_id = #{record.taskId} AND tt.task_id = #{record.taskId}
</if> </if>