修改工单详情返回字段

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBill.java

@@ -93,6 +93,8 @@ public class AsBusrepairBill extends BaseEntity {
     private String groupName;
     @ApiModelProperty("应收金额")
     private BigDecimal receivableAmount;
+    @ApiModelProperty("实收金额")
+    private BigDecimal actualAmount;
     @ApiModelProperty("工时费")
     private BigDecimal hourAmount;
     @ApiModelProperty("材料费")
@@ -109,4 +111,19 @@ public class AsBusrepairBill extends BaseEntity {
     private BigDecimal taxAmount;
     @ApiModelProperty("是否外出（1是，2否）")
     private String isGoOut;
+    @ApiModelProperty("索赔厂家")
+    private String claimManufacturer;
+    @ApiModelProperty("索赔厂家sid")
+    private String claimManufacturerSid;
+    @ApiModelProperty("特殊标志（1有，0无）")
+    private Integer isSpecialSign;
+    @ApiModelProperty("施救费")
+    private BigDecimal rescueAmount;
+    @ApiModelProperty("厂家补助备注")
+    private String subsidyRemarks;
+    @ApiModelProperty("施救费备注")
+    private String  rescueRemarks;
+    @ApiModelProperty("外出费备注")
+    private String outRemarks;
+
 }

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillDetailsVo.java

@@ -18,8 +18,24 @@ import java.util.List;
 public class AsBusrepairBillDetailsVo implements Vo {
     private String sid;
     private String orgPath;
+    @ApiModelProperty("索赔厂家")
+    private String claimManufacturer;
+    @ApiModelProperty("索赔厂家sid")
+    private String claimManufacturerSid;
+    @ApiModelProperty("特殊标志（1有，0无）")
+    private String isSpecialSign;
+    @ApiModelProperty("客户来源 ")
+    private String customerSource;
+    @ApiModelProperty("对接人sid")
+    private String dockingPeopleSid;
+    @ApiModelProperty("对接人")
+    private String dockingPeople;
+    @ApiModelProperty("对接人电话")
+    private String dockingPhone;
     @ApiModelProperty("应收金额")
     private String receivableAmount;
+    @ApiModelProperty("实收金额")
+    private String actualAmount;
     @ApiModelProperty("工时费")
     private String hourAmount;
     @ApiModelProperty("材料费")
@@ -133,4 +149,13 @@ public class AsBusrepairBillDetailsVo implements Vo {
     private List<GoodsDetailsVo> goodsDetailsVos = new ArrayList<>(); //商品信息
     private SettleVo settleVo = new SettleVo(); //结算信息
     private boolean showReSettleBtn; //是否显示反结算按钮，ture显示，false不显示
+    @ApiModelProperty("厂家补助备注")
+    private String subsidyRemarks;
+    @ApiModelProperty("施救费备注")
+    private String  rescueRemarks;
+    @ApiModelProperty("外出费备注")
+    private String outRemarks;
+    @ApiModelProperty("施救费")
+    private String rescueAmount;
+    private String fileName; //文件名称
 }

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillDto.java

@@ -20,8 +20,24 @@ public class AsBusrepairBillDto implements Dto {
     private String orgPath;
     @ApiModelProperty("是否外出（1是，2否）")
     private String isGoOut;
+    @ApiModelProperty("索赔厂家")
+    private String claimManufacturer;
+    @ApiModelProperty("索赔厂家sid")
+    private String claimManufacturerSid;
+    @ApiModelProperty("特殊标志（1有，0无）")
+    private String isSpecialSign;
+    @ApiModelProperty("客户来源")
+    private String customerSource;
+    @ApiModelProperty("对接人sid")
+    private String dockingPeopleSid;
+    @ApiModelProperty("对接人")
+    private String dockingPeople;
+    @ApiModelProperty("对接人电话")
+    private String dockingPhone;
     @ApiModelProperty("应收金额")
     private String receivableAmount;
+    @ApiModelProperty("实收金额")
+    private String actualAmount;
     @ApiModelProperty("工时费")
     private String hourAmount;
     @ApiModelProperty("材料费")
@@ -117,5 +133,13 @@ public class AsBusrepairBillDto implements Dto {
     private List<AitemVo> aitemVos = new ArrayList<>();// 附加项目
     private SettleVo settleVo = new SettleVo(); //结算信息
     private List<GoodsDetailsVo> goodsDetailsVos = new ArrayList<>(); //商品信息
-
+    @ApiModelProperty("厂家补助备注")
+    private String subsidyRemarks;
+    @ApiModelProperty("施救费备注")
+    private String  rescueRemarks;
+    @ApiModelProperty("外出费备注")
+    private String outRemarks;
+    @ApiModelProperty("施救费")
+    private String rescueAmount;
+    private String fileName; //文件名称
 }

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/InsuranceRecordVo.java

@@ -0,0 +1,34 @@
+package com.yxt.anrui.as.api.asbusrepairbill;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/7/1 14:01
+ */
+@Data
+public class InsuranceRecordVo {
+
+    @ApiModelProperty("工单sid")
+    private String billSid;
+    @ApiModelProperty("使用保险方Key")
+    private String useInsurerKey;
+    @ApiModelProperty("使用保险方")
+    private String useInsurer;
+    @ApiModelProperty("使用险种key")
+    private String insuranceTypeKey;
+    @ApiModelProperty("使用险种")
+    private String insuranceType;
+    @ApiModelProperty("保险公司key")
+    private String insuranceCompanyKey;
+    @ApiModelProperty("保险公司")
+    private String insuranceCompany;
+    @ApiModelProperty("报案号")
+    private String claimBillNo;
+    @ApiModelProperty("勘察员及电话")
+    private String investigator;
+    @ApiModelProperty("定损员及电话")
+    private String lossAdjuster;
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/InsuranceVo.java

@@ -3,6 +3,8 @@ package com.yxt.anrui.as.api.asbusrepairbill;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @author Fan
  * @description
@@ -13,28 +15,14 @@ public class InsuranceVo {
 
     @ApiModelProperty("责任划分")
     private String responsibility;
-    @ApiModelProperty("对方险种")
-    private String otherInsuranceType;
     @ApiModelProperty("责任划分")
     private String responsibilityKey;
-    @ApiModelProperty("对方险种")
-    private String otherInsuranceTypeKey;
-    @ApiModelProperty("保险公司1")
-    private String insuranceCompany1;
-    @ApiModelProperty("保险公司2")
-    private String insuranceCompany2;
-    @ApiModelProperty("保险人员")
-    private String insurer;
-    @ApiModelProperty("保险索赔单号")
-    private String claimBillNo;
-    @ApiModelProperty("勘察员")
-    private String investigator;
-    @ApiModelProperty("定损员")
-    private String lossAdjuster;
-    @ApiModelProperty("特殊标志（1有，0无）")
-    private String isSpecialSign;
-    @ApiModelProperty("出险类型")
-    private String accidentType;
-    @ApiModelProperty("出险类型")
-    private String accidentTypeKey;
+    @ApiModelProperty("是否存在人伤（1是，0否）")
+    private String isPersonInjuries;
+    @ApiModelProperty("责任比例Key")
+    private String responsibilityRatioKey;
+    @ApiModelProperty("责任比例")
+    private String responsibilityRatio;
+
+    private List<InsuranceRecordVo> insuranceList;
 }

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/InvoiceVo.java

@@ -27,5 +27,8 @@ public class InvoiceVo {
     private String invoiceCode;
     @ApiModelProperty("税率")
     private String taxRate;
-
+    @ApiModelProperty("开票单位sid")
+    private String invoiceCompanySid;
+    @ApiModelProperty("开票单位")
+    private String invoiceCompany;
 }

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/SitemVo.java

@@ -26,7 +26,7 @@ public class SitemVo {
     private String subjectSid;
     @ApiModelProperty("科目（自费、保内等）")
     private String subject;
-    @ApiModelProperty("考核工时(考核价）")
+    @ApiModelProperty("工时提成")
     private String examineHourPrice;
     @ApiModelProperty("工时单价")
     private String hourPrice;

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillinsurance/AsBusrepairBillInsurance.java

@@ -45,4 +45,11 @@ public class AsBusrepairBillInsurance extends BaseEntity {
     private String accidentType;
     @ApiModelProperty("出险类型")
     private String accidentTypeKey;
+    @ApiModelProperty("是否存在人伤（1是，0否）")
+    private String isPersonInjuries;
+    @ApiModelProperty("责任比例Key")
+    private String responsibilityRatioKey;
+    @ApiModelProperty("责任比例")
+    private String responsibilityRatio;
+
 }

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillinsurancerecord/AsBusrepairBillInsuranceRecord.java

@@ -0,0 +1,40 @@
+package com.yxt.anrui.as.api.asbusrepairbillinsurancerecord;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/7/1 13:57
+ */
+@Data
+@ApiModel(value = "维修工单-保险信息列表", description = "维修工单-保险信息列表")
+@TableName("as_busrepair_bill_insurance_record")
+public class AsBusrepairBillInsuranceRecord  extends BaseEntity {
+
+    @ApiModelProperty("工单sid")
+    private String billSid;
+    @ApiModelProperty("使用保险方Key")
+    private String useInsurerKey;
+    @ApiModelProperty("使用保险方")
+    private String useInsurer;
+    @ApiModelProperty("使用险种key")
+    private String insuranceTypeKey;
+    @ApiModelProperty("使用险种")
+    private String insuranceType;
+    @ApiModelProperty("保险公司key")
+    private String insuranceCompanyKey;
+    @ApiModelProperty("保险公司")
+    private String insuranceCompany;
+    @ApiModelProperty("报案号")
+    private String claimBillNo;
+    @ApiModelProperty("勘察员及电话")
+    private String investigator;
+    @ApiModelProperty("定损员及电话")
+    private String lossAdjuster;
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillinvoice/AsBusrepairBillInvoice.java

@@ -32,6 +32,9 @@ public class AsBusrepairBillInvoice extends BaseEntity {
     private String invoiceCode;
     @ApiModelProperty("税率")
     private BigDecimal taxRate;
-
+    @ApiModelProperty("开票单位sid")
+    private String invoiceCompanySid;
+    @ApiModelProperty("开票单位")
+    private String invoiceCompany;
 
 }