1 year ago
parent
commit
a2d0daadd3

+ 1 - 1
platform-dao/src/main/resources/mapper/sqarepartmanage/SparePartUsedMapper.xml

@@ -43,7 +43,7 @@
         used.id, used.store_id, used.sb_id,used.price,
         used.part_id, used.spare_id, used.start_date,
         used.status, used.change_date,
-        used.num,used.used_source,
+        used.num,
         used.real_change_date,
         used.repair_id,
         used.repair_no,

+ 2 - 1
platform-rest/src/main/java/com/platform/rest/controller/repair/RepairApplicationFormController.java

@@ -19,6 +19,7 @@ import com.platform.dao.vo.export.repair.ExporHistoryFaultsVO;
 import com.platform.dao.vo.export.repair.ExportRepairApplicationFormMergeVO;
 import com.platform.dao.vo.export.repair.ExportRepairApplicationFormVO;
 import com.platform.dao.vo.export.repair.ExportRepairCheckVO;
+import com.platform.dao.vo.export.sb.ExportSbStatusLogVO2;
 import com.platform.dao.vo.repair.RepairApplicationFormVO;
 import com.platform.rest.RestApplication;
 import com.platform.rest.log.annotation.SysLog;
@@ -347,7 +348,7 @@ public class RepairApplicationFormController {
             }
         }
         List<RepairApplicationFormVO> excelList = repairApplicationFormMapper.selectPageList(record);
-        ExcelUtil.exportResponseDict(response, ExporHistoryFaultsVO.class, excelList, "历史故障统计");
+        ExcelUtil.exportResponseDict(response, ExporHistoryFaultsVO.class, BeanConverterUtil.copyListProperties(excelList, ExporHistoryFaultsVO.class), "历史故障统计");
     }
 
 }

+ 1 - 1
platform-rest/src/main/java/com/platform/rest/controller/repair/RepairFeeController.java

@@ -150,7 +150,7 @@ public class RepairFeeController {
   @PreAuthorize("@pms.hasPermission('repair-fees-export')")
   public void export2(HttpServletResponse response, RepairFeeDTO repairFeeDTO) {
     List<RepairFee> list = repairFeeMapper.selectPageList(repairFeeDTO);
-    ExcelUtil.exportResponseDict(response, ExportRepairFeeVO.class, BeanConverterUtil.copyListProperties(list, ExportHistoryRepairFeeVO.class), "维修费用单");
+    ExcelUtil.exportResponseDict(response, ExportHistoryRepairFeeVO.class, BeanConverterUtil.copyListProperties(list, ExportHistoryRepairFeeVO.class), "维修费用单");
   }
 
 }