Merge remote-tracking branch 'origin/master'

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<String> selectOneByVehSidAndNotStop(@RequestParam("vehSid") String vehSid);
-}
+
+    @ApiOperation("根据订单sid车架号查询")
+    @GetMapping("/selByOrderSidAndVinNo")
+    ResultBean<BusSalesOrderVehicle> selByOrderSidAndVinNo(@RequestParam("salesOrderSid")String salesOrderSid, @RequestParam("vinNo")String vinNo);
+}

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;
     }
 
-}
+    @Override
+    public ResultBean<BusSalesOrderVehicle> selByOrderSidAndVinNo(String salesOrderSid, String vinNo) {
+        return null;
+    }
+
+}

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<BusSalesOrderVehi
     List<String> selectBySalesOrderSid2(String saleOrderSid);
 
     String selectOneByVehSidAndNotStop(String vehSid);
-}
+
+    BusSalesOrderVehicle selByOrderSidAndVinNo(@Param("salesOrderSid") String salesOrderSid, @Param("vinNo") String vinNo);
+}

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
     </select>
-</mapper>
+    <select id="selByOrderSidAndVinNo"
+            resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle">
+        SELECT
+            *
+        FROM bus_sales_order_vehicle bv
+        where bv.`salesOrderSid` = #{salesOrderSid} and
+            bv.linkNo LIKE CONCAT( '%', #{vinNo}, '%' )
+    </select>
+</mapper>

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);
     }
-}
+
+    @Override
+    public ResultBean<BusSalesOrderVehicle> selByOrderSidAndVinNo(String salesOrderSid, String vinNo) {
+        ResultBean rb = ResultBean.fireFail();
+        BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selByOrderSidAndVinNo(salesOrderSid,vinNo);
+        return rb.success().setData(busSalesOrderVehicle);
+    }
+}

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<BusSalesOrde
     public String selectOneByVehSidAndNotStop(String vehSid) {
         return baseMapper.selectOneByVehSidAndNotStop(vehSid);
     }
-}
+
+    public BusSalesOrderVehicle selByOrderSidAndVinNo(String salesOrderSid, String vinNo) {
+        String substringVinNo = vinNo.substring(vinNo.length() - 8);
+        return baseMapper.selByOrderSidAndVinNo(salesOrderSid,substringVinNo);
+    }
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeign.java

@@ -87,7 +87,7 @@ public interface LoanRepaymentScheduleFeign {
     @ApiOperation(value = "导入贷后历史数据")
     @PostMapping("/importHistoryData")
     public ResultBean importHistoryData(
-            @RequestParam(value = "file") MultipartFile file, @RequestParam(value = "request") HttpServletRequest request, @RequestParam(value = "response") HttpServletResponse response) throws IOException;
+            @RequestParam(value = "file") MultipartFile file, HttpServletRequest request) throws IOException;
 
     //-------------------------app接口--------------------
 

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeignFallback.java

@@ -74,7 +74,7 @@ public class LoanRepaymentScheduleFeignFallback implements LoanRepaymentSchedule
     }
 
     @Override
-    public ResultBean importHistoryData(MultipartFile file, HttpServletRequest request, HttpServletResponse response) throws IOException {
+    public ResultBean importHistoryData(MultipartFile file, HttpServletRequest request) throws IOException {
         return null;
     }
 

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleRest.java

@@ -89,8 +89,8 @@ public class LoanRepaymentScheduleRest implements LoanRepaymentScheduleFeign {
     }
 
     @Override
-    public ResultBean importHistoryData(MultipartFile file, HttpServletRequest request, HttpServletResponse response) throws IOException {
-        return loanRepaymentScheduleService.importHistoryData(file,request,response);
+    public ResultBean importHistoryData(MultipartFile file, HttpServletRequest request) throws IOException {
+        return loanRepaymentScheduleService.importHistoryData(file,request);
     }
 
     @Override

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java

@@ -4891,7 +4891,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
     /**
      * 导入历史数据生成还款计划表
      */
-    public void saveHistoryRecord(List<HistoryDataImportVo> list) {
+    public List<LoanRepaymentPlanDetails> saveHistoryRecord(List<HistoryDataImportVo> list) {
         List<LoanRepaymentSchedule> schedules = new ArrayList<>(); //还款计划表主表
         List<LoanRepaymentPlanDetails> planDetails = new ArrayList<>();//还款计划表明细
         List<LoanRepaymentHistory> histories = new ArrayList<>();//还款记录
@@ -4928,7 +4928,8 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
             String salesOrderSid = "";
             String loanContractSid = "";
             String borrowerSid = "";
-            String[] splitVin = v.getVinNo().split(",");
+            String vinNo = v.getVinNo();
+            String busVinSid = "";
             if (StringUtils.isNotBlank(v.getOtherBankNo())) {
                 isOther = "1";
                 if (v.getBankContractNo().equals(v.getOtherBankNo())) {
@@ -4992,18 +4993,30 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                 customerTemps.add(crmCustomerTemp);
             }
             //根据车架号查询销售订单
-            String orderSid = baseVehicleOutApplyFeign.selectSidByVinNo(splitVin[0]).getData();
+            String orderSid = baseVehicleOutApplyFeign.selectSidByVinNo(vinNo).getData();
             if (StringUtils.isNotBlank(orderSid)) {
+                salesOrderSid = orderSid;
+                // 查询销售订单车辆列表
+                ResultBean<BusSalesOrderVehicle> 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";// 临时目录

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;
 
 }

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("部门名称")

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(售后服务) <br/>
  * File: AsServiceGroupVo.java <br/>
@@ -55,6 +58,10 @@ public class AsServiceGroupDetailsVo implements Vo {
     private String groupName;
     @ApiModelProperty("排序")
     private Integer sortNo;
+    @ApiModelProperty("成员sid")
+    private List<String> memberSids = new ArrayList<>();
+    @ApiModelProperty("成员姓名")
+    private List<String> memberNames = new ArrayList<>();
     @ApiModelProperty("部门sid")
     private String useOrgSid;
     @ApiModelProperty("部门名称")

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(售后服务) <br/>
  * File: AsServiceGroupDto.java <br/>
@@ -57,6 +60,10 @@ public class AsServiceGroupDto implements Dto {
     private String groupName;
     @ApiModelProperty("排序")
     private Integer sortNo;
+    @ApiModelProperty("成员sid")
+    private List<String> memberSids = new ArrayList<>();
+    @ApiModelProperty("成员姓名")
+    private List<String> memberNames = new ArrayList<>();
     @ApiModelProperty("部门sid")
     private String useOrgSid;
     @ApiModelProperty("部门名称")

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;
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupService.java

@@ -176,6 +176,10 @@ public class AsServiceGroupService extends MybatisBaseService<AsServiceGroupMapp
     public void insertByDto(AsServiceGroupDto dto) {
         AsServiceGroup entity = new AsServiceGroup();
         BeanUtil.copyProperties(dto, entity, "id", "sid");
+        List<String> memberSids = dto.getMemberSids();
+        List<String> 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<AsServiceGroupMapp
         }
         AsServiceGroup entity = fetchBySid(dtoSid);
         BeanUtil.copyProperties(dto, entity, "id", "sid");
+        List<String> memberSids = dto.getMemberSids();
+        List<String> 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<AsServiceGroupMapp
         AsServiceGroup entity = baseMapper.fetchIsDeleteBySid(sid);
         AsServiceGroupDetailsVo vo = new AsServiceGroupDetailsVo();
         BeanUtil.copyProperties(entity, vo);
+        String memberSid = entity.getMemberSid();
+        String memberName = entity.getMemberName();
+        if (StringUtils.isNotBlank(memberSid)){
+            vo.setMemberSids(Arrays.asList(memberSid.split(",")));
+        }
+        if (StringUtils.isNotBlank(memberName)){
+            vo.setMemberNames(Arrays.asList(memberName.split(",")));
+        }
         return vo;
     }