refactor(credit): 调整判决债务人实体的金额字段命名
- 将CreditJudgmentDebtor实体中的amount字段描述从"执行标的(元)"改为"涉案金额" - 将CreditJudgmentDebtorImportParam参数类中的amount字段重命名为involvedAmount - 更新控制器中对金额字段的引用,使用新的involvedAmount字段名 - 移除参数类中重复的involvedAmount2字段定义 - 在导入模板示例中移除金额字段的默认值设置
This commit is contained in:
@@ -278,7 +278,6 @@ public class CreditJudgmentDebtorController extends BaseController {
|
|||||||
example.setName("某某公司");
|
example.setName("某某公司");
|
||||||
example.setCode("1234567890");
|
example.setCode("1234567890");
|
||||||
example.setOccurrenceTime("2024-01-10");
|
example.setOccurrenceTime("2024-01-10");
|
||||||
example.setAmount("100000");
|
|
||||||
example.setDataStatus("已公开");
|
example.setDataStatus("已公开");
|
||||||
example.setComments("备注信息");
|
example.setComments("备注信息");
|
||||||
templateList.add(example);
|
templateList.add(example);
|
||||||
@@ -311,7 +310,7 @@ public class CreditJudgmentDebtorController extends BaseController {
|
|||||||
|| isHeaderValue(param.getCode(), "证件号/组织机构代码")
|
|| isHeaderValue(param.getCode(), "证件号/组织机构代码")
|
||||||
|| isHeaderValue(param.getOccurrenceTime(), "立案日期")
|
|| isHeaderValue(param.getOccurrenceTime(), "立案日期")
|
||||||
|| isHeaderValue(param.getCourtName(), "法院")
|
|| isHeaderValue(param.getCourtName(), "法院")
|
||||||
|| isHeaderValue(param.getAmount(), "执行标的(元)")
|
|| isHeaderValue(param.getInvolvedAmount(), "执行标的(元)")
|
||||||
|| isHeaderValue(param.getDataStatus(), "数据状态");
|
|| isHeaderValue(param.getDataStatus(), "数据状态");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -356,10 +355,7 @@ public class CreditJudgmentDebtorController extends BaseController {
|
|||||||
? param.getOccurrenceTime2().trim()
|
? param.getOccurrenceTime2().trim()
|
||||||
: (param.getOccurrenceTime() != null ? param.getOccurrenceTime().trim() : null);
|
: (param.getOccurrenceTime() != null ? param.getOccurrenceTime().trim() : null);
|
||||||
entity.setOccurrenceTime(occurrenceTime);
|
entity.setOccurrenceTime(occurrenceTime);
|
||||||
String amount = !ImportHelper.isBlank(param.getInvolvedAmount2())
|
entity.setAmount(param.getInvolvedAmount());
|
||||||
? param.getInvolvedAmount2().trim()
|
|
||||||
: (param.getAmount() != null ? param.getAmount().trim() : null);
|
|
||||||
entity.setAmount(amount);
|
|
||||||
entity.setCourtName(param.getCourtName());
|
entity.setCourtName(param.getCourtName());
|
||||||
entity.setDataStatus(param.getDataStatus());
|
entity.setDataStatus(param.getDataStatus());
|
||||||
entity.setComments(param.getComments());
|
entity.setComments(param.getComments());
|
||||||
|
|||||||
@@ -58,7 +58,7 @@ public class CreditJudgmentDebtor implements Serializable {
|
|||||||
@Schema(description = "发生时间")
|
@Schema(description = "发生时间")
|
||||||
private String occurrenceTime;
|
private String occurrenceTime;
|
||||||
|
|
||||||
@Schema(description = "执行标的(元)")
|
@Schema(description = "涉案金额")
|
||||||
private String amount;
|
private String amount;
|
||||||
|
|
||||||
@Schema(description = "法院")
|
@Schema(description = "法院")
|
||||||
|
|||||||
@@ -37,8 +37,9 @@ public class CreditJudgmentDebtorImportParam implements Serializable {
|
|||||||
@Excel(name = "立案日期")
|
@Excel(name = "立案日期")
|
||||||
private String occurrenceTime;
|
private String occurrenceTime;
|
||||||
|
|
||||||
@Excel(name = "执行标的(元)")
|
@Schema(description = "涉案金额")
|
||||||
private String amount;
|
@Excel(name = "涉案金额")
|
||||||
|
private String involvedAmount;
|
||||||
|
|
||||||
@Excel(name = "法院")
|
@Excel(name = "法院")
|
||||||
private String courtName;
|
private String courtName;
|
||||||
@@ -52,8 +53,4 @@ public class CreditJudgmentDebtorImportParam implements Serializable {
|
|||||||
@Schema(description = "发生时间")
|
@Schema(description = "发生时间")
|
||||||
@Excel(name = "发生时间")
|
@Excel(name = "发生时间")
|
||||||
private String occurrenceTime2;
|
private String occurrenceTime2;
|
||||||
|
|
||||||
@Schema(description = "涉案金额")
|
|
||||||
@Excel(name = "涉案金额")
|
|
||||||
private String involvedAmount2;
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user