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

领料申请查看按钮数据展示

This commit is contained in:
liang.chao 2024-03-01 17:32:41 +08:00
parent 738706a03c
commit 242b86514e
3 changed files with 52 additions and 18 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/controller/TmTaskController.java
View File

@ -556,13 +556,25 @@ public class TmTaskController extends BaseController {
return getDataTable(leaseAuditList); return getDataTable(leaseAuditList);
} }
@Log(title = "获取领料申请-详情列表", businessType = BusinessType.QUERY) @Log(title = "获取领料申请-查看列表", businessType = BusinessType.QUERY)
@GetMapping("/getLeaseApplyListAll") @GetMapping("/getLeaseApplyListAll")
public TableDataInfo getLeaseApplyListAll(@RequestParam(value = "taskId", required = false, defaultValue = "") String taskId) { public TableDataInfo getLeaseApplyListAll(@RequestParam(value = "taskId", required = false, defaultValue = "") String taskId) {
TmTask task = new TmTask(); TmTask task = new TmTask();
task.setTaskId(Long.parseLong(taskId)); task.setTaskId(Long.parseLong(taskId));
task.setFlag(1);
List<TmTask> leaseAuditList = tmTaskService.getLeaseApplyListAll(task); List<TmTask> leaseAuditList = tmTaskService.getLeaseApplyListAll(task);
return getDataTable(leaseAuditList); return getDataTable(leaseAuditList);
} }
@Log(title = "获取领料申请-驳回提交数据", businessType = BusinessType.QUERY)
@GetMapping("/getLeaseApplyAuditListAll")
public TableDataInfo getLeaseApplyAuditListAll(@RequestParam(value = "taskId", required = false, defaultValue = "") String taskId) {
TmTask task = new TmTask();
task.setTaskId(Long.parseLong(taskId));
task.setFlag(0);
List<TmTask> leaseAuditList = tmTaskService.getLeaseApplyListAll(task);
return getDataTable(leaseAuditList);
}
} }

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java
View File

@ -44,6 +44,8 @@ public class TmTask implements Serializable {
@ApiModelProperty(value="任务状态(数据字典)") @ApiModelProperty(value="任务状态(数据字典)")
private Integer taskStatus; private Integer taskStatus;
private Integer flag;
/** /**
* 预领料合计数 * 预领料合计数
*/ */

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

@ -782,26 +782,46 @@ public class TmTaskServiceImpl implements TmTaskService {
List<LeaseApplyInfo> leaseApplyInfos = new ArrayList<>(); List<LeaseApplyInfo> leaseApplyInfos = new ArrayList<>();
if (tmTask != null) { if (tmTask != null) {
List<LeaseApplyInfo> leaseApplyInfoList = tmTaskMapper.getLeaseListByLeaseInfo(task); List<LeaseApplyInfo> leaseApplyInfoList = tmTaskMapper.getLeaseListByLeaseInfo(task);
for (LeaseApplyInfo applyInfo : leaseApplyInfoList) { if (task.getFlag() == 0) {
if ("2".equals(applyInfo.getStatus()) || "4".equals(applyInfo.getStatus()) || "6".equals(applyInfo.getStatus()) || "8".equals(applyInfo.getStatus())) { for (LeaseApplyInfo applyInfo : leaseApplyInfoList) {
leaseApplyInfos.add(applyInfo); if ("2".equals(applyInfo.getStatus()) || "4".equals(applyInfo.getStatus()) || "6".equals(applyInfo.getStatus()) || "8".equals(applyInfo.getStatus())) {
} leaseApplyInfos.add(applyInfo);
}
tmTask.setLeaseApplyInfoList(leaseApplyInfoList);
List<LeaseApplyDetails> listLeaseDetails = new ArrayList<>();
for (LeaseApplyInfo leaseApplyInfo : leaseApplyInfos) {
if (leaseApplyInfo != null) {
// 去查询领料任务详情表
List<LeaseApplyDetails> leaseApplyDetails = tmTaskMapper.getLeaseApplyDetailsByApply(leaseApplyInfo);
if (leaseApplyDetails != null && !leaseApplyDetails.isEmpty()) {
leaseApplyInfo.setLeaseApplyDetails(leaseApplyDetails);
listLeaseDetails.addAll(leaseApplyDetails);
} }
} }
tmTask.setLeaseApplyInfoList(leaseApplyInfoList);
List<LeaseApplyDetails> listLeaseDetails = new ArrayList<>();
for (LeaseApplyInfo leaseApplyInfo : leaseApplyInfos) {
if (leaseApplyInfo != null) {
// 去查询领料任务详情表
List<LeaseApplyDetails> leaseApplyDetails = tmTaskMapper.getLeaseApplyDetailsByApply(leaseApplyInfo);
if (leaseApplyDetails != null && !leaseApplyDetails.isEmpty()) {
leaseApplyInfo.setLeaseApplyDetails(leaseApplyDetails);
listLeaseDetails.addAll(leaseApplyDetails);
}
}
}
// 塞入领料任务详情的集合中
tmTask.setLeaseApplyDetails(listLeaseDetails);
}
if (task.getFlag() == 1) {
tmTask.setLeaseApplyInfoList(leaseApplyInfoList);
List<LeaseApplyDetails> listLeaseDetails = new ArrayList<>();
for (LeaseApplyInfo leaseApplyInfo : leaseApplyInfoList) {
if (leaseApplyInfo != null) {
// 去查询领料任务详情表
List<LeaseApplyDetails> leaseApplyDetails = tmTaskMapper.getLeaseApplyDetailsByApply(leaseApplyInfo);
if (leaseApplyDetails != null && !leaseApplyDetails.isEmpty()) {
leaseApplyInfo.setLeaseApplyDetails(leaseApplyDetails);
listLeaseDetails.addAll(leaseApplyDetails);
}
}
}
// 塞入领料任务详情的集合中
tmTask.setLeaseApplyDetails(listLeaseDetails);
} }
// 塞入领料任务详情的集合中
tmTask.setLeaseApplyDetails(listLeaseDetails);
} }
tmTaskList.add(tmTask); tmTaskList.add(tmTask);
return tmTaskList; return tmTaskList;