退料申请表数据问题修改

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")) {

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<String, Object> 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("beginTime", beginTime + " 00:00:00");
-            params.put("endTime", endTime+" 23:59:59");
+            params.put("endTime", endTime + " 23:59:59");
             repairAuditDetails.setParams(params);
         }
         List<ScrapApplyDetailsVO> 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<String, Object> 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("beginTime", beginTime + " 00:00:00");
-            params.put("endTime", endTime+" 23:59:59");
+            params.put("endTime", endTime + " 23:59:59");
             bean.setParams(params);
         }
         List<RepairAuditDetailsVO> 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<RepairAuditDetails> 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<RepairRecord> 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<RepairPart> list = repairAuditDetailsService.getPartRecord(repairAuditDetails);
         return getDataTable(list);

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<String, Object> 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");

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;

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<String> getFileUrl(String fileIds) {
         List<String> fileUrlList = new ArrayList<>();
-        if (fileIds.isEmpty()){
+        if (fileIds!=null &&fileIds.isEmpty()){
             for (String s : fileIds.split(",")) {
                 String url = scrapApplyDetailsMapper.getFileUrl(s);
                 fileUrlList.add(url);