|
|
@@ -15,6 +15,7 @@ import com.ydtech.modules.inv.model.*;
|
|
|
import com.ydtech.modules.inv.model.vo.InvAccountOperateVo;
|
|
|
import com.ydtech.modules.inv.service.*;
|
|
|
import com.ydtech.modules.inv.utils.EasyExcelUtils;
|
|
|
+import org.apache.commons.lang3.ObjectUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
@@ -24,6 +25,7 @@ import java.text.SimpleDateFormat;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.Date;
|
|
|
import java.util.List;
|
|
|
+import java.util.Optional;
|
|
|
|
|
|
import static com.ydtech.modules.inv.utils.TransferUtils.*;
|
|
|
|
|
|
@@ -89,7 +91,10 @@ public class InvAccountExcelServiceImpl extends ServiceImpl<InvAccountExcelMappe
|
|
|
List<InvAccountExcel> records = invAccountExcelIPage.getRecords();
|
|
|
for (InvAccountExcel record : records) {
|
|
|
StringBuilder a = new StringBuilder();
|
|
|
- String[] split = record.getPayMethod().split(",");
|
|
|
+ String payMethod = Optional.ofNullable(record)
|
|
|
+ .map(InvAccountExcel::getPayMethod)
|
|
|
+ .orElse("");
|
|
|
+ String[] split = payMethod.split(",");
|
|
|
for (int i = 0; i < split.length; i++) {
|
|
|
a.append(InvPayMethodEnum.getNameByCode(split[i]));
|
|
|
if (i < split.length - 1) {
|
wks