客户管理问题修改，车型问题修改，合同档案代码，合同审核代码

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppBaseConfigNowCarQuery.java

@@ -0,0 +1,25 @@
+package com.yxt.anrui.base.api.basevehicle;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppBaseConfigNowCarQuery implements Query {
+
+    @ApiModelProperty("车型sid")
+    private String modelSid;
+
+    @ApiModelProperty("配置sid")
+    private String configSid;
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+
+    @ApiModelProperty("分公司sid")
+    private String useOrg;
+
+    @ApiModelProperty("只考虑车架号")
+    private String names;
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppBaseConfigNowCarVo.java

@@ -0,0 +1,23 @@
+package com.yxt.anrui.base.api.basevehicle;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AppBaseConfigNowCarVo implements Vo {
+
+    @ApiModelProperty("车型名称")
+    private String modelName;
+
+    @ApiModelProperty("销售指导价")
+    private String price;
+
+    @ApiModelProperty("现车列表")
+    private List<AppBaseVinNowCarVo> records;
+
+    @ApiModelProperty("常用配置")
+    private String commonlyConfig;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppBaseVinNowCarVo.java

@@ -0,0 +1,25 @@
+package com.yxt.anrui.base.api.basevehicle;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppBaseVinNowCarVo implements Vo {
+
+    @ApiModelProperty("车架号")
+    private String vin;
+
+    @ApiModelProperty("状态")
+    private String state;
+
+    @ApiModelProperty("颜色")
+    private String color;
+
+    @ApiModelProperty("合格证")
+    private String certificate;
+
+    @ApiModelProperty("存放地点")
+    private String address;
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java

@@ -233,5 +233,7 @@ public interface BaseVehicleFeign {
     @GetMapping("/carConfigSummary/{modelSid}/{configSid}")
     public ResultBean<AppCarConfigSummaryVo> getCarConfigSummary(@PathVariable("modelSid") String modelSid, @PathVariable("configSid") String configSid);
 
-
+    @ApiOperation("手机端-配置列表获取现车列表")
+    @PostMapping("/getModelNowCarList")
+    public ResultBean<AppBaseConfigNowCarVo> getModelNowCarList(@RequestBody PagerQuery<AppBaseConfigNowCarQuery> pagerQuery);
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java

@@ -159,4 +159,9 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<AppBaseConfigNowCarVo> getModelNowCarList(PagerQuery<AppBaseConfigNowCarQuery> pagerQuery) {
+        return null;
+    }
+
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/AppCommonContractInitVo.java

@@ -0,0 +1,70 @@
+package com.yxt.anrui.base.api.commoncontract;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AppCommonContractInitVo implements Vo {
+
+    @ApiModelProperty("合同sid")
+    private String contractSid;
+
+    @ApiModelProperty("单台价格")
+    private String price;
+
+    @ApiModelProperty("数量")
+    private String number;
+
+    @ApiModelProperty("车型")
+    private String model;
+
+    @ApiModelProperty("乙方名称")
+    private String partyB;
+
+    @ApiModelProperty("合同编号")
+    private String contractId;
+
+    @ApiModelProperty("合同价格")
+    private String contractPrice;
+
+    @ApiModelProperty("新车买卖合同")
+    private List<String> contractImages;
+
+    @ApiModelProperty("现场签署图片")
+    private List<String> siteSigImages;
+
+    @ApiModelProperty("身份证图片")
+    private List<String> idCardImages;
+
+    @ApiModelProperty("客户类型")
+    private String customerKey;
+
+    @ApiModelProperty("任务id")
+    private String taskId;
+
+    @ApiModelProperty("流程实例id")
+    private String procInsId;
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+
+    @ApiModelProperty("是否是档案库里的身份证")
+    private boolean idCardArchives;
+
+    @ApiModelProperty("客户sid")
+    private String customerSid;
+
+    @ApiModelProperty("合同附件")
+    private String appdixUrl;
+
+    @ApiModelProperty("现场签署图片附件")
+    private String sceneSignUrl;
+
+    @ApiModelProperty("身份证图片")
+    private String idImagesUrl;
+
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/AppCommonContractPageVo.java

@@ -0,0 +1,35 @@
+package com.yxt.anrui.base.api.commoncontract;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppCommonContractPageVo implements Vo {
+
+    @ApiModelProperty("合同sid")
+    private String contractSid;
+
+    @ApiModelProperty("合同编号")
+    private String contractId;
+
+    @ApiModelProperty("合同类型")
+    private String contractType;
+
+    @ApiModelProperty("乙方名称")
+    private String partyB;
+
+    @ApiModelProperty("经办人")
+    private String handler;
+
+    @ApiModelProperty("合同金额")
+    private String contractPrice;
+
+    @ApiModelProperty("是否显示办理按钮")
+    private boolean isShowUpdate;
+
+    @ApiModelProperty("节点状态")
+    private String nodeState;
+
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/AppCommonContractQuery.java

@@ -0,0 +1,38 @@
+package com.yxt.anrui.base.api.commoncontract;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-base(安瑞基础) <br/>
+ * File: CommonContractQuery.java <br/>
+ * Class: com.yxt.anrui.base.api.commoncontract.CommonContractQuery <br/>
+ * Description: 合同表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-10-12 14:02:40 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "合同表 查询条件", description = "合同表 查询条件")
+@Data
+public class AppCommonContractQuery implements Query {
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+
+    @ApiModelProperty("合同类型key")
+    private String type;
+
+    @ApiModelProperty("")
+    private String names;
+
+    @ApiModelProperty("业务员sid")
+    private String staffSid;
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/AppCrmCustomerFileDto.java

@@ -0,0 +1,71 @@
+package com.yxt.anrui.base.api.commoncontract;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+public class AppCrmCustomerFileDto implements Dto {
+
+    @ApiModelProperty("合同sid")
+    private String contractSid;
+
+    @ApiModelProperty("单台价格")
+    private BigDecimal price;
+
+    @ApiModelProperty("数量")
+    private String number;
+
+    @ApiModelProperty("车型")
+    private String model;
+
+    @ApiModelProperty("乙方名称")
+    private String partyB;
+
+    @ApiModelProperty("合同编号")
+    private String contractId;
+
+    @ApiModelProperty("合同价格")
+    private String contractPrice;
+
+    @ApiModelProperty("新车买卖合同")
+    private List<String> contractImages;
+
+    @ApiModelProperty("现场签署图片")
+    private List<String> siteSigImages;
+
+    @ApiModelProperty("身份证图片")
+    private List<String> idCardImages;
+
+    @ApiModelProperty("客户类型")
+    private String customerKey;
+
+    @ApiModelProperty("任务id")
+    private String taskId;
+
+    @ApiModelProperty("流程实例id")
+    private String procInsId;
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+
+    @ApiModelProperty("是否是档案库里的身份证")
+    private boolean idCardArchives;
+
+    @ApiModelProperty("客户sid")
+    private String customerSid;
+
+    @ApiModelProperty("合同附件")
+    private String appdixUrl;
+
+    @ApiModelProperty("现场签署图片附件")
+    private String sceneSignUrl;
+
+    @ApiModelProperty("身份证图片")
+    private String idImagesUrl;
+
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContract.java

@@ -84,6 +84,9 @@ public class CommonContract extends BaseEntity {
     @ApiModelProperty("现场签署图片附件")
     private String sceneSignUrl;
 
+    @ApiModelProperty("身份证信息附件")
+    private String idImagesUrl;
+
     @ApiModelProperty("车型名称")
     private String modelName;
     @ApiModelProperty("台数")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java

@@ -66,7 +66,6 @@ public interface CommonContractFeign {
     public ResultBean<CommonContractBuscenterVo> selectByBusSid(@RequestParam("busSid") String busSid);
 
 
-
     /************************************手机端接口*******************************************/
 
     @ApiOperation("根据sid更新合同订金")
@@ -106,7 +105,6 @@ public interface CommonContractFeign {
     /*****************************************************************************************/
 
     /**
-     *
      * @param sids
      * @return
      */
@@ -145,4 +143,19 @@ public interface CommonContractFeign {
 
     /**************************************************************************************************************************************/
 
+    @ApiOperation("移动端-合同审核列表")
+    @PostMapping("/getContractList")
+    @ResponseBody
+    public ResultBean<PagerVo<AppCommonContractPageVo>> getContractList(@RequestBody PagerQuery<AppCommonContractQuery> pagerQuery);
+
+    @ApiOperation("移动端-初始化合同审核")
+    @PostMapping("/getContractInfo/{contractSid}/{userSid}")
+    @ResponseBody
+    public ResultBean<AppCommonContractInitVo> getContractInfo(@PathVariable("contractSid") String contractSid, @PathVariable("userSid") String userSid);
+
+    @ApiOperation("移动端-保存合同审核")
+    @PostMapping("/saveContractInfo")
+    @ResponseBody
+    public ResultBean saveContractInfo(@RequestBody AppCrmCustomerFileDto dto);
+
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeignFallback.java

@@ -150,4 +150,19 @@ public class CommonContractFeignFallback implements CommonContractFeign {
         ResultBean rb = ResultBean.fireFail();
         return rb.setMsg("接口anrui-base/commoncontract/submitCarSaleContractApprove无法访问");
     }
+
+    @Override
+    public ResultBean<PagerVo<AppCommonContractPageVo>> getContractList(PagerQuery<AppCommonContractQuery> pagerQuery) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<AppCommonContractInitVo> getContractInfo(String contractSid, String userSid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean saveContractInfo(AppCrmCustomerFileDto dto) {
+        return null;
+    }
 }