diff --git a/src/main/java/com/gxwebsoft/credit/controller/CreditJudgmentDebtorController.java b/src/main/java/com/gxwebsoft/credit/controller/CreditJudgmentDebtorController.java index 2b72eb0..f97f0e4 100644 --- a/src/main/java/com/gxwebsoft/credit/controller/CreditJudgmentDebtorController.java +++ b/src/main/java/com/gxwebsoft/credit/controller/CreditJudgmentDebtorController.java @@ -143,6 +143,7 @@ public class CreditJudgmentDebtorController extends BaseController { ExcelImportSupport.ImportResult importResult = ExcelImportSupport.read( file, CreditJudgmentDebtorImportParam.class, this::isEmptyImportRow); List list = importResult.getData(); + System.out.println("list = " + list.size()); int usedTitleRows = importResult.getTitleRows(); int usedHeadRows = importResult.getHeadRows(); @@ -244,11 +245,11 @@ public class CreditJudgmentDebtorController extends BaseController { } private boolean isEmptyImportRow(CreditJudgmentDebtorImportParam param) { + System.out.println("param2 = " + param); if (param == null) { return true; } return ImportHelper.isBlank(param.getCaseNumber()) - && ImportHelper.isBlank(param.getName()) && ImportHelper.isBlank(param.getCode()); } @@ -256,10 +257,12 @@ public class CreditJudgmentDebtorController extends BaseController { CreditJudgmentDebtor entity = new CreditJudgmentDebtor(); entity.setCaseNumber(param.getCaseNumber()); - entity.setName(param.getName()); + entity.setName1(param.getName1()); + String debtorName = ImportHelper.isBlank(param.getName()) ? param.getName1() : param.getName(); + entity.setName(debtorName); entity.setCode(param.getCode()); entity.setOccurrenceTime(param.getOccurrenceTime()); - entity.setAmount(ImportHelper.parseBigDecimal(param.getAmount(), "执行标的(元)")); + entity.setAmount(param.getAmount()); entity.setDataStatus(param.getDataStatus()); entity.setComments(param.getComments()); diff --git a/src/main/java/com/gxwebsoft/credit/entity/CreditJudgmentDebtor.java b/src/main/java/com/gxwebsoft/credit/entity/CreditJudgmentDebtor.java index 3f88e99..444d376 100644 --- a/src/main/java/com/gxwebsoft/credit/entity/CreditJudgmentDebtor.java +++ b/src/main/java/com/gxwebsoft/credit/entity/CreditJudgmentDebtor.java @@ -45,7 +45,7 @@ public class CreditJudgmentDebtor implements Serializable { private String occurrenceTime; @Schema(description = "执行标的(元)") - private BigDecimal amount; + private String amount; @Schema(description = "法院") private String courtName; diff --git a/src/main/java/com/gxwebsoft/credit/param/CreditJudgmentDebtorParam.java b/src/main/java/com/gxwebsoft/credit/param/CreditJudgmentDebtorParam.java index 83b60e5..4d077cc 100644 --- a/src/main/java/com/gxwebsoft/credit/param/CreditJudgmentDebtorParam.java +++ b/src/main/java/com/gxwebsoft/credit/param/CreditJudgmentDebtorParam.java @@ -41,7 +41,7 @@ public class CreditJudgmentDebtorParam extends BaseParam { @Schema(description = "执行标的(元)") @QueryField(type = QueryType.EQ) - private BigDecimal amount; + private String amount; @Schema(description = "法院") private String courtName;