Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaffiliatcompany/BaseAffiliatCompanyDetailsVo.java

@@ -16,6 +16,9 @@ import java.util.List;
 @Data
 public class BaseAffiliatCompanyDetailsVo implements Vo {
     private static final long serialVersionUID = 1294843919462746225L;
+
+    @ApiModelProperty("sid")
+    private String sid;
     @ApiModelProperty("单位名称")
     private String orgName;
 

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorlegal/BaseDistributorLegalDto.java

@@ -2,6 +2,8 @@ package com.yxt.anrui.base.api.basedistributorlegal;
 
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.anrui.base.api.basedistributorappendix.BaseDistributorAppendixDto;
+import com.yxt.anrui.base.api.basedistributorbank.BaseDistributorBankDto;
 import com.yxt.anrui.base.api.basedistributorstaff.BaseDistributorStaff;
 import com.yxt.anrui.base.api.basedistributorstaff.BaseDistributorStaffDto;
 import com.yxt.common.core.dto.Dto;
@@ -33,6 +35,9 @@ public class BaseDistributorLegalDto implements Dto {
 
     private static final long serialVersionUID = 7039517493269003427L;
     //以下是基础表字段
+    @ApiModelProperty(value = "userSid", required = true)
+    @NotBlank(message = "userSid不能为空")
+    private String userSid;
 
     @ApiModelProperty(value = "经销商名称", required = true)
     @NotBlank(message = "经销商名称不能为空")
@@ -65,6 +70,9 @@ public class BaseDistributorLegalDto implements Dto {
     @ApiModelProperty(value = "通讯地址邮编", required = true)
     private String zipCode;
 
+    @ApiModelProperty(value = "通讯地址")
+    private String address;
+
     @ApiModelProperty(value = "使用组织", required = true)
     private String useOrg;
     @ApiModelProperty(value = "使用组织Name", required = true)
@@ -140,4 +148,8 @@ public class BaseDistributorLegalDto implements Dto {
 
     @ApiModelProperty("人员list")
     private List<BaseDistributorStaffDto> list;
+    @ApiModelProperty(value = "备案资料")
+    private List<BaseDistributorAppendixDto> baseDistributorAppendixs;
+    @ApiModelProperty(value = "备案账号")
+    private List<BaseDistributorBankDto> baseDistributorBanks;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorlegal/BaseDistributorLegalVo.java

@@ -0,0 +1,122 @@
+package com.yxt.anrui.base.api.basedistributorlegal;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.anrui.base.api.basedistributorappendix.BaseDistributorAppendixVo;
+import com.yxt.anrui.base.api.basedistributorbank.BaseDistributorBankVo;
+import com.yxt.anrui.base.api.basedistributorstaff.BaseDistributorStaffDto;
+import com.yxt.anrui.base.api.basedistributorstaff.BaseDistributorStaffVo;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class BaseDistributorLegalVo implements Vo {
+
+    @ApiModelProperty("企业经销商sid")
+    private String sid;
+
+    @ApiModelProperty("userSid")
+    private String userSid;
+   //@ApiModelProperty(value = "使用组织sid:List类型")
+    //private String[][] useOrg;
+
+    @ApiModelProperty(value = "使用组织sid类型")
+    private String useOrg;
+
+    @ApiModelProperty(value = "经销商名称")
+    private String distributorName;
+
+    @ApiModelProperty(value = "经销商类型key值")
+    private String distributorType;
+
+    @ApiModelProperty(value = "经销商类型value值")
+    private String distributorTypeValue;
+
+    @ApiModelProperty(value = "经销商等级key值")
+    private String distributorLevel;
+
+    @ApiModelProperty(value = "经销商等级value值")
+    private String distributorLevelValue;
+
+    @ApiModelProperty(value = "证书号码")
+    private String numCode;
+
+    @ApiModelProperty(value = "联系电话")
+    private String businessMobile;
+
+    @ApiModelProperty(value = "通讯地址")
+    private String address;
+
+    @ApiModelProperty(value = "通讯地址邮编")
+    private String zipCode;
+
+    @ApiModelProperty(value = "使用组织Name")
+    private String useOrgName;
+
+    @ApiModelProperty(value = "经销商分类key值")
+    private String distributorClassification;
+
+    @ApiModelProperty(value = "经销商分类value值")
+    private String distributorClassificationValue;
+
+    //以下是法人表字段
+
+    @ApiModelProperty(value = "企业性质")
+    private String enterpriseNature;
+
+    @ApiModelProperty(value = "注册资本")
+    private String registeredCapital;
+
+    @ApiModelProperty(value = "注册资本单位（万元/美元）")
+    private String registeredCapitalOrg;
+
+    @ApiModelProperty(value = "成立日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @NotNull(message = "成立日期不能为空")
+    private Date setUpTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @ApiModelProperty(value = "营业期限开始时间")
+    @NotNull(message = "营业期限开始时间不能为空")
+    private Date businessTermStartTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @ApiModelProperty(value = "营业期限结束时间")
+    @NotNull(message = "营业期限结束时间不能为空")
+    private Date businessTermEndTime;
+
+    @ApiModelProperty(value = "登记机关")
+    private String registAuthority;
+
+    @ApiModelProperty(value = "核准日期")
+    private String approvalDate;
+
+    @ApiModelProperty(value = "登记状态")
+    private String registState;
+
+    @ApiModelProperty(value = "是否担保回购 是:1 否:2")
+    private String guaranteeOrNot;
+
+    @ApiModelProperty(value = "业务联系人")
+    private String businessContact;
+
+    @ApiModelProperty(value = "企业负责人")
+    private String enterpriseContact;
+
+    @ApiModelProperty(value = "联系方式")
+    private String enterpriseMobile;
+
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+
+    @ApiModelProperty("人员list")
+    private List<BaseDistributorStaffVo> list;
+    @ApiModelProperty(value = "备案资料")
+    private List<BaseDistributorAppendixVo> baseDistributorAppendixs;
+    @ApiModelProperty(value = "备案账号")
+    private List<BaseDistributorBankVo> baseDistributorBanks;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorperson/BaseDistributorPersonDto.java

@@ -1,12 +1,15 @@
 package com.yxt.anrui.base.api.basedistributorperson;
 
 
+import com.yxt.anrui.base.api.basedistributorappendix.BaseDistributorAppendixDto;
+import com.yxt.anrui.base.api.basedistributorbank.BaseDistributorBankDto;
 import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 /**
  * Project: anrui-base(安瑞基础信息模块) <br/>
@@ -26,6 +29,9 @@ import javax.validation.constraints.NotBlank;
 public class BaseDistributorPersonDto implements Dto {
 
     private static final long serialVersionUID = -5720096918135139457L;
+    @ApiModelProperty(value = "userSid", required = true)
+    @NotBlank(message = "userSid不能为空")
+    private String userSid;
     //以下为基础表的字段
     @ApiModelProperty(value = "姓名", required = true)
     @NotBlank(message = "姓名不能为空")
@@ -97,4 +103,9 @@ public class BaseDistributorPersonDto implements Dto {
 
     @ApiModelProperty(value = "备注", required = true)
     private String remarks;
+
+    @ApiModelProperty(value = "备案资料")
+    private List<BaseDistributorAppendixDto> baseDistributorAppendixs;
+    @ApiModelProperty(value = "备案账号")
+    private List<BaseDistributorBankDto> baseDistributorBanks;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorperson/BaseDistributorPersonVo.java

@@ -0,0 +1,82 @@
+package com.yxt.anrui.base.api.basedistributorperson;
+
+import com.yxt.anrui.base.api.basedistributorappendix.BaseDistributorAppendixVo;
+import com.yxt.anrui.base.api.basedistributorbank.BaseDistributorBankVo;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class BaseDistributorPersonVo implements Vo {
+
+	@ApiModelProperty("个人经销商sid")
+    private String sid;
+
+    @ApiModelProperty("userSid")
+    private String userSid;
+    //以下为基础表的字段
+    @ApiModelProperty(value = "姓名")
+    private String distributorName;
+
+    @ApiModelProperty(value = "经销商类型key值")
+    private String distributorType;
+
+    @ApiModelProperty(value = "经销商类型value值")
+    private String distributorTypeValue;
+
+    @ApiModelProperty(value = "身份证号")
+    private String numCode;
+
+    @ApiModelProperty(value = "联系电话")
+    private String businessMobile;
+
+    @ApiModelProperty(value = "通讯地址")
+    private String address;
+
+    @ApiModelProperty(value = "通讯地址邮编")
+    private String zipCode;
+
+    @ApiModelProperty("经销商等级key值")
+    private String distributorLevel;
+    @ApiModelProperty("经销商等级value值")
+    private String distributorLevelValue;
+
+    @ApiModelProperty(value = "经销商分类")
+    private String distributorClassification;
+
+    @ApiModelProperty(value = "经销商分类value")
+    private String distributorClassificationValue;
+
+    //以下为个人表的字段
+    @ApiModelProperty(value = "项目类型")
+    private String projectType;
+    @ApiModelProperty(value = "项目类型Value值")
+    private String projectTypeValue;
+
+    @ApiModelProperty(value = "区域-省")
+    private String province;
+
+    @ApiModelProperty(value = "区域-市")
+    private String city;
+
+    @ApiModelProperty(value = "区域-县区")
+    private String county;
+
+    @ApiModelProperty(value = "省市县Code值")
+    private String addressCode;
+
+    @ApiModelProperty(value = "经销商品牌")
+    private String distributorBrand;
+
+    @ApiModelProperty(value = "所属厂商")
+    private String belongsToVendor;
+
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+    @ApiModelProperty(value = "备案资料")
+    private List<BaseDistributorAppendixVo> baseDistributorAppendixs;
+    @ApiModelProperty(value = "备案账号")
+    private List<BaseDistributorBankVo> baseDistributorBanks;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplication.java

@@ -88,4 +88,13 @@ public class BaseOutsourcingApplication extends BaseEntity {
     private BigDecimal totalExpenseAmount; // 费用金额合计
     @ApiModelProperty("部门sid")
     private String orgSid; // 部门sid
+    @ApiModelProperty("流程定义的id")
+    private String procDefId;
+    @ApiModelProperty("环节定义的sid")
+    private String nodeSid;
+    @ApiModelProperty("流程实例的sid")
+    private String procInstSid;
+
+    @ApiModelProperty(value = "节点状态")
+    private String nodeState;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDto.java

@@ -57,6 +57,8 @@ public class BaseOutsourcingApplicationDto implements Dto {
 	private String sid; // 申请编号
 	@ApiModelProperty("用户sid")
 	private String userSid; // 用户sid
+	@ApiModelProperty("业务员sid")
+	private String staffSid; // 业务员sid
 	@ApiModelProperty("申请编号")
     private String applicationCode; // 申请编号
 	@ApiModelProperty("申请人姓名")
@@ -93,6 +95,15 @@ public class BaseOutsourcingApplicationDto implements Dto {
     private String totalExpenseAmount; // 费用金额合计
 	@ApiModelProperty("部门sid")
 	private String orgSid; // 部门sid
+	@ApiModelProperty("流程定义的id")
+	private String procDefId;
+	@ApiModelProperty("环节定义的sid")
+	private String nodeSid;
+	@ApiModelProperty("流程实例的sid")
+	private String procInstSid;
+
+	@ApiModelProperty(value = "节点状态")
+	private String nodeState;
 	@ApiModelProperty("外采车辆列表")
 	private List<BaseOutsourcingApplicationVehicleDto> baseOutsourcingApplicationVehicleDtos; // 外采车辆列表
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationFeign.java

@@ -25,15 +25,21 @@
  *********************************************************/
 package com.yxt.anrui.base.api.baseoutsourcingapplication;
 
+import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicleVo;
+import com.yxt.anrui.base.api.flow.FlowTaskVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.ApiParam;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Project: anrui-base(外采管理) <br/>
@@ -71,4 +77,41 @@ public interface BaseOutsourcingApplicationFeign {
     @ApiOperation("编辑回显和详情")
     @GetMapping("/fetchBySid/{sid}")
     public ResultBean<BaseOutsourcingApplicationDetailsVo> fetchBySid(@PathVariable("sid") String sid);
+
+    @ApiOperation("政策外采车辆选择列表")
+    @GetMapping("/fetchVehicle")
+    public ResultBean<BaseVehicleVo> fetchVehicle(@RequestParam("vehicleSid") String vehicleSid);
+
+    /*************************流程审批**************************/
+
+    @ApiOperation("提交盖章申请审批流程")
+    @PostMapping("/submitBaseOutSourcingApplication")
+    public ResultBean submitBaseOutSourcingApplication(@RequestBody @Valid SubmitBaseOutSourcingApplicationDto dto);
+
+    @ApiOperation(value = "办理（同意）")
+    @PostMapping("/complete")
+    public ResultBean complete(@ApiParam(value = "变量集合,json对象") @RequestBody Map<String, Object> variables);
+
+    @ApiOperation(value = "撤回流程")
+    @PostMapping(value = "/revokeProcess/{userSid}/{businessSid}")
+    public ResultBean revokeProcess(
+            @ApiParam(value = "用户sid") @PathVariable(value = "userSid")String userSid,
+            @ApiParam(value = "业务sid") @PathVariable(value = "businessSid")String businessSid,
+            @ApiParam(value = "工作流任务相关--请求参数") @RequestBody FlowTaskVo flowTaskVo) ;
+
+    @ApiOperation(value = "驳回任务")
+    @PostMapping(value = "/reject/{businessSid}")
+    public ResultBean taskReject(@ApiParam(value = "业务sid") @PathVariable(value = "businessSid")String businessSid,
+                                 @ApiParam(value = "工作流任务相关--请求参数")@RequestBody FlowTaskVo flowTaskVo);
+
+    @ApiOperation(value = "终止任务")
+    @PostMapping(value = "/breakProcess/{businessSid}")
+    public ResultBean breakProcess(@ApiParam(value = "业务sid") @PathVariable(value = "businessSid")String businessSid,
+                                   @RequestBody FlowTaskVo flowTaskVo);
+
+    @ApiOperation(value = "流程历史流转记录" )
+    @GetMapping(value = "/task/flowRecord/{procInsId}/{deployId}")
+    public ResultBean flowRecord( @ApiParam(value = "流程实例id")@PathVariable(value = "procInsId")String procInsId,
+                                  @ApiParam(value = "目前没用")@PathVariable(value = "deployId")String deployId);
+
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationFeignFallback.java

@@ -25,12 +25,15 @@
  *********************************************************/
 package com.yxt.anrui.base.api.baseoutsourcingapplication;
 
+import com.yxt.anrui.base.api.basevehicle.BaseVehicleVo;
+import com.yxt.anrui.base.api.flow.FlowTaskVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * Project: anrui-base(外采管理) <br/>
@@ -69,4 +72,39 @@ public class BaseOutsourcingApplicationFeignFallback implements BaseOutsourcingA
 		return null;
 	}
 
+	@Override
+	public ResultBean<BaseVehicleVo> fetchVehicle(String vehicleSid) {
+		return null;
+	}
+
+	@Override
+	public ResultBean submitBaseOutSourcingApplication(SubmitBaseOutSourcingApplicationDto dto) {
+		return null;
+	}
+
+	@Override
+	public ResultBean complete(Map<String, Object> variables) {
+		return null;
+	}
+
+	@Override
+	public ResultBean revokeProcess(String userSid, String businessSid, FlowTaskVo flowTaskVo) {
+		return null;
+	}
+
+	@Override
+	public ResultBean taskReject(String businessSid, FlowTaskVo flowTaskVo) {
+		return null;
+	}
+
+	@Override
+	public ResultBean breakProcess(String businessSid, FlowTaskVo flowTaskVo) {
+		return null;
+	}
+
+	@Override
+	public ResultBean flowRecord(String procInsId, String deployId) {
+		return null;
+	}
+
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationQuery.java

@@ -53,6 +53,10 @@ public class BaseOutsourcingApplicationQuery implements Query {
     private String applicationStartDate; // 申请日期开始日期
 	@ApiModelProperty("申请日期结束日期")
 	private String applicationEndDate; // 申请日期结束日期
-	@ApiModelProperty("车型sid")
-    private String modelSid; // 车型sid
+	@ApiModelProperty("车型名称")
+    private String modelName; // 车型名称
+	@ApiModelProperty("业务员sid")
+	private String staffSid; // 业务员sid
+	@ApiModelProperty("分公司sid")
+	private String useOrgSid; // 分公司sid
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/SubmitBaseOutSourcingApplicationDto.java

@@ -0,0 +1,28 @@
+package com.yxt.anrui.base.api.baseoutsourcingapplication;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author liuguohui
+ * @version 1.0
+ * @description
+ * @date 2022/04/13
+ */
+@ApiModel("提交")
+@Data
+public class SubmitBaseOutSourcingApplicationDto extends BaseOutsourcingApplicationDto{
+
+    @ApiModelProperty("业务sid")
+    private String businessSid;
+
+    @ApiModelProperty("意见")
+    private String comment;
+
+    @ApiModelProperty("流程实例id")
+    private String instanceId;
+
+    @ApiModelProperty("任务id")
+    private String taskId;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepostprice/BaseOrderPostPriceQuery.java

@@ -0,0 +1,17 @@
+package com.yxt.anrui.base.api.basepostprice;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/5/12 15:22
+ * @Description
+ */
+@Data
+public class BaseOrderPostPriceQuery implements Query {
+    private static final long serialVersionUID = -8496157517849599849L;
+
+    private String brandSid;
+    private String roleSid;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepostprice/BaseOrderPostPriceVo.java

@@ -0,0 +1,20 @@
+package com.yxt.anrui.base.api.basepostprice;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/5/12 15:19
+ * @Description
+ */
+@Data
+public class BaseOrderPostPriceVo implements Vo {
+    private static final long serialVersionUID = 7153675503206019053L;
+    @ApiModelProperty(value = "让价金额")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private String price;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepostprice/BasePostPriceFeign.java

@@ -25,16 +25,15 @@
  *********************************************************/
 package com.yxt.anrui.base.api.basepostprice;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 /**
  * Project: anrui-base(基础信息) <br/>
  * File: BasePostPriceFeign.java <br/>
@@ -65,14 +64,19 @@ public interface BasePostPriceFeign {
     @PostMapping("/save")
     @ResponseBody
     public ResultBean save(@RequestBody BasePostPriceDto dto);
-        
+
     @ApiOperation("根据sid删除记录")
     @DeleteMapping("/delBySids")
     @ResponseBody
     public ResultBean delBySids(@RequestBody String[] sids);
-      
+
     @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
     @ResponseBody
     public ResultBean<BasePostPriceDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+
+    @ApiOperation("根据角色和品牌查询权限价格")
+    @GetMapping("/selectPostPrice")
+    @ResponseBody
+    ResultBean<BaseOrderPostPriceVo> selectPostPrice(@SpringQueryMap BaseOrderPostPriceQuery query);
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepostprice/BasePostPriceFeignFallback.java

@@ -30,8 +30,6 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
-
 /**
  * Project: anrui-base(基础信息) <br/>
  * File: BasePostPriceFeignFallback.java <br/>
@@ -69,4 +67,9 @@ public class BasePostPriceFeignFallback implements BasePostPriceFeign {
 		ResultBean rb = ResultBean.fireFail();
 		return rb.setMsg("接口anrui-base/basepostprice/fetchDetailsBySid无法访问");
 	}
+
+	@Override
+	public ResultBean<BaseOrderPostPriceVo> selectPostPrice(BaseOrderPostPriceQuery query) {
+		return null;
+	}
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelListVo.java

@@ -17,6 +17,8 @@ public class BaseVehicleModelListVo implements Vo {
     private String sid;
     @ApiModelProperty(value = "品牌名称")
     private String brandName;
+    @ApiModelProperty(value = "品牌sid")
+    private String brandSid;
     @ApiModelProperty(value = "车型名称")
     private String vehicleAlias;
     @ApiModelProperty(value = "版本")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclepolicy/BaseVehiclePolicyFeign.java

@@ -25,16 +25,14 @@
  *********************************************************/
 package com.yxt.anrui.base.api.basevehiclepolicy;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 /**
  * Project: anrui-base(基础信息) <br/>
  * File: BaseVehiclePolicyFeign.java <br/>
@@ -75,4 +73,8 @@ public interface BaseVehiclePolicyFeign {
     @GetMapping("/fetchDetailsBySid/{sid}")
     @ResponseBody
     public ResultBean<BaseVehiclePolicyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+    @ApiOperation("根据车辆sid查询销售政策中的优惠金额")
+    @GetMapping("/selectPrice/{vehicleSid}")
+    @ResponseBody
+    ResultBean<BaseVehiclePriceVo> selectPrice(@PathVariable(value = "vehicleSid") String vehicleSid);
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclepolicy/BaseVehiclePolicyFeignFallback.java

@@ -30,8 +30,6 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
-
 /**
  * Project: anrui-base(基础信息) <br/>
  * File: BaseVehiclePolicyFeignFallback.java <br/>
@@ -69,4 +67,9 @@ public class BaseVehiclePolicyFeignFallback implements BaseVehiclePolicyFeign {
 		ResultBean rb = ResultBean.fireFail();
 		return rb.setMsg("接口anrui-base/basevehiclepolicy/fetchDetailsBySid无法访问");
 	}
+
+	@Override
+	public ResultBean<BaseVehiclePriceVo> selectPrice(String vehicleSid) {
+		return null;
+	}
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclepolicy/BaseVehiclePriceVo.java

@@ -0,0 +1,21 @@
+package com.yxt.anrui.base.api.basevehiclepolicy;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/5/13 10:28
+ * @Description
+ */
+@Data
+public class BaseVehiclePriceVo implements Vo {
+    private static final long serialVersionUID = 4695719404638327720L;
+
+    @ApiModelProperty(value = "优惠金额")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private String discountMoney;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelVo.java

@@ -21,4 +21,7 @@ public class BaseVehmodelVo implements Vo {
     private String modelName;
     @ApiModelProperty(value = "更多配置")
     private String otherConfig;
+
+    @ApiModelProperty(value = "品牌sid")
+    private String brandSid;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyListVo.java

@@ -18,4 +18,10 @@ public class BusVehicleApplyListVo implements Vo {
     private String linkText;
     @ApiModelProperty("采购订单sid")
     private String linkSid;
+    @ApiModelProperty("可使用台数")
+    private Integer useNum;
+    @ApiModelProperty("台数")
+    private Integer platformNo;
+    @ApiModelProperty("锁定台数")
+    private Integer lockingNum;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/flow/AppFlowRecordVo.java

@@ -0,0 +1,43 @@
+package com.yxt.anrui.base.api.flow;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description
+ * @Author liuguohui
+ * @Date 2021/12/27
+ */
+@Data
+@ApiModel("手机端审批流程")
+public class AppFlowRecordVo implements Vo {
+
+    @ApiModelProperty(value = "任务名称")
+    private String taskName;
+
+    @ApiModelProperty(value = "任务执行人名称")
+    private String assigneeName;
+
+    @ApiModelProperty("任务执行人头像")
+    private String assigneeHeadImage;
+
+    @ApiModelProperty("任务创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String createTime;
+
+    @ApiModelProperty("任务完成时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String finishTime;
+
+    @ApiModelProperty("任务耗时")
+    private String duration;
+
+    @ApiModelProperty("意见类别 1正常（同意）意见 2退回意见 3 驳回意见 4 委派意见 5 转办意见 6 终止流程 7 撤回流程")
+    private String type;
+
+    @ApiModelProperty("意见内容")
+    private String comment;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/flow/AppFlowTaskQuery.java

@@ -0,0 +1,28 @@
+package com.yxt.anrui.base.api.flow;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Description
+ * @Author liuguohui
+ * @Date 2021/12/27
+ */
+@Data
+@ApiModel("手机端查询待办订单任务详情")
+public class AppFlowTaskQuery implements Query {
+
+    @ApiModelProperty(value = "订单sid", required = true)
+    @NotBlank(message = "订单sid不能为空")
+    private String orderSid;
+
+    @ApiModelProperty(value = "流程实例ID")
+    private String procInsId;
+
+    @ApiModelProperty(value = "流程部署编号")
+    private String deployId;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/flow/FlowCommentDto.java

@@ -0,0 +1,40 @@
+package com.yxt.anrui.base.api.flow;
+
+import lombok.Builder;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author XuanXuan
+ * @date 2021/3/28 15:50
+ */
+@Data
+@Builder
+/*@NoArgsConstructor
+@AllArgsConstructor*/
+public class FlowCommentDto implements Serializable {
+    public FlowCommentDto() {
+    }
+
+    public FlowCommentDto(String type, String comment) {
+        this.type = type;
+        this.comment = comment;
+    }
+
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1929734226858491967L;
+
+	/**
+     * 意见类别 1正常（同意）意见 2退回意见 3 驳回意见 4 委派意见 5 转办意见 6 终止流程 7 撤回流程
+     */
+    private String type;
+
+    /**
+     * 意见内容
+     */
+    private String comment;
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/flow/FlowTask.java

@@ -0,0 +1,98 @@
+package com.yxt.anrui.base.api.flow;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>工作流任务<p>
+ *
+ * @author XuanXuan
+ * @date 2021-04-03
+ */
+@ApiModel("工作流任务相关-返回参数")
+@Data
+public class FlowTask extends BaseEntity implements Serializable {
+
+    @ApiModelProperty("任务编号")
+    private String taskId;
+
+    @ApiModelProperty("任务名称")
+    private String taskName;
+
+    @ApiModelProperty("任务Key")
+    private String taskDefKey;
+
+    @ApiModelProperty("任务执行人Id")
+    private Long assigneeId;
+
+    @ApiModelProperty("部门名称")
+    private String deptName;
+
+    @ApiModelProperty("流程发起人部门名称")
+    private String startDeptName;
+
+    @ApiModelProperty("任务执行人名称")
+    private String assigneeName;
+
+    @ApiModelProperty("任务执行人头像")
+    private String assigneeHeadImage;
+
+    @ApiModelProperty("流程发起人Id")
+    private String startUserId;
+
+    @ApiModelProperty("流程发起人名称")
+    private String startUserName;
+
+    @ApiModelProperty("流程类型")
+    private String category;
+
+    @ApiModelProperty("流程变量信息")
+    private Object procVars;
+
+    @ApiModelProperty("局部变量信息")
+    private Object taskLocalVars;
+
+    @ApiModelProperty("流程部署编号")
+    private String deployId;
+
+    @ApiModelProperty("流程ID")
+    private String procDefId;
+
+    @ApiModelProperty("流程key")
+    private String procDefKey;
+
+    @ApiModelProperty("流程定义名称")
+    private String procDefName;
+
+    @ApiModelProperty("流程定义内置使用版本")
+    private int procDefVersion;
+
+    @ApiModelProperty("流程实例ID")
+    private String procInsId;
+
+    @ApiModelProperty("历史流程实例ID")
+    private String hisProcInsId;
+
+    @ApiModelProperty("任务耗时")
+    private String duration;
+
+    @ApiModelProperty("任务意见")
+    private FlowCommentDto comment = new FlowCommentDto();
+
+    @ApiModelProperty("候选执行人")
+    private String candidate;
+
+    @ApiModelProperty("任务创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    @ApiModelProperty("任务完成时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date finishTime;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/flow/FlowTaskQuery.java

@@ -0,0 +1,23 @@
+package com.yxt.anrui.base.api.flow;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author hanweijia
+ * @date 2021/11/06 13:53
+ * @description
+ */
+@Data
+public class FlowTaskQuery implements Query {
+    private static final long serialVersionUID = -7395299971899690002L;
+    @ApiModelProperty(value = "用户sid", required = true)
+    private String userSid;
+    @ApiModelProperty(value = "zd", required = true)
+    private String zd;
+    @ApiModelProperty(value = "days", required = true)
+    private String days;
+
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/flow/FlowTaskVo.java

@@ -0,0 +1,51 @@
+package com.yxt.anrui.base.api.flow;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>流程任务<p>
+ *
+ * @author XuanXuan
+ * @date 2021-04-03
+ */
+@ApiModel("工作流任务相关--请求参数")
+@Data
+public class FlowTaskVo {
+
+    @ApiModelProperty("任务Id")
+    private String taskId;
+
+    @ApiModelProperty("用户Id")
+    private String userId;
+    @ApiModelProperty("用户Sid")
+    private String userSid;
+
+    @ApiModelProperty("任务意见")
+    private String comment;
+
+    @ApiModelProperty("流程实例Id")
+    private String instanceId;
+
+    @ApiModelProperty("节点")
+    private String targetKey;
+
+    @ApiModelProperty("流程变量信息")
+    private Map<String, Object> values=new HashMap<>();
+
+    @ApiModelProperty("审批人")
+    private String assignee;
+
+    @ApiModelProperty("候选人")
+    private List<String> candidateUsers=new ArrayList<>();
+
+    @ApiModelProperty("审批组")
+    private List<String> candidateGroups=new ArrayList<>();
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/flow/Flowable.java

@@ -3,13 +3,6 @@ package com.yxt.anrui.base.api.flow;
 import com.yxt.common.core.domain.BaseEntity;
 import lombok.Data;
 
-/**
- * @author liuguohui
- * @version 1.0
- * @description
- * @date 2022/03/03
- */
 @Data
 public class Flowable extends BaseEntity {
-
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/flow/FlowableFallback.java

@@ -0,0 +1,43 @@
+package com.yxt.anrui.base.api.flow;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+@Component
+public class FlowableFallback implements FlowableFeign{
+    @Override
+    public ResultBean businessStart(String procDefId, String userSid, Map<String, Object> variables) {
+        return null;
+    }
+
+    @Override
+    public ResultBean processPagerList(Integer pageNum, Integer pageSize) {
+        return null;
+    }
+
+    @Override
+    public ResultBean myprocess( String userSid, PagerQuery<FlowTaskQuery> taskQueryPagerQuery) {
+        return null;
+    }
+
+    @Override
+    public ResultBean getAppFlowRecordList(AppFlowTaskQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        return rb.setMsg("接口anrui-buscenter/bussolutiondetail/getOrderTaskDetaile无法访问");
+    }
+
+    @Override
+    public ResultBean stopProcess(FlowTaskVo flowTaskVo) {
+        return null;
+    }
+
+    @Override
+    public ResultBean deleteProcess(String procInsId) {
+        return null;
+    }
+
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/flow/FlowableFeign.java

@@ -0,0 +1,76 @@
+package com.yxt.anrui.base.api.flow;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Map;
+
+@Api(tags = "Flowable")
+@FeignClient(
+        contextId = "anrui-base-flow-Flowable",
+        name = "anrui-base",
+        path = "v1/flow",
+        fallback = FlowableFallback.class)
+public interface FlowableFeign {
+    /**
+     * 业务系统发起流程申请
+     * @param procDefId 流程定义id
+     * @param userSid 用户sid
+     * @param variables form参数
+     * @return
+     */
+    @PostMapping("/businessStart/{procDefId}/{userSid}")
+    public ResultBean businessStart(@ApiParam(value = "流程定义id") @PathVariable(value = "procDefId") String procDefId,
+                                    @ApiParam(value = "用户sid") @PathVariable(value = "userSid") String userSid,
+                                    @ApiParam(value = "变量集合,json对象") @RequestBody Map<String, Object> variables);
+
+    /**
+     * 流程定义列表  一般业务中不需要查询该列表
+     * @param pageNum 页数
+     * @param pageSize 容量
+     * @return
+     */
+    @PostMapping("/processPagerList/{userSid}")
+    public ResultBean processPagerList(@ApiParam(value = "当前页码", required = true) @RequestParam("pageNum") Integer pageNum,
+                                       @ApiParam(value = "每页条数", required = true) @RequestParam("pageSize") Integer pageSize);
+
+    /**
+     * 我的流程 我发起的流程
+     * @param userSid 用户sid
+     * @param taskQueryPagerQuery 查询参数
+     * @return
+     */
+    @PostMapping("/myprocess/{userSid}")
+    public ResultBean myprocess(@ApiParam(value = "用户sid") @PathVariable(value = "userSid") String userSid,
+                                @ApiParam(value = "变量集合,json对象") @RequestBody PagerQuery<FlowTaskQuery> taskQueryPagerQuery);
+
+    @ApiOperation("手机端查询审批订单流程记录")
+    @PostMapping("/getAppFlowRecordList")
+    public ResultBean<List<AppFlowRecordVo>> getAppFlowRecordList(@RequestBody AppFlowTaskQuery query);
+
+    /**
+     * 取消申请
+     * @param flowTaskVo
+     * @return
+     */
+    @ApiOperation(value = "取消申请")
+    @PostMapping(value = "/task/stopProcess")
+    @ResponseBody
+    ResultBean stopProcess(@ApiParam(value = "工作流任务相关--请求参数")@RequestBody FlowTaskVo flowTaskVo);
+    /**
+     * 删除流程实例
+     * @param procInsId 流程实例id
+     * @return
+     */
+    @ApiOperation(value = "删除流程实例")
+    @DeleteMapping(value = "/task/deleteProcess/{procInsId}")
+    @ResponseBody
+    ResultBean deleteProcess(@ApiParam(value = "流程实例id")@PathVariable(value = "procInsId")String procInsId);
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/flow/TaskQuery.java

@@ -0,0 +1,90 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.flow;
+
+import com.yxt.common.core.query.Query;
+
+/**
+ * Project: anrui-parent <br/>
+ * File: TaskQuery.java <br/>
+ * Class: com.yxt.anrui.portal.biz.flow.TaskQuery <br/>
+ * Description: <描述类的功能>. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021/10/27 下午3:36 <br/>
+ *
+ * @author popo
+ * @version 1.0
+ * @since 1.0
+ */
+public class TaskQuery implements Query {
+
+    private String userSid;
+    private String days;
+    private String zd1;
+    private String processDefinitionId;
+    private String startTime;
+
+    public String getZd1() {
+        return zd1;
+    }
+
+    public void setZd1(String zd1) {
+        this.zd1 = zd1;
+    }
+
+    public String getProcessDefinitionId() {
+        return processDefinitionId;
+    }
+
+    public void setProcessDefinitionId(String processDefinitionId) {
+        this.processDefinitionId = processDefinitionId;
+    }
+
+    public String getUserSid() {
+        return userSid;
+    }
+
+    public void setUserSid(String userSid) {
+        this.userSid = userSid;
+    }
+
+    public String getDays() {
+        return days;
+    }
+
+    public void setDays(String days) {
+        this.days = days;
+    }
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java

@@ -2,6 +2,8 @@ package com.yxt.anrui.base.biz.basedistributor;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basedistributor.*;
+import com.yxt.anrui.base.api.basedistributorlegal.BaseDistributorLegalVo;
+import com.yxt.anrui.base.api.basedistributorperson.BaseDistributorPersonVo;
 import com.yxt.anrui.base.api.basedistributorstaff.BaseDistributorStaff;
 import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerExportVo;
 import com.yxt.anrui.base.biz.basedistributorlegal.BaseDistributorLegalService;
@@ -118,7 +120,6 @@ public class BaseDistributorRest implements BaseDistributorFeign {
      */
     @Override
     public ResultBean<Map<String, Object>> details(String sid) {
-        Map<String, Object> map = new HashMap<>();
         ResultBean rb = ResultBean.fireFail();
 //        BaseDistributor baseDistributor = baseDistributorService.fetchBySid(sid);
         BaseDistributorVo baseDistributorVo = baseDistributorService.selBySid(sid);
@@ -126,13 +127,14 @@ public class BaseDistributorRest implements BaseDistributorFeign {
             return rb.fail().setMsg("该经销商不存在");
         } else {
             if (personType.equals(baseDistributorVo.getDistributorClassification())) {//个人
-                map = baseDistributorPersonService.details(sid);
+                BaseDistributorPersonVo baseDistributorPersonVo = baseDistributorPersonService.details(sid);
+                return rb.success().setData(baseDistributorPersonVo);
             } else if (legalType.equals(baseDistributorVo.getDistributorClassification())) {//法人
-                map = baseDistributorLegalService.details(sid);
-                map.put("useOrg",baseDistributorVo.getUseOrg());
+                BaseDistributorLegalVo baseDistributorLegalVo = baseDistributorLegalService.details(sid);
+                return rb.success().setData(baseDistributorLegalVo);
             }
         }
-        return rb.success().setData(map);
+        return rb.success();
     }
 
     /**

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java

@@ -92,6 +92,8 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
      */
     public ResultBean<String> saveFrDto(BaseDistributorLegalDto dto) {
         BaseDistributor baseDistributor = new BaseDistributor();
+        baseDistributor.setAddress(dto.getAddress());
+        baseDistributor.setCreateBySid(dto.getUserSid());
         baseDistributor.setDistributorName(dto.getDistributorName());//经销商名称
         baseDistributor.setDistributorType(dto.getDistributorType());//经销商类型
         baseDistributor.setDistributorTypeValue(dto.getDistributorTypeValue());//经销商类型value
@@ -138,6 +140,7 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
      */
     public ResultBean<String> saveGrDto(BaseDistributorPersonDto dto) {
         BaseDistributor baseDistributor = new BaseDistributor();
+        baseDistributor.setCreateBySid(dto.getUserSid());
         baseDistributor.setDistributorName(dto.getDistributorName());//经销商名称
         baseDistributor.setDistributorType(dto.getDistributorType());//经销商类型
         baseDistributor.setDistributorTypeValue(dto.getDistributorTypeValue());//经销商类型value值

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorappendix/BaseDistributorAppendixMapper.java

@@ -5,9 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.base.api.basedistributorappendix.BaseDistributorAppendix;
 import com.yxt.anrui.base.api.basedistributorappendix.BaseDistributorAppendixVo;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Update;
+import org.apache.ibatis.annotations.*;
 
 import java.util.List;
 
@@ -35,4 +33,10 @@ public interface BaseDistributorAppendixMapper extends BaseMapper<BaseDistributo
 
     @Update("update base_distributor_appendix set isDelete = 1 where sid = #{sid}")
     int updateBySidIsDelete(String sid);
+
+    @Delete("delete from base_distributor_appendix where linkSid = #{sid}")
+    void delByLinkSid(String sid);
+
+    @Select("select * from base_distributor_appendix where linkSid = #{sid}")
+    List<BaseDistributorAppendixVo> selByLinkSid(String sid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorappendix/BaseDistributorAppendixService.java

@@ -207,4 +207,12 @@ public class BaseDistributorAppendixService extends MybatisBaseService<BaseDistr
     public int updateBySidIsDelete(String sid) {
         return baseMapper.updateBySidIsDelete(sid);
     }
+
+    public void delByLinkSid(String sid) {
+        baseMapper.delByLinkSid(sid);
+    }
+
+    public List<BaseDistributorAppendixVo> selByLinkSid(String sid) {
+        return baseMapper.selByLinkSid(sid);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorbank/BaseDistributorBankMapper.java

@@ -7,12 +7,9 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.base.api.baseaffiliatcompany.BaseAffiliatCompanyQuery;
 import com.yxt.anrui.base.api.baseaffiliatcompany.BaseAffiliatCompanyVo;
 import com.yxt.anrui.base.api.basedistributorbank.BaseDistributorBankQuery;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.*;
 import com.yxt.anrui.base.api.basedistributorbank.BaseDistributorBank;
 import com.yxt.anrui.base.api.basedistributorbank.BaseDistributorBankVo;
-import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
 
@@ -42,4 +39,10 @@ public interface BaseDistributorBankMapper extends BaseMapper<BaseDistributorBan
 
     @Update("update base_distributor_bank set isDelete = 1 where sid = #{sid}")
     int updateBySidIsDelete(String sid);
+
+    @Delete("delete from base_distributor_bank where distributorSid = #{sid}")
+    void delByDistributorSid(String sid);
+
+    @Select("select * from base_distributor_bank where distributorSid = #{sid}")
+    List<BaseDistributorBankVo> selByDistributorSid(String sid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorbank/BaseDistributorBankService.java

@@ -73,4 +73,12 @@ public class BaseDistributorBankService extends MybatisBaseService<BaseDistribut
     public int updateBySidIsDelete(String sid) {
         return baseMapper.updateBySidIsDelete(sid);
     }
+
+    public void delByDistributorSid(String sid) {
+        baseMapper.delByDistributorSid(sid);
+    }
+
+    public List<BaseDistributorBankVo> selByDistributorSid(String sid) {
+        return baseMapper.selByDistributorSid(sid);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorlegal/BaseDistributorLegalMapper.java

@@ -2,6 +2,7 @@ package com.yxt.anrui.base.biz.basedistributorlegal;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yxt.anrui.base.api.basedistributorlegal.BaseDistributorLegal;
+import com.yxt.anrui.base.api.basedistributorlegal.BaseDistributorLegalVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Update;
 
@@ -39,6 +40,6 @@ public interface BaseDistributorLegalMapper extends BaseMapper<BaseDistributorLe
      * @param sid 经销商sid
      * @return
      */
-    Map<String, Object> details(String sid);
+    BaseDistributorLegalVo details(String sid);
 
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorlegal/BaseDistributorLegalMapper.xml

@@ -3,8 +3,9 @@
 <mapper namespace="com.yxt.anrui.base.biz.basedistributorlegal.BaseDistributorLegalMapper">
 
     <!--根据经销商sid查询经销商法人及经销商基础信息-->
-    <select id="details" resultType="java.util.Map">
+    <select id="details" resultType="com.yxt.anrui.base.api.basedistributorlegal.BaseDistributorLegalVo">
         SELECT bl.sid,
+               bd.createBySid as userSid,
                bl.enterpriseContact,
                bl.enterpriseNature,
                bl.registeredCapital,

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorlegal/BaseDistributorLegalRest.java

@@ -1,7 +1,12 @@
 package com.yxt.anrui.base.biz.basedistributorlegal;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.yxt.anrui.base.api.basedistributor.BaseDistributor;
 import com.yxt.anrui.base.api.basedistributor.BaseDistributorDto;
+import com.yxt.anrui.base.api.basedistributorappendix.BaseDistributorAppendix;
+import com.yxt.anrui.base.api.basedistributorappendix.BaseDistributorAppendixDto;
+import com.yxt.anrui.base.api.basedistributorbank.BaseDistributorBank;
+import com.yxt.anrui.base.api.basedistributorbank.BaseDistributorBankDto;
 import com.yxt.anrui.base.api.basedistributorlegal.BaseDistributorLegal;
 import com.yxt.anrui.base.api.basedistributorlegal.BaseDistributorLegalDto;
 import com.yxt.anrui.base.api.basedistributorlegal.BaseDistributorLegalFeign;
@@ -9,7 +14,10 @@ import com.yxt.anrui.base.api.basedistributorlegal.BaseDistributorLegalOneDto;
 import com.yxt.anrui.base.api.basedistributorstaff.BaseDistributorStaff;
 import com.yxt.anrui.base.api.basedistributorstaff.BaseDistributorStaffDto;
 import com.yxt.anrui.base.biz.basedistributor.BaseDistributorService;
+import com.yxt.anrui.base.biz.basedistributorappendix.BaseDistributorAppendixService;
+import com.yxt.anrui.base.biz.basedistributorbank.BaseDistributorBankService;
 import com.yxt.anrui.base.biz.basedistributorstaff.BaseDistributorStaffService;
+import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.core.result.ResultBean;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,6 +52,12 @@ public class BaseDistributorLegalRest implements BaseDistributorLegalFeign {
     BaseDistributorService baseDistributorService;
     @Autowired
     private BaseDistributorStaffService baseDistributorStaffService;
+    @Autowired
+    private FileUploadComponent fileUploadComponent;
+    @Autowired
+    private BaseDistributorAppendixService baseDistributorAppendixService;
+    @Autowired
+    private BaseDistributorBankService baseDistributorBankService;
 
     /**
      * 新增法人基础信息
@@ -55,6 +69,10 @@ public class BaseDistributorLegalRest implements BaseDistributorLegalFeign {
     public ResultBean save(BaseDistributorLegalDto dto) {
         ResultBean rb = ResultBean.fireFail();
         String numCode = dto.getNumCode();
+        String jxsSid = "";
+        BaseDistributorLegal bdbl = new BaseDistributorLegal();
+        List<BaseDistributorAppendixDto> baseDistributorAppendixs = dto.getBaseDistributorAppendixs();
+        List<BaseDistributorBankDto> baseDistributorBanks = dto.getBaseDistributorBanks();
         int count = baseDistributorService.selectNumCode(numCode);
         if (count > 0) {
             return rb.fail().setMsg("保存失败，统一社会信用代码已存在");
@@ -72,8 +90,8 @@ public class BaseDistributorLegalRest implements BaseDistributorLegalFeign {
         if (stringResultBean.getSuccess()) {
             String sid = stringResultBean.getData();//经销商sid
             //存储法人表信息
-            BaseDistributorLegal bdbl = new BaseDistributorLegal();
             bdbl.setDistributorSid(sid);
+            bdbl.setCreateBySid(dto.getUserSid());
             bdbl.setEnterpriseNature(dto.getEnterpriseNature());
             bdbl.setRegisteredCapital(dto.getRegisteredCapital());
             bdbl.setRegisteredCapitalOrg(dto.getRegisteredCapitalOrg());
@@ -92,6 +110,7 @@ public class BaseDistributorLegalRest implements BaseDistributorLegalFeign {
             if (!isSave) {
                 return rb.setMsg("经销商法人信息保存失败");
             }
+            jxsSid = stringResultBean.getData();
             //再新增
             if (dto.getList().size() > 0) {
                 for (int i = 0; i < dto.getList().size(); i++) {
@@ -105,8 +124,32 @@ public class BaseDistributorLegalRest implements BaseDistributorLegalFeign {
         } else {
             return rb.setMsg(stringResultBean.getMsg());
         }
+        for (BaseDistributorAppendixDto baseDistributorAppendix : baseDistributorAppendixs) {
+            BaseDistributorAppendix entity = new BaseDistributorAppendix();
+            BeanUtil.copyProperties(baseDistributorAppendix, entity);
+            entity.setCreateBySid(dto.getUserSid());
+            entity.setCreateTime(new Date());
+            String filePath = baseDistributorAppendix.getFilePath();
+            if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
+            }
+            entity.setFilePath(filePath);
+            entity.setLinkSid(jxsSid);
+            boolean save = baseDistributorAppendixService.save(entity);
+            if (!save) {
+                return rb.setMsg("备案资料保存失败");
+            }
+        }
+        for (BaseDistributorBankDto baseDistributorBank : baseDistributorBanks) {
+            BaseDistributorBank entity = new BaseDistributorBank();
+            BeanUtil.copyProperties(baseDistributorBank, entity);
+            entity.setDistributorSid(jxsSid);
+            boolean save = baseDistributorBankService.save(entity);
+            if (!save) {
+                return rb.setMsg("备案账号保存失败");
+            }
+        }
         return rb.success().setData(stringResultBean.getData()).setMsg("保存成功");
-
     }
 
     /**
@@ -119,6 +162,8 @@ public class BaseDistributorLegalRest implements BaseDistributorLegalFeign {
     @Override
     public ResultBean update(BaseDistributorLegalDto dto, String sid) {
         ResultBean rb = ResultBean.fireFail();
+        List<BaseDistributorAppendixDto> baseDistributorAppendixs = dto.getBaseDistributorAppendixs();
+        List<BaseDistributorBankDto> baseDistributorBanks = dto.getBaseDistributorBanks();
         //根据法人信息sid查询经销商法人信息
         BaseDistributorLegal baseDistributorLegal = baseDistributorLegalService.fetchBySid(sid);
         if (baseDistributorLegal == null) {
@@ -142,6 +187,7 @@ public class BaseDistributorLegalRest implements BaseDistributorLegalFeign {
         baseDistributorLegalOneDto.setBusinessTermEndTime(dto.getBusinessTermEndTime());
         //修改经销商基础信息
         BaseDistributorDto baseDistributorDto = new BaseDistributorDto();
+        baseDistributorDto.setAddress(dto.getAddress());
         baseDistributorDto.setDistributorType(dto.getDistributorType());
         baseDistributorDto.setDistributorLevel(dto.getDistributorLevel());
         baseDistributorDto.setNumCode(dto.getNumCode());
@@ -169,6 +215,27 @@ public class BaseDistributorLegalRest implements BaseDistributorLegalFeign {
         if (count1 == 0 || count == 0) {
             return rb.setMsg("修改失败");
         }
+        baseDistributorAppendixService.delByLinkSid(sid);
+        for (BaseDistributorAppendixDto baseDistributorAppendix : baseDistributorAppendixs) {
+            BaseDistributorAppendix entity = new BaseDistributorAppendix();
+            BeanUtil.copyProperties(baseDistributorAppendix, entity);
+            entity.setCreateBySid(dto.getUserSid());
+            entity.setCreateTime(new Date());
+            String filePath = baseDistributorAppendix.getFilePath();
+            if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
+            }
+            entity.setFilePath(filePath);
+            entity.setLinkSid(sid);
+            baseDistributorAppendixService.save(entity);
+        }
+        baseDistributorBankService.delByDistributorSid(sid);
+        for (BaseDistributorBankDto baseDistributorBank : baseDistributorBanks) {
+            BaseDistributorBank entity = new BaseDistributorBank();
+            BeanUtil.copyProperties(baseDistributorBank, entity);
+            entity.setDistributorSid(sid);
+            baseDistributorBankService.save(entity);
+        }
         return rb.success().setMsg("修改成功");
     }
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorlegal/BaseDistributorLegalService.java

@@ -1,10 +1,18 @@
 package com.yxt.anrui.base.biz.basedistributorlegal;
 
+import com.yxt.anrui.base.api.basedistributorappendix.BaseDistributorAppendixVo;
+import com.yxt.anrui.base.api.basedistributorbank.BaseDistributorBankVo;
 import com.yxt.anrui.base.api.basedistributorlegal.BaseDistributorLegal;
+import com.yxt.anrui.base.api.basedistributorlegal.BaseDistributorLegalVo;
+import com.yxt.anrui.base.api.basedistributorstaff.BaseDistributorStaffVo;
+import com.yxt.anrui.base.biz.basedistributorappendix.BaseDistributorAppendixService;
+import com.yxt.anrui.base.biz.basedistributorbank.BaseDistributorBankService;
+import com.yxt.anrui.base.biz.basedistributorstaff.BaseDistributorStaffService;
 import com.yxt.common.base.service.MybatisBaseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -25,7 +33,12 @@ public class BaseDistributorLegalService extends MybatisBaseService<BaseDistribu
 
     @Autowired
     BaseDistributorLegalMapper baseDistributorLegalMapper;
-
+    @Autowired
+    private BaseDistributorAppendixService baseDistributorAppendixService;
+    @Autowired
+    private BaseDistributorBankService baseDistributorBankService;
+    @Autowired
+    private BaseDistributorStaffService baseDistributorStaffService;
 
     /**
      * 根据经销商sid删除经销商法人信息
@@ -43,7 +56,14 @@ public class BaseDistributorLegalService extends MybatisBaseService<BaseDistribu
      * @param sid 经销商sid
      * @return
      */
-    public Map<String, Object> details(String sid) {
-        return baseMapper.details(sid);
+    public BaseDistributorLegalVo details(String sid) {
+        BaseDistributorLegalVo baseDistributorLegalVo = baseMapper.details(sid);
+        List<BaseDistributorAppendixVo> baseDistributorAppendixVos = baseDistributorAppendixService.selByLinkSid(sid);
+        List<BaseDistributorBankVo> baseDistributorBankVos = baseDistributorBankService.selByDistributorSid(sid);
+        List<BaseDistributorStaffVo> baseDistributorStaffVos = baseDistributorStaffService.selbyDistributorSid(sid);
+        baseDistributorLegalVo.setBaseDistributorAppendixs(baseDistributorAppendixVos);
+        baseDistributorLegalVo.setBaseDistributorBanks(baseDistributorBankVos);
+        baseDistributorLegalVo.setList(baseDistributorStaffVos);
+        return baseDistributorLegalVo;
     }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorperson/BaseDistributorPersonMapper.java

@@ -2,6 +2,7 @@ package com.yxt.anrui.base.biz.basedistributorperson;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yxt.anrui.base.api.basedistributorperson.BaseDistributorPerson;
+import com.yxt.anrui.base.api.basedistributorperson.BaseDistributorPersonVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Update;
 
@@ -38,6 +39,6 @@ public interface BaseDistributorPersonMapper extends BaseMapper<BaseDistributorP
      * @param sid 经销商sid
      * @return
      */
-    Map<String, Object> details(String sid);
+    BaseDistributorPersonVo details(String sid);
 
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorperson/BaseDistributorPersonMapper.xml

@@ -8,9 +8,9 @@
 <!--        where distributorSid = #{sid}-->
 <!--    </delete>-->
     <!--根据经销商sid查询经销商个人及经销商基础信息-->
-    <select id="details" resultType="java.util.Map">
+    <select id="details" resultType="com.yxt.anrui.base.api.basedistributorperson.BaseDistributorPersonVo">
         SELECT bp.sid,
-               bp.distributorSid,
+               bp.createBySid as userSid,
                bp.projectType,
                bp.projectTypeValue,
                bp.distributorBrand,

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorperson/BaseDistributorPersonRest.java

@@ -44,39 +44,7 @@ public class BaseDistributorPersonRest implements BaseDistributorPersonFeign {
      */
     @Override
     public ResultBean save(BaseDistributorPersonDto dto) {
-        ResultBean rb = ResultBean.fireFail();
-        String numCode = dto.getNumCode();
-        int count = baseDistributorService.selectNumCode(numCode);
-        if (count > 0) {
-            return rb.fail().setMsg("保存失败，统一社会信用代码已存在");
-        }
-        if (dto.getNumCode().length() != 18 && dto.getNumCode().length() != 9){
-            return ResultBean.fireFail().setMsg("统一信用社会代码应为9位或18位");
-        }
-        //创建基础信息的对象,和数据库对应的实体类
-        ResultBean<String> stringResultBean = baseDistributorService.saveGrDto(dto);
-        if (stringResultBean.getSuccess()) {
-            String sid = stringResultBean.getData();
-            //存储个人表信息
-            BaseDistributorPerson bp = new BaseDistributorPerson();
-            bp.setDistributorSid(sid);//经销商sid
-            bp.setProjectType(dto.getProjectType());//项目类型
-            bp.setProjectTypeValue(dto.getProjectTypeValue());//项目类型Value
-            bp.setDistributorBrand(dto.getDistributorBrand());//经销商品牌
-            bp.setBelongsToVendor(dto.getBelongsToVendor());//所属厂商
-            bp.setProvince(dto.getProvince());//省
-            bp.setCity(dto.getCity());//市
-            bp.setCounty(dto.getCounty());//县
-            bp.setAddressCode(dto.getAddressCode());//省市县code值
-            bp.setRemarks(dto.getRemarks());
-            boolean isSave = baseDistributorPersonService.save(bp);
-            if (!isSave) {
-                return rb.setMsg("经销商个人信息保存失败");
-            }
-        } else {
-            return rb.setMsg(stringResultBean.getMsg());
-        }
-        return rb.success().setData(stringResultBean.getData()).setMsg("保存成功");
+        return baseDistributorPersonService.saveAll(dto);
     }
 
     /**
@@ -88,33 +56,6 @@ public class BaseDistributorPersonRest implements BaseDistributorPersonFeign {
      */
     @Override
     public ResultBean update(BaseDistributorPersonDto dto, String sid) {
-        ResultBean rb = ResultBean.fireFail();
-        //根据个人信息sid查询经销商个人信息
-        BaseDistributorPerson baseDistributorPerson = baseDistributorPersonService.fetchBySid(sid);
-        if (baseDistributorPerson == null) {
-            return rb.setMsg("该经销商个人不存在");
-        }
-        //修改经销商个人信息
-        BaseDistributorPersonOneDto baseDistributorPersonOneDto = new BaseDistributorPersonOneDto();
-        baseDistributorPersonOneDto.setBelongsToVendor(dto.getBelongsToVendor());
-        baseDistributorPersonOneDto.setCity(dto.getCity());
-        baseDistributorPersonOneDto.setCounty(dto.getCounty());
-        baseDistributorPersonOneDto.setDistributorBrand(dto.getDistributorBrand());
-        baseDistributorPersonOneDto.setProjectType(dto.getProjectType());
-        baseDistributorPersonOneDto.setProvince(dto.getProvince());
-        baseDistributorPersonOneDto.setRemarks(dto.getRemarks());
-        //修改经销商基础信息
-        BaseDistributorDto baseDistributorDto = new BaseDistributorDto();
-        baseDistributorDto.setNumCode(dto.getNumCode());
-        baseDistributorDto.setDistributorName(dto.getDistributorName());
-        baseDistributorDto.setAddress(dto.getAddress());
-        baseDistributorDto.setDistributorType(dto.getDistributorType());
-        baseDistributorDto.setBusinessMobile(dto.getBusinessMobile());
-        int count1 = baseDistributorService.updateBySid(baseDistributorDto.toMap(), baseDistributorPerson.getDistributorSid());
-        int count = baseDistributorPersonService.updateBySid(baseDistributorPersonOneDto.toMap(), sid);
-        if (count1 == 0 || count == 0) {
-            return rb.setMsg("修改失败");
-        }
-        return rb.success().setMsg("修改成功");
+        return baseDistributorPersonService.updateAll(dto,sid);
     }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorperson/BaseDistributorPersonService.java

@@ -1,12 +1,37 @@
 package com.yxt.anrui.base.biz.basedistributorperson;
 
+import cn.hutool.core.bean.BeanUtil;
+import com.auth0.jwt.JWT;
+import com.auth0.jwt.interfaces.DecodedJWT;
+import com.yxt.anrui.base.api.basedistributor.BaseDistributor;
+import com.yxt.anrui.base.api.basedistributor.BaseDistributorDto;
+import com.yxt.anrui.base.api.basedistributorappendix.BaseDistributorAppendix;
+import com.yxt.anrui.base.api.basedistributorappendix.BaseDistributorAppendixDto;
+import com.yxt.anrui.base.api.basedistributorappendix.BaseDistributorAppendixVo;
+import com.yxt.anrui.base.api.basedistributorbank.BaseDistributorBank;
+import com.yxt.anrui.base.api.basedistributorbank.BaseDistributorBankDto;
+import com.yxt.anrui.base.api.basedistributorbank.BaseDistributorBankVo;
 import com.yxt.anrui.base.api.basedistributorperson.BaseDistributorPerson;
+import com.yxt.anrui.base.api.basedistributorperson.BaseDistributorPersonDto;
+import com.yxt.anrui.base.api.basedistributorperson.BaseDistributorPersonOneDto;
+import com.yxt.anrui.base.api.basedistributorperson.BaseDistributorPersonVo;
+import com.yxt.anrui.base.biz.basedistributor.BaseDistributorService;
+import com.yxt.anrui.base.biz.basedistributorappendix.BaseDistributorAppendixService;
+import com.yxt.anrui.base.biz.basedistributorbank.BaseDistributorBankService;
+import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.JWTUtil;
+import com.yxt.common.core.result.ResultBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 import java.util.Map;
 
+import static cn.hutool.json.XMLTokener.entity;
+
 /**
  * Project: anrui-base(安瑞基础信息模块) <br/>
  * File: BaseDistributorPersonService.java <br/>
@@ -25,6 +50,14 @@ public class BaseDistributorPersonService extends MybatisBaseService<BaseDistrib
 
     @Autowired
     BaseDistributorPersonMapper baseDistributorPersonMapper;
+    @Autowired
+    BaseDistributorService baseDistributorService;
+    @Autowired
+    private FileUploadComponent fileUploadComponent;
+    @Autowired
+    private BaseDistributorAppendixService baseDistributorAppendixService;
+    @Autowired
+    private BaseDistributorBankService baseDistributorBankService;
 
     /**
      * 根据经销商sid删除经销商个人数据
@@ -42,8 +75,121 @@ public class BaseDistributorPersonService extends MybatisBaseService<BaseDistrib
      * @param sid 经销商sid
      * @return
      */
-    public Map<String, Object> details(String sid) {
-        return baseMapper.details(sid);
+    public BaseDistributorPersonVo details(String sid) {
+        BaseDistributorPersonVo baseDistributorPersonVo = baseMapper.details(sid);
+        List<BaseDistributorAppendixVo> baseDistributorAppendixVos = baseDistributorAppendixService.selByLinkSid(sid);
+        List<BaseDistributorBankVo> baseDistributorBankVos = baseDistributorBankService.selByDistributorSid(sid);
+        baseDistributorPersonVo.setBaseDistributorAppendixs(baseDistributorAppendixVos);
+        baseDistributorPersonVo.setBaseDistributorBanks(baseDistributorBankVos);
+        return baseDistributorPersonVo;
     }
 
+    public ResultBean saveAll(BaseDistributorPersonDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        String numCode = dto.getNumCode();
+        List<BaseDistributorAppendixDto> baseDistributorAppendixs = dto.getBaseDistributorAppendixs();
+        List<BaseDistributorBankDto> baseDistributorBanks = dto.getBaseDistributorBanks();
+        BaseDistributorPerson bp = new BaseDistributorPerson();
+        int count = baseDistributorService.selectNumCode(numCode);
+        if (count > 0) {
+            return rb.fail().setMsg("保存失败，身份证号码已存在");
+        }
+        if (dto.getNumCode().length() != 18 && dto.getNumCode().length() != 9) {
+            return ResultBean.fireFail().setMsg("身份证号码应为18位");
+        }
+        //创建基础信息的对象,和数据库对应的实体类
+        ResultBean<String> stringResultBean = baseDistributorService.saveGrDto(dto);
+        String sid = stringResultBean.getData();
+        if (stringResultBean.getSuccess()) {
+
+            //存储个人表信息
+            bp.setCreateBySid(dto.getUserSid());
+            bp.setDistributorSid(sid);//经销商sid
+            bp.setProjectType(dto.getProjectType());//项目类型
+            bp.setProjectTypeValue(dto.getProjectTypeValue());//项目类型Value
+            bp.setDistributorBrand(dto.getDistributorBrand());//经销商品牌
+            bp.setBelongsToVendor(dto.getBelongsToVendor());//所属厂商
+            bp.setProvince(dto.getProvince());//省
+            bp.setCity(dto.getCity());//市
+            bp.setCounty(dto.getCounty());//县
+            bp.setAddressCode(dto.getAddressCode());//省市县code值
+            bp.setRemarks(dto.getRemarks());
+            save(bp);
+        }
+        for (BaseDistributorAppendixDto baseDistributorAppendix : baseDistributorAppendixs) {
+            BaseDistributorAppendix entity = new BaseDistributorAppendix();
+            BeanUtil.copyProperties(baseDistributorAppendix, entity);
+            entity.setCreateBySid(dto.getUserSid());
+            entity.setCreateTime(new Date());
+            String filePath = baseDistributorAppendix.getFilePath();
+            if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
+            }
+            entity.setFilePath(filePath);
+            entity.setLinkSid(sid);
+            baseDistributorAppendixService.save(entity);
+        }
+        for (BaseDistributorBankDto baseDistributorBank : baseDistributorBanks) {
+            BaseDistributorBank entity = new BaseDistributorBank();
+            BeanUtil.copyProperties(baseDistributorBank, entity);
+            entity.setDistributorSid(sid);
+            baseDistributorBankService.save(entity);
+        }
+        return rb.success().setMsg("保存成功");
+    }
+
+    public ResultBean updateAll(BaseDistributorPersonDto dto, String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        //根据个人信息sid查询经销商个人信息
+        BaseDistributorPerson baseDistributorPerson = fetchBySid(sid);
+        if (baseDistributorPerson == null) {
+            return rb.setMsg("该经销商个人不存在");
+        }
+        List<BaseDistributorAppendixDto> baseDistributorAppendixs = dto.getBaseDistributorAppendixs();
+        List<BaseDistributorBankDto> baseDistributorBanks = dto.getBaseDistributorBanks();
+        //修改经销商个人信息
+        BaseDistributorPersonOneDto baseDistributorPersonOneDto = new BaseDistributorPersonOneDto();
+        baseDistributorPersonOneDto.setBelongsToVendor(dto.getBelongsToVendor());
+        baseDistributorPersonOneDto.setCity(dto.getCity());
+        baseDistributorPersonOneDto.setCounty(dto.getCounty());
+        baseDistributorPersonOneDto.setDistributorBrand(dto.getDistributorBrand());
+        baseDistributorPersonOneDto.setProjectType(dto.getProjectType());
+        baseDistributorPersonOneDto.setProvince(dto.getProvince());
+        baseDistributorPersonOneDto.setRemarks(dto.getRemarks());
+        //修改经销商基础信息
+        BaseDistributorDto baseDistributorDto = new BaseDistributorDto();
+        baseDistributorDto.setZipCode(dto.getZipCode());
+        baseDistributorDto.setNumCode(dto.getNumCode());
+        baseDistributorDto.setDistributorName(dto.getDistributorName());
+        baseDistributorDto.setAddress(dto.getAddress());
+        baseDistributorDto.setDistributorType(dto.getDistributorType());
+        baseDistributorDto.setBusinessMobile(dto.getBusinessMobile());
+        int count1 = baseDistributorService.updateBySid(baseDistributorDto.toMap(), baseDistributorPerson.getDistributorSid());
+        int count = updateBySid(baseDistributorPersonOneDto.toMap(), sid);
+        if (count1 == 0 || count == 0) {
+            return rb.setMsg("修改失败");
+        }
+        baseDistributorAppendixService.delByLinkSid(baseDistributorPerson.getDistributorSid());
+        for (BaseDistributorAppendixDto baseDistributorAppendix : baseDistributorAppendixs) {
+            BaseDistributorAppendix entity = new BaseDistributorAppendix();
+            BeanUtil.copyProperties(baseDistributorAppendix, entity);
+            entity.setCreateBySid(dto.getUserSid());
+            entity.setCreateTime(new Date());
+            String filePath = baseDistributorAppendix.getFilePath();
+            if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
+            }
+            entity.setFilePath(filePath);
+            entity.setLinkSid(baseDistributorPerson.getDistributorSid());
+            baseDistributorAppendixService.save(entity);
+        }
+        baseDistributorBankService.delByDistributorSid(baseDistributorPerson.getDistributorSid());
+        for (BaseDistributorBankDto baseDistributorBank : baseDistributorBanks) {
+            BaseDistributorBank entity = new BaseDistributorBank();
+            BeanUtil.copyProperties(baseDistributorBank, entity);
+            entity.setDistributorSid(baseDistributorPerson.getDistributorSid());
+            baseDistributorBankService.save(entity);
+        }
+        return rb.success().setMsg("修改成功");
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorstaff/BaseDistributorStaffMapper.java

@@ -58,4 +58,7 @@ public interface BaseDistributorStaffMapper extends BaseMapper<BaseDistributorSt
      * @return
      */
     List<BaseDistributorStaff> selectBySid(String sid);
+
+    @Select("select * from base_distributor_staff where distributorSid = #{sid}")
+    List<BaseDistributorStaffVo> selbyDistributorSid(String sid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorstaff/BaseDistributorStaffService.java

@@ -74,4 +74,8 @@ public class BaseDistributorStaffService extends MybatisBaseService<BaseDistribu
     public List<BaseDistributorStaff> selectBySid(String sid) {
         return baseMapper.selectBySid(sid);
     }
+
+    public List<BaseDistributorStaffVo> selbyDistributorSid(String sid) {
+        return baseMapper.selbyDistributorSid(sid);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationMapper.java

@@ -37,6 +37,7 @@ import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicat
 import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationVo;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * Project: anrui-base(外采管理) <br/>
@@ -62,4 +63,6 @@ public interface BaseOutsourcingApplicationMapper extends BaseMapper<BaseOutsour
 	BaseOutsourcingApplicationDetailsVo BaseOutsourcingApplicationDetailsVo(String sid);
 
     int selectCountByOrgSid(@Param("billsType") String billsType, @Param("date") String date, @Param("orgSid") String orgSid);
+
+    int updateFlowFiled(Map<String, Object> map);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationMapper.xml

@@ -19,4 +19,16 @@
 		  AND orgSid = #{orgSid}
 		  AND applicationCode LIKE concat(#{billsType}, '%')
     </select>
+
+	<update id="updateFlowFiled">
+		UPDATE base_outsourcing_application
+		SET nodeState=#{nodeState}, nodeSid=#{taskDefKey}
+		<if test="procDefId != null and procDefId != ''">
+			, procDefId=#{procDefId}
+		</if>
+		<if test="procInsId != null and procInsId != ''">
+			, procInstSid=#{procInsId}
+		</if>
+		WHERE sid=#{sid}
+    </update>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationRest.java

@@ -26,6 +26,9 @@
 package com.yxt.anrui.base.biz.baseoutsourcingapplication;
 
 import com.yxt.anrui.base.api.baseoutsourcingapplication.*;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicleVo;
+import com.yxt.anrui.base.api.flow.FlowTaskVo;
+import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -35,6 +38,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * Project: anrui-base(外采管理) <br/>
@@ -56,6 +60,8 @@ public class BaseOutsourcingApplicationRest implements BaseOutsourcingApplicatio
 
 	@Autowired
 	private BaseOutsourcingApplicationService baseOutsourcingApplicationService;
+	@Autowired
+	private BaseVehicleService baseVehicleService;
 
 	@Override
 	@ApiOperation("根据条件分页查询数据的列表")
@@ -86,4 +92,39 @@ public class BaseOutsourcingApplicationRest implements BaseOutsourcingApplicatio
     public ResultBean<BaseOutsourcingApplicationDetailsVo> fetchBySid(@PathVariable("sid") String sid){
 		return baseOutsourcingApplicationService.fetchAllBySid(sid);
 	}
+
+	@Override
+	public ResultBean<BaseVehicleVo> fetchVehicle(String vehicleSid) {
+		return baseVehicleService.fetchVehicle(vehicleSid);
+	}
+
+	@Override
+	public ResultBean submitBaseOutSourcingApplication(SubmitBaseOutSourcingApplicationDto dto) {
+		return baseOutsourcingApplicationService.submitBaseOutSourcingApplication(dto);
+	}
+
+	@Override
+	public ResultBean complete(Map<String, Object> variables) {
+		return baseOutsourcingApplicationService.complete(variables);
+	}
+
+	@Override
+	public ResultBean revokeProcess(String userSid, String businessSid, FlowTaskVo flowTaskVo) {
+		return baseOutsourcingApplicationService.revokeProcess(userSid, businessSid, flowTaskVo);
+	}
+
+	@Override
+	public ResultBean taskReject(String businessSid, FlowTaskVo flowTaskVo) {
+		return baseOutsourcingApplicationService.taskReject(businessSid, flowTaskVo);
+	}
+
+	@Override
+	public ResultBean breakProcess(String businessSid, FlowTaskVo flowTaskVo) {
+		return baseOutsourcingApplicationService.breakProcess(businessSid, flowTaskVo);
+	}
+
+	@Override
+	public ResultBean flowRecord(String procInsId, String deployId) {
+		return baseOutsourcingApplicationService.flowRecord(procInsId, deployId);
+	}
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java

@@ -32,9 +32,18 @@ import com.yxt.anrui.base.api.baseoutsourcingapplication.*;
 import com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicle;
 import com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicleDto;
 import com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicleVo;
+import com.yxt.anrui.base.api.flow.FlowTaskVo;
 import com.yxt.anrui.base.biz.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicleService;
-import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.BusArrearsCarryVehicleApplyPageVo;
+import com.yxt.anrui.base.biz.flow.FlowableService;
+import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
+import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
+import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkDto;
 import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFeign;
+import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFlowStateEnum;
+import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkTypeEnum;
+import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
+import com.yxt.anrui.flowable.api.utils.ProcessStateEnum;
+import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
 import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign;
 import com.yxt.anrui.portal.api.dictcommon.DictCommonVo;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
@@ -89,6 +98,10 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
 	private SysOrganizationFeign sysOrganizationFeign;
 	@Autowired
 	private SysStaffOrgFeign sysStaffOrgFeign;
+	@Autowired
+	private FlowTaskFeign flowTaskFeign;
+	@Autowired
+	private FlowableService flowableService;
 
 	private QueryWrapper<BaseOutsourcingApplication> createQueryWrapper(BaseOutsourcingApplicationQuery query) {
 		// todo: 这里根据具体业务调整查询条件
@@ -99,23 +112,36 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
 		qw.apply(StringUtils.isNotEmpty(applicationStartDate), "date_format (applicationDate,'%Y-%m-%d') >= date_format('" + applicationStartDate + "','%Y-%m-%d')").
 				apply(StringUtils.isNotEmpty(applicationEndDate), "date_format (applicationDate,'%Y-%m-%d') <= date_format('" + applicationEndDate + "','%Y-%m-%d')"
 				);
-		if (StringUtils.isNotBlank(query.getModelSid())) {
-			qw.eq("modelSid", query.getModelSid());
+		if (StringUtils.isNotBlank(query.getModelName())) {
+			qw.like("modelName", query.getModelName());
 		}
 		return qw;
 	}
 	
 	public PagerVo<BaseOutsourcingApplicationVo> listPageVo(PagerQuery<BaseOutsourcingApplicationQuery> pq) {
 		BaseOutsourcingApplicationQuery query = pq.getParams();
+		String staffSid = query.getStaffSid();
+		ResultBean<List<SysStaffOrgVo>> sysStaffOrgListByStaffSid = sysStaffOrgFeign.getSysStaffOrgListByStaffSid(staffSid);
+		List<SysStaffOrgVo> data = sysStaffOrgListByStaffSid.getData();
+		String orgSidPath = "";
+		for (SysStaffOrgVo datum : data) {
+			orgSidPath = datum.getOrgSidPath();
+			String[] split = orgSidPath.split("/");
+			for (String s : split) {
+				ResultBean<SysOrganizationVo> sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(s);
+				SysOrganizationVo data1 = sysOrganizationVoResultBean.getData();
+				Integer isDept = data1.getIsDept();
+				String psid = data1.getPsid();
+				if (isDept == 0 && !psid.equals(0)) {
+					orgSidPath = s;
+					break;
+				}
+			}
+		}
+		query.setUseOrgSid(orgSidPath);
 		QueryWrapper<BaseOutsourcingApplication> qw = createQueryWrapper(query);
 		IPage<BaseOutsourcingApplication> page = PagerUtil.queryToPage(pq);
 		IPage<BaseOutsourcingApplicationVo> pagging = baseMapper.selectPageVo(page, qw);
-		List<BaseOutsourcingApplicationVo> records = pagging.getRecords();
-		for (BaseOutsourcingApplicationVo record : records) {
-			String sid = record.getSid();
-			String nodeState = sysFormLinkFeign.selectStateByBusinessSid(sid).getData().getNodeState();
-			record.setNodeState(nodeState);
-		}
 		PagerVo<BaseOutsourcingApplicationVo> p = PagerUtil.pageToVo(pagging, null);
 		return p;
 	}
@@ -138,7 +164,7 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
 				baseOutsourcingApplicationVehicle.setOutAppSid(sid1);
 				baseOutsourcingApplicationVehicleService.save(baseOutsourcingApplicationVehicle);
 			}
-			return rb.success().setMsg("添加成功");
+			return rb.success().setMsg("添加成功").setData(entity.getSid());
 		}
 		updateBySid(dto,sid);
 		baseOutsourcingApplicationVehicleService.deleteByOutAppSid(sid);
@@ -227,4 +253,212 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
 	public int selectCountByOrgSid(String billsType, String date, String orgSid) {
 		return baseMapper.selectCountByOrgSid(billsType, date, orgSid);
 	}
+
+	public ResultBean submitBaseOutSourcingApplication(SubmitBaseOutSourcingApplicationDto dto) {
+		String orgSid = checkUserOrg(dto.getStaffSid());
+		ResultBean resultBean = saveOrUpdateDto(dto);
+		String  businessSid = resultBean.getData().toString();
+		Map<String, Object> variables = new HashMap<>();
+		variables.put("businessSid", businessSid);
+		variables.put("orgSid", orgSid); //部门sid
+		if (StringUtils.isBlank(dto.getTaskId())) { // 新提交
+			String proDefId = ProcDefEnum.SEALAPPLY.getProDefId();
+			ResultBean resultBean1 = flowableService.businessStart(ProcDefEnum.BASEOUTSOURCINGAPPLICATION.getProDefId(), dto.getUserSid(), variables);
+			if (resultBean1.getSuccess() && resultBean1.getData() != null) {
+				Map<String, String> map = (Map<String, String>) resultBean1.getData();
+				//更新业务表中的流程状态
+				Map<String, Object> paramMap = new HashMap<>();
+				paramMap.put("sid", businessSid);
+				paramMap.put("procDefId", ProcDefEnum.SEALAPPLY.getProDefId());
+				paramMap.put("nodeState", map.get("nodeState"));
+				paramMap.put("procInsId", map.get("procInsId"));
+				paramMap.put("taskDefKey", map.get("taskDefKey"));
+				updateFlowFiled(paramMap);
+			}
+			return resultBean1;
+		} else { // 驳回到发起人后再次提交
+			variables.put("comment", StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交");
+			variables.put("instanceId", dto.getInstanceId());
+			variables.put("taskId", dto.getTaskId());
+			variables.put("userSid", dto.getUserSid());
+			return complete(variables);
+		}
+	}
+
+	/**
+	 * 检查用户是否设置部门
+	 *
+	 * @param staffSid
+	 * @return 返回部门sid
+	 */
+	private String checkUserOrg(String staffSid) {
+		String orgSid = "";
+		ResultBean<String> resultBean = sysStaffOrgFeign.getSysStaffOrgSidListByStaffSid(staffSid);
+		if (resultBean.getSuccess()) {
+			orgSid = resultBean.getData();
+		}
+		return orgSid;
+	}
+
+	/**
+	 * 保存流程业务关联表 数据
+	 *
+	 * @param map
+	 */
+	private void saveSysFormLink(Map<String, String> map) {
+		String sid = map.get("sid");
+		ResultBean resultBean = sysFormLinkFeign.selectByBusinessSid(sid);
+		if (!resultBean.getSuccess()) { // 新增
+			SysFormLinkDto sysFormLinkDto = new SysFormLinkDto();
+			sysFormLinkDto.setBusinessSid(map.get("sid"));
+			sysFormLinkDto.setProcInsId(map.get("procInsId"));
+			sysFormLinkDto.setTaskDefKey(map.get("taskDefKey"));
+			sysFormLinkDto.setNodeState(map.get("nodeState"));
+			sysFormLinkDto.setFormType(SysFormLinkTypeEnum.ORDER_DEPOSIT_VEHICLE.getCode());
+			sysFormLinkDto.setFlowState(Integer.parseInt(SysFormLinkFlowStateEnum.PROCESSING.getCode()));
+			sysFormLinkFeign.save(sysFormLinkDto);
+		} else { // 更新
+			Map<String, Object> updateMap = new HashMap<>();
+			updateMap.put("businessSid", sid);
+			updateMap.put("nodeState", map.get("nodeState"));
+			updateMap.put("taskDefKey", map.get("taskDefKey"));
+			updateMap.put("flowState", SysFormLinkFlowStateEnum.PROCESSING.getCode());
+			sysFormLinkFeign.updateFiled(updateMap);
+		}
+	}
+
+	/**
+	 * 办理
+	 * @param variables
+	 * @return
+	 */
+	public ResultBean complete(Map<String, Object> variables) {
+		BusinessVariables bv= BusinessVariables.builder().build();
+		bv.setDetailUrl("");
+		bv.setHandleUrl("");
+		bv.setFormVariables(variables);
+		ResultBean<com.yxt.anrui.flowable.api.flowtask.FlowTask> resultBean = flowTaskFeign.businessComplete(bv);
+		if (!resultBean.getSuccess()) {
+			return resultBean;
+		}
+		String nodeState = "";
+		String taskDefKey = "";
+		Map<String, Object> paramMap = new HashMap<>();
+		paramMap.put("sid", variables.get("businessSid").toString());
+		if (resultBean.getData() != null) {
+			ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(resultBean.getData().getProcInsId());
+			if (listResultBean.getSuccess() && listResultBean.getData() != null && listResultBean.getData().size() != 0) {
+				nodeState = listResultBean.getData().get(0).getName_();
+				taskDefKey = listResultBean.getData().get(0).getTask_def_key_();
+			} else {
+				nodeState = ProcessStateEnum.FINISHED.getStateName();
+				taskDefKey = "Event_end";
+				paramMap.put("flowState", SysFormLinkFlowStateEnum.FINISH.getCode());
+			}
+		}
+		paramMap.put("nodeState", nodeState);
+		paramMap.put("taskDefKey", taskDefKey);
+		updateFlowFiled(paramMap);
+		return resultBean;
+	}
+
+	/**
+	 * 更新流程相关的状态
+	 * @param map
+	 * @return
+	 */
+	private int updateFlowFiled(Map<String, Object> map) {
+		return baseMapper.updateFlowFiled(map);
+	}
+
+	/**
+	 * 撤回
+	 * @param userSid
+	 * @param businessSid
+	 * @param flowTaskVo
+	 * @return
+	 */
+	public ResultBean revokeProcess(String userSid, String businessSid, FlowTaskVo flowTaskVo) {
+		com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl=new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo();
+		BeanUtil.copyProperties(flowTaskVo,fl);
+		fl.setUserSid(userSid);
+		ResultBean<List<LatestTaskVo>> resultBean = flowTaskFeign.revokeProcess(fl);
+		if (!resultBean.getSuccess()) {
+			return resultBean;
+		}
+		String nodeState = resultBean.getData().get(0).getName_();
+		String taskDefKey = resultBean.getData().get(0).getTask_def_key_();
+		String incomingSourceRef = resultBean.getData().get(0).getIncomingSourceRef();
+		Map<String, Object> paramMap = new HashMap<>();
+		paramMap.put("sid", businessSid);
+		if (incomingSourceRef.contains("start")) {
+			paramMap.put("nodeState", SysFormLinkFlowStateEnum.UNCOMMITTED.getState());
+			paramMap.put("taskDefKey", taskDefKey);
+			paramMap.put("flowState", SysFormLinkFlowStateEnum.UNCOMMITTED.getCode());
+		} else {
+			paramMap.put("nodeState",nodeState );
+			paramMap.put("taskDefKey",taskDefKey );
+		}
+		updateFlowFiled(paramMap);
+		return resultBean;
+	}
+
+	/**
+	 * 驳回
+	 * @param businessSid
+	 * @param flowTaskVo
+	 * @return
+	 */
+	public ResultBean taskReject(String businessSid, FlowTaskVo flowTaskVo) {
+		com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl=new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo();
+		BeanUtil.copyProperties(flowTaskVo,fl);
+		ResultBean<List<LatestTaskVo>> resultBean = flowTaskFeign.taskReject(fl);
+		if (!resultBean.getSuccess()) {
+			return resultBean;
+		}
+		String nodeState = resultBean.getData().get(0).getName_();
+		String taskDefKey = resultBean.getData().get(0).getTask_def_key_();
+		String incomingSourceRef = resultBean.getData().get(0).getIncomingSourceRef();
+		Map<String, Object> paramMap = new HashMap<>();
+		paramMap.put("sid", businessSid);
+		paramMap.put("nodeState", nodeState);
+		paramMap.put("taskDefKey", taskDefKey);
+		if (incomingSourceRef.contains("start")) {
+			paramMap.put("flowState", SysFormLinkFlowStateEnum.REJECT.getCode());
+		}
+		updateFlowFiled(paramMap);
+		return resultBean;
+	}
+
+	/**
+	 * 终止流程
+	 * @param businessSid
+	 * @param flowTaskVo
+	 * @return
+	 */
+	public ResultBean breakProcess(String businessSid, FlowTaskVo flowTaskVo) {
+		com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl=new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo();
+		BeanUtil.copyProperties(flowTaskVo,fl);
+		ResultBean resultBean = flowTaskFeign.breakProcess(fl);
+		if (!resultBean.getSuccess()) {
+			return resultBean;
+		}
+		Map<String, Object> paramMap = new HashMap<>();
+		paramMap.put("sid", businessSid);
+		paramMap.put("nodeState", String.valueOf(resultBean.getData()));
+		paramMap.put("taskDefKey", "Event_end");
+		paramMap.put("flowState", SysFormLinkFlowStateEnum.BREAK.getCode());
+		updateFlowFiled(paramMap);
+		return resultBean;
+	}
+
+	/**
+	 * 流程历史流转记录
+	 * @param procInsId
+	 * @param deployId
+	 * @return
+	 */
+	public ResultBean flowRecord(String procInsId, String deployId) {
+		return  flowTaskFeign.businessFlowRecord(procInsId,deployId);
+	}
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepostprice/BasePostPriceMapper.java

@@ -26,14 +26,15 @@
 package com.yxt.anrui.base.biz.basepostprice;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.base.api.basepostprice.BaseOrderPostPriceVo;
+import com.yxt.anrui.base.api.basepostprice.BasePostPrice;
+import com.yxt.anrui.base.api.basepostprice.BasePostPriceVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
-import com.yxt.anrui.base.api.basepostprice.BasePostPrice;
-import com.yxt.anrui.base.api.basepostprice.BasePostPriceVo;
 
 import java.util.List;
 
@@ -53,13 +54,15 @@ import java.util.List;
 @Mapper
 public interface BasePostPriceMapper extends BaseMapper<BasePostPrice> {
 
-	//@Update("update base_post_price set name=#{msg} where id=#{id}")
-	//IPage<BasePostPriceVo> voPage(IPage<BasePostPrice> page, @Param(Constants.WRAPPER) QueryWrapper<BasePostPrice> qw);
-	
-	IPage<BasePostPriceVo> selectPageVo(IPage<BasePostPrice> page, @Param(Constants.WRAPPER) Wrapper<BasePostPrice> qw);
-	
-	List<BasePostPriceVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BasePostPrice> qw);
-	
-	@Select("select * from base_post_price")
-	List<BasePostPriceVo> selectListVo();
+    //@Update("update base_post_price set name=#{msg} where id=#{id}")
+    //IPage<BasePostPriceVo> voPage(IPage<BasePostPrice> page, @Param(Constants.WRAPPER) QueryWrapper<BasePostPrice> qw);
+
+    IPage<BasePostPriceVo> selectPageVo(IPage<BasePostPrice> page, @Param(Constants.WRAPPER) Wrapper<BasePostPrice> qw);
+
+    List<BasePostPriceVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BasePostPrice> qw);
+
+    @Select("select * from base_post_price")
+    List<BasePostPriceVo> selectListVo();
+
+    BaseOrderPostPriceVo selectPostPrice(@Param("brandSid") String brandSid, @Param("roleSid") String roleSid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepostprice/BasePostPriceMapper.xml

@@ -1,13 +1,28 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yxt.anrui.base.biz.basepostprice.BasePostPriceMapper">
-<!--    <where> ${ew.sqlSegment} </where>-->
-<!--    ${ew.customSqlSegment} -->
-	<select id="selectPageVo" resultType="com.yxt.anrui.base.api.basepostprice.BasePostPriceVo">
-		SELECT * FROM base_post_price <where> ${ew.sqlSegment} </where>
-	</select>
-	
-	<select id="selectListAllVo" resultType="com.yxt.anrui.base.api.basepostprice.BasePostPriceVo">
-		SELECT * FROM base_post_price <where> ${ew.sqlSegment} </where>
-	</select>
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.anrui.base.api.basepostprice.BasePostPriceVo">
+        SELECT *
+        FROM base_post_price
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="selectListAllVo" resultType="com.yxt.anrui.base.api.basepostprice.BasePostPriceVo">
+        SELECT *
+        FROM base_post_price
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="selectPostPrice" resultType="com.yxt.anrui.base.api.basepostprice.BaseOrderPostPriceVo">
+        select price
+        from base_post_price
+        where brandSid = #{brandSid}
+          and roleSid = #{roleSid}
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepostprice/BasePostPriceRest.java

@@ -25,6 +25,7 @@
  *********************************************************/
 package com.yxt.anrui.base.biz.basepostprice;
 
+import com.yxt.anrui.base.api.basepostprice.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -33,14 +34,6 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-import com.yxt.anrui.base.api.basepostprice.BasePostPrice;
-import com.yxt.anrui.base.api.basepostprice.BasePostPriceQuery;
-import com.yxt.anrui.base.api.basepostprice.BasePostPriceVo;
-import com.yxt.anrui.base.api.basepostprice.BasePostPriceDetailsVo;
-import com.yxt.anrui.base.api.basepostprice.BasePostPriceDto;
-import com.yxt.anrui.base.api.basepostprice.BasePostPriceFeign;
-
 /**
  * Project: anrui-base(基础信息) <br/>
  * File: BasePostPriceFeignFallback.java <br/>
@@ -97,4 +90,9 @@ public class BasePostPriceRest implements BasePostPriceFeign {
 		BasePostPriceDetailsVo vo = basePostPriceService.fetchDetailsVoBySid(sid);
 		return rb.success().setData(vo);
 	}
+
+	@Override
+	public ResultBean<BaseOrderPostPriceVo> selectPostPrice(BaseOrderPostPriceQuery query) {
+		return basePostPriceService.selectPostPrice(query);
+	}
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepostprice/BasePostPriceService.java

@@ -28,23 +28,15 @@ package com.yxt.anrui.base.biz.basepostprice;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.apache.commons.lang3.StringUtils;
+import com.yxt.anrui.base.api.basepostprice.*;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.anrui.base.api.basepostprice.BasePostPrice;
-import com.yxt.anrui.base.api.basepostprice.BasePostPriceQuery;
-import com.yxt.anrui.base.api.basepostprice.BasePostPriceVo;
-import com.yxt.anrui.base.api.basepostprice.BasePostPriceDetailsVo;
-import com.yxt.anrui.base.api.basepostprice.BasePostPriceDto;
-import com.yxt.anrui.base.api.basepostprice.BasePostPriceFeign;
-
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-
 /**
  * Project: anrui-base(基础信息) <br/>
  * File: BasePostPriceService.java <br/>
@@ -60,51 +52,59 @@ import java.util.List;
  */
 @Service
 public class BasePostPriceService extends MybatisBaseService<BasePostPriceMapper, BasePostPrice> {
-	private QueryWrapper<BasePostPrice> createQueryWrapper(BasePostPriceQuery query) {
-		// todo: 这里根据具体业务调整查询条件
-		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
-		QueryWrapper<BasePostPrice> qw = new QueryWrapper<>();
-		return qw;
-	}
-	
-	public PagerVo<BasePostPriceVo> listPageVo(PagerQuery<BasePostPriceQuery> pq) {
-		BasePostPriceQuery query = pq.getParams();
-		QueryWrapper<BasePostPrice> qw = createQueryWrapper(query);
-		IPage<BasePostPrice> page = PagerUtil.queryToPage(pq);
-		IPage<BasePostPriceVo> pagging = baseMapper.selectPageVo(page, qw);
-		PagerVo<BasePostPriceVo> p = PagerUtil.pageToVo(pagging, null);
-		return p;
-	}
-	
-	public void saveOrUpdateDto(BasePostPriceDto dto){
+    private QueryWrapper<BasePostPrice> createQueryWrapper(BasePostPriceQuery query) {
+        // todo: 这里根据具体业务调整查询条件
+        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+        QueryWrapper<BasePostPrice> qw = new QueryWrapper<>();
+        return qw;
+    }
+
+    public PagerVo<BasePostPriceVo> listPageVo(PagerQuery<BasePostPriceQuery> pq) {
+        BasePostPriceQuery query = pq.getParams();
+        QueryWrapper<BasePostPrice> qw = createQueryWrapper(query);
+        IPage<BasePostPrice> page = PagerUtil.queryToPage(pq);
+        IPage<BasePostPriceVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<BasePostPriceVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public void saveOrUpdateDto(BasePostPriceDto dto) {
         String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
             this.insertByDto(dto);
-            return; 
-        } 
-		this.updateByDto(dto);
-	}
-	
-	public void insertByDto(BasePostPriceDto dto){
-		BasePostPrice entity = new BasePostPrice();
-		BeanUtil.copyProperties(dto, entity, "id", "sid");
-		baseMapper.insert(entity);
-	}
-	
-	public void updateByDto(BasePostPriceDto dto){
-          String dtoSid = dto.getSid();
+            return;
+        }
+        this.updateByDto(dto);
+    }
+
+    public void insertByDto(BasePostPriceDto dto) {
+        BasePostPrice entity = new BasePostPrice();
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.insert(entity);
+    }
+
+    public void updateByDto(BasePostPriceDto dto) {
+        String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
             return;
-        } 
-		BasePostPrice entity = fetchBySid(dtoSid);
-		BeanUtil.copyProperties(dto, entity, "id", "sid");
-		baseMapper.updateById(entity);
-	}
-	
-	public BasePostPriceDetailsVo fetchDetailsVoBySid(String sid){
-		BasePostPrice entity = fetchBySid(sid);
-		BasePostPriceDetailsVo vo = new BasePostPriceDetailsVo();
-		BeanUtil.copyProperties(entity, vo);
-		return vo;
-	}
+        }
+        BasePostPrice entity = fetchBySid(dtoSid);
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.updateById(entity);
+    }
+
+    public BasePostPriceDetailsVo fetchDetailsVoBySid(String sid) {
+        BasePostPrice entity = fetchBySid(sid);
+        BasePostPriceDetailsVo vo = new BasePostPriceDetailsVo();
+        BeanUtil.copyProperties(entity, vo);
+        return vo;
+    }
+
+    public ResultBean<BaseOrderPostPriceVo> selectPostPrice(BaseOrderPostPriceQuery query) {
+        ResultBean<BaseOrderPostPriceVo> rb = ResultBean.fireFail();
+        String brandSid = query.getBrandSid();
+        String roleSid = query.getRoleSid();
+        BaseOrderPostPriceVo vo = baseMapper.selectPostPrice(brandSid,roleSid);
+        return rb.success().setData(vo);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java

@@ -10,6 +10,7 @@ import com.yxt.anrui.base.api.basevehicle.AppPurchaseDetailsVo;
 import com.yxt.common.core.result.ResultBean;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
@@ -237,7 +238,6 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
      * 手机端查询不本公司的现车，排产车
      *
      * @param modelSid
-     * @param sid
      * @return
      */
     List<AppMoreConfigVo> getCompanyModelList(@Param("modelSid") String modelSid, @Param("useOrg") String useOrg);
@@ -314,4 +314,6 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
     IPage<BaseVehicleActualVo> vehicleActualPageList(IPage<BaseVehicleActualVo> page, @Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw);
 
     IPage<PcBaseVehicleOrderVo> selectVo(IPage<BaseVehicle> page, @Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw);
+
+    BaseVehicleVo fetchVehicle(QueryWrapper<BaseVehicleVo> qw);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml

@@ -660,4 +660,9 @@
             order by isFictitious desc
         </where>
     </select>
+
+    <select id="fetchVehicle" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicleVo">
+        SELECT * FROM base_vehicle
+                ${ew.customSqlSegment}
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@@ -17,6 +17,8 @@ import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositVehicleQuer
 import com.yxt.anrui.portal.api.sysorganization.SysOrganization;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.scm.api.scmvehiclereturndetails.ScmVehicleReturnDetailsFeign;
 import com.yxt.common.base.config.component.FileUploadComponent;
@@ -51,32 +53,17 @@ import java.util.Map;
 public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, BaseVehicle> {
 
     @Autowired
-    private SysUserFeign sysUserFeign;
-
+    private SysStaffOrgFeign sysStaffOrgFeign;
     @Autowired
     private SysOrganizationFeign sysOrganizationFeign;
-
     @Autowired
     private BaseModelConfigService baseModelConfigService;
-
-    @Autowired
-    private BaseModelSzconfigService baseModelSzconfigService;
-
-    @Autowired
-    private BaseTrailerService baseTrailerService;
-
     @Autowired
     private CommonAppendixService commonAppendixService;
-
     @Autowired
     private BaseVehicleAppendixService baseVehicleAppendixService;
-
     @Autowired
     private FileUploadComponent fileUploadComponent;
-
-    @Autowired
-    private ScmVehicleReturnDetailsFeign scmVehicleReturnDetailsFeign;
-
     @Autowired
     private PcBusMainDepositFeign pcBusMainDepositFeign;
 
@@ -1187,4 +1174,26 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         }
         return qw;
     }
+
+    public ResultBean<BaseVehicleVo> fetchVehicle(String vehicleSid) {
+        ResultBean rb = ResultBean.fireFail();
+        QueryWrapper<BaseVehicleVo> qw = vehicleActualWrapper1(vehicleSid);
+        BaseVehicleVo baseVehicleVo = baseMapper.fetchVehicle(qw);
+        return rb.success().setData(baseVehicleVo);
+    }
+
+    private QueryWrapper<BaseVehicleVo> vehicleActualWrapper1(String vehicleSid) {
+        QueryWrapper<BaseVehicleVo> qw = new QueryWrapper<>();
+
+        if (StringUtils.isNotBlank(vehicleSid)){
+            String[] split = vehicleSid.split(",");
+            for (String s : split) {
+                qw.ne("sid",s);
+            }
+        }
+
+        qw.eq("vehicleState",0005);
+        qw.eq("lockedState",03);
+        return qw;
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.xml

@@ -333,6 +333,7 @@
         SELECT DISTINCT
         bm.sid,
         bm.brandName,
+        bm.carBrand as brandSid,
         bm.vehicleAlias,
         bm.vehicleVersionValue,
         bm.fuelTypeValue,

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclepolicy/BaseVehiclePolicyMapper.java

@@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.base.api.basevehiclepolicy.BaseVehiclePriceVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -53,13 +54,21 @@ import java.util.List;
 @Mapper
 public interface BaseVehiclePolicyMapper extends BaseMapper<BaseVehiclePolicy> {
 
-	//@Update("update base_vehicle_policy set name=#{msg} where id=#{id}")
-	//IPage<BaseVehiclePolicyVo> voPage(IPage<BaseVehiclePolicy> page, @Param(Constants.WRAPPER) QueryWrapper<BaseVehiclePolicy> qw);
-	
-	IPage<BaseVehiclePolicyVo> selectPageVo(IPage<BaseVehiclePolicy> page, @Param(Constants.WRAPPER) Wrapper<BaseVehiclePolicy> qw);
-	
-	List<BaseVehiclePolicyVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BaseVehiclePolicy> qw);
-	
-	@Select("select * from base_vehicle_policy")
-	List<BaseVehiclePolicyVo> selectListVo();
+    //@Update("update base_vehicle_policy set name=#{msg} where id=#{id}")
+    //IPage<BaseVehiclePolicyVo> voPage(IPage<BaseVehiclePolicy> page, @Param(Constants.WRAPPER) QueryWrapper<BaseVehiclePolicy> qw);
+
+    IPage<BaseVehiclePolicyVo> selectPageVo(IPage<BaseVehiclePolicy> page, @Param(Constants.WRAPPER) Wrapper<BaseVehiclePolicy> qw);
+
+    List<BaseVehiclePolicyVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BaseVehiclePolicy> qw);
+
+    @Select("select * from base_vehicle_policy")
+    List<BaseVehiclePolicyVo> selectListVo();
+
+    /**
+     * 根据车辆sid查询销售政策的优惠金额
+     *
+     * @param vehicleSid 车辆sid
+     * @return
+     */
+    BaseVehiclePriceVo selectPrice(String vehicleSid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclepolicy/BaseVehiclePolicyMapper.xml

@@ -1,13 +1,28 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yxt.anrui.base.biz.basevehiclepolicy.BaseVehiclePolicyMapper">
-<!--    <where> ${ew.sqlSegment} </where>-->
-<!--    ${ew.customSqlSegment} -->
-	<select id="selectPageVo" resultType="com.yxt.anrui.base.api.basevehiclepolicy.BaseVehiclePolicyVo">
-		SELECT * FROM base_vehicle_policy <where> ${ew.sqlSegment} </where>
-	</select>
-	
-	<select id="selectListAllVo" resultType="com.yxt.anrui.base.api.basevehiclepolicy.BaseVehiclePolicyVo">
-		SELECT * FROM base_vehicle_policy <where> ${ew.sqlSegment} </where>
-	</select>
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.anrui.base.api.basevehiclepolicy.BaseVehiclePolicyVo">
+        SELECT *
+        FROM base_vehicle_policy
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="selectListAllVo" resultType="com.yxt.anrui.base.api.basevehiclepolicy.BaseVehiclePolicyVo">
+        SELECT *
+        FROM base_vehicle_policy
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="selectPrice" resultType="com.yxt.anrui.base.api.basevehiclepolicy.BaseVehiclePriceVo">
+        select bd.discountMoney
+        from base_vehicle_policy bv
+                 left join base_discountpackage bd on bd.sid = bv.policySid
+        where vehicleSid = #{vehicleSid}
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclepolicy/BaseVehiclePolicyRest.java

@@ -25,22 +25,16 @@
  *********************************************************/
 package com.yxt.anrui.base.biz.basevehiclepolicy;
 
+import com.yxt.anrui.base.api.basevehiclepolicy.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-import com.yxt.anrui.base.api.basevehiclepolicy.BaseVehiclePolicy;
-import com.yxt.anrui.base.api.basevehiclepolicy.BaseVehiclePolicyQuery;
-import com.yxt.anrui.base.api.basevehiclepolicy.BaseVehiclePolicyVo;
-import com.yxt.anrui.base.api.basevehiclepolicy.BaseVehiclePolicyDetailsVo;
-import com.yxt.anrui.base.api.basevehiclepolicy.BaseVehiclePolicyDto;
-import com.yxt.anrui.base.api.basevehiclepolicy.BaseVehiclePolicyFeign;
-
 /**
  * Project: anrui-base(基础信息) <br/>
  * File: BaseVehiclePolicyFeignFallback.java <br/>
@@ -55,46 +49,51 @@ import com.yxt.anrui.base.api.basevehiclepolicy.BaseVehiclePolicyFeign;
  * @since 1.0
  */
 @Api(tags = "车辆与销售政策关联表")
-@RestController("com.yxt.anrui.base.biz.basevehiclepolicy.BaseVehiclePolicyRest")
+@Controller
 @RequestMapping("v1/basevehiclepolicy")
 public class BaseVehiclePolicyRest implements BaseVehiclePolicyFeign {
 
-	@Autowired
-	private BaseVehiclePolicyService baseVehiclePolicyService;
+    @Autowired
+    private BaseVehiclePolicyService baseVehiclePolicyService;
 
-	@Override
-	@ApiOperation("根据条件分页查询数据的列表")
-	@PostMapping("/listPage")
-	public ResultBean<PagerVo<BaseVehiclePolicyVo>> listPage(@RequestBody PagerQuery<BaseVehiclePolicyQuery> pq){
-		ResultBean rb = ResultBean.fireFail();
-		PagerVo<BaseVehiclePolicyVo> pv = baseVehiclePolicyService.listPageVo(pq);
-		return rb.success().setData(pv);
-	}
+    @Override
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<BaseVehiclePolicyVo>> listPage(@RequestBody PagerQuery<BaseVehiclePolicyQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<BaseVehiclePolicyVo> pv = baseVehiclePolicyService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
 
-	@Override
-	@ApiOperation("新增或修改")
-	@PostMapping("/save")
-	public ResultBean save(@RequestBody BaseVehiclePolicyDto dto){
-		ResultBean rb = ResultBean.fireFail();
-		baseVehiclePolicyService.saveOrUpdateDto(dto);
-		return rb.success();
-	}
+    @Override
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody BaseVehiclePolicyDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        baseVehiclePolicyService.saveOrUpdateDto(dto);
+        return rb.success();
+    }
 
-	@Override
-	@ApiOperation("根据sid批量删除")
+    @Override
+    @ApiOperation("根据sid批量删除")
     @PostMapping("/delBySids")
-    public ResultBean delBySids(@RequestBody String[] sids){
-		ResultBean rb = ResultBean.fireFail();
-		baseVehiclePolicyService.delBySids(sids);
-		return rb.success();
-	}
+    public ResultBean delBySids(@RequestBody String[] sids) {
+        ResultBean rb = ResultBean.fireFail();
+        baseVehiclePolicyService.delBySids(sids);
+        return rb.success();
+    }
 
-	@Override
-	@ApiOperation("根据SID获取一条记录")
+    @Override
+    @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
-    public ResultBean<BaseVehiclePolicyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
-		ResultBean rb = ResultBean.fireFail();
-		BaseVehiclePolicyDetailsVo vo = baseVehiclePolicyService.fetchDetailsVoBySid(sid);
-		return rb.success().setData(vo);
-	}
+    public ResultBean<BaseVehiclePolicyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        BaseVehiclePolicyDetailsVo vo = baseVehiclePolicyService.fetchDetailsVoBySid(sid);
+        return rb.success().setData(vo);
+    }
+
+    @Override
+    public ResultBean<BaseVehiclePriceVo> selectPrice(String vehicleSid) {
+        return baseVehiclePolicyService.selectPrice(vehicleSid);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclepolicy/BaseVehiclePolicyService.java

@@ -28,23 +28,15 @@ package com.yxt.anrui.base.biz.basevehiclepolicy;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.apache.commons.lang3.StringUtils;
+import com.yxt.anrui.base.api.basevehiclepolicy.*;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.anrui.base.api.basevehiclepolicy.BaseVehiclePolicy;
-import com.yxt.anrui.base.api.basevehiclepolicy.BaseVehiclePolicyQuery;
-import com.yxt.anrui.base.api.basevehiclepolicy.BaseVehiclePolicyVo;
-import com.yxt.anrui.base.api.basevehiclepolicy.BaseVehiclePolicyDetailsVo;
-import com.yxt.anrui.base.api.basevehiclepolicy.BaseVehiclePolicyDto;
-import com.yxt.anrui.base.api.basevehiclepolicy.BaseVehiclePolicyFeign;
-
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-
 /**
  * Project: anrui-base(基础信息) <br/>
  * File: BaseVehiclePolicyService.java <br/>
@@ -60,51 +52,63 @@ import java.util.List;
  */
 @Service
 public class BaseVehiclePolicyService extends MybatisBaseService<BaseVehiclePolicyMapper, BaseVehiclePolicy> {
-	private QueryWrapper<BaseVehiclePolicy> createQueryWrapper(BaseVehiclePolicyQuery query) {
-		// todo: 这里根据具体业务调整查询条件
-		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
-		QueryWrapper<BaseVehiclePolicy> qw = new QueryWrapper<>();
-		return qw;
-	}
-	
-	public PagerVo<BaseVehiclePolicyVo> listPageVo(PagerQuery<BaseVehiclePolicyQuery> pq) {
-		BaseVehiclePolicyQuery query = pq.getParams();
-		QueryWrapper<BaseVehiclePolicy> qw = createQueryWrapper(query);
-		IPage<BaseVehiclePolicy> page = PagerUtil.queryToPage(pq);
-		IPage<BaseVehiclePolicyVo> pagging = baseMapper.selectPageVo(page, qw);
-		PagerVo<BaseVehiclePolicyVo> p = PagerUtil.pageToVo(pagging, null);
-		return p;
-	}
-	
-	public void saveOrUpdateDto(BaseVehiclePolicyDto dto){
+    private QueryWrapper<BaseVehiclePolicy> createQueryWrapper(BaseVehiclePolicyQuery query) {
+        // todo: 这里根据具体业务调整查询条件
+        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+        QueryWrapper<BaseVehiclePolicy> qw = new QueryWrapper<>();
+        return qw;
+    }
+
+    public PagerVo<BaseVehiclePolicyVo> listPageVo(PagerQuery<BaseVehiclePolicyQuery> pq) {
+        BaseVehiclePolicyQuery query = pq.getParams();
+        QueryWrapper<BaseVehiclePolicy> qw = createQueryWrapper(query);
+        IPage<BaseVehiclePolicy> page = PagerUtil.queryToPage(pq);
+        IPage<BaseVehiclePolicyVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<BaseVehiclePolicyVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public void saveOrUpdateDto(BaseVehiclePolicyDto dto) {
         String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
             this.insertByDto(dto);
-            return; 
-        } 
-		this.updateByDto(dto);
-	}
-	
-	public void insertByDto(BaseVehiclePolicyDto dto){
-		BaseVehiclePolicy entity = new BaseVehiclePolicy();
-		BeanUtil.copyProperties(dto, entity, "id", "sid");
-		baseMapper.insert(entity);
-	}
-	
-	public void updateByDto(BaseVehiclePolicyDto dto){
-          String dtoSid = dto.getSid();
+            return;
+        }
+        this.updateByDto(dto);
+    }
+
+    public void insertByDto(BaseVehiclePolicyDto dto) {
+        BaseVehiclePolicy entity = new BaseVehiclePolicy();
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.insert(entity);
+    }
+
+    public void updateByDto(BaseVehiclePolicyDto dto) {
+        String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
             return;
-        } 
-		BaseVehiclePolicy entity = fetchBySid(dtoSid);
-		BeanUtil.copyProperties(dto, entity, "id", "sid");
-		baseMapper.updateById(entity);
-	}
-	
-	public BaseVehiclePolicyDetailsVo fetchDetailsVoBySid(String sid){
-		BaseVehiclePolicy entity = fetchBySid(sid);
-		BaseVehiclePolicyDetailsVo vo = new BaseVehiclePolicyDetailsVo();
-		BeanUtil.copyProperties(entity, vo);
-		return vo;
-	}
+        }
+        BaseVehiclePolicy entity = fetchBySid(dtoSid);
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.updateById(entity);
+    }
+
+    public BaseVehiclePolicyDetailsVo fetchDetailsVoBySid(String sid) {
+        BaseVehiclePolicy entity = fetchBySid(sid);
+        BaseVehiclePolicyDetailsVo vo = new BaseVehiclePolicyDetailsVo();
+        BeanUtil.copyProperties(entity, vo);
+        return vo;
+    }
+
+    /**
+     * 根据车辆sid查询销售政策的优惠金额
+     *
+     * @param vehicleSid 车辆sid
+     * @return
+     */
+    public ResultBean<BaseVehiclePriceVo> selectPrice(String vehicleSid) {
+        ResultBean<BaseVehiclePriceVo> rb = ResultBean.fireFail();
+        BaseVehiclePriceVo vo = baseMapper.selectPrice(vehicleSid);
+        return rb.success().setData(vo);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml

@@ -209,7 +209,7 @@
     </select>
 
     <select id="selectO" resultType="com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelVo">
-        select bvc.guidedPrice, bm.modelName, bmc.otherConfig
+        select bvc.guidedPrice, bm.modelName, bmc.otherConfig,bm.carBrand as brandSid
         from base_vehmodel_config bvc
                  left join base_vehicle_model bm on bvc.modelSid = bm.sid
                  left join base_model_config bmc on bvc.configurationItemsSid = bmc.sid

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailService.java

@@ -130,6 +130,13 @@ public class BusVehicleApplyDetailService extends MybatisBaseService<BusVehicleA
 		QueryWrapper<BusVehicleApply> qw = applyPageWrapper(query);
 		IPage<BusVehicleApply> page = PagerUtil.queryToPage(pagerQuery);
 		IPage<BusVehicleApplyListVo> pagging = baseMapper.applyPage(page, qw);
+		List<BusVehicleApplyListVo> list = pagging.getRecords();
+		for (int i = 0; i <list.size() ; i++) {
+			int platformNo = list.get(i).getPlatformNo();
+			int lockingNum = list.get(i).getLockingNum();
+			int useNum = platformNo-lockingNum;
+			list.get(i).setUseNum(useNum);
+		}
 		PagerVo<BusVehicleApplyListVo> p = PagerUtil.pageToVo(pagging, null);
 		return p;
 	}
@@ -143,9 +150,9 @@ public class BusVehicleApplyDetailService extends MybatisBaseService<BusVehicleA
         QueryWrapper<BusVehicleApply> qw = new QueryWrapper<>();
 		if (query != null) {
 			//车型sid
-			qw.eq("bd.modelSid", query.getModelSid());
+			qw.eq("bd.vehicleSid", query.getModelSid());
 			//配置sid
-			qw.eq("bd.modelConfigSid", query.getConfigSid());
+			qw.eq("bd.configSid", query.getConfigSid());
 			if (query.getSidList().size() > 0) {
 				qw.notIn("bo.sid", query.getSidList());
 			}

anrui-base/anrui-base-ui/src/api/business/beiAn.js

@@ -13,7 +13,6 @@ export function pagerList(data) {
 export function SaveListFaRen(data) {
   return request({
     url: '/base/v1/basedistributorappendix/save',
-    data,
     method: 'post',
     data: data,
     headers: {
@@ -61,7 +60,8 @@ export function uploadFile(data) {
  // 移除
  export function deleteFilesOss(data) {
    return request({
-     url: '/base/v1/basedistributorappendix/deleteFilesOss',data,
+     url: '/base/v1/basedistributorappendix/deleteFilesOss',
+     data,
      method: 'post',
      headers: {
        'Content-Type': 'multipart/form-data'
@@ -69,10 +69,10 @@ export function uploadFile(data) {
    })
  }
 
-//下载
+// 下载
  export function postDownload(data) {
    return request({
-     url: '/base/v1/basedistributorappendix/download?path='+data,
+     url: '/base/v1/basedistributorappendix/download?path=' + data,
      method: 'post',
      responseType: 'blob',
      headers: {
@@ -80,3 +80,15 @@ export function uploadFile(data) {
      }
    })
  }
+
+// 上传文件(接口返回文件的名称、类型、大小、全路径等信息)
+export function upload(data) {
+  return request({
+    url: '/base/file/upload',
+    data,
+    method: 'post',
+    headers: {
+      'Content-Type': 'multipart/form-data'
+    }
+  })
+}

anrui-base/anrui-base-ui/src/api/jichuxinxi/baseaffiliatcompany.js

@@ -15,7 +15,7 @@ export function pagerList(data) {
 // 添加
 export function SaveList(data) {
     return request({
-        url: '/base/v1/baseaffiliatcompany/save', data,
+        url: '/base/v1/baseaffiliatcompany/save',
         method: 'post',
         data: data,
         headers: { 'Content-Type': 'application/json' }
@@ -33,7 +33,7 @@ export function Update(data) {
 // 删除
 export function deleteBySids(data) {
     return request({
-        url: '/base/v1/baseaffiliatcompany/deleteBySids?sidsList='+ data,
+        url: '/base/v1/baseaffiliatcompany/deleteBySids?sidsList=' + data,
         method: 'DELETE',
         data: qs.stringify(data)
     })
@@ -42,7 +42,7 @@ export function deleteBySids(data) {
 export function details(data) {
     return request({
         url: 'base/v1/baseaffiliatcompany/fetchSid/' + data,
-        method: 'get',
+        method: 'get'
     })
 }
 // 文件上传接
@@ -92,9 +92,9 @@ export function download(data) {
 // 移除
 export function deleteFilesOss(data) {
     return request({
-        url: '/base/v1/baseaffiliatcompanyappendix/deleteFilesOss', data,
+        url: '/base/v1/baseaffiliatcompanyappendix/deleteFilesOss',
         method: 'post',
-        data: qs.stringify(data),
+        data: qs.stringify(data)
     })
 }
 

anrui-base/anrui-base-ui/src/components/uploadFile/multifileUpload.vue

@@ -0,0 +1,87 @@
+<template>
+  <div>
+    <!-- 此上传模板支持多文件上传-->
+    <el-upload action="" :data="datas" :accept="accept" :on-change="handleChange" :on-remove="handleRemove" :file-list="fileList_FuJian" :http-request="uploadSectionFile" :show-file-list="showfile" multiple>
+      <el-button size="small" type="primary">选择文件</el-button>
+      <div slot="tip" v-show="reminder == true" class="el-upload__tip">单个文件大小不允许超过100M,支持上传文件类型: {{ accept }}</div>
+    </el-upload>
+  </div>
+</template>
+
+<script>
+import { upload } from '@/api/business/beiAn'
+
+export default {
+  props: {
+    placeholder: {
+      type: String,
+      default: ''
+    },
+    // 由父组件根据不同需求传参数，设置接受上传的文件类型
+    accept: {
+      type: String,
+      default: ''
+    },
+    // 设置提示内容能否展示
+    reminder: {
+      type: Boolean,
+      default: true
+    },
+    // 设置是否显示已上传文件列表
+    showfile: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data() {
+    return {
+      datas: null,
+      name: null,
+      accessToken: {},
+      fileList_FuJian: [],
+      enclosure: '',
+      file_add: '',
+      idsz: '',
+      file_catch: '',
+      files_list: []
+    }
+  },
+  methods: {
+    show(val) {
+      this.fileList_FuJian = []
+      this.fileList_FuJian = val
+    },
+    handleChange(file, fileList) {
+    },
+    handleRemove(file, fileList) {
+      this.$emit('handleRemove', file)
+    },
+    // 上传文件 FrontPhoto
+    uploadSectionFile(params) {
+      const file = params.file
+      // 根据后台需求数据格式
+      const form = new FormData()
+      // 文件对象
+      form.append('file', file)
+      // 项目封装的请求方法，下面做简单介绍
+      upload(form).then((res) => {
+        // 自行处理各种情况
+        if (res.success) {
+          this.$emit('handleSuccess', res)
+        }
+        if (res.msg === '操作成功') {
+          this.$message({
+            message: '上传成功！',
+            type: 'success'
+          })
+        }
+      }).catch((err) => {
+        console.log(err)
+        // 如果等于备案,就调备案图片上传接口
+      })
+    }
+  }
+}
+</script>
+
+<style scoped></style>

anrui-base/anrui-base-ui/src/router/index.js

@@ -370,26 +370,26 @@ export const constantRoutes = [
 					title: '挂靠公司管理'
 				}
 			},
-			{
-				path: '/guakaogongsi/guakaogongsiAdd/:id',
-				component: () =>
-					import('@/views/guakaogongsi/guakaogongsiguanli/guakaogongsiAdd.vue'),
-				name: 'guakaogongsiAdd',
-				hidden: true,
-				meta: {
-					title: '挂靠公司添加'
-				}
-			},
-			{
-				path: '/guakaogongsi/guakaogongsiInfo',
-				component: () =>
-					import('@/views/guakaogongsi/guakaogongsiguanli/guakaogongsiInfo.vue'),
-				name: 'guakaogongsiInfo',
-				hidden: true,
-				meta: {
-					title: '挂靠公司详情'
-				}
-			},
+			// {
+			// 	path: '/guakaogongsi/guakaogongsiAdd/:id',
+			// 	component: () =>
+			// 		import('@/views/guakaogongsi/guakaogongsiguanli/guakaogongsiAdd.vue'),
+			// 	name: 'guakaogongsiAdd',
+			// 	hidden: true,
+			// 	meta: {
+			// 		title: '挂靠公司添加'
+			// 	}
+			// },
+			// {
+			// 	path: '/guakaogongsi/guakaogongsiInfo',
+			// 	component: () =>
+			// 		import('@/views/guakaogongsi/guakaogongsiguanli/guakaogongsiInfo.vue'),
+			// 	name: 'guakaogongsiInfo',
+			// 	hidden: true,
+			// 	meta: {
+			// 		title: '挂靠公司详情'
+			// 	}
+			// },
 			{
 				path: '/guakaogongsi/renwu',
 				component: () =>

anrui-base/anrui-base-ui/src/views/guakaogongsi/guakaogongsiguanli/guakaogongsiInfo.vue

@@ -8,77 +8,78 @@
       </div>
     </div>
     <div class="listconadd">
-      <el-form ref="dataForm" :model="temp" label-position="right" label-width="190px" class="forminfo" :rules="rules">
-        <div class="title">挂靠公司信息</div>
-        <el-row>
-          <el-col :span="4" class="trightb">企业名称：</el-col>
-          <el-col :span="8" class="tleft"> {{ temp.orgName }} </el-col>
-          <el-col :span="4" class="trightb">登记注册号类型：</el-col>
-          <el-col :span="8" class="tleft"> {{ temp.registNumTypeValue }} </el-col>
+      <div class="wlInfo">挂靠公司信息</div>
+      <el-form ref="dataForm" :model="temp" label-position="right" class="forminfo" :rules="rules">
+        <el-row style="border-top: 1px solid #DFE6EC">
+          <el-col :span="4" class="trightb">企业名称</el-col>
+          <el-col :span="8" class="tleft"> {{ temp.orgName }}</el-col>
+          <el-col :span="4" class="trightb">登记注册号类型</el-col>
+          <el-col :span="8" class="tleft"> {{ temp.registNumTypeValue }}</el-col>
         </el-row>
         <el-row>
-          <el-col :span="4" class="trightb">登记注册号码：</el-col>
-          <el-col :span="8" class="tleft"> {{ temp.registNum }} </el-col>
-          <el-col :span="4" class="trightb">中征码(贷款卡编码)：</el-col>
-          <el-col :span="8" class="tleft"> {{ temp.signatureCode }} </el-col>
+          <el-col :span="4" class="trightb">登记注册号码</el-col>
+          <el-col :span="8" class="tleft"> {{ temp.registNum }}</el-col>
+          <el-col :span="4" class="trightb">中征码(贷款卡编码)</el-col>
+          <el-col :span="8" class="tleft"> {{ temp.signatureCode }}</el-col>
         </el-row>
         <el-row>
-          <el-col :span="4" class="trightb">公司联系电话：</el-col>
-          <el-col :span="8" class="tleft"> {{ temp.telephone }} </el-col>
-          <el-col :span="4" class="trightb">成立时间：</el-col>
-          <el-col :span="8" class="tleft"> {{ temp.setUpTime | parseTime("{y}-{m}-{d} {h}:{i}:{s}") }} </el-col>
+          <el-col :span="4" class="trightb">公司联系电话</el-col>
+          <el-col :span="8" class="tleft"> {{ temp.telephone }}</el-col>
+          <el-col :span="4" class="trightb">成立时间</el-col>
+          <el-col :span="8" class="tleft"> {{ temp.setUpTime }}</el-col>
         </el-row>
         <el-row>
-          <el-col :span="4" class="trightb">注册资本(万)：</el-col>
-          <el-col :span="8" class="tleft"> {{ temp.registCapital }} </el-col>
-          <el-col :span="4" class="trightb">注册(登记)地址：</el-col>
-          <el-col :span="8" class="tleft"> {{ temp.registAddress }} </el-col>
+          <el-col :span="4" class="trightb">注册资本(万)</el-col>
+          <el-col :span="8" class="tleft"> {{ temp.registCapital }}</el-col>
+          <el-col :span="4" class="trightb">注册(登记)地址</el-col>
+          <el-col :span="8" class="tleft"> {{ temp.registAddress }}</el-col>
         </el-row>
         <el-row>
-          <el-col :span="4" class="trightb">公司地址：</el-col>
-          <el-col :span="20" class="tleft"> {{ temp.province }} {{temp.city}} {{temp.county}}</el-col>
+          <el-col :span="4" class="trightb">公司地址</el-col>
+          <el-col :span="20" class="tleft"> {{ temp.province }} {{ temp.city }} {{ temp.county }}</el-col>
         </el-row>
         <el-row>
           <el-col :span="4" class="trightb">联系地址：</el-col>
-          <el-col :span="8" class="tleft"> {{ temp.address }} </el-col>
-          <el-col :span="4" class="trightb">业务联系人：</el-col>
-          <el-col :span="8" class="tleft"> {{ temp.contract }} </el-col>
+          <el-col :span="8" class="tleft"> {{ temp.address }}</el-col>
+          <el-col :span="4" class="trightb">业务联系人</el-col>
+          <el-col :span="8" class="tleft"> {{ temp.contract }}</el-col>
         </el-row>
         <el-row>
-          <el-col :span="4" class="trightb">联系电话：</el-col>
-          <el-col :span="8" class="tleft"> {{ temp.mobile }} </el-col>
-          <el-col :span="4" class="trightb">经营(业务)范围：</el-col>
-          <el-col :span="8" class="tleft"> {{ temp.businessScope }} </el-col>
+          <el-col :span="4" class="trightb">联系电话</el-col>
+          <el-col :span="8" class="tleft"> {{ temp.mobile }}</el-col>
+          <el-col :span="4" class="trightb">经营(业务)范围</el-col>
+          <el-col :span="8" class="tleft"> {{ temp.businessScope }}</el-col>
         </el-row>
         <el-row>
-          <el-col :span="4" class="trightb">许可证类型：</el-col>
-          <el-col :span="8" class="tleft"> {{ temp.licenseType }} </el-col>
-          <el-col :span="4" class="trightb">资质有效期：</el-col>
-          <el-col :span="8" class="tleft"> {{ temp.qualifiDate }} </el-col>
+          <el-col :span="4" class="trightb">许可证类型</el-col>
+          <el-col :span="8" class="tleft"> {{ temp.licenseType }}</el-col>
+          <el-col :span="4" class="trightb">资质有效期</el-col>
+          <el-col :span="8" class="tleft"> {{ temp.qualifiDate }}</el-col>
         </el-row>
         <el-row>
-          <el-col :span="4" class="trightb">法定代表人姓名：</el-col>
-          <el-col :span="8" class="tleft"> {{ temp.legalName }} </el-col>
-          <el-col :span="4" class="trightb">法定代表人身份证号码：</el-col>
-          <el-col :span="8" class="tleft"> {{ temp.legalIdCard }} </el-col>
+          <el-col :span="4" class="trightb">法定代表人姓名</el-col>
+          <el-col :span="8" class="tleft"> {{ temp.legalName }}</el-col>
+          <el-col :span="4" class="trightb">法定代表人身份证号码</el-col>
+          <el-col :span="8" class="tleft"> {{ temp.legalIdCard }}</el-col>
         </el-row>
         <el-row>
-          <el-col :span="4" class="trightb">法定代表人联系方式：</el-col>
-          <el-col :span="8" class="tleft"> {{ temp.legalMobile }} </el-col>
-          <el-col :span="4" class="trightb">使用组织：</el-col>
-          <el-col :span="8" class="tleft"> {{ temp.useOrgName }} </el-col>
+          <el-col :span="4" class="trightb">法定代表人联系方式</el-col>
+          <el-col :span="8" class="tleft"> {{ temp.legalMobile }}</el-col>
+          <el-col :span="4" class="trightb">使用组织</el-col>
+          <el-col :span="8" class="tleft"> {{ temp.useOrgName }}</el-col>
         </el-row>
-
-        <div class="wenjiantit">营业执照</div>
-        <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;">
-          <el-table-column label="是否已提交" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.state }}</span>
-            </template>
-          </el-table-column>
+        <div class="headline">
+          <div style="margin-left: 5px;font-weight: bold">营业执照</div>
+        </div>
+        <el-table :key="businessLicenseKey" v-loading="listLoading" :data="list1" border style="width: 100%;">
+<!--          <el-table-column label="是否已提交" align="center">-->
+<!--            <template slot-scope="scope">-->
+<!--              <span>{{ scope.row.state }}</span>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
           <el-table-column label=" 文件名" align="center">
             <template slot-scope="scope">
-              <span style="color: #018AD2;" @click="lookeImg(scope.row)">{{ scope.row.fileName }}</span>
+              <span>{{ scope.row.fileName }}</span>
             </template>
           </el-table-column>
           <el-table-column label="文件类型" align="center">
@@ -97,25 +98,23 @@
             </template>
           </el-table-column>
           <el-table-column label="操作" align="center" width="250px" class-name="small-padding fixed-width">
-            <template slot-scope="{row}">
-              <!-- <el-button type="primary" @click="downloadImgByBlob(row)">下载</el-button> -->
-              <el-link target="_blank" :href="row.filePath" :underline="false" style="margin-left:15px">
-                <el-button size="mini" type="primary">下载</el-button>
-              </el-link>
-            </template>
-          </el-table-column>
-        </el-table>
-        <div class="wenjiantit">道路运输许可证</div>
-        <el-table :key="tableKey" v-loading="listLoading" :data="listDaolu" border style="width: 100%;">
-
-          <el-table-column label="是否已提交" align="center">
+<!--            <template slot-scope="{row}">-->
+<!--              <el-link target="_blank" :href="row.filePath" :underline="false" style="margin-left:15px">-->
+<!--                <el-button size="mini" type="primary">下载</el-button>-->
+<!--              </el-link>-->
+<!--            </template>-->
             <template slot-scope="scope">
-              <span>{{ scope.row.state }}</span>
+              <el-button type="primary" size="small" @click="lookeImg(scope.row)">查看</el-button>
             </template>
           </el-table-column>
+        </el-table>
+        <div class="headline">
+          <div style="margin-left: 5px;font-weight: bold">道路运输许可证</div>
+        </div>
+        <el-table :key="roadTransportKey" v-loading="listLoading" :data="list2" border style="width: 100%;">
           <el-table-column label=" 文件名" align="center">
             <template slot-scope="scope">
-              <span style="color: #018AD2;" @click="lookeImg(scope.row)">{{ scope.row.fileName }}</span>
+              <span>{{ scope.row.fileName }}</span>
             </template>
           </el-table-column>
           <el-table-column label="文件类型" align="center">
@@ -134,21 +133,15 @@
             </template>
           </el-table-column>
           <el-table-column label="操作" align="center" width="250px" class-name="small-padding fixed-width">
-            <template slot-scope="{row}">
-              <!-- <el-button type="primary" @click="downloadImgByBlob(row)">下载</el-button> -->
-              <el-link target="_blank" :href="row.filePath" :underline="false" style="margin-left:15px">
-                <el-button size="mini" type="primary">下载</el-button>
-              </el-link>
-            </template>
-          </el-table-column>
-        </el-table>
-        <div class="wenjiantit">法人身份证</div>
-        <el-table :key="tableKey" v-loading="listLoading" :data="listFaren" border style="width: 100%;">
-          <el-table-column label="是否已提交" align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.state }}</span>
+              <el-button type="primary" size="small" @click="lookeImg(scope.row)">查看</el-button>
             </template>
           </el-table-column>
+        </el-table>
+        <div class="headline">
+          <div style="margin-left: 5px;font-weight: bold">法人身份证</div>
+        </div>
+        <el-table :key="corporateIdentityCardKey" v-loading="listLoading" :data="list3" border style="width: 100%;">
           <el-table-column label=" 文件名" align="center">
             <template slot-scope="scope">
               <span style="color: #018AD2;" @click="lookeImg(scope.row)">{{ scope.row.fileName }}</span>
@@ -170,20 +163,20 @@
             </template>
           </el-table-column>
           <el-table-column label="操作" align="center" width="250px" class-name="small-padding fixed-width">
-            <template slot-scope="{row}">
-              <el-link target="_blank" :href="row.filePath" :underline="false" style="margin-left:15px">
-                <el-button size="mini" type="primary">下载</el-button>
-              </el-link>
-            </template>
-          </el-table-column>
-        </el-table>
-        <div class="wenjiantit">其他资料</div>
-        <el-table :key="tableKey" v-loading="listLoading" :data="listQita" border style="width: 100%;">
-          <el-table-column label="是否已提交" align="center">
+<!--            <template slot-scope="{row}">-->
+<!--              <el-link target="_blank" :href="row.filePath" :underline="false" style="margin-left:15px">-->
+<!--                <el-button size="mini" type="primary">下载</el-button>-->
+<!--              </el-link>-->
+<!--            </template>-->
             <template slot-scope="scope">
-              <span>{{ scope.row.state }}</span>
+              <el-button type="primary" size="small" @click="lookeImg(scope.row)">查看</el-button>
             </template>
           </el-table-column>
+        </el-table>
+        <div class="headline">
+          <div style="margin-left: 5px;font-weight: bold">其他材料</div>
+        </div>
+        <el-table :key="otherDetailsKey" v-loading="listLoading" :data="list4" border style="width: 100%;">
           <el-table-column label=" 文件名" align="center">
             <template slot-scope="scope">
               <span style="color: #018AD2;" @click="lookeImg(scope.row)">{{ scope.row.fileName }}</span>
@@ -210,256 +203,96 @@
             </template>
           </el-table-column>
         </el-table>
-        <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" width="1000px"
-          :close-on-click-modal="false">
+        <el-dialog :visible.sync="dialogFormVisible">
           <div class="result-cont">
-            <img :src="user_img" style="width: 100%; height: 500px;">
+            <img :src="user_img" style="width: 100%" alt="">
           </div>
         </el-dialog>
       </el-form>
-      <!-- <img :src="User_img2" style="width: 100%; height: 500px;"> -->
     </div>
   </div>
 </template>
 
 <script>
-  import {
-    mapGetters
-  } from 'vuex'
-  import {
-    details,
-    listFujian,
-    download,
-    downloadUrl
-  } from '@/api/jichuxinxi/baseaffiliatcompany'
-  import {
-    getFileType,
-    parseDate,
-    parseTime,
-    ConvertMenuState
-  } from '@/utils'
-  export default {
-    name: 'GuakaogongsiInfo',
-    // components: {  },
-    data() {
-      return {
-        // --按钮菜单-------
-        menuState: {
-          add: false, // 添加
-          edit: false, // 编辑
-          delete: false, // 删除
-          view: false, // 查看
-          audit: false, // 审核
-          input: false, // 导入
-          output: false, // 导出
-          upload: false, // 同步
-          release: false, // 下发
-        },
-        ddzz: '',
-        tableKey: 0,
-        // list: null,
-        list: [],
-        listDaolu: [],
-        listFaren: [],
-        listQita: [],
-        total: 1,
-        FormLoading: false,
-        listLoading: false,
-        //营业执照
-        listQuery: {
-          attachType: '0001',
-          linkSid: '',
-        },
-        //道路运输许可证
-        listDaoluers: {
-          attachType: '0002',
-          linkSid: '',
-        },
-        //法人身份证
-        listFarenes: {
-          attachType: '0003',
-          linkSid: '',
-        },
-        //其他资料
-        listQitaes: {
-          attachType: '0004',
-          linkSid: '',
-        },
-        temp: {}, // 查看实体
-        textMap: {
-          update: '修改',
-          create: '创建',
-        },
-        User_img2: '',
-        dialogFormVisible: false, // 添加修改对话框状态
-        dialogFormShowVisible: false, // 查看对话框默认关闭状态
-        dialogStatus: '', // 对话框状态
-        fenzuOptions: [],
-        tempDate: {},
-        user_img: '',
-        rules: {
-          title: [{
-            required: true,
-            message: '请填写',
-            trigger: 'blur'
-          }],
-        },
-        // ------------------------------------
-      }
-    },
-    computed: {
-      ...mapGetters([
-        'id',
-        'roles',
-        'rolesIds',
-        'departmentId',
-        'departmentCode',
-      ]),
+import { details, download } from '@/api/jichuxinxi/baseaffiliatcompany'
+import { postDownload } from '@/api/business/beiAn'
+
+export default {
+  name: 'GuakaogongsiInfo',
+  data() {
+    return {
+      businessLicenseKey: 0,
+      roadTransportKey: 1,
+      corporateIdentityCardKey: 2,
+      otherDetailsKey: 3,
+      list1: [],
+      list2: [],
+      list3: [],
+      list4: [],
+      FormLoading: false,
+      listLoading: false,
+      temp: {}, // 查看实体
+      dialogFormVisible: false, // 查看对话框状态
+      dialogStatus: '', // 对话框状态
+      tempDate: {},
+      user_img: '',
+      rules: {}
+    }
+  },
+  methods: {
+    downloadElxe(row) {
+      postDownload(row.filePath).then((res) => {
+        const blob = new Blob([res], {
+          type: 'application/msword'
+        })
+        const objectUrl = URL.createObjectURL(blob)
+        window.location.href = objectUrl
+      })
     },
-    created() {
-      this.tempDate.sid = this.$route.query.sid
-      // console.log(this.tempDate.sid, 2222)e
-      // 初始化变量
-      this.init()
-      this.handleCheck()
-      this.ChaXunYingyezhizhao()
-      this.ChaXunDaoLUYUNSHu()
-      this.ChaXunFaERen()
-      this.ChaXunQiTaZiLiao()
+    // 返回
+    handleReturn() {
+      this.$emit('doback')
     },
-    methods: {
-      // downloadImgByBlob(row) {
-      //   download(row.filePath).then((response) => {
-      //     // 图片转为base64
-      //     let blob = new Blob([response], {
-      //       tyoe: 'image/png'
-      //     })
-      //     var base64 = 'data:image/png;base64,'
-      //     let url = window.URL.createObjectURL(blob)
-      //     window.location.href = url
-      //   })
-      // },
-      downloadElxe(row) {
-        download(row.filePath).then((res) => {
-          const blob = new Blob([res], {
-            type: 'application/msword',
+    // 打开查看
+    showInfo(sid) {
+      this.FormLoading = true
+      details(sid).then((response) => {
+        console.log('查询', response)
+        this.FormLoading = false
+        if (response.code === '200') {
+          this.temp = response.data
+          this.list1 = response.data.yyzzList
+          this.list2 = response.data.dlysxkzList
+          this.list3 = response.data.frsfzList
+          this.list4 = response.data.qtzlList
+        } else {
+          this.$notify({
+            title: '失败',
+            message: '查询失败',
+            type: 'error'
           })
-          const objectUrl = URL.createObjectURL(blob)
-          window.location.href = objectUrl
-        })
-      },
-      init() {},
-      // 查询营业执照
-      ChaXunYingyezhizhao() {
-        this.listLoading = true
-        this.listQuery.linkSid = this.tempDate.sid
-        listFujian(this.listQuery).then((response) => {
-          this.listLoading = false
-          console.log('列表查询结果：', response)
-          if (response.code === '200') {
-            this.list = response.data
-          }
-        })
-      },
-      //查询道路运输许可证
-      ChaXunDaoLUYUNSHu() {
-        this.listLoading = true
-        this.listDaoluers.linkSid = this.tempDate.sid
-        listFujian(this.listDaoluers).then((response) => {
-          this.listLoading = false
-          console.log('列表查询结果：', response)
-          if (response.code === '200') {
-            this.listDaolu = response.data
-          }
-        })
-      },
-      // 查询法人身份证
-      ChaXunFaERen() {
-        this.listLoading = true
-        this.listFarenes.linkSid = this.tempDate.sid
-        listFujian(this.listFarenes).then((response) => {
-          this.listLoading = false
-          console.log('列表查询结果：', response)
-          if (response.code === '200') {
-            this.listFaren = response.data
-          }
-        })
-      },
-      //其他资料
-      ChaXunQiTaZiLiao() {
-        this.listLoading = true
-        this.listQitaes.linkSid = this.tempDate.sid
-        listFujian(this.listQitaes).then((response) => {
-          this.listLoading = false
-          console.log('列表查询结果：', response)
-          if (response.code === '200') {
-            this.listQita = response.data
-          }
-        })
-      },
-      // ----------------------------------方法--------------------
-      // 返回
-      handleReturn() {
-        this.$router.go(-1)
-      },
-      // xiaZai(url) {
-      //   window.location.href = url;
-      // },
-      // 添加前数据初始化
-      resetTemp() {
-        this.temp = {
-          address: '',
-          businessScope: '',
-          contract: '',
-          legalIdCard: '',
-          legalMobile: '',
-          legalName: '',
-          licenseType: '',
-          mobile: '',
-          orgAddress: '',
-          orgName: '',
-          qualifiDate: '',
-          registAddress: '',
-          registCapital: '',
-          registNum: '',
-          registNumType: '',
-          setUpTime: '',
-          signatureCode: '',
-          telephone: '',
-          useOrg: '',
         }
-      },
-      // 打开查看
-      handleCheck() {
-        this.FormLoading = true
-        details(this.tempDate.sid).then((response) => {
-          console.log('查询', response)
-          this.FormLoading = false
-          if (response.code === '200') {
-            this.temp = response.data
-            console.log('查询1', this.temp)
-          } else {
-            this.$notify({
-              title: '失败',
-              message: '查询失败',
-              type: 'error',
-            })
-          }
-        })
-      },
-      lookeImg(row) {
-        console.log('777899', row)
-        this.user_img = row.filePath
-        this.dialogFormVisible = true
-        this.dialogTitle = '查看'
-      }
+      })
     },
+    lookeImg(row) {
+      this.user_img = row.filePath
+      this.dialogFormVisible = true
+      this.dialogTitle = '查看'
+    }
   }
+}
 </script>
 <style scoped>
-  .wenjiantit {
-    font-size: 16px;
-    font-weight: bold;
-    margin: 25px 0 10px 0;
-  }
+.headline{
+  height: 40px;
+  padding: 10px;
+  font-weight: bold;
+  background-color: #ffffff;
+  border: 1px solid #DFE6EC;
+}
+.wlInfo {
+  text-align: center;
+  font-size: 28px;
+  line-height: 90px;
+}
 </style>

anrui-base/anrui-base-ui/src/views/guakaogongsi/guakaogongsiguanli/guakaogongsiguanli.vue

@@ -1,111 +1,111 @@
 <template>
   <div class="app-container">
-    <div class="tab-header webtop">
-      <div>挂靠公司管理</div>
-      <div>
-        <el-button type="primary" size="small" @click="handleCreate()">新建</el-button>
-        <el-button type="primary" size="small" @click="handleUpdate()">修改</el-button>
-        <el-button type="danger" size="small" @click="handleDelete()">删除</el-button>
-        <!-- <el-button type="success" size="small" @click="handleDaoChu()">导出</el-button> -->
+    <div v-show="viewState ==1">
+      <div class="tab-header webtop">
+        <div>挂靠公司管理</div>
+        <div>
+          <el-button type="primary" size="small" @click="handleCreate()">新建</el-button>
+          <el-button type="primary" size="small" @click="handleUpdate()">编辑</el-button>
+          <el-button type="danger" size="small" @click="handleDelete()">删除</el-button>
+          <el-button type="primary" size="small" @click="handleDaoChu()">导出</el-button>
+          <el-button type="info" size="small">关闭</el-button>
+        </div>
       </div>
-    </div>
-
-    <div class="searchcon">
-      <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
-      <div v-show="isSearchShow" class="search">
-        <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
-          <el-form-item label="企业名称">
-            <el-input v-model="listQuery.orgName" placeholder="请输入企业名称" clearable class="filter-item" />
-          </el-form-item>
-          <el-form-item label="状态">
-            <el-select v-model="listQuery.state" class="filter-item" clearable placeholder="请选择状态">
-              <el-option v-for="item in states" :key="item.value" :label="item.label" :value="item.value" />
-            </el-select>
-          </el-form-item>
-          <el-button type="primary" @click="handleFilter">查询</el-button>
-
-        </el-form>
+      <div class="searchcon">
+        <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
+        <div v-show="isSearchShow" class="search">
+          <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
+            <el-form-item label="企业名称">
+              <el-input v-model="listQuery.params.orgName" placeholder="请输入企业名称" clearable class="filter-item"/>
+            </el-form-item>
+            <el-form-item label="状态">
+              <el-select v-model="listQuery.params.state" class="filter-item" clearable placeholder="请选择状态">
+                <el-option v-for="item in states" :key="item.value" :label="item.label" :value="item.value"/>
+              </el-select>
+            </el-form-item>
+            <el-button type="primary" @click="handleFilter">查询</el-button>
+            <el-button type="primary" @click="handleReset">重置</el-button>
+          </el-form>
+        </div>
+      </div>
+      <div class="listtop">
+        <div class="tit">挂靠公司信息列表</div>
+        <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+      </div>
+      <div class="">
+        <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange">
+          <el-table-column width="50px" type="selection" align="center"/>
+          <el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
+          <el-table-column label="企业名称" align="center">
+            <template slot-scope="scope">
+              <span class="bluezi" @click="handleCheck(scope.row)">{{ scope.row.orgName }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="登记注册号码" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.registNum }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="法人代表姓名" align="center" width="120px">
+            <template slot-scope="scope">
+              <span>{{ scope.row.legalName }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="资质有效期" align="center" width="110px">
+            <template slot-scope="scope">
+              <span>{{ scope.row.qualifiDate }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="状态" align="center" width="70px">
+            <template slot-scope="scope">
+              <span>{{ scope.row.state }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="流程编号" align="center">
+            <template slot-scope="scope">
+              <span class="bluezi" @click="handleRenwu(row)">{{ scope.row.code }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" align="center" width="250px" class-name="small-padding fixed-width">
+            <template slot-scope="{row}">
+              <!-- <el-button size="mini" type="primary" @click="handleCheck(row)">查看</el-button> -->
+              <el-button size="mini" type="primary" @click="handleShenHeLiuCheng(row)">发起审核流程</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div class="pages">
+        <div class="tit"/>
+        <!-- 翻页 -->
+        <pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
       </div>
     </div>
-    <div class="listtop">
-      <!-- <div class="tit" @click="handleRenwu111">挂靠公司信息列表</div> -->
-      <div class="tit">挂靠公司信息列表</div>
-      <pageye v-show="total>0" :total="total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList" />
-    </div>
-    <div class="">
-      <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange">
-        <el-table-column width="50px" type="selection" align="center" />
-        <el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center" />
-        <el-table-column label="企业名称" align="center">
-          <template slot-scope="scope">
-            <span class="bluezi" @click="handleCheck(scope.row)">{{ scope.row.orgName }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="登记注册号码" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.registNum }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="法人代表姓名" align="center" width="120px">
-          <template slot-scope="scope">
-            <span>{{ scope.row.legalName }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="资质有效期" align="center" width="110px">
-          <template slot-scope="scope">
-            <span>{{ scope.row.qualifiDate }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="状态" align="center" width="70px">
-          <template slot-scope="scope">
-            <span>{{ scope.row.state }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="流程编号" align="center">
-          <template slot-scope="scope">
-            <span class="bluezi" @click="handleRenwu(row)">{{ scope.row.code }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" width="250px" class-name="small-padding fixed-width">
-          <template slot-scope="{row}">
-            <!-- <el-button size="mini" type="primary" @click="handleCheck(row)">查看</el-button> -->
-            <el-button size="mini" type="primary" @click="handleShenHeLiuCheng(row)">发起审核流程</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <div class="pages">
-      <div class="tit" />
-      <!-- 翻页 -->
-      <pagination v-show="total>0" :total="total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList" />
-    </div>
+    <guakaogongsiAdd v-show="viewState == 2 || viewState ==3" ref="divAdd" @doback="resetState" @reloadlist="getList"/>
+    <guakaogongsiInfo v-show="viewState == 4" ref="divInfo" @doback="resetState"/>
   </div>
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
-import {
-  pagerList,
-  SaveList,
-  Update,
-  deleteBySids,
-  details,
-} from '@/api/jichuxinxi/baseaffiliatcompany'
-import { setuser, getuser } from '@/utils/baocun'
-import { delUser } from '@/api/system/user/Auser'
+import { pagerList, deleteBySids } from '@/api/jichuxinxi/baseaffiliatcompany'
+import { setuser } from '@/utils/baocun'
 import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
+import guakaogongsiAdd from './guakaogongsiAdd.vue'
+import guakaogongsiInfo from './guakaogongsiInfo.vue'
 export default {
   name: 'Guakaogongsiguanli',
   components: {
     Pagination,
     pageye,
+    guakaogongsiAdd,
+    guakaogongsiInfo
   },
 
   data() {
     return {
       isSearchShow: false,
       searchxianshitit: '显示查询条件',
+      viewState: 1,
       // --按钮菜单-------
       menuState: {
         add: false, // 添加
@@ -116,77 +116,31 @@ export default {
         input: false, // 导入
         output: false, // 导出
         upload: false, // 同步
-        release: false, // 下发
+        release: false // 下发
       },
       // 查询 -----------
       tableKey: 0,
       sids: [],
       list: [],
-      total: 1,
       FormLoading: false,
       listLoading: false,
       listQuery: {
         params: {
           orgName: '',
-          state: '',
+          state: ''
         },
+        total: 0,
         current: 1,
-        size: 20,
+        size: 10
       },
-      selectDate: undefined,
       temp: {}, // 添加和修改
-      textMap: {
-        update: '编辑',
-        create: '创建',
-      },
       sdies: '',
       dialogFormVisible: false, // 添加修改对话框状态
       dialogFormShowVisible: false, // 查看对话框默认关闭状态
       dialogStatus: '', // 对话框状态
-      states: [],
-      // tureArrys: [
-      //   {
-      //     value: 1,
-      //     label: '是'
-      //   },
-      //   {
-      //     value: 0,
-      //     label: '否'
-      //   }
-      // ],
-      // fenzuOptions: [
-      //   { value: '1', label: '单位' },
-      //   { value: '2', label: '个人' }
-      // ],
-      rules: {
-        title: [
-          {
-            required: true,
-            message: '请填写',
-            trigger: 'blur',
-          },
-        ],
-        qc: [
-          {
-            required: true,
-            message: '请填写全称',
-            trigger: 'blur',
-          },
-        ],
-      },
-      sidsList: '',
-      // ------------------------------------
+      states: []
     }
   },
-  computed: {
-    ...mapGetters([
-      'id',
-      'roles',
-      'rolesIds',
-      'departmentId',
-      'departmentCode',
-    ]),
-  },
   created() {
     // 初始化变量
     this.init()
@@ -221,18 +175,10 @@ export default {
       var pageindex = index + 1 + pagestart
       return pageindex
     },
-
     // 查询列表信息
     getList() {
       this.listLoading = true
-      pagerList({
-        current: this.listQuery.current,
-        size: this.listQuery.size,
-        params: {
-          state: this.listQuery.state,
-          orgName: this.listQuery.orgName,
-        },
-      }).then((response) => {
+      pagerList(this.listQuery).then((response) => {
         console.log('列表查询结果1：', response)
         console.log('列表查询结果：' + JSON.stringify(response))
         this.listLoading = false
@@ -242,10 +188,10 @@ export default {
           response.data.total > 0
         ) {
           this.list = response.data.records
-          this.total = response.data.total
+          this.listQuery.total = response.data.total
         } else {
           this.list = []
-          this.total = 0
+          this.listQuery.total = 0
         }
       })
     },
@@ -254,13 +200,17 @@ export default {
       this.listQuery.current = 1
       this.getList()
     },
-
-    // ----------------------------------方法--------------------
-    // 添加前数据初始化
-    resetTemp() {
-      this.temp = {
-        jc: '',
+    handleReset() {
+      this.listQuery = {
+        params: {
+          orgName: '',
+          state: ''
+        },
+        total: 0,
+        current: 1,
+        size: 10
       }
+      this.getList()
     },
     handleSelectionChange(row) {
       const aa = []
@@ -274,30 +224,31 @@ export default {
     },
     // 打开添加
     handleCreate() {
-      this.$router.push({
-        path: '/guakaogongsi/guakaogongsiAdd/0',
-      })
+      // this.$router.push({
+      //   path: '/guakaogongsi/guakaogongsiAdd/0'
+      // })
+      this.viewState = 2
+      this.$refs['divAdd'].showAdd()
     },
     // 打开修改
     handleUpdate() {
       if (this.sids.length === 1) {
         this.dialogStatus = 'update'
-        this.$router.push({
-          path: `/guakaogongsi/guakaogongsiAdd/${this.sids[0]}`,
-        })
+        this.viewState = 3
+        this.$refs['divAdd'].showEdit(this.sids)
       } else if (this.sids.length > 1) {
         this.$notify({
           title: '提示',
           message: '不能选中多个挂靠公司信息修改!!',
           type: 'info',
-          duration: 2000,
+          duration: 2000
         })
       } else {
         this.$notify({
           title: '提示',
           message: '没有选择挂靠公司信息!!',
           type: 'error',
-          duration: 2000,
+          duration: 2000
         })
         return
       }
@@ -305,19 +256,14 @@ export default {
     // 打开任务
     handleRenwu() {
       this.$router.push({
-        path: '/guakaogongsi/renwu',
+        path: '/guakaogongsi/renwu'
       })
     },
 
     // 打开查看
     handleCheck(scope) {
-      console.log('88888888', scope)
-      this.$router.push({
-        path: '/guakaogongsi/guakaogongsiInfo',
-        query: {
-          sid: scope.sid,
-        },
-      })
+      this.viewState = 4
+      this.$refs['divInfo'].showInfo(scope.sid)
     },
     // 根据本行ID删除数据
     handleDelete() {
@@ -329,14 +275,14 @@ export default {
               title: '提示',
               message: '删除成功',
               type: 'success',
-              duration: 2000,
+              duration: 2000
             })
             this.getList()
           } else {
             this.$notify({
               title: '删除失败',
               message: response.msg,
-              type: 'error',
+              type: 'error'
             })
           }
         })
@@ -345,17 +291,20 @@ export default {
           title: '提示',
           message: '没有选择挂靠公司信息!!',
           type: 'error',
-          duration: 2000,
+          duration: 2000
         })
         return
       }
     },
+    resetState() {
+      this.viewState = 1
+    },
     // 导出
     handleDaoChu(row) {
       this.$confirm('确定要导出数据, 是否继续?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-        type: 'warning',
+        type: 'warning'
       })
     },
     // 发起审核流程
@@ -363,7 +312,7 @@ export default {
       this.$confirm('确定要发起审核流程吗？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-        type: 'warning',
+        type: 'warning'
       })
       // .then(() => {
       //   const tempData = Object.assign({}, row) // copy obj

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/pc/PcBusDepositQuery.java

@@ -0,0 +1,27 @@
+package com.yxt.anrui.buscenter.api.busmaindeposit.pc;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/5/12 9:22
+ * @Description
+ */
+@Data
+public class PcBusDepositQuery implements Query {
+    private static final long serialVersionUID = -8450815150713107831L;
+
+    @ApiModelProperty(value = "付款人姓名")
+    private String draweeName;
+    @ApiModelProperty(value = "创建开始日期")
+    private String createDateStart;
+    @ApiModelProperty(value = "创建结束日期")
+    private String createDateEnd;
+
+    @ApiModelProperty(value = "业务员sid")
+    private String staffSid;
+    @ApiModelProperty(value = "客户sid")
+    private String customerSid;
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/pc/PcBusDepositVo.java

@@ -0,0 +1,45 @@
+package com.yxt.anrui.buscenter.api.busmaindeposit.pc;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/5/11 16:13
+ * @Description
+ */
+@Data
+public class PcBusDepositVo implements Vo {
+    private static final long serialVersionUID = 8256642059267742328L;
+
+    @ApiModelProperty(value = "节点状态")
+    private String nodeState;
+
+    @ApiModelProperty(value = "单据类型")
+    private String depositBillType;
+
+    @ApiModelProperty(value = "单据编号")
+    private String billNo;
+    @ApiModelProperty(value = "制单日期")
+    private String createDate;
+    @ApiModelProperty(value = "销售专员")
+    private String staffName;
+
+    @ApiModelProperty(value = "客户付款人")
+    private String draweeName;
+    @ApiModelProperty(value = "联系电话")
+    private String draweeMobile;
+    @ApiModelProperty(value = "订金")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private String deposit;
+    @ApiModelProperty(value = "已使用订金")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private String usedDeposit;
+    @ApiModelProperty(value = "预定车辆")
+    private Integer vehicleNum;
+
+
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/pc/PcBusMainDepositFeign.java

@@ -35,5 +35,8 @@ public interface PcBusMainDepositFeign {
     @ApiOperation(value = "销售订单-查询配置该业务员该客户选择的该车型及配置下的所有车辆的集合")
     ResultBean<List<String>> selectVehicleList(@SpringQueryMap PcBusMainDepositVehicleQuery query);
 
-
+    @ResponseBody
+    @PostMapping(value = "/depositPageList")
+    @ApiOperation(value = "销售订单-虚拟订单订金分页列表")
+    ResultBean<PagerVo<PcBusDepositVo>> depositPageList(@RequestBody PagerQuery<PcBusDepositQuery> query);
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/pc/PcBusMainDepositVo.java

@@ -15,6 +15,8 @@ public class PcBusMainDepositVo implements Vo {
 
     @ApiModelProperty(value = "品牌")
     private String brandName;
+    @ApiModelProperty(value = "品牌sid")
+    private String brandSid;
     @ApiModelProperty(value = "车型sid")
     private String modelSid;
     @ApiModelProperty(value = "车型配置sid")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderAllDto.java

@@ -16,6 +16,7 @@ import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -110,4 +111,9 @@ public class BusSalesOrderAllDto implements Dto {
     @ApiModelProperty(value = "客户头像", required = true)
     @NotBlank(message = "客户头像不能为空")
     private String customerPhoto;
+
+    @ApiModelProperty(value = "选择的现车的车辆sid")
+    private List<String> vehicleList = new ArrayList<>();
+    @ApiModelProperty(value = "优惠包价值")
+    private List<String> priceList = new ArrayList<>();
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderPowerVo.java

@@ -0,0 +1,20 @@
+package com.yxt.anrui.buscenter.api.bussalesorder;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/5/13 10:59
+ * @Description
+ */
+@Data
+public class BusSalesOrderPowerVo implements Vo {
+    private static final long serialVersionUID = -7297987001568904641L;
+
+    @ApiModelProperty(value = "销售支持部经理是否有权限")
+    private Boolean isHavePower;
+    @ApiModelProperty(value = "总经理是否有权限")
+    private Boolean isPower;
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdeposit/BusSalesOrderDepositDto.java

@@ -31,8 +31,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.math.BigDecimal;
-
 /**
  * Project: anrui-buscenter(业务管理) <br/>
  * File: BusSalesOrderDepositDto.java <br/>
@@ -52,7 +50,7 @@ public class BusSalesOrderDepositDto implements Dto {
 
     private static final long serialVersionUID = -5178085916707721474L;
     @ApiModelProperty("单台订金")
-    private BigDecimal deposit;
+    private String deposit;
     @ApiModelProperty("订金合计")
     private String depositAll;
     @ApiModelProperty("订金交纳方式")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModelDto.java

@@ -31,7 +31,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.math.BigDecimal;
+import javax.validation.constraints.NotBlank;
 
 /**
  * Project: anrui-buscenter(业务管理) <br/>
@@ -51,26 +51,39 @@ import java.math.BigDecimal;
 public class BusSalesOrderModelDto implements Dto {
 
     private static final long serialVersionUID = -216156078782065154L;
-    
+
     @ApiModelProperty(value = "品牌")
+    @NotBlank(message = "参数错误：品牌")
     private String brandName;
+    @ApiModelProperty(value = "品牌sid")
+    @NotBlank(message = "参数错误：品牌sid")
+    private String brandSid;
     @ApiModelProperty("车型sid")
+    @NotBlank(message = "参数错误：车型sid")
     private String modelSid;
     @ApiModelProperty("配置sid")
+    @NotBlank(message = "参数错误：配置sid")
     private String modelConfigSid;
     @ApiModelProperty("车型名称")
+    @NotBlank(message = "参数错误：车型名称")
     private String modelName;
     @ApiModelProperty("车型配置名称")
+    @NotBlank(message = "参数错误：车型配置名称")
     private String modelConfig;
     @ApiModelProperty("常用配置")
+    @NotBlank(message = "参数错误：常用配置")
     private String config;
     @ApiModelProperty("更多配置")
+    @NotBlank(message = "参数错误：更多配置")
     private String moreConfig;
     @ApiModelProperty("特殊配置说明")
+    @NotBlank(message = "特殊配置说明不能为空")
     private String specialConfig;
     @ApiModelProperty("单台指导价")
-    private BigDecimal guildPrice;
+    @NotBlank(message = "参数错误：主车单台指导价")
+    private String guildPrice;
     @ApiModelProperty("单台成交价")
-    private BigDecimal finalPrice;
+    @NotBlank(message = "单台成交价不能为空")
+    private String finalPrice;
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesvehicleorder/BusSalesVehicleOrderDto.java

@@ -56,5 +56,9 @@ public class BusSalesVehicleOrderDto implements Dto {
     private String linkNo;
     @ApiModelProperty("采购订单日期")
     private String linkText;
+    @ApiModelProperty("可使用台数")
+    private Integer useNum;
+    @ApiModelProperty("本次使用台数")
+    private Integer usingNum;
 
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.java

@@ -31,6 +31,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.buscenter.api.busmaindeposit.*;
+import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusDepositVo;
 import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -115,4 +116,6 @@ public interface BusMainDepositMapper extends BaseMapper<BusMainDeposit> {
      * @return
      */
     List<String> selectVehicleList(@Param("modelSid") String modelSid, @Param("modelConfigSid") String modelConfigSid, @Param("staffSid") String staffSid, @Param("customerSid") String customerSid);
+
+    IPage<PcBusDepositVo> depositPageList(IPage<BusMainDeposit> page,  @Param(Constants.WRAPPER)QueryWrapper<BusMainDeposit> qw);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml

@@ -149,7 +149,7 @@
 
     <select id="orderPageList" resultType="com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositVo">
         select bv.brandName,
-               bv.modelName as modelAlias,
+               bv.modelName        as modelAlias,
                bv.modelotherConfig as config,
                bv.modelSid,
                bv.modelConfigSid
@@ -172,4 +172,21 @@
           and bd.staffSid = #{staffSid}
           and bd.depositBillTypeKey = '02'
     </select>
+
+    <select id="depositPageList" resultType="com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusDepositVo">
+        select bmd.nodeState,
+               bmd.depositBillType,
+               bmd.billNo,
+               bmd.createDate,
+               bmd.staffName,
+               bd.draweeName,
+               bd.draweeMobile,
+               bd.deposit,
+               bd.usedDeposit,
+               bd.vehicleNum
+        from bus_main_deposit bmd
+                 left join bus_deposit bd on bd.billSid = bmd.sid
+                 left join bus_deposit_customer bc on bc.billSid = bmd.sid
+            ${ew.customSqlSegment}
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java

@@ -42,9 +42,7 @@ import com.yxt.anrui.buscenter.api.busdepositvehicle.BusDepositVehicle;
 import com.yxt.anrui.buscenter.api.busdepositvehiclecustomer.BusDepositVehicleCustomer;
 import com.yxt.anrui.buscenter.api.busdepositvehiclecustomer.BusDepositVehicleCustomerVo;
 import com.yxt.anrui.buscenter.api.busmaindeposit.*;
-import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositQuery;
-import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositVehicleQuery;
-import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositVo;
+import com.yxt.anrui.buscenter.api.busmaindeposit.pc.*;
 import com.yxt.anrui.buscenter.biz.busdeposit.BusDepositService;
 import com.yxt.anrui.buscenter.biz.busdepositcustomer.BusDepositCustomerService;
 import com.yxt.anrui.buscenter.biz.busdepositvehicle.BusDepositVehicleService;
@@ -187,7 +185,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
         IPage<BusMainDepositListVo> pagging = baseMapper.selectPageVo(page, qw);
         List<BusMainDepositListVo> list = pagging.getRecords();
         for (BusMainDepositListVo vo : list) {
-                ResultBean<SysFormStateVo> resultBean = sysFormLinkFeign.selectStateByBusinessSid(vo.getSid());
+            ResultBean<SysFormStateVo> resultBean = sysFormLinkFeign.selectStateByBusinessSid(vo.getSid());
             if (resultBean.getSuccess() && resultBean.getData() != null) {
                 SysFormStateVo formState = resultBean.getData();
                 vo.setNodeState(formState.getNodeState());
@@ -1464,6 +1462,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
                         list.get(i).setGuidedPrice(voResultBean.getData().getGuidedPrice());
                         list.get(i).setModelName(voResultBean.getData().getModelName());
                         list.get(i).setOtherConfig(voResultBean.getData().getOtherConfig());
+                        list.get(i).setBrandSid(voResultBean.getData().getBrandSid());
                     }
                 }
             }
@@ -1484,7 +1483,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
         }
         qw.eq("bd.staffSid", query.getStaffSid());
         qw.eq("bc.customerSid", query.getCustomerSid());
-        qw.eq("bd.state",1);
+        qw.eq("bd.state", 1);
         qw.groupBy("bv.modelSid", "bv.modelConfigSid");
         return qw;
     }
@@ -1501,4 +1500,30 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
         }
         return rb.success().setData(stringList);
     }
+
+    public PagerVo<PcBusDepositVo> depositPageList(PagerQuery<PcBusDepositQuery> pagerQuery) {
+        PcBusDepositQuery query = pagerQuery.getParams();
+        QueryWrapper<BusMainDeposit> qw = createDepositPageWrapper(query);
+        IPage<BusMainDeposit> page = PagerUtil.queryToPage(pagerQuery);
+        IPage<PcBusDepositVo> pagging = baseMapper.depositPageList(page, qw);
+        PagerVo<PcBusDepositVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    private QueryWrapper<BusMainDeposit> createDepositPageWrapper(PcBusDepositQuery query) {
+        QueryWrapper<BusMainDeposit> qw = new QueryWrapper<>();
+        if (query != null) {
+            if (StringUtils.isNotBlank(query.getDraweeName())) {
+                qw.like("bd.draweeName", query.getDraweeName());
+            }
+            if (StringUtils.isNotBlank(query.getCreateDateStart()) && StringUtils.isNotBlank(query.getCreateDateEnd())) {
+                qw.between("bmd.createDate", query.getCreateDateStart(), query.getCreateDateEnd());
+            }
+        }
+        qw.eq("bd.staffSid", query.getStaffSid());
+        qw.eq("bc.customerSid", query.getCustomerSid());
+        qw.eq("bd.state", 1);
+        qw.eq("bmd.depositBillTypeKey", "01");
+        return qw;
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/pc/PcBusMainDepositRest.java

@@ -1,9 +1,6 @@
 package com.yxt.anrui.buscenter.biz.busmaindeposit.pc;
 
-import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositFeign;
-import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositQuery;
-import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositVehicleQuery;
-import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositVo;
+import com.yxt.anrui.buscenter.api.busmaindeposit.pc.*;
 import com.yxt.anrui.buscenter.biz.busmaindeposit.BusMainDepositService;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -39,4 +36,11 @@ public class PcBusMainDepositRest implements PcBusMainDepositFeign {
     public ResultBean<List<String>> selectVehicleList(PcBusMainDepositVehicleQuery query) {
         return busMainDepositService.selectVehicleList(query);
     }
+
+    @Override
+    public ResultBean<PagerVo<PcBusDepositVo>> depositPageList(PagerQuery<PcBusDepositQuery> query) {
+        ResultBean<PagerVo<PcBusDepositVo>> rb = ResultBean.fireFail();
+        PagerVo<PcBusDepositVo> pv = busMainDepositService.depositPageList(query);
+        return rb.success().setData(pv);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -30,8 +30,13 @@ import cn.hutool.core.convert.Convert;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo;
+import com.yxt.anrui.base.api.basepostprice.BaseOrderPostPriceQuery;
+import com.yxt.anrui.base.api.basepostprice.BaseOrderPostPriceVo;
+import com.yxt.anrui.base.api.basepostprice.BasePostPriceFeign;
 import com.yxt.anrui.base.api.basevehicle.AppVinsDetailsVo;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
+import com.yxt.anrui.base.api.basevehiclepolicy.BaseVehiclePolicyFeign;
+import com.yxt.anrui.base.api.basevehiclepolicy.BaseVehiclePriceVo;
 import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigFeign;
 import com.yxt.anrui.base.api.busvehicleorder.AppOrderReadyCar;
 import com.yxt.anrui.base.api.busvehicleorder.BusVehicleOrderFeign;
@@ -88,6 +93,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
 import java.util.*;
 
 /**
@@ -137,6 +143,10 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
     private BaseVehicleFeign baseVehicleFeign;
     @Autowired
     private BusVehicleOrderFeign busVehicleOrderFeign;
+    @Autowired
+    private BasePostPriceFeign basePostPriceFeign;
+    @Autowired
+    private BaseVehiclePolicyFeign baseVehiclePolicyFeign;
 
     /**
      * 构造查询条件
@@ -280,6 +290,11 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
     public ResultBean<String> saveOrUpdateOrder(BusSalesOrderAllDto dto) {
         ResultBean<String> rb = ResultBean.fireFail();
         String sid = dto.getSid();
+        //验证传入的参数是否正确
+        ResultBean resultBean = isCheck(dto);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
         if (StringUtils.isBlank(dto.getSid())) {
             //新增
             sid = save(dto);
@@ -289,6 +304,107 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         return rb.success().setData(sid);
     }
 
+    /**
+     * 验证销售订单中的计算数值的情况是否计算的正确
+     *
+     * @param dto 数据传输对象
+     * @return
+     */
+    public ResultBean isCheck(BusSalesOrderAllDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        //验证台数是否正确
+        //初始化台数
+        int vehicleNum = 0;
+        if ("1".equals(dto.getType())) {
+            //现车
+            vehicleNum = dto.getBusSalesOrderVehicleList().size();
+
+        } else if ("2".equals(dto.getType())) {
+            //采购订单
+            List<BusSalesVehicleOrderDto> busSalesVehicleOrderList = dto.getBusSalesVehicleOrderList();
+            for (int i = 0; i < busSalesVehicleOrderList.size(); i++) {
+                vehicleNum = vehicleNum + busSalesVehicleOrderList.get(i).getUsingNum();
+            }
+        }
+        //判断和价格信息中的台数是否一致
+        int quantity = dto.getBusSalesOrderPrice().getQuantity();
+        if (vehicleNum != quantity) {
+            return rb.setMsg("选择的台数与价格信息中的台数数值不一致");
+        }
+        BigDecimal singleGuildPriceBig = new BigDecimal("0");
+        BigDecimal singleFinalPriceBig = new BigDecimal("0");
+        //单台指导价
+        String guildPrice = dto.getBusSalesOrderModel().getGuildPrice();
+        singleGuildPriceBig = singleGuildPriceBig.add(new BigDecimal(guildPrice));
+        //单台成交价
+        String finalPrice = dto.getBusSalesOrderModel().getFinalPrice();
+        singleFinalPriceBig = singleFinalPriceBig.add(new BigDecimal(finalPrice));
+        //包含上装
+        if ("1".equals(dto.getIsTop())) {
+            //上装价格
+            String topPrice = dto.getBusSalesOrderMakeup().getTopPrice();
+            singleGuildPriceBig.add(new BigDecimal(topPrice));
+            singleFinalPriceBig.add(new BigDecimal(topPrice));
+        }
+        //单台指导价（主车+上装价格）
+        String singleGuildPrice = dto.getBusSalesOrderPrice().getSingleGuildPrice();
+        String singleFinalPrice = dto.getBusSalesOrderPrice().getSingleFinalPrice();
+        //比较单台指导价（主车加上装）是否等于 单台指导价+上装的价格
+        if (new BigDecimal(singleGuildPrice).compareTo(singleGuildPriceBig) != 0) {
+            return rb.setMsg("价格信息中的单台指导价数值计算错误");
+        }
+        //比较单台成交价（主车加上装） 是否等于单台成交价+上装的价格
+        if (new BigDecimal(singleFinalPrice).compareTo(singleFinalPriceBig) != 0) {
+            return rb.setMsg("价格信息中的单台成交价数值计算错误");
+        }
+        //计算车价合计是否正确
+        String priceSum = dto.getBusSalesOrderPrice().getPriceSum();
+
+        //车价合计是否等于单台成交价*数量
+        if (new BigDecimal(priceSum).compareTo(singleFinalPriceBig.multiply(new BigDecimal(new Integer(quantity).toString()))) != 0) {
+            return rb.setMsg("价格信息中的车价合计数值计算错误");
+        }
+        //计算主车优惠明细计算的是否正确
+        List<BusSalesOrderDiscountDto> busSalesOrderDiscountList = dto.getBusSalesOrderDiscountList();
+        if (busSalesOrderDiscountList.size() > 0) {
+            for (int i = 0; i < busSalesOrderDiscountList.size(); i++) {
+                //价值
+                String price = busSalesOrderDiscountList.get(i).getPrice();
+                Integer num = busSalesOrderDiscountList.get(i).getNum();
+                String totalValue = busSalesOrderDiscountList.get(i).getTotalValue();
+                if (new BigDecimal(totalValue).compareTo(new BigDecimal(price).multiply(new BigDecimal(num.toString()))) != 0) {
+                    return rb.setMsg("主车优惠明细中总价值数值计算错误");
+                }
+            }
+        }
+        //订金信息的数值验证
+        String deposit = dto.getBusSalesOrderDeposit().getDeposit();
+        String depositAll = dto.getBusSalesOrderDeposit().getDepositAll();
+        if (new BigDecimal(depositAll).compareTo(new BigDecimal(deposit).multiply(new BigDecimal(new Integer(quantity).toString()))) != 0) {
+            return rb.setMsg("订金信息中订金合计数值计算错误");
+        }
+        if ("02".equals(dto.getBusSalesOrderDeposit().getDepositTypeKey())) {
+            List<BusDepositFictitiousDto> busDepositFictitiousList = dto.getBusDepositFictitiousList();
+            BigDecimal depositBig = new BigDecimal("0");
+            if (busDepositFictitiousList.size() > 0) {
+                for (int i = 0; i < busDepositFictitiousList.size(); i++) {
+                    String depositPrice = busDepositFictitiousList.get(i).getDepositPrice();
+                    String price = busDepositFictitiousList.get(i).getPrice();
+                    if (new BigDecimal(price).compareTo(new BigDecimal(depositPrice)) > 0) {
+                        return rb.setMsg("虚拟订单中存在本次结转金额大于订金剩余金额的数据");
+                    }
+                    depositBig = depositBig.add(new BigDecimal(price));
+                }
+            }
+            //判断补交金额和订金合计-本次结转金额
+            String makeUpDeposit = dto.getBusSalesOrderDeposit().getMakeUpDeposit();
+            if (new BigDecimal(makeUpDeposit).compareTo(new BigDecimal(depositAll).subtract(depositBig)) != 0) {
+                return rb.setMsg("订金信息中需补交订金数值计算错误");
+            }
+        }
+        return rb.success();
+    }
+
     private void updateOrder(BusSalesOrderAllDto dto) {
         //主车车型信息
         BusSalesOrderModelDto busSalesOrderModelDto = dto.getBusSalesOrderModel();
@@ -421,10 +537,14 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             } else {
                 variables.put("isLoan", false);
             }
-            //查询销售支持部经理是否超权限
-
-            //查询总经理审批是否超权限
-
+            //查询角色是否超权限
+            BusSalesOrderPowerVo busSalesOrderPowerVo = isHavePower(dto);
+            boolean isHavePower = busSalesOrderPowerVo.getIsHavePower();
+            boolean isPower = busSalesOrderPowerVo.getIsPower();
+            //销售部经理是否超权限
+            variables.put("isPrice", isHavePower);
+            //总经理是否超权限
+            variables.put("isPrice1", isPower);
             //查询是否排产
             if ("3".equals(dto.getType())) {
                 variables.put("isLoan1", true);
@@ -432,7 +552,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 variables.put("isLoan1", false);
             }
             variables.put("orgSid", orgSid);
-            ResultBean businessResultBean = flowableFeign.businessStart(ProcDefEnum.SCMVEHICLERETURN.getProDefId(), dto.getUserSid(), variables);
+            ResultBean businessResultBean = flowableFeign.businessStart(ProcDefEnum.SALESORDER.getProDefId(), dto.getUserSid(), variables);
             if (businessResultBean.getSuccess() && businessResultBean.getData() != null) {
                 Map<String, String> map = (Map<String, String>) businessResultBean.getData();
                 //更新业务表中的流程状态
@@ -449,6 +569,113 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         return resultBean;
     }
 
+    /**
+     * 判断销售部经理和总经理是否超权限
+     *
+     * @param dto 数据传输对象
+     * @return
+     */
+    public BusSalesOrderPowerVo isHavePower(BusSalesOrderAllDto dto) {
+        BusSalesOrderPowerVo busSalesOrderPowerVo = new BusSalesOrderPowerVo();
+        boolean isHavePower = false;
+        boolean isPower = false;
+        //总指导价-总成交价-总优惠包的价值
+        BigDecimal bigDecimalOne = new BigDecimal("0");
+        //初始化总促销金额
+        BigDecimal initBigDecimal = new BigDecimal("0");
+        //岗位权限+总促销价格
+        BigDecimal bigDecimalTwo = new BigDecimal("0");
+        //单台指导价(主车加上装)
+        String singleGuildPrice = dto.getBusSalesOrderPrice().getSingleGuildPrice();
+        //单台成交价(主车加上装)
+        String singleFinalPrice = dto.getBusSalesOrderPrice().getSingleFinalPrice();
+        //台数
+        Integer quantity = dto.getBusSalesOrderPrice().getQuantity();
+        //计算总指导价
+        BigDecimal guildPriceAll = new BigDecimal(singleGuildPrice).multiply(new BigDecimal(quantity.toString()));
+        //计算总成交价
+        BigDecimal finalPriceAll = new BigDecimal(singleFinalPrice).multiply(new BigDecimal(quantity.toString()));
+        //总优惠包
+        BigDecimal discountPrice = new BigDecimal("0");
+        List<String> priceList = dto.getPriceList();
+        if (priceList.size() > 0) {
+            for (int i = 0; i < priceList.size(); i++) {
+                String price = priceList.get(i);
+                discountPrice = discountPrice.add(new BigDecimal(price));
+            }
+        }
+        //计算总指导价-总成交价-总优惠包的价值
+        bigDecimalOne = guildPriceAll.subtract(finalPriceAll).subtract(discountPrice);
+        List<String> vehicleList = new ArrayList<>();
+        //是否是现车
+        if ("1".equals(dto.getType())) {
+            vehicleList = dto.getVehicleList();
+            //根据现车去查询销售政策的总促销政策之和
+            if (vehicleList.size() > 0) {
+                for (int i = 0; i < vehicleList.size(); i++) {
+                    //根据sid去查询销售政策的sid，根据销售政策查询销售政策的金额
+                    ResultBean<BaseVehiclePriceVo> priceResultBean = baseVehiclePolicyFeign.selectPrice(vehicleList.get(i));
+                    String price = priceResultBean.getData().getDiscountMoney();
+                    BigDecimal bigDecimal1 = new BigDecimal(price);
+                    initBigDecimal = initBigDecimal.add(bigDecimal1);
+                }
+            }
+        }
+        //销售经理的角色sid
+        String roleSid = "f0a79b5e-5338-435e-b0c6-08fc01048f55";
+        //查询销售支持部经理是否超权限
+        String brandSid = dto.getBusSalesOrderModel().getBrandSid();
+        BaseOrderPostPriceQuery baseOrderPostPriceQuery = new BaseOrderPostPriceQuery();
+        baseOrderPostPriceQuery.setBrandSid(brandSid);
+        baseOrderPostPriceQuery.setRoleSid(roleSid);
+        ResultBean<BaseOrderPostPriceVo> resultBean1 = basePostPriceFeign.selectPostPrice(baseOrderPostPriceQuery);
+        if (resultBean1.getSuccess()) {
+            String price = resultBean1.getData().getPrice();
+            //ToDo:计算是否有权限：岗位权限（销售部经理权限、总经理权限）+总促销金额<总指导价-总成交价-优惠包总价值
+            //销售支持部经理的岗位权限价格
+            BigDecimal bigDecimal2 = new BigDecimal(price);
+            bigDecimalTwo = bigDecimal2.add(initBigDecimal);
+            //判断岗位权限+总促销价格和总指导价-总成交价-优惠包总价值的大小
+            if (bigDecimalTwo.compareTo(bigDecimalOne) < 0) {
+                //bigDecimalTwo<bigDecimalOne
+                isHavePower = true;
+            } else if (bigDecimalTwo.compareTo(bigDecimalOne) > 0) {
+                //bigDecimalTwo>bigDecimalOne
+                isHavePower = false;
+            } else {
+                isHavePower = false;
+            }
+        }
+        //总经理的角色sid
+        roleSid = "135b4829-2928-4124-a5b3-7d4b1101a863";
+        //查询总经理审批是否超权限
+        baseOrderPostPriceQuery = new BaseOrderPostPriceQuery();
+        baseOrderPostPriceQuery.setBrandSid(brandSid);
+        baseOrderPostPriceQuery.setRoleSid(roleSid);
+        ResultBean<BaseOrderPostPriceVo> resultBean2 = basePostPriceFeign.selectPostPrice(baseOrderPostPriceQuery);
+        if (resultBean2.getSuccess()) {
+            String price = resultBean2.getData().getPrice();
+            //ToDo:计算是否有权限：岗位权限（销售部经理权限、总经理权限）+总促销金额>总指导价-总成交价-优惠包总价值
+            //总经理的岗位权限价格
+            bigDecimalTwo = new BigDecimal("0");
+            BigDecimal bigDecimal2 = new BigDecimal(price);
+            bigDecimalTwo = bigDecimal2.add(initBigDecimal);
+            //判断岗位权限+总促销价格和总指导价-总成交价-优惠包总价值的大小
+            if (bigDecimalTwo.compareTo(bigDecimalOne) < 0) {
+                //bigDecimalTwo<bigDecimalOne
+                isPower = true;
+            } else if (bigDecimalTwo.compareTo(bigDecimalOne) > 0) {
+                //bigDecimalTwo>bigDecimalOne
+                isPower = false;
+            } else {
+                isPower = false;
+            }
+        }
+        busSalesOrderPowerVo.setIsPower(isPower);
+        busSalesOrderPowerVo.setIsHavePower(isHavePower);
+        return busSalesOrderPowerVo;
+    }
+
     /**
      * 查询用户是否设置了部门
      *
@@ -910,7 +1137,6 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
     }
 
 
-
     /**
      * 删除/批量删除销售订单
      *

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/pc/PcCrmVehicleDemandVo.java

@@ -19,6 +19,8 @@ public class PcCrmVehicleDemandVo implements Vo {
     private String modelConfigSid;
     @ApiModelProperty(value = "品牌")
     private String brandName;
+    @ApiModelProperty(value = "品牌sid")
+    private String brandSid;
     @ApiModelProperty(value = "车型别名")
     private String modelAlias;
     /**

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java

@@ -387,6 +387,7 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
                     list.get(i).setGuidedPrice(voResultBean.getData().getGuidedPrice());
                     list.get(i).setModelName(voResultBean.getData().getModelName());
                     list.get(i).setOtherConfig(voResultBean.getData().getOtherConfig());
+                    list.get(i).setBrandSid(voResultBean.getData().getBrandSid());
                 }
             }
         }

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java

@@ -18,7 +18,8 @@ public enum ProcDefEnum {
     SCMVEHICLERETURN("采购退库", "process_md8aeoap:4:245028"),
     SEALAPPLY("盖章申请", "process_7h0z66tp:1:240064" ),
     BASEVEHICLEACTUALSALES("未售买断", ""),//ToDo
-    SALESORDER("销售订单审批流程", ""),//ToDo
+    SALESORDER("销售订单审批流程", "process_p5ils2rn:3:252512"),
+    BASEOUTSOURCINGAPPLICATION("外采申请", "process_5tqysnjc:1:232504"),
     ;
 
     ProcDefEnum(String proDefName, String proDefId) {

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlService.java

@@ -183,6 +183,6 @@ public class SysProUrlService extends MybatisBaseService<SysProUrlMapper, SysPro
             return rb.setMsg("请指定要操作的类型");
         }
         String url = baseMapper.selectUrlByKey(procDefId, taskDefKey, type);
-        return null;
+        return rb.success().setData(url);
     }
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeign.java

@@ -78,4 +78,9 @@ public interface SysStaffOrgFeign {
     @ResponseBody
     @ApiModelProperty("根据员工sid获取部门全路径")
     ResultBean<String> selectSidPathByStaffSid(@RequestParam(value = "applySid") String applySid);
+
+    @GetMapping("/selectAllByStaffSid")
+    @ResponseBody
+    @ApiModelProperty("根据员工sid获取主管部门信息")
+    ResultBean<SysStaffOrg> selectAllByStaffSid(@RequestParam(value = "staffSid") String staffSid);
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeignFallback.java

@@ -84,4 +84,9 @@ public class SysStaffOrgFeignFallback implements SysStaffOrgFeign {
 	public ResultBean<String> selectSidPathByStaffSid(String applySid) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<SysStaffOrg> selectAllByStaffSid(String staffSid) {
+		return null;
+	}
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserVo.java

@@ -67,6 +67,10 @@ public class SysUserVo implements Vo {
     private String userTypeKey;
     @ApiModelProperty("用户头像")
     private String headImage;
+    @ApiModelProperty("组织名称")
+    private String orgNamePath;
+    @ApiModelProperty("组织sid")
+    private String orgSidPath;
     @ApiModelProperty(value = "token")
     private String token;
     @ApiModelProperty(value = "角色sids")

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.java

@@ -74,4 +74,7 @@ public interface SysStaffOrgMapper extends BaseMapper<SysStaffOrg> {
     String getSysStaffOrgSidListByStaffSid(@Param("staffSid") String staffSid);
 
     String selectBySidPathByStaffSid(String applySid);
+
+    @Select("select * from sys_staff_org where staffSid=#{staffSid} AND manageType != 2")
+    SysStaffOrg selectAllByStaffSid(String staffSid);
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgRest.java

@@ -1,9 +1,6 @@
 package com.yxt.anrui.portal.biz.sysstafforg;
 
-import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgDto;
-import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
-import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgQuery;
-import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo;
+import com.yxt.anrui.portal.api.sysstafforg.*;
 import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -118,4 +115,9 @@ public class SysStaffOrgRest implements SysStaffOrgFeign {
     public ResultBean<String> selectSidPathByStaffSid(String applySid) {
         return sysStaffOrgService.selectSidPathByStaffSid(applySid);
     }
+
+    @Override
+    public ResultBean<SysStaffOrg> selectAllByStaffSid(String staffSid) {
+        return sysStaffOrgService.selectAllByStaffSid(staffSid);
+    }
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java

@@ -181,4 +181,10 @@ public class SysStaffOrgService extends MybatisBaseService<SysStaffOrgMapper, Sy
         }
         return rb.success().setData(sid);
     }
+
+    public ResultBean<SysStaffOrg> selectAllByStaffSid(String staffSid) {
+        ResultBean rb = ResultBean.fireFail();
+        SysStaffOrg sysStaffOrg = baseMapper.selectAllByStaffSid(staffSid);
+        return rb.success().setData(sysStaffOrg);
+    }
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java

@@ -9,6 +9,7 @@ import com.yxt.anrui.portal.api.sms.SmsFeign;
 import com.yxt.anrui.portal.api.sysrole.SysRoleQuery;
 import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfo;
 import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoVo;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo;
 import com.yxt.anrui.portal.api.sysuser.*;
 import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo;
@@ -261,6 +262,8 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
         userInfoOneVo.setUserName(user.getUserName());
         userInfoOneVo.setIsAdmin(user.getIsAdmin());
 
+        SysStaffOrg sysStaffOrg = sysStaffOrgService.selectAllByStaffSid(user.getStaffSid()).getData();
+
         userInfoOneVo.setRoleName("");
         String dwjb = "";
         // 系统管理员（没有对应的人员和单位）
@@ -277,6 +280,8 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
                 userInfoOneVo.setName(staffVo.getName());
                 userInfoOneVo.setMobile(staffVo.getMobile());
                 userInfoOneVo.setStaffSid(staffVo.getSid());
+                userInfoOneVo.setOrgNamePath(sysStaffOrg.getOrgNamePath());
+                userInfoOneVo.setOrgSidPath(sysStaffOrg.getOrgSidPath());
             }
             // 尚无单位人员，没有单位和部门信息
             if ("3".equals(user.getIsAdmin())) {
@@ -291,6 +296,8 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
                     userInfoOneVo.setDepartmentName(sysStaffOrgVo.getOrgName());
                     userInfoOneVo.setOrganizationSid(sysStaffOrgVo.getOrgSid());
                     userInfoOneVo.setOrganizationName(sysStaffOrgVo.getOrgName());
+                    userInfoOneVo.setOrgNamePath(sysStaffOrg.getOrgNamePath());
+                    userInfoOneVo.setOrgSidPath(sysStaffOrg.getOrgSidPath());
                 }
             }
         }