From a9627e18d2689ebd77a87fc9d73212d376b6f4eb Mon Sep 17 00:00:00 2001 From: "liang.chao" Date: Wed, 13 Mar 2024 20:10:57 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=96=99=E7=94=B3=E8=AF=B7=E8=A1=A8?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/LeaseOutDetailsServiceImpl.java | 2 +- .../RepairAuditDetailsController.java | 32 ++++++++----------- .../ScrapApplyDetailsController.java | 2 +- .../SecondaryWarehouseController.java | 1 - .../impl/ScrapApplyDetailsServiceImpl.java | 2 +- 5 files changed, 16 insertions(+), 23 deletions(-) diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java index f27fd2ad..37a9ab1e 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java @@ -197,7 +197,7 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService { String agreementId = leaseOutDetailsMapper.getAgreementId(taskId); String protocol = leaseOutDetailsMapper.getProtocol(agreementId); MaType ma = leaseOutDetailsMapper.getMaType(record.getTypeId()); - if (protocol.isEmpty()) { + if (StringUtils.isEmpty(protocol)) { ma.setFinalPrice(ma.getLeasePrice()); } else { if (protocol.equals("1")) { diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairAuditDetailsController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairAuditDetailsController.java index 19193ba1..e2ce7543 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairAuditDetailsController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairAuditDetailsController.java @@ -27,14 +27,13 @@ import com.bonus.sgzb.common.core.web.page.TableDataInfo; /** * 修试审核详细 - * + * * @author bonus * @date 2023-12-16 */ @RestController @RequestMapping("/details") -public class RepairAuditDetailsController extends BaseController -{ +public class RepairAuditDetailsController extends BaseController { @Autowired private IRepairAuditDetailsService repairAuditDetailsService; @@ -43,15 +42,14 @@ public class RepairAuditDetailsController extends BaseController */ @ApiOperation("查询修试审核任务列表") @GetMapping("/questList") - public TableDataInfo questList(RepairAuditDetails repairAuditDetails) - { + public TableDataInfo questList(RepairAuditDetails repairAuditDetails) { startPage(); Map params = repairAuditDetails.getParams(); - if (!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"); repairAuditDetails.setParams(params); } List list = repairAuditDetailsService.selectRepairQuestList(repairAuditDetails); @@ -63,14 +61,13 @@ public class RepairAuditDetailsController extends BaseController */ @Log(title = "导出修试审核任务列表", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(HttpServletResponse response, RepairAuditDetails bean) - { + public void export(HttpServletResponse response, RepairAuditDetails bean) { Map params = bean.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"); bean.setParams(params); } List list = repairAuditDetailsService.exportRepairQuestList(bean); @@ -83,8 +80,7 @@ public class RepairAuditDetailsController extends BaseController */ @ApiOperation("查看修饰审核任务详细列表") @GetMapping("/getRepairAuditList") - public TableDataInfo getRepairAuditList(RepairAuditDetails repairAuditDetails) - { + public TableDataInfo getRepairAuditList(RepairAuditDetails repairAuditDetails) { startPage(); List list = repairAuditDetailsService.getRepairAuditList(repairAuditDetails); return getDataTable(list); @@ -95,8 +91,7 @@ public class RepairAuditDetailsController extends BaseController */ @ApiOperation("查看维修记录") @GetMapping("/getRepairRecord") - public TableDataInfo getRepairRecord(RepairAuditDetails repairAuditDetails) - { + public TableDataInfo getRepairRecord(RepairAuditDetails repairAuditDetails) { startPage(); List list = repairAuditDetailsService.getRepairRecord(repairAuditDetails); return getDataTable(list); @@ -107,8 +102,7 @@ public class RepairAuditDetailsController extends BaseController */ @ApiOperation("查看配件记录") @GetMapping("/getPartRecord") - public TableDataInfo getPartRecord(RepairAuditDetails repairAuditDetails) - { + public TableDataInfo getPartRecord(RepairAuditDetails repairAuditDetails) { startPage(); List list = repairAuditDetailsService.getPartRecord(repairAuditDetails); return getDataTable(list); 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 f0308d36..73c325dc 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 @@ -71,7 +71,7 @@ public class ScrapApplyDetailsController extends BaseController public void export(HttpServletResponse response, ScrapApplyDetails bean) { Map params = bean.getParams(); - if (!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"); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/SecondaryWarehouseController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/SecondaryWarehouseController.java index 5a9785dc..665ae744 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/SecondaryWarehouseController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/SecondaryWarehouseController.java @@ -1,7 +1,6 @@ package com.bonus.sgzb.material.controller; import cn.hutool.core.convert.Convert; -import com.bonus.sgzb.base.api.domain.SltAgreementInfo; import com.bonus.sgzb.common.core.utils.poi.ExcelUtil; import com.bonus.sgzb.common.core.web.controller.BaseController; import com.bonus.sgzb.common.core.web.domain.AjaxResult; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ScrapApplyDetailsServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ScrapApplyDetailsServiceImpl.java index b3858919..5d4e04bc 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ScrapApplyDetailsServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ScrapApplyDetailsServiceImpl.java @@ -72,7 +72,7 @@ public class ScrapApplyDetailsServiceImpl implements IScrapApplyDetailsService { @Override public List getFileUrl(String fileIds) { List fileUrlList = new ArrayList<>(); - if (fileIds.isEmpty()){ + if (fileIds!=null &&fileIds.isEmpty()){ for (String s : fileIds.split(",")) { String url = scrapApplyDetailsMapper.getFileUrl(s); fileUrlList.add(url);