From 9cff1a978159e7c593b258065ed0127ae73fd403 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Mon, 1 Jul 2024 15:06:38 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E8=BF=94=E5=9B=9E=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/asbusrepairbill/AsBusrepairBill.java | 17 ++++++++ .../AsBusrepairBillDetailsVo.java | 25 ++++++++++++ .../asbusrepairbill/AsBusrepairBillDto.java | 26 +++++++++++- .../asbusrepairbill/InsuranceRecordVo.java | 34 ++++++++++++++++ .../as/api/asbusrepairbill/InsuranceVo.java | 32 +++++---------- .../as/api/asbusrepairbill/InvoiceVo.java | 5 ++- .../anrui/as/api/asbusrepairbill/SitemVo.java | 2 +- .../AsBusrepairBillInsurance.java | 7 ++++ .../AsBusrepairBillInsuranceRecord.java | 40 +++++++++++++++++++ .../AsBusrepairBillInvoice.java | 5 ++- 10 files changed, 167 insertions(+), 26 deletions(-) create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/InsuranceRecordVo.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillinsurancerecord/AsBusrepairBillInsuranceRecord.java 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 b385b9fecf..8e41c11bd3 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 @@ -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; + } 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 228c51dc60..5291fa80fd 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 @@ -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 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; //文件名称 } 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 364ea20551..98353a399e 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 @@ -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 aitemVos = new ArrayList<>();// 附加项目 private SettleVo settleVo = new SettleVo(); //结算信息 private List goodsDetailsVos = new ArrayList<>(); //商品信息 - + @ApiModelProperty("厂家补助备注") + private String subsidyRemarks; + @ApiModelProperty("施救费备注") + private String rescueRemarks; + @ApiModelProperty("外出费备注") + private String outRemarks; + @ApiModelProperty("施救费") + private String rescueAmount; + private String fileName; //文件名称 } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/InsuranceRecordVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/InsuranceRecordVo.java new file mode 100644 index 0000000000..c41750ef8d --- /dev/null +++ b/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; +} 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 2708c86b55..f473a9f164 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 @@ -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 insuranceList; } 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 3d5a281b9d..ed59b52457 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 @@ -27,5 +27,8 @@ public class InvoiceVo { private String invoiceCode; @ApiModelProperty("税率") private String taxRate; - + @ApiModelProperty("开票单位sid") + private String invoiceCompanySid; + @ApiModelProperty("开票单位") + private String invoiceCompany; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/SitemVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/SitemVo.java index 2329a5c314..5cd0c2bee5 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/SitemVo.java +++ b/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; 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 acd02c1ae8..45f3cfaca2 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 @@ -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; + } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillinsurancerecord/AsBusrepairBillInsuranceRecord.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillinsurancerecord/AsBusrepairBillInsuranceRecord.java new file mode 100644 index 0000000000..b02e0ece9c --- /dev/null +++ b/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; + +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillinvoice/AsBusrepairBillInvoice.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillinvoice/AsBusrepairBillInvoice.java index ac52c437dc..d69d4620e3 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillinvoice/AsBusrepairBillInvoice.java +++ b/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; } From eab471301f95ea570fc577636359c7fc6404c590 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Mon, 1 Jul 2024 17:59:23 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=B4=B7=E5=90=8E=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=8E=86=E5=8F=B2=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusSalesOrderVehicleFeign.java | 6 ++++- .../BusSalesOrderVehicleFeignFallback.java | 7 +++++- .../BusSalesOrderVehicleMapper.java | 4 +++- .../BusSalesOrderVehicleMapper.xml | 10 +++++++- .../BusSalesOrderVehicleRest.java | 9 +++++++- .../BusSalesOrderVehicleService.java | 7 +++++- .../LoanRepaymentScheduleFeign.java | 2 +- .../LoanRepaymentScheduleFeignFallback.java | 2 +- .../LoanRepaymentScheduleRest.java | 4 ++-- .../LoanRepaymentScheduleService.java | 23 +++++++++++++++---- 10 files changed, 59 insertions(+), 15 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java index 8ca928ecaa..b505685860 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java @@ -171,4 +171,8 @@ public interface BusSalesOrderVehicleFeign { @ApiOperation("根据车辆sid查询最新一条不为终止的销售订单") @PostMapping("/selectOneByVehSidAndNotStop") ResultBean selectOneByVehSidAndNotStop(@RequestParam("vehSid") String vehSid); -} \ No newline at end of file + + @ApiOperation("根据订单sid车架号查询") + @GetMapping("/selByOrderSidAndVinNo") + ResultBean selByOrderSidAndVinNo(@RequestParam("salesOrderSid")String salesOrderSid, @RequestParam("vinNo")String vinNo); +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java index a20623cc19..a8c4269d99 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java @@ -168,4 +168,9 @@ public class BusSalesOrderVehicleFeignFallback implements BusSalesOrderVehicleFe return null; } -} \ No newline at end of file + @Override + public ResultBean selByOrderSidAndVinNo(String salesOrderSid, String vinNo) { + return null; + } + +} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java index 2e054ed7ca..2df56b44e0 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java @@ -183,4 +183,6 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper selectBySalesOrderSid2(String saleOrderSid); String selectOneByVehSidAndNotStop(String vehSid); -} \ No newline at end of file + + BusSalesOrderVehicle selByOrderSidAndVinNo(@Param("salesOrderSid") String salesOrderSid, @Param("vinNo") String vinNo); +} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml index 8c25131095..feb5930bd1 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml @@ -364,4 +364,12 @@ ORDER BY bv.`createTime` DESC LIMIT 1 - \ No newline at end of file + + diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java index e3ed02d2c2..650841a793 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java @@ -192,4 +192,11 @@ public class BusSalesOrderVehicleRest implements BusSalesOrderVehicleFeign { String orderSid = busSalesOrderVehicleService.selectOneByVehSidAndNotStop(vehSid); return rb.success().setData(orderSid); } -} \ No newline at end of file + + @Override + public ResultBean selByOrderSidAndVinNo(String salesOrderSid, String vinNo) { + ResultBean rb = ResultBean.fireFail(); + BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selByOrderSidAndVinNo(salesOrderSid,vinNo); + return rb.success().setData(busSalesOrderVehicle); + } +} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java index 8ed42d3367..8ae0f9d4ac 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java @@ -667,4 +667,9 @@ public class BusSalesOrderVehicleService extends MybatisBaseService list) { + public List saveHistoryRecord(List list) { List schedules = new ArrayList<>(); //还款计划表主表 List planDetails = new ArrayList<>();//还款计划表明细 List histories = new ArrayList<>();//还款记录 @@ -4928,7 +4928,8 @@ public class LoanRepaymentScheduleService extends MybatisBaseService busSalesOrderVehicle = busSalesOrderVehicleFeign.selByOrderSidAndVinNo(salesOrderSid,vinNo); + BusSalesOrderVehicle vehicleData = busSalesOrderVehicle.getData(); + if (vehicleData != null) { + busVinSid = vehicleData.getSid(); + loanContractSid = vehicleData.getLoanContractSid(); + borrowerSid = vehicleData.getBorrowerSid(); + } + } else { + + } } - + return planDetails; } - public ResultBean importHistoryData(MultipartFile file, HttpServletRequest request, HttpServletResponse response) { + public ResultBean importHistoryData(MultipartFile file, HttpServletRequest request) { ResultBean rb = ResultBean.fireFail(); try { String temp = request.getSession().getServletContext().getRealPath(File.separator) + "temp";// 临时目录 From 7ac881c5cddfee29cb930c0acb90a7457fc5af9c Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Tue, 2 Jul 2024 09:45:10 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=8F=AD=E7=BB=84=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=88=90=E5=91=98=E9=80=89=E6=8B=A9=E5=B9=B6=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../as/api/asservicegroup/AsServiceGroup.java | 4 ++++ .../asservicegroup/AsServiceGroupDetailsVo.java | 7 +++++++ .../as/api/asservicegroup/AsServiceGroupDto.java | 7 +++++++ .../as/api/asservicegroup/AsServiceGroupVo.java | 2 ++ .../asservicegroup/AsServiceGroupService.java | 16 ++++++++++++++++ 5 files changed, 36 insertions(+) diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroup.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroup.java index b29485dc76..e33007bd91 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroup.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroup.java @@ -54,6 +54,10 @@ public class AsServiceGroup extends BaseEntity { private String groupName; @ApiModelProperty("排序") private Integer sortNo; + @ApiModelProperty("成员sid") + private String memberSid; + @ApiModelProperty("成员姓名") + private String memberName; @ApiModelProperty("部门sid") private String useOrgSid; @ApiModelProperty("部门名称") diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroupDetailsVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroupDetailsVo.java index 78650394b6..555bac1259 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroupDetailsVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroupDetailsVo.java @@ -32,6 +32,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; +import java.util.List; + /** * Project: yxt-as(售后服务)
* File: AsServiceGroupVo.java
@@ -55,6 +58,10 @@ public class AsServiceGroupDetailsVo implements Vo { private String groupName; @ApiModelProperty("排序") private Integer sortNo; + @ApiModelProperty("成员sid") + private List memberSids = new ArrayList<>(); + @ApiModelProperty("成员姓名") + private List memberNames = new ArrayList<>(); @ApiModelProperty("部门sid") private String useOrgSid; @ApiModelProperty("部门名称") diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroupDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroupDto.java index ebca202fce..e3e032779f 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroupDto.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroupDto.java @@ -32,6 +32,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; +import java.util.List; + /** * Project: yxt-as(售后服务)
* File: AsServiceGroupDto.java
@@ -57,6 +60,10 @@ public class AsServiceGroupDto implements Dto { private String groupName; @ApiModelProperty("排序") private Integer sortNo; + @ApiModelProperty("成员sid") + private List memberSids = new ArrayList<>(); + @ApiModelProperty("成员姓名") + private List memberNames = new ArrayList<>(); @ApiModelProperty("部门sid") private String useOrgSid; @ApiModelProperty("部门名称") diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroupVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroupVo.java index 7db041eedc..1ec1d4ffc3 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroupVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroupVo.java @@ -57,4 +57,6 @@ public class AsServiceGroupVo implements Vo { private Integer sortNo; @ApiModelProperty("门店") private String useOrgName; + @ApiModelProperty("成员姓名") + private String memberName; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupService.java index 5ff044d502..b0b42c413a 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupService.java @@ -176,6 +176,10 @@ public class AsServiceGroupService extends MybatisBaseService memberSids = dto.getMemberSids(); + List memberNames = dto.getMemberNames(); + entity.setMemberSid(StringUtils.join(memberSids,",")); + entity.setMemberName(StringUtils.join(memberNames,",")); baseMapper.insert(entity); } @@ -186,6 +190,10 @@ public class AsServiceGroupService extends MybatisBaseService memberSids = dto.getMemberSids(); + List memberNames = dto.getMemberNames(); + entity.setMemberSid(StringUtils.join(memberSids,",")); + entity.setMemberName(StringUtils.join(memberNames,",")); baseMapper.updateById(entity); } @@ -193,6 +201,14 @@ public class AsServiceGroupService extends MybatisBaseService