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-06-21 10:37:11 +08:00
parent 9cc286e4b7 1f800582da
commit 04346fe02f
3 changed files with 42 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java
View File

@ -28,7 +28,6 @@ import java.util.Map;
/** /**
* token 控制 * token 控制
*
* @author ruoyi * @author ruoyi
*/ */
@RestController @RestController

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java
View File

@ -616,6 +616,4 @@ public class TmTaskController extends BaseController {
List<TmTask> leaseAuditList = tmTaskService.getLeaseApplyListAll(task); List<TmTask> leaseAuditList = tmTaskService.getLeaseApplyListAll(task);
return getDataTable(leaseAuditList); return getDataTable(leaseAuditList);
} }
} }

42
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ScrapApplyDetailsController.java
View File

@ -61,6 +61,21 @@ public class ScrapApplyDetailsController extends BaseController {
return getDataTable(list); return getDataTable(list);
} }
@ApiOperation("查询报废任务列表-app")
@GetMapping("/getScrapTaskListApp")
public AjaxResult listApp(ScrapApplyDetails scrapApplyDetails) {
Map<String, Object> params = scrapApplyDetails.getParams();
if (!params.isEmpty()) {
String beginTime = (String) params.get("beginTime");
String endTime = (String) params.get("endTime");
params.put("beginTime", beginTime + " 00:00:00");
params.put("endTime", endTime + " 23:59:59");
scrapApplyDetails.setParams(params);
}
List<ScrapApplyDetailsVO> list = scrapApplyDetailsService.selectScrapApplyDetailsList(scrapApplyDetails);
return AjaxResult.success(list);
}
/** /**
@ -74,6 +89,16 @@ public class ScrapApplyDetailsController extends BaseController {
return getDataTable(list); return getDataTable(list);
} }
/**
* 查看报废任务详细列表-app
*/
@ApiOperation("查看报废任务详细列表")
@GetMapping("/getScrapAuditListApp")
public AjaxResult getScrapAuditListApp(ScrapApplyDetails scrapApplyDetails) {
List<ScrapApplyDetails> list = scrapApplyDetailsService.getScrapAuditList(scrapApplyDetails);
return AjaxResult.success(list);
}
/** /**
* 报废任务审核 * 报废任务审核
*/ */
@ -124,6 +149,23 @@ public class ScrapApplyDetailsController extends BaseController {
List<ScrapApplyDetailsVO> list = scrapApplyDetailsService.getScrapApplyList(scrapApplyDetails); List<ScrapApplyDetailsVO> list = scrapApplyDetailsService.getScrapApplyList(scrapApplyDetails);
return getDataTable(list); return getDataTable(list);
} }
/**
* 查询预报废任务列表-App
*/
@ApiOperation("查询预报废任务列表")
@PostMapping("/getScrapApplyListApp")
public AjaxResult getScrapApplyListApp(@RequestBody ScrapApplyDetails scrapApplyDetails) {
Map<String, Object> params = scrapApplyDetails.getParams();
if (!params.isEmpty()) {
String beginTime = (String) params.get("beginTime");
String endTime = (String) params.get("endTime");
params.put("beginTime", beginTime + " 00:00:00");
params.put("endTime", endTime + " 23:59:59");
scrapApplyDetails.setParams(params);
}
List<ScrapApplyDetailsVO> list = scrapApplyDetailsService.getScrapApplyList(scrapApplyDetails);
return AjaxResult.success(list);
}
/** /**