From c20ea17df39d68844b4f56a71c0cd50f9e673554 Mon Sep 17 00:00:00 2001 From: "liang.chao" Date: Tue, 14 May 2024 17:51:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=81=E5=A4=8F=E6=B5=81=E7=A8=8B=E5=8F=8A?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ScrapApplyDetailsController.java | 67 ++++++++----------- 1 file changed, 29 insertions(+), 38 deletions(-) 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 3a290d10..96191d17 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 @@ -35,15 +35,14 @@ import com.bonus.sgzb.common.core.web.page.TableDataInfo; /** * 报废任务详细 - * + * * @author bonus * @date 2023-12-15 */ @RestController @Api(value = "报废任务详细") @RequestMapping("/scrap") -public class ScrapApplyDetailsController extends BaseController -{ +public class ScrapApplyDetailsController extends BaseController { @Resource private IScrapApplyDetailsService scrapApplyDetailsService; @@ -52,15 +51,14 @@ public class ScrapApplyDetailsController extends BaseController */ @ApiOperation("查询报废任务列表") @GetMapping("/getScrapTaskList") - public TableDataInfo list(ScrapApplyDetails scrapApplyDetails) - { + public TableDataInfo list(ScrapApplyDetails scrapApplyDetails) { startPage(); Map params = scrapApplyDetails.getParams(); - if (!params.isEmpty()){ + 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"); + params.put("beginTime", beginTime + " 00:00:00"); + params.put("endTime", endTime + " 23:59:59"); scrapApplyDetails.setParams(params); } List list = scrapApplyDetailsService.selectScrapApplyDetailsList(scrapApplyDetails); @@ -72,14 +70,13 @@ public class ScrapApplyDetailsController extends BaseController */ @Log(title = "导出报废任务列表", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(HttpServletResponse response, ScrapApplyDetails bean) - { + public void export(HttpServletResponse response, ScrapApplyDetails bean) { Map params = bean.getParams(); - if (params!=null && !params.isEmpty()){ + if (params != null && !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"); + params.put("beginTime", beginTime + " 00:00:00"); + params.put("endTime", endTime + " 23:59:59"); bean.setParams(params); } List list = scrapApplyDetailsService.exportScrapApplyDetailsList(bean); @@ -92,8 +89,7 @@ public class ScrapApplyDetailsController extends BaseController */ @ApiOperation("查看报废任务详细列表") @GetMapping("/getScrapAuditList") - public TableDataInfo getScrapAuditList(ScrapApplyDetails scrapApplyDetails) - { + public TableDataInfo getScrapAuditList(ScrapApplyDetails scrapApplyDetails) { startPage(); List list = scrapApplyDetailsService.getScrapAuditList(scrapApplyDetails); return getDataTable(list); @@ -114,8 +110,7 @@ public class ScrapApplyDetailsController extends BaseController */ @ApiOperation("查看报废明细") @GetMapping("/getScrapRecord") - public TableDataInfo getScrapRecord(ScrapApplyDetails scrapApplyDetails) - { + public TableDataInfo getScrapRecord(ScrapApplyDetails scrapApplyDetails) { startPage(); List list = scrapApplyDetailsService.getScrapRecord(scrapApplyDetails); return getDataTable(list); @@ -126,8 +121,7 @@ public class ScrapApplyDetailsController extends BaseController */ @ApiOperation("查看报废照片") @GetMapping("/getFileUrl") - public AjaxResult getFileUrl(String fileIds) - { + public AjaxResult getFileUrl(String fileIds) { List list = scrapApplyDetailsService.getFileUrl(fileIds); return AjaxResult.success(list); } @@ -137,15 +131,14 @@ public class ScrapApplyDetailsController extends BaseController */ @ApiOperation("查询预报废任务列表") @PostMapping("/getScrapApplyList") - public TableDataInfo getScrapApplyList(ScrapApplyDetails scrapApplyDetails) - { + public TableDataInfo getScrapApplyList(ScrapApplyDetails scrapApplyDetails) { startPage(); Map params = scrapApplyDetails.getParams(); - if (!params.isEmpty()){ + 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"); + params.put("beginTime", beginTime + " 00:00:00"); + params.put("endTime", endTime + " 23:59:59"); scrapApplyDetails.setParams(params); } List list = scrapApplyDetailsService.getScrapApplyList(scrapApplyDetails); @@ -169,7 +162,7 @@ public class ScrapApplyDetailsController extends BaseController @ApiOperation("报废任务提交审计信息") @Log(title = "报废任务提交审计信息", businessType = BusinessType.UPDATE) @PostMapping("/submitScrapTask") - public AjaxResult submitScrapTask(@RequestBody ScrapAudit scrapAudit){ + public AjaxResult submitScrapTask(@RequestBody ScrapAudit scrapAudit) { return toAjax(scrapApplyDetailsService.submitScrapTask(scrapAudit)); } @@ -178,15 +171,14 @@ public class ScrapApplyDetailsController extends BaseController */ @ApiOperation("查询报废审核任务列表") @PostMapping("/scrapTaskReviewList") - public TableDataInfo scrapTaskReviewList(ScrapApplyDetails scrapApplyDetails) - { + public TableDataInfo scrapTaskReviewList(ScrapApplyDetails scrapApplyDetails) { startPage(); Map params = scrapApplyDetails.getParams(); - if (!params.isEmpty()){ + 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"); + params.put("beginTime", beginTime + " 00:00:00"); + params.put("endTime", endTime + " 23:59:59"); scrapApplyDetails.setParams(params); } List list = scrapApplyDetailsService.scrapTaskReviewList(scrapApplyDetails); @@ -214,11 +206,11 @@ public class ScrapApplyDetailsController extends BaseController public TableDataInfo obtainDisposalList(@RequestBody ScrapApplyDetails scrapApplyDetails) { startPage(); Map params = scrapApplyDetails.getParams(); - if (!params.isEmpty()){ + 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"); + params.put("beginTime", beginTime + " 00:00:00"); + params.put("endTime", endTime + " 23:59:59"); scrapApplyDetails.setParams(params); } List list = scrapApplyDetailsService.obtainDisposalList(scrapApplyDetails); @@ -242,14 +234,13 @@ public class ScrapApplyDetailsController extends BaseController */ @Log(title = "导出预报废审核列表", businessType = BusinessType.EXPORT) @PostMapping("/exportForecastWaste") - public void exportForecastWaste(HttpServletResponse response, ScrapApplyDetails scrapApplyDetails) - { + public void exportForecastWaste(HttpServletResponse response, ScrapApplyDetails scrapApplyDetails) { Map params = scrapApplyDetails.getParams(); - if (params!=null && !params.isEmpty()){ + if (params != null && !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"); + params.put("beginTime", beginTime + " 00:00:00"); + params.put("endTime", endTime + " 23:59:59"); scrapApplyDetails.setParams(params); } //获取预报废列表