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

Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx

This commit is contained in:
BianLzhaoMin 2024-05-29 10:47:35 +08:00
parent 3be3fd24eb fcbc5f720e
commit b43a8e501e
3 changed files with 54 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java
View File

@ -142,4 +142,6 @@ public interface TmTaskMapper {
int updateLeaseApplyInfoRejectInfoCq(@Param("record") LeaseApplyInfo leaseApplyInfo); int updateLeaseApplyInfoRejectInfoCq(@Param("record") LeaseApplyInfo leaseApplyInfo);
int updateLeaseApplyInfoAuditInfoCq(@Param("record") LeaseApplyInfo leaseApplyInfo); int updateLeaseApplyInfoAuditInfoCq(@Param("record") LeaseApplyInfo leaseApplyInfo);
int getDeptId(String createBy);
} }

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

@ -615,37 +615,16 @@ 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();
List<TmTask> tmTaskList = new ArrayList<>(); List<LeaseApplyInfo> collect;
int count = 0;
List<LeaseApplyInfo> leaseApplyInfoList = new ArrayList<>();
List<TmTask> tmTaskList = tmTaskMapper.getAuditManageListByLeaseTmTask(record);
if (roles.contains("admin")) { if (roles.contains("admin")) {
tmTaskList = tmTaskMapper.getAuditManageListByLeaseTmTask(record); for (TmTask tmTask : tmTaskList) {
} else if (roles.contains("em01") || roles.contains("em02")) { //机具经理、机具副经理 if (tmTask != null) {
record.setDeptId(101L); // 去查询任务分单表
tmTaskList = tmTaskMapper.getAuditManageListByLeaseTmTask(record); collect = tmTaskMapper.getAuditManageListByLeaseInfo(tmTask);
} else if (roles.contains("sgb")) { //施管部经理 record.setDeptId(null);
record.setDeptId(210L);
tmTaskList = tmTaskMapper.getAuditManageListByLeaseTmTask(record);
} else if (roles.contains("dm01") || roles.contains("dm04")) { //调试经理、调试安全专责
record.setDeptId(102L);
tmTaskList = tmTaskMapper.getAuditManageListByLeaseTmTask(record);
} else if (roles.contains("dm02")) { //调试审核员
record.setCompanyId(102);
tmTaskList = tmTaskMapper.getAuditManageListByLeaseTmTask(record);
} else if (roles.contains("fgs")) { //各分公司经理
record.setDeptId(deptId);
tmTaskList = tmTaskMapper.getAuditManageListByLeaseTmTask(record);
} else { //其他角色只能看到自己部门下的数据
record.setDeptId(deptId);
tmTaskList = tmTaskMapper.getAuditManageListByLeaseTmTask(record);
}
for (TmTask tmTask : tmTaskList) {
int count = 0;
if (tmTask != null) {
tmTask.setDeptId(deptId);
// 去查询任务分单表
List<LeaseApplyInfo> collect = tmTaskMapper.getAuditManageListByLeaseInfo(tmTask);
//管理员可以看到所有数据
if (roles.contains("admin")) {
// 对领料任务集合查询具体详情 // 对领料任务集合查询具体详情
for (LeaseApplyInfo leaseApplyInfo : collect) { for (LeaseApplyInfo leaseApplyInfo : collect) {
if (leaseApplyInfo != null) { if (leaseApplyInfo != null) {
@ -666,76 +645,50 @@ public class TmTaskServiceImpl implements TmTaskService {
} }
} }
} }
} else if (roles.contains("em01") || roles.contains("em02") || roles.contains("sgb")) { }
List<LeaseApplyInfo> auditListByLeaseInfo = collect.stream().filter(t -> t.getCompanyId() != null).filter(t -> t.getCompanyId() == 101).collect(Collectors.toList()); // 塞入预领的合计数量
if (auditListByLeaseInfo != null && !auditListByLeaseInfo.isEmpty()) { tmTask.setPreCountNum(count);
// 对领料任务集合查询具体详情 }
for (LeaseApplyInfo leaseApplyInfo : auditListByLeaseInfo) {
if (leaseApplyInfo != null) { } else {
// 去查询领料任务详情表 for (TmTask tmTask : tmTaskList) {
List<LeaseApplyDetails> leaseApplyDetails = tmTaskMapper.getLeaseApplyManageDetails(leaseApplyInfo); collect = tmTaskMapper.getAuditManageListByLeaseInfo(tmTask);
if (leaseApplyDetails.size() > 0) { for (LeaseApplyInfo leaseApplyInfo : collect) {
for (LeaseApplyDetails leaseApplyDetail : leaseApplyDetails) { String createBy = leaseApplyInfo.getCreateBy();
if (leaseApplyDetail != null && leaseApplyDetail.getPreNum() != null) { // 查询当前领料人所属部门
// 统计预领数量 int deptId1 = tmTaskMapper.getDeptId(createBy);
count += leaseApplyDetail.getPreNum(); if ((deptId == 101 && leaseApplyInfo.getCompanyId() == 101) || (deptId1 == deptId && deptId1 == 101)) {
} leaseApplyInfoList.add(leaseApplyInfo);
}
// 塞入领料任务详情的集合中
leaseApplyInfo.setLeaseApplyDetails(leaseApplyDetails);
// 存入领料任务实体集合
tmTask.setLeaseApplyInfoList(auditListByLeaseInfo);
tmTask.setRemark(collect.get(0).getRemark());
}
}
}
} }
} else if (roles.contains("dm01") || roles.contains("dm04") || roles.contains("dm02")) { if ((deptId == 102 && leaseApplyInfo.getCompanyId() == 102) || (deptId1 == deptId && deptId1 == 102)) {
List<LeaseApplyInfo> auditListByLeaseInfo = collect.stream().filter(t -> t.getCompanyId() != null).filter(t -> t.getCompanyId() == 102).collect(Collectors.toList()); leaseApplyInfoList.add(leaseApplyInfo);
if (auditListByLeaseInfo != null && !auditListByLeaseInfo.isEmpty()) {
// 对领料任务集合查询具体详情
for (LeaseApplyInfo leaseApplyInfo : auditListByLeaseInfo) {
if (leaseApplyInfo != null) {
// 去查询领料任务详情表
List<LeaseApplyDetails> leaseApplyDetails = tmTaskMapper.getLeaseApplyManageDetails(leaseApplyInfo);
if (leaseApplyDetails.size() > 0) {
for (LeaseApplyDetails leaseApplyDetail : leaseApplyDetails) {
if (leaseApplyDetail != null) {
// 统计预领数量
count += leaseApplyDetail.getPreNum();
}
}
// 塞入领料任务详情的集合中
leaseApplyInfo.setLeaseApplyDetails(leaseApplyDetails);
// 存入领料任务实体集合
tmTask.setLeaseApplyInfoList(auditListByLeaseInfo);
tmTask.setRemark(collect.get(0).getRemark());
}
}
}
} }
} else { if ((roles.contains("sgb") && leaseApplyInfo.getCompanyId() == 101) || (deptId1 == 210)) {
//其他部门人只能看到自己部门下的数据 leaseApplyInfoList.add(leaseApplyInfo);
List<LeaseApplyInfo> auditListByLeaseInfo = collect.stream().filter(t -> t.getCreateBy().equals(deptId.toString())).collect(Collectors.toList()); }
if (auditListByLeaseInfo != null && !auditListByLeaseInfo.isEmpty()) { if (roles.contains("fgs") && (deptId == deptId1)) {
// 对领料任务集合查询具体详情 leaseApplyInfoList.add(leaseApplyInfo);
for (LeaseApplyInfo leaseApplyInfo : auditListByLeaseInfo) { }
if (leaseApplyInfo != null) { }
// 去查询领料任务详情表
List<LeaseApplyDetails> leaseApplyDetails = tmTaskMapper.getLeaseApplyManageDetails(leaseApplyInfo); if (leaseApplyInfoList != null && !leaseApplyInfoList.isEmpty()) {
if (leaseApplyDetails.size() > 0) { // 对领料任务集合查询具体详情
for (LeaseApplyDetails leaseApplyDetail : leaseApplyDetails) { for (LeaseApplyInfo leaseApplyInfo : leaseApplyInfoList) {
if (leaseApplyDetail != null) { if (leaseApplyInfo != null) {
// 统计预领数量 // 去查询领料任务详情表
count += leaseApplyDetail.getPreNum(); List<LeaseApplyDetails> leaseApplyDetails = tmTaskMapper.getLeaseApplyManageDetails(leaseApplyInfo);
} if (leaseApplyDetails.size() > 0) {
for (LeaseApplyDetails leaseApplyDetail : leaseApplyDetails) {
if (leaseApplyDetail != null && leaseApplyDetail.getPreNum() != null) {
// 统计预领数量
count += leaseApplyDetail.getPreNum();
} }
// 塞入领料任务详情的集合中
leaseApplyInfo.setLeaseApplyDetails(leaseApplyDetails);
// 存入领料任务实体集合
tmTask.setLeaseApplyInfoList(auditListByLeaseInfo);
tmTask.setRemark(collect.get(0).getRemark());
} }
// 塞入领料任务详情的集合中
leaseApplyInfo.setLeaseApplyDetails(leaseApplyDetails);
// 存入领料任务实体集合
tmTask.setLeaseApplyInfoList(leaseApplyInfoList);
tmTask.setRemark(leaseApplyInfoList.get(0).getRemark());
} }
} }
} }

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

@ -1152,4 +1152,7 @@
AND task_type = #{taskType} AND task_type = #{taskType}
ORDER BY create_time DESC LIMIT 1 ORDER BY create_time DESC LIMIT 1
</select> </select>
<select id="getDeptId" resultType="java.lang.Integer">
select dept_id from sys_user where user_id = #{createBy}
</select>
</mapper> </mapper>