叉车维修保养记录 excel 导入 报错返回值处理

cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/impl/EquForkliftRepairRecordServiceImpl.java

@@ -1,5 +1,6 @@
 package com.rongwei.bscommon.sys.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -9,6 +10,7 @@ import com.rongwei.bscommon.sys.dao.EquForkliftRepairRecordDao;
 import com.rongwei.bscommon.sys.excel.EquForkliftRepairRecordTemplate;
 import com.rongwei.bscommon.sys.service.EquForkliftRepairRecordService;
 import com.rongwei.bscommon.sys.utils.CommonUtils;
+import com.rongwei.bscommon.sys.utils.DateUtils;
 import com.rongwei.bsentity.domain.EquForkliftRepairRecordDo;
 import com.rongwei.bsentity.enums.MaintenanceTypeEnum;
 import com.rongwei.bsentity.enums.PlantEnum;
@@ -27,6 +29,8 @@ import java.util.Objects;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import static com.rongwei.safecommon.utils.SaveConstans.DatePattern.DATE_PATTERN_YMD;
+
 @Service
 public class EquForkliftRepairRecordServiceImpl extends ServiceImpl<EquForkliftRepairRecordDao, EquForkliftRepairRecordDo> implements EquForkliftRepairRecordService {
 
@@ -107,7 +111,7 @@ public class EquForkliftRepairRecordServiceImpl extends ServiceImpl<EquForkliftR
 
     public void jointErrorData(List<EquForkliftRepairRecordDo> forkliftRepairRecordDoList, List<String> errorData) {
         forkliftRepairRecordDoList.forEach(info -> {
-            errorData.add(PlantEnum.nameOf(info.getTenantid()) + ",已存在了" + "-" + MaintenanceTypeEnum.typeOf(info.getEquipmentnumber()+"-" + info.getRapairdate() +"-" + info.getRapairdetail() + "的内容，不可重复导入，请检查"));
+            errorData.add(PlantEnum.nameOf(info.getTenantid()) + ",已存在了叉车编号" + ":" + info.getEquipmentnumber()+" 维修/保养日期:" +  DateUtil.format(info.getRapairdate(),DATE_PATTERN_YMD) +" 维修/保养内容:" + info.getRapairdetail() + "的数据，不可重复导入，请检查");
         });
 
     }

cx-equipment/cx-equipment-server/src/main/java/com/rongwei/bsserver/sys/controller/EquForkliftRepairRecordController.java

@@ -23,7 +23,7 @@ public class EquForkliftRepairRecordController {
     private EquForkliftRepairRecordService equForkliftRepairRecordService;
 
 
-    @PostMapping("uploadimportForkliftRepairRecordSave")
+    @PostMapping("/uploadimportForkliftRepairRecordSave")
     public R uploadimportForkliftRepairRecordSave(@RequestParam("file") MultipartFile multipartFile){
         try {
             log.info("进入接口：/equForkliftRepairRecord/importStandardSave,入参:{}", multipartFile);