diff --git a/sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java b/sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java index 44268fa8..62f6ae9b 100644 --- a/sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java +++ b/sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java @@ -28,7 +28,6 @@ import java.util.Map; /** * token 控制 - * * @author ruoyi */ @RestController diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java index a1d99467..c7027ccd 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java @@ -616,6 +616,4 @@ public class TmTaskController extends BaseController { List leaseAuditList = tmTaskService.getLeaseApplyListAll(task); return getDataTable(leaseAuditList); } - - } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ScrapApplyDetailsController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ScrapApplyDetailsController.java index f7001083..a40b1ed4 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ScrapApplyDetailsController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ScrapApplyDetailsController.java @@ -61,6 +61,21 @@ public class ScrapApplyDetailsController extends BaseController { return getDataTable(list); } + @ApiOperation("查询报废任务列表-app") + @GetMapping("/getScrapTaskListApp") + public AjaxResult listApp(ScrapApplyDetails scrapApplyDetails) { + Map 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 list = scrapApplyDetailsService.selectScrapApplyDetailsList(scrapApplyDetails); + return AjaxResult.success(list); + } + /** @@ -74,6 +89,16 @@ public class ScrapApplyDetailsController extends BaseController { return getDataTable(list); } + /** + * 查看报废任务详细列表-app + */ + @ApiOperation("查看报废任务详细列表") + @GetMapping("/getScrapAuditListApp") + public AjaxResult getScrapAuditListApp(ScrapApplyDetails scrapApplyDetails) { + List list = scrapApplyDetailsService.getScrapAuditList(scrapApplyDetails); + return AjaxResult.success(list); + } + /** * 报废任务审核 */ @@ -124,6 +149,23 @@ public class ScrapApplyDetailsController extends BaseController { List list = scrapApplyDetailsService.getScrapApplyList(scrapApplyDetails); return getDataTable(list); } + /** + * 查询预报废任务列表-App + */ + @ApiOperation("查询预报废任务列表") + @PostMapping("/getScrapApplyListApp") + public AjaxResult getScrapApplyListApp(@RequestBody ScrapApplyDetails scrapApplyDetails) { + Map 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 list = scrapApplyDetailsService.getScrapApplyList(scrapApplyDetails); + return AjaxResult.success(list); + } /**