diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/RepairController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/RepairController.java
index 5dfd14e2..6aa9291f 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/RepairController.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/RepairController.java
@@ -47,7 +47,7 @@ public class RepairController extends BaseController {
      * 导出维修任务列表
      */
     @RequiresPermissions("domain:details:export")
-    @Log(title = "维修任务列表", businessType = BusinessType.EXPORT)
+    @Log(title = "导出维修任务列表", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, RepairTask bean)
     {
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java
index ade6cb43..0955bc05 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java
@@ -94,20 +94,19 @@ public class RepairServiceImpl implements RepairService {
             }
         }
         if (partList != null && partList.size()>0){
-            for (RepairPartDetails partDetails : partList){
-                if (partDetails.getPartId() == null && bean.getRepairType().equals("1")){
-                    throw new ServiceException("请选择配件");
-                }
-                if (bean.getRepairType().equals("1")){
-                    if (partDetails.getPartCost() == null || partDetails.getPartCost().isEmpty()){
-                        partDetails.setPartCost("0");
+            if (bean.getRepairType().equals("1")){
+                for (RepairPartDetails partDetails : partList){
+                    if(partDetails.getPartId() != null){
+                        if (partDetails.getPartCost() == null || partDetails.getPartCost().isEmpty()){
+                            partDetails.setPartCost("0");
+                        }
+                        partDetails.setTaskId(bean.getTaskId());
+                        partDetails.setMaId(bean.getMaId());
+                        partDetails.setTypeId(bean.getTypeId());
+                        partDetails.setCreateBy(loginUser.getUserid());
+                        partDetails.setCompanyId(bean.getCompanyId());
+                        mapper.addPart(partDetails);
                     }
-                    partDetails.setTaskId(bean.getTaskId());
-                    partDetails.setMaId(bean.getMaId());
-                    partDetails.setTypeId(bean.getTypeId());
-                    partDetails.setCreateBy(loginUser.getUserid());
-                    partDetails.setCompanyId(bean.getCompanyId());
-                    mapper.addPart(partDetails);
                 }
             }
             if (bean.getRepairType().equals("2")){
@@ -189,7 +188,6 @@ public class RepairServiceImpl implements RepairService {
     }
 
 
-
     @Override
     public int completeRepair(ArrayList<Long> ids) {
         LoginUser loginUser = SecurityUtils.getLoginUser();
@@ -201,7 +199,4 @@ public class RepairServiceImpl implements RepairService {
         return mapper.selectUserList();
     }
 
-
-
-
 }
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 70f10ccc..f8bf2a43 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
@@ -56,7 +56,7 @@ public class RepairAuditDetailsController extends BaseController
      * 导出修试审核任务列表
      */
     @RequiresPermissions("domain:details:export")
-    @Log(title = "修试审核任务列表", businessType = BusinessType.EXPORT)
+    @Log(title = "导出修试审核任务列表", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, RepairAuditDetails bean)
     {
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 26f74ff4..0ca7d1fd 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
@@ -57,7 +57,7 @@ public class ScrapApplyDetailsController extends BaseController
      * 导出报废任务列表
      */
     @RequiresPermissions("domain:details:export")
-    @Log(title = "报废任务列表", businessType = BusinessType.EXPORT)
+    @Log(title = "导出报废任务列表", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, ScrapApplyDetails bean)
     {
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java
index 581eaf99..44aa3f84 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java
@@ -238,7 +238,6 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
                         scrapApplyDetailsMapper.insertScrapApplyDetails(scrapApplyDetails);
 
                     }
-
                 }
                 // 修饰审核通过时改修任务为已通过审核
                 task1.setTaskStatus(47);
@@ -256,7 +255,6 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
                 taskMapper.updateTmTask(tmTask);
             }
         }
-
         return 1;
     }
 
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/vo/RepairAuditDetailsVO.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/vo/RepairAuditDetailsVO.java
index 46e4c1ee..5506adb3 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/vo/RepairAuditDetailsVO.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/vo/RepairAuditDetailsVO.java
@@ -34,9 +34,8 @@ public class RepairAuditDetailsVO {
     /**
      * 创建时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "任务创建时间",sort = 5)
-    private Date createTime;
+    private String createTime;
 
     // 维修单号
     @Excel(name = "维修单号",sort = 6)
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/vo/ScrapApplyDetailsVO.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/vo/ScrapApplyDetailsVO.java
index 82ae27ec..dcf97f2d 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/vo/ScrapApplyDetailsVO.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/vo/ScrapApplyDetailsVO.java
@@ -1,12 +1,10 @@
 package com.bonus.sgzb.material.vo;
 
 import com.bonus.sgzb.common.core.annotation.Excel;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 @Data
 public class ScrapApplyDetailsVO {
@@ -34,9 +32,8 @@ public class ScrapApplyDetailsVO {
     /**
      * 创建时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "任务创建时间",sort = 5)
-    private Date createTime;
+    private String createTime;
 
     // 维修单号
     @Excel(name = "维修单号",sort = 6)