refactor(credit): 移除多余的案号字段处理逻辑
- 删除了 CreditGqdjImportParam 中的 caseNumber3 字段及其 Excel 注解 - 移除了控制器中对 caseNumber3 的所有验证和处理逻辑 - 简化了案号字段的空值检查条件 - 更新了导入参数的过滤条件以匹配新的字段结构 - 优化了案号设置的条件判断流程
This commit is contained in:
@@ -206,7 +206,7 @@ public class CreditGqdjController extends BaseController {
|
|||||||
p -> p != null
|
p -> p != null
|
||||||
&& (!ImportHelper.isBlank(p.getCaseNumber())
|
&& (!ImportHelper.isBlank(p.getCaseNumber())
|
||||||
|| !ImportHelper.isBlank(p.getCaseNumber2())
|
|| !ImportHelper.isBlank(p.getCaseNumber2())
|
||||||
|| !ImportHelper.isBlank(p.getCaseNumber3())),
|
),
|
||||||
sheetIndex
|
sheetIndex
|
||||||
);
|
);
|
||||||
List<CreditGqdjImportParam> list = importResult.getData();
|
List<CreditGqdjImportParam> list = importResult.getData();
|
||||||
@@ -222,8 +222,7 @@ public class CreditGqdjController extends BaseController {
|
|||||||
this::isEmptyImportRow,
|
this::isEmptyImportRow,
|
||||||
p -> p != null
|
p -> p != null
|
||||||
&& (!ImportHelper.isBlank(p.getCaseNumber())
|
&& (!ImportHelper.isBlank(p.getCaseNumber())
|
||||||
|| !ImportHelper.isBlank(p.getCaseNumber2())
|
|| !ImportHelper.isBlank(p.getCaseNumber2()))
|
||||||
|| !ImportHelper.isBlank(p.getCaseNumber3()))
|
|
||||||
);
|
);
|
||||||
list = importResult.getData();
|
list = importResult.getData();
|
||||||
usedTitleRows = importResult.getTitleRows();
|
usedTitleRows = importResult.getTitleRows();
|
||||||
@@ -474,8 +473,7 @@ public class CreditGqdjController extends BaseController {
|
|||||||
this::isEmptyImportRow,
|
this::isEmptyImportRow,
|
||||||
p -> p != null
|
p -> p != null
|
||||||
&& (!ImportHelper.isBlank(p.getCaseNumber())
|
&& (!ImportHelper.isBlank(p.getCaseNumber())
|
||||||
|| !ImportHelper.isBlank(p.getCaseNumber2())
|
|| !ImportHelper.isBlank(p.getCaseNumber2())),
|
||||||
|| !ImportHelper.isBlank(p.getCaseNumber3())),
|
|
||||||
sheetIndex
|
sheetIndex
|
||||||
);
|
);
|
||||||
List<CreditGqdjImportParam> list = importResult.getData();
|
List<CreditGqdjImportParam> list = importResult.getData();
|
||||||
@@ -754,7 +752,6 @@ public class CreditGqdjController extends BaseController {
|
|||||||
// we still want to read the row and report "案号不能为空" instead of "未读取到数据".
|
// we still want to read the row and report "案号不能为空" instead of "未读取到数据".
|
||||||
return ImportHelper.isBlank(param.getCaseNumber())
|
return ImportHelper.isBlank(param.getCaseNumber())
|
||||||
&& ImportHelper.isBlank(param.getCaseNumber2())
|
&& ImportHelper.isBlank(param.getCaseNumber2())
|
||||||
&& ImportHelper.isBlank(param.getCaseNumber3())
|
|
||||||
&& ImportHelper.isBlank(param.getAppellee())
|
&& ImportHelper.isBlank(param.getAppellee())
|
||||||
&& ImportHelper.isBlank(param.getAppellee2())
|
&& ImportHelper.isBlank(param.getAppellee2())
|
||||||
&& ImportHelper.isBlank(param.getPlaintiffAppellant())
|
&& ImportHelper.isBlank(param.getPlaintiffAppellant())
|
||||||
@@ -782,8 +779,6 @@ public class CreditGqdjController extends BaseController {
|
|||||||
|
|
||||||
if (!ImportHelper.isBlank(param.getCaseNumber2())) {
|
if (!ImportHelper.isBlank(param.getCaseNumber2())) {
|
||||||
entity.setCaseNumber(param.getCaseNumber2());
|
entity.setCaseNumber(param.getCaseNumber2());
|
||||||
} else if (!ImportHelper.isBlank(param.getCaseNumber3())) {
|
|
||||||
entity.setCaseNumber(param.getCaseNumber3());
|
|
||||||
} else {
|
} else {
|
||||||
entity.setCaseNumber(param.getCaseNumber());
|
entity.setCaseNumber(param.getCaseNumber());
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,10 +20,6 @@ public class CreditGqdjImportParam implements Serializable {
|
|||||||
@Excel(name = "案号")
|
@Excel(name = "案号")
|
||||||
private String caseNumber2;
|
private String caseNumber2;
|
||||||
|
|
||||||
// Some upstream sources use "暗号" as the case number column.
|
|
||||||
@Excel(name = "暗号")
|
|
||||||
private String caseNumber3;
|
|
||||||
|
|
||||||
@Excel(name = "被执行人")
|
@Excel(name = "被执行人")
|
||||||
private String appellee;
|
private String appellee;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user