diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBill.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBill.java index 2b58b5e7fc..cf55056c81 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBill.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBill.java @@ -20,7 +20,9 @@ public class AsBusrepairBill extends BaseEntity { @ApiModelProperty("单据编号") private String billNo; @ApiModelProperty("单据类型0正常工单、1保险理赔、2协议单位") - private Integer billType; + private Integer billTypeKey; + @ApiModelProperty("单据类型0正常工单、1保险理赔、2协议单位") + private String billType; @ApiModelProperty("进厂时间") private Date entryTime; @ApiModelProperty("预计完工时间-工单") diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillDetailsVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillDetailsVo.java index bdd8c1d8b6..55e75ac331 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillDetailsVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillDetailsVo.java @@ -38,6 +38,8 @@ public class AsBusrepairBillDetailsVo implements Vo { @ApiModelProperty("单据编号") private String billNo; @ApiModelProperty("单据类型0正常工单、1保险理赔、2协议单位") + private String billTypeKey; + @ApiModelProperty("单据类型0正常工单、1保险理赔、2协议单位") private String billType; @ApiModelProperty("进厂时间") private String entryTime; diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillDto.java index 279a9db5aa..a14157c00e 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillDto.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillDto.java @@ -41,6 +41,8 @@ public class AsBusrepairBillDto implements Dto { @ApiModelProperty("创建组织sid") private String createOrgSid; @ApiModelProperty("单据类型0正常工单、1保险理赔、2协议单位") + private String billTypeKey; + @ApiModelProperty("单据类型0正常工单、1保险理赔、2协议单位") private String billType; @ApiModelProperty("进厂时间") private String entryTime; diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillVo.java index fa75995f34..a3401ec07d 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillVo.java @@ -16,7 +16,7 @@ import java.util.Date; @Data public class AsBusrepairBillVo implements Vo { - + private String sid; @ApiModelProperty("单据编号") private String billNo; @ApiModelProperty("当前环节") diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/InsuranceVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/InsuranceVo.java index a020ef6993..2708c86b55 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/InsuranceVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/InsuranceVo.java @@ -15,6 +15,10 @@ public class InsuranceVo { private String responsibility; @ApiModelProperty("对方险种") private String otherInsuranceType; + @ApiModelProperty("责任划分") + private String responsibilityKey; + @ApiModelProperty("对方险种") + private String otherInsuranceTypeKey; @ApiModelProperty("保险公司1") private String insuranceCompany1; @ApiModelProperty("保险公司2") @@ -31,4 +35,6 @@ public class InsuranceVo { private String isSpecialSign; @ApiModelProperty("出险类型") private String accidentType; + @ApiModelProperty("出险类型") + private String accidentTypeKey; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/InvoiceVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/InvoiceVo.java index a1e7100781..3d5a281b9d 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/InvoiceVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/InvoiceVo.java @@ -17,6 +17,8 @@ public class InvoiceVo { private String isInvoicing; @ApiModelProperty("发票类型") private String invoiceType; + @ApiModelProperty("发票类型") + private String invoiceTypeKey; @ApiModelProperty("开票名称") private String invoiceTitle; @ApiModelProperty("税号") diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillinsurance/AsBusrepairBillInsurance.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillinsurance/AsBusrepairBillInsurance.java index 6727d3f301..acd02c1ae8 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillinsurance/AsBusrepairBillInsurance.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillinsurance/AsBusrepairBillInsurance.java @@ -23,6 +23,10 @@ public class AsBusrepairBillInsurance extends BaseEntity { private String responsibility; @ApiModelProperty("对方险种") private String otherInsuranceType; + @ApiModelProperty("责任划分") + private String responsibilityKey; + @ApiModelProperty("对方险种") + private String otherInsuranceTypeKey; @ApiModelProperty("保险公司1") private String insuranceCompany1; @ApiModelProperty("保险公司2") @@ -39,4 +43,6 @@ public class AsBusrepairBillInsurance extends BaseEntity { private Integer isSpecialSign; @ApiModelProperty("出险类型") private String accidentType; + @ApiModelProperty("出险类型") + private String accidentTypeKey; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackage/AsServicePackageMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackage/AsServicePackageMapper.xml index 2ec3e239cd..e1ae0e38be 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackage/AsServicePackageMapper.xml +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackage/AsServicePackageMapper.xml @@ -40,4 +40,4 @@ WHERE useOrgSid = #{useOrgSid} - \ No newline at end of file +