bug修复

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairRecord.java

@@ -98,12 +98,18 @@ public class RepairRecord implements Serializable {
      */
     @ApiModelProperty(value = "维修内容")
     private String repairContent;
+
+    @ApiModelProperty(value = "维修内容")
+    private String repairTotalContent;
     /**
      * 类型（0不收费，1收费）
      */
     @ApiModelProperty(value = "类型（0不收费，1收费）")
     private String partType;
 
+    @ApiModelProperty(value = "类型（0不收费，1收费）")
+    private String partTotalType;
+
     /**
      * 维修人
      */
@@ -142,6 +148,9 @@ public class RepairRecord implements Serializable {
     @Excel(name = "配件名称")
     private String partName;
 
+    @ApiModelProperty(value = "配件名称")
+    private String partTotalName;
+
     /**
      * 配件数量
      */
@@ -149,6 +158,9 @@ public class RepairRecord implements Serializable {
     @Excel(name = "配件数量",cellType = Excel.ColumnType.NUMERIC)
     private int partNum;
 
+    @ApiModelProperty(value = "配件数量")
+    private int partTotalNum;
+
     /**
      * 配件单价
      */
@@ -156,6 +168,9 @@ public class RepairRecord implements Serializable {
     @Excel(name = "配件单价")
     private String partPrice;
 
+    @ApiModelProperty(value = "配件单价")
+    private String partTotalPrice;
+
     /**
      * 工程名称
      */

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java

@@ -3,6 +3,7 @@ package com.bonus.sgzb.material.service.impl;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
@@ -17,7 +18,6 @@ import com.bonus.sgzb.common.security.utils.SecurityUtils;
 import com.bonus.sgzb.material.domain.*;
 import com.bonus.sgzb.material.mapper.*;
 import com.bonus.sgzb.material.service.IRepairAuditDetailsService;
-import com.bonus.sgzb.material.vo.GlobalContants;
 import com.bonus.sgzb.material.vo.RepairAuditDetailsVO;
 import com.bonus.sgzb.material.vo.ScrapApplyDetailsVO;
 import com.bonus.sgzb.material.vo.ScrapAudit;
@@ -174,6 +174,14 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
                     if (CollectionUtils.isNotEmpty(partDetailsList)) {
                         info.setRepairPartList(partDetailsList);
                     }
+                } else {
+                    RepairRecord repairRecord = new RepairRecord();
+                    repairRecord.setPartName(info.getPartTotalName());
+                    repairRecord.setPartNum(info.getPartTotalNum());
+                    repairRecord.setPartPrice(info.getPartTotalPrice());
+                    repairRecord.setPartType(info.getPartTotalType());
+                    repairRecord.setRepairContent(info.getRepairTotalContent());
+                    info.setRepairPartList(Collections.singletonList(repairRecord));
                 }
             }
         }

sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairAuditDetailsMapper.xml

@@ -438,11 +438,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                scrap_reason as scrapReason,
                scrap_type as scrapType,
                msi.supplier as supplier,
-               repair_content as repairContent,
+               part_num as partTotalNum,
+               part_price as partTotalPrice,
+               repair_content as repairTotalContent,
+               part_type as partTotalType,
+               part_name as partTotalName,
                file_ids as fileIds,
                su.nick_name as repairer,
-               rar.remark,
+               rar.remark
-               rar.id as id
         from repair_apply_record rar
         left join ma_supplier_info msi on msi.supplier_id = rar.supplier_id
         left join sys_user su on su.user_id = rar.repairer