From a48d69b0aee3d8c39c843f1b313fb6a1615bc865 Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Wed, 13 Apr 2022 10:30:10 +0800
Subject: [PATCH 01/15] =?UTF-8?q?=E7=BC=96=E5=86=99pc=E7=AB=AF=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E4=B8=AD=E6=A0=B9=E6=8D=AE=E6=B5=81=E7=A8=8B=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89iD=E5=92=8C=E8=8A=82=E7=82=B9id=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E5=AF=B9=E5=BA=94=E7=9A=84url?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/sysprourl/SysProUrlFeign.java         | 30 +++++--
 .../api/sysprourl/SysProUrlFeignFallBack.java |  5 ++
 .../biz/sysprourl/SysProUrlController.java    | 23 +++--
 .../biz/sysprourl/SysProUrlMapper.java        | 10 +++
 .../biz/sysprourl/SysProUrlMapper.xml         | 90 ++++++++++++++-----
 .../biz/sysprourl/SysProUrlService.java       | 58 ++++++++----
 6 files changed, 165 insertions(+), 51 deletions(-)

diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/sysprourl/SysProUrlFeign.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/sysprourl/SysProUrlFeign.java
index de59be8b7d..00187b5a63 100644
--- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/sysprourl/SysProUrlFeign.java
+++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/sysprourl/SysProUrlFeign.java
@@ -4,6 +4,7 @@ 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.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
@@ -20,28 +21,29 @@ public interface SysProUrlFeign {
      */
     @PostMapping("/list")
     @ResponseBody
-    public ResultBean<PagerVo<SysProUrlVo>> list(@RequestBody PagerQuery<SysProUrlQuery> pq) ;
+    public ResultBean<PagerVo<SysProUrlVo>> list(@RequestBody PagerQuery<SysProUrlQuery> pq);
+
 
-   
     /**
      * 获取流程业务表单url对象
      */
     @GetMapping(value = "/getSysProUrl/{formId}")
     @ResponseBody
-    public  ResultBean getSysProUrl(@PathVariable("formId") int formId);
+    public ResultBean getSysProUrl(@PathVariable("formId") int formId);
+
     /**
      * 根据流程实例id获取form信息
      */
     @GetMapping(value = "/getForm/{proId}")
     @ResponseBody
-    public  ResultBean getForm(@PathVariable("proId") String proId);
+    public ResultBean getForm(@PathVariable("proId") String proId);
 
     /**
      * 新增流程业务表单url对象
      */
-    @PostMapping(value="/add")
+    @PostMapping(value = "/add")
     @ResponseBody
-    public ResultBean<String> add(@RequestBody SysProUrl sysProUrl) ;
+    public ResultBean<String> add(@RequestBody SysProUrl sysProUrl);
 
     /**
      * 修改流程业务表单url对象
@@ -62,4 +64,20 @@ public interface SysProUrlFeign {
     @ApiOperation("app根据流程定义id，节点id，终端及类型查询流程与业务表单url")
     @PostMapping("/selectAppUrlByTaskDefKey")
     ResultBean<AppUrlVo> selectAppUrlByTaskDefKey(@Valid @RequestBody AppSysProUrlQuery query);
+
+
+    /**
+     * pc根据流程定义id，节点id，终端及类型查询流程与业务表单url
+     *
+     * @param procDefId  流程定义id
+     * @param taskDefKey 节点id
+     * @param type       类型：1办理，2详情
+     * @return
+     */
+    @ApiOperation("查询流程与业务表单的url")
+    @GetMapping("/selectUrlByKey")
+    ResultBean<String> selectUrlByKey(@ApiParam(value = "流程定义id") @RequestParam(value = "procDefId") String procDefId,
+                                      @ApiParam(value = "节点id") @RequestParam(value = "taskDefKey") String taskDefKey,
+                                      @ApiParam(value = "类型:1办理，2详情") @RequestParam(value = "type") String type);
+
 }
diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/sysprourl/SysProUrlFeignFallBack.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/sysprourl/SysProUrlFeignFallBack.java
index 76e46169b8..e3e49a5c1a 100644
--- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/sysprourl/SysProUrlFeignFallBack.java
+++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/sysprourl/SysProUrlFeignFallBack.java
@@ -54,4 +54,9 @@ public class SysProUrlFeignFallBack implements SysProUrlFeign {
     public ResultBean<AppUrlVo> selectAppUrlByTaskDefKey(AppSysProUrlQuery query) {
         return null;
     }
+
+    @Override
+    public ResultBean<String> selectUrlByKey(String procDefId, String taskDefKey, String type) {
+        return null;
+    }
 }
diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlController.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlController.java
index 86b3c2f664..5754114293 100644
--- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlController.java
+++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlController.java
@@ -40,16 +40,16 @@ public class SysProUrlController implements SysProUrlFeign {
 
     @Override
     public ResultBean getSysProUrl(int formId) {
-        ResultBean< SysProUrl> rb = ResultBean.fireFail();
+        ResultBean<SysProUrl> rb = ResultBean.fireFail();
         SysProUrl sysProUrl = sysProUrlService.selectSysProUrlById(formId);
-        return  rb.success().setData(sysProUrl);
+        return rb.success().setData(sysProUrl);
     }
 
     @Override
     public ResultBean getForm(String proId) {
-        ResultBean< SysForm> rb = ResultBean.fireFail();
+        ResultBean<SysForm> rb = ResultBean.fireFail();
         SysForm sysForm = sysDeployFormService.selectSysDeployFormByDeployId(proId);
-        return  rb.success().setData(sysForm);
+        return rb.success().setData(sysForm);
     }
 
     /**
@@ -73,7 +73,7 @@ public class SysProUrlController implements SysProUrlFeign {
     @DeleteMapping("/{formIds}")
     @Override
     public ResultBean<String> remove(@PathVariable Long[] formIds) {
-       sysProUrlService.deleteSysProUrlByIds(formIds);
+        sysProUrlService.deleteSysProUrlByIds(formIds);
         ResultBean<String> rb = ResultBean.fireFail();
         return rb.success().setMsg("操作成功");
     }
@@ -106,4 +106,17 @@ public class SysProUrlController implements SysProUrlFeign {
         }
         return new ResultBean<AppUrlVo>().success().setData(appUrlVo);
     }
+
+    /**
+     * pc根据流程定义id，节点id，终端及类型查询流程与业务表单url
+     *
+     * @param procDefId  流程定义id
+     * @param taskDefKey 节点id
+     * @param type       类型：1办理，2详情
+     * @return
+     */
+    @Override
+    public ResultBean<String> selectUrlByKey(String procDefId, String taskDefKey, String type) {
+        return sysProUrlService.selectUrlByKey(procDefId, taskDefKey, type);
+    }
 }
diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlMapper.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlMapper.java
index 6541eeb645..bea6ceed0a 100644
--- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlMapper.java
+++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlMapper.java
@@ -79,4 +79,14 @@ public interface SysProUrlMapper extends BaseMapper<SysProUrl> {
     List<SysProUrlVo> selectListByProcDefId(@Param("proc_def_id") String proc_def_id, @Param("taskDefKey") String taskDefKey);
 
     SysProUrlVo selectUniByTaskDefKey(SysProUrlQuery query);
+
+    /**
+     * pc根据流程定义id，节点id，终端及类型查询流程与业务表单url
+     *
+     * @param procDefId  流程id
+     * @param taskDefKey 节点iD
+     * @param type       类型：1办理，2详情
+     * @return
+     */
+    String selectUrlByKey(@Param("procDefId") String procDefId, @Param("taskDefKey") String taskDefKey, @Param("type") String type);
 }
diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlMapper.xml b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlMapper.xml
index f9f2872f01..6afab06bd6 100644
--- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlMapper.xml
+++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlMapper.xml
@@ -2,50 +2,96 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yxt.anrui.flowable.biz.sysprourl.SysProUrlMapper">
     <select id="getSysProUrlVoList" resultType="com.yxt.anrui.flowable.api.sysprourl.SysProUrl">
-        select id as id, url as url, type as type,  terminal as terminal,  formId as formId,  title as title
+        select id as id, url as url, type as type, terminal as terminal, formId as formId, title as title
         from sys_pro_url
     </select>
     <select id="getSysProUrlVoTotal" resultType="int">
-        select  count(*) as total from sys_pro_url
+        select count(*) as total
+        from sys_pro_url
     </select>
-    <insert id="insertSysProUrl" parameterType="com.yxt.anrui.flowable.api.sysprourl.SysProUrl" useGeneratedKeys="true" keyProperty="sid">
+    <insert id="insertSysProUrl" parameterType="com.yxt.anrui.flowable.api.sysprourl.SysProUrl" useGeneratedKeys="true"
+            keyProperty="sid">
         insert into sys_pro_url
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="url != null">url,</if>
-            <if test="type != null">type,</if>
-            <if test="terminal != null">terminal,</if>
-            <if test="formId != null">formId,</if>
-            <if test="title != null">title</if>
+            <if test="url != null">
+                url,
+            </if>
+            <if test="type != null">
+                type,
+            </if>
+            <if test="terminal != null">
+                terminal,
+            </if>
+            <if test="formId != null">
+                formId,
+            </if>
+            <if test="title != null">
+                title
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="url != null">#{url},</if>
-            <if test="type != null">#{type},</if>
-            <if test="terminal != null">#{terminal},</if>
-            <if test="formId != null">#{formId},</if>
-            <if test="title != null">#{title},</if>
+            <if test="url != null">
+                #{url},
+            </if>
+            <if test="type != null">
+                #{type},
+            </if>
+            <if test="terminal != null">
+                #{terminal},
+            </if>
+            <if test="formId != null">
+                #{formId},
+            </if>
+            <if test="title != null">
+                #{title},
+            </if>
         </trim>
     </insert>
     <delete id="deleteSysProUrlByIds" parameterType="String">
-        delete from sys_pro_url where sid in
+        delete
+        from sys_pro_url where sid in
         <foreach item="formId" collection="array" open="(" separator="," close=")">
             #{sid}
         </foreach>
     </delete>
-    <select id="selectSysProUrlById" parameterType="Integer" resultType="com.yxt.anrui.flowable.api.sysprourl.SysProUrl">
-        select id as id, url as url, type as type,  terminal as terminal,  formId as formId,  title as title from sys_pro_url
+    <select id="selectSysProUrlById" parameterType="Integer"
+            resultType="com.yxt.anrui.flowable.api.sysprourl.SysProUrl">
+        select id as id, url as url, type as type, terminal as terminal, formId as formId, title as title
+        from sys_pro_url
         where formId = #{formId}
     </select>
 
     <select id="selectListByProcDefId" resultType="com.yxt.anrui.flowable.api.sysprourl.SysProUrlVo">
-        SELECT url, type, terminal,formId,title,proc_def_id, taskDefKey,modulePluginName
+        SELECT url,
+               type,
+               terminal,
+               formId,
+               title,
+               proc_def_id,
+               taskDefKey,
+               modulePluginName
         FROM sys_pro_url
-        WHERE proc_def_id=#{proc_def_id} AND (taskDefKey=#{taskDefKey} OR taskDefKey IS NULL OR taskDefKey = '')
-        ORDER BY terminal DESC,id ASC
+        WHERE proc_def_id = #{proc_def_id}
+          AND (taskDefKey = #{taskDefKey} OR taskDefKey IS NULL OR taskDefKey = '')
+        ORDER BY terminal DESC, id ASC
     </select>
 
-    <select id="selectUniByTaskDefKey" parameterType="com.yxt.anrui.flowable.api.sysprourl.SysProUrlQuery" resultType="com.yxt.anrui.flowable.api.sysprourl.SysProUrlVo">
-        SELECT url,modulePluginName
+    <select id="selectUniByTaskDefKey" parameterType="com.yxt.anrui.flowable.api.sysprourl.SysProUrlQuery"
+            resultType="com.yxt.anrui.flowable.api.sysprourl.SysProUrlVo">
+        SELECT url, modulePluginName
         FROM sys_pro_url
-        WHERE proc_def_id=#{proc_def_id} AND type=#{type} AND terminal=#{terminal} AND taskDefKey=#{taskDefKey}
+        WHERE proc_def_id = #{proc_def_id}
+          AND type = #{type}
+          AND terminal = #{terminal}
+          AND taskDefKey = #{taskDefKey}
+    </select>
+
+    <select id="selectUrlByKey" resultType="java.lang.String">
+        select url
+        from sys_pro_url
+        where proc_def_id = #{procDefId}
+          and type = #{type}
+          and taskDefKey = #{taskDefKey}
+          and terminal = 1
     </select>
 </mapper>
\ No newline at end of file
diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlService.java
index 4a58e738b0..8b408c89ea 100644
--- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlService.java
+++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlService.java
@@ -20,7 +20,7 @@ import java.util.List;
 
 /**
  * 流程表单Service业务层处理
- * 
+ *
  * @author XuanXuan Xuan
  * @date 2021-04-03
  */
@@ -33,18 +33,17 @@ public class SysProUrlService extends MybatisBaseService<SysProUrlMapper, SysPro
 
     /**
      * 查询流程表单
-     * 
+     *
      * @param formId 流程表单ID
      * @return 流程表单
      */
-    public SysProUrl selectSysProUrlById(int formId)
-    {
-        return  baseMapper.selectSysProUrlById(formId);
+    public SysProUrl selectSysProUrlById(int formId) {
+        return baseMapper.selectSysProUrlById(formId);
     }
 
     public IPage<SysProUrlVo> selectSysProUrlList(PagerQuery<SysProUrlQuery> pagerQuery) {
         List<SysProUrlVo> SysProUrls = baseMapper.selectListVo();
-        IPage<SysProUrlVo> page =new Page<>();// PagerUtil.queryToPage(pagerQuery);
+        IPage<SysProUrlVo> page = new Page<>();// PagerUtil.queryToPage(pagerQuery);
         QueryWrapper<SysProUrlVo> qw = createQueryWrapper(pagerQuery.getParams());
         List<SysProUrlVo> SysProUrlVoList = baseMapper.getSysProUrlVoList(page, qw);
         int total = baseMapper.getSysProUrlVoTotal(page, qw);
@@ -55,46 +54,42 @@ public class SysProUrlService extends MybatisBaseService<SysProUrlMapper, SysPro
 
     /**
      * 新增流程表单
-     * 
+     *
      * @param SysProUrl 流程表单
      * @return 结果
      */
-    public int insertSysProUrl(SysProUrl SysProUrl)
-    {
+    public int insertSysProUrl(SysProUrl SysProUrl) {
         SysProUrl.setCreateTime(new Date());
         return baseMapper.insertSysProUrl(SysProUrl);
     }
 
     /**
      * 修改流程表单
-     * 
+     *
      * @param SysProUrl 流程表单
      * @return 结果
      */
-    public int updateSysProUrl(SysProUrl SysProUrl)
-    {
+    public int updateSysProUrl(SysProUrl SysProUrl) {
         return 0;//SysProUrlMapper.updateSysProUrl(SysProUrl);
     }
 
     /**
      * 批量删除流程表单
-     * 
+     *
      * @param formIds 需要删除的流程表单ID
      * @return 结果
      */
-    public int deleteSysProUrlByIds(Long[] formIds)
-    {
+    public int deleteSysProUrlByIds(Long[] formIds) {
         return baseMapper.deleteSysProUrlByIds(formIds);
     }
 
     /**
      * 删除流程表单信息
-     * 
+     *
      * @param formId 流程表单ID
      * @return 结果
      */
-    public int deleteSysProUrlById(Long formId)
-    {
+    public int deleteSysProUrlById(Long formId) {
         return 0;// SysProUrlMapper.deleteSysProUrlById(formId);
     }
 
@@ -115,6 +110,7 @@ public class SysProUrlService extends MybatisBaseService<SysProUrlMapper, SysPro
 
     /**
      * 根据流程id及终端查询url
+     *
      * @param proc_def_id
      * @return
      */
@@ -124,6 +120,7 @@ public class SysProUrlService extends MybatisBaseService<SysProUrlMapper, SysPro
 
     /**
      * 根据流程定义id，节点id，终端及类型查询流程与业务表单url
+     *
      * @param query
      * @return
      */
@@ -137,6 +134,7 @@ public class SysProUrlService extends MybatisBaseService<SysProUrlMapper, SysPro
 
     /**
      * app根据流程定义id，节点id，终端及类型查询流程与业务表单url
+     *
      * @param query
      * @return
      */
@@ -163,4 +161,28 @@ public class SysProUrlService extends MybatisBaseService<SysProUrlMapper, SysPro
         }
         return appUrlVo;
     }
+
+    /**
+     * pc根据流程定义id，节点id，终端及类型查询流程与业务表单url
+     *
+     * @param procDefId  流程id
+     * @param taskDefKey 节点iD
+     * @param type       类型：1办理，2详情
+     * @return
+     */
+    public ResultBean<String> selectUrlByKey(String procDefId, String taskDefKey, String type) {
+        ResultBean<String> rb = ResultBean.fireFail();
+        //验证参数
+        if (StringUtils.isBlank(procDefId)) {
+            return rb.setMsg("流程定义id不能为空");
+        }
+        if (StringUtils.isBlank(taskDefKey)) {
+            return rb.setMsg("节点id不能为空");
+        }
+        if (StringUtils.isBlank(type)) {
+            return rb.setMsg("请指定要操作的类型");
+        }
+        String url = baseMapper.selectUrlByKey(procDefId, taskDefKey, type);
+        return null;
+    }
 }

From 4d26a991f737a49ec432e1dba21c55099d35a4dd Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Wed, 13 Apr 2022 10:52:37 +0800
Subject: [PATCH 02/15] =?UTF-8?q?=E6=AC=BE=E9=A1=B9=E5=9F=BA=E7=A1=80?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BusCollectionConfirmation.java            |  81 +++++
 .../BusCollectionConfirmationDetailsVo.java   |  87 ++++++
 .../BusCollectionConfirmationDto.java         |  83 +++++
 .../BusCollectionConfirmationFeign.java       |  74 +++++
 ...usCollectionConfirmationFeignFallback.java |  72 +++++
 .../BusCollectionConfirmationQuery.java       |  60 ++++
 .../BusCollectionConfirmationVo.java          |  68 ++++
 .../api/buscustomerbill/BusCustomerBill.java  | 294 ++++++++++++++++++
 .../buscustomerbill/BusCustomerBillDto.java   |  99 ++++++
 .../buscustomerbill/BusCustomerBillFeign.java |  94 ++++++
 .../BusCustomerBillFeignFallback.java         | 100 ++++++
 .../buscustomerbill/BusCustomerBillQuery.java |  96 ++++++
 .../buscustomerbill/BusCustomerBillVo.java    |  97 ++++++
 .../BusCustomerBillDetailed.java              | 278 +++++++++++++++++
 .../BusCustomerBillDetailedDto.java           |  94 ++++++
 .../BusCustomerBillDetailedFeign.java         |  94 ++++++
 .../BusCustomerBillDetailedFeignFallback.java | 100 ++++++
 .../BusCustomerBillDetailedQuery.java         |  94 ++++++
 .../BusCustomerBillDetailedVo.java            |  94 ++++++
 .../BusSelectedReceivablesDetailed.java       | 262 ++++++++++++++++
 .../BusSelectedReceivablesDetailedDto.java    |  78 +++++
 .../BusSelectedReceivablesDetailedFeign.java  |  94 ++++++
 ...ectedReceivablesDetailedFeignFallback.java | 100 ++++++
 .../BusSelectedReceivablesDetailedQuery.java  |  91 ++++++
 .../BusSelectedReceivablesDetailedVo.java     |  91 ++++++
 .../BusUncollectedReceivablesDetailed.java    | 214 +++++++++++++
 .../BusUncollectedReceivablesDetailedDto.java |  82 +++++
 ...usUncollectedReceivablesDetailedFeign.java |  94 ++++++
 ...ectedReceivablesDetailedFeignFallback.java | 100 ++++++
 ...usUncollectedReceivablesDetailedQuery.java |  82 +++++
 .../BusUncollectedReceivablesDetailedVo.java  |  82 +++++
 .../BusCollectionConfirmationMapper.java      |  65 ++++
 .../BusCollectionConfirmationMapper.xml       |  13 +
 .../BusCollectionConfirmationRest.java        |  91 ++++++
 .../BusCollectionConfirmationService.java     | 134 ++++++++
 .../BusCustomerBillMapper.java                |  65 ++++
 .../buscustomerbill/BusCustomerBillMapper.xml |  13 +
 .../buscustomerbill/BusCustomerBillRest.java  | 144 +++++++++
 .../BusCustomerBillService.java               | 172 ++++++++++
 .../BusCustomerBillDetailedMapper.java        |  65 ++++
 .../BusCustomerBillDetailedMapper.xml         |  13 +
 .../BusCustomerBillDetailedRest.java          | 144 +++++++++
 .../BusCustomerBillDetailedService.java       | 168 ++++++++++
 .../BusSelectedReceivablesDetailedMapper.java |  65 ++++
 .../BusSelectedReceivablesDetailedMapper.xml  |  13 +
 .../BusSelectedReceivablesDetailedRest.java   | 144 +++++++++
 ...BusSelectedReceivablesDetailedService.java | 164 ++++++++++
 ...sUncollectedReceivablesDetailedMapper.java |  65 ++++
 ...usUncollectedReceivablesDetailedMapper.xml |  13 +
 ...BusUncollectedReceivablesDetailedRest.java | 144 +++++++++
 ...UncollectedReceivablesDetailedService.java | 152 +++++++++
 51 files changed, 5276 insertions(+)
 create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmation.java
 create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationDetailsVo.java
 create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationDto.java
 create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationFeign.java
 create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationFeignFallback.java
 create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationQuery.java
 create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationVo.java
 create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscustomerbill/BusCustomerBill.java
 create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscustomerbill/BusCustomerBillDto.java
 create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscustomerbill/BusCustomerBillFeign.java
 create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscustomerbill/BusCustomerBillFeignFallback.java
 create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscustomerbill/BusCustomerBillQuery.java
 create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscustomerbill/BusCustomerBillVo.java
 create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscustomerbilldetailed/BusCustomerBillDetailed.java
 create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscustomerbilldetailed/BusCustomerBillDetailedDto.java
 create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscustomerbilldetailed/BusCustomerBillDetailedFeign.java
 create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscustomerbilldetailed/BusCustomerBillDetailedFeignFallback.java
 create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscustomerbilldetailed/BusCustomerBillDetailedQuery.java
 create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscustomerbilldetailed/BusCustomerBillDetailedVo.java
 create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailed.java
 create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedDto.java
 create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedFeign.java
 create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedFeignFallback.java
 create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedQuery.java
 create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedVo.java
 create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailed.java
 create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedDto.java
 create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedFeign.java
 create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedFeignFallback.java
 create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedQuery.java
 create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedVo.java
 create mode 100644 anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationMapper.java
 create mode 100644 anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationMapper.xml
 create mode 100644 anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationRest.java
 create mode 100644 anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationService.java
 create mode 100644 anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscustomerbill/BusCustomerBillMapper.java
 create mode 100644 anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscustomerbill/BusCustomerBillMapper.xml
 create mode 100644 anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscustomerbill/BusCustomerBillRest.java
 create mode 100644 anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscustomerbill/BusCustomerBillService.java
 create mode 100644 anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscustomerbilldetailed/BusCustomerBillDetailedMapper.java
 create mode 100644 anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscustomerbilldetailed/BusCustomerBillDetailedMapper.xml
 create mode 100644 anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscustomerbilldetailed/BusCustomerBillDetailedRest.java
 create mode 100644 anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscustomerbilldetailed/BusCustomerBillDetailedService.java
 create mode 100644 anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedMapper.java
 create mode 100644 anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedMapper.xml
 create mode 100644 anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedRest.java
 create mode 100644 anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedService.java
 create mode 100644 anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedMapper.java
 create mode 100644 anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedMapper.xml
 create mode 100644 anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedRest.java
 create mode 100644 anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedService.java

diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmation.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmation.java
new file mode 100644
index 0000000000..bb8387434f
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmation.java
@@ -0,0 +1,81 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.buscollectionconfirmation;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: anrui-buscenter(销售相关) <br/>
+ * File: BusCollectionConfirmation.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.buscollectionconfirmation.BusCollectionConfirmation <br/>
+ * Description: 收款确认表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-12 17:57:01 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "收款确认表", description = "收款确认表")
+@Data
+@TableName("bus_collection_confirmation")
+public class BusCollectionConfirmation extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("创建人接口")
+    private String createByName; // 创建人接口
+	@ApiModelProperty("收款日期")
+    private String collectionDate; // 收款日期
+	@ApiModelProperty("收款银行")
+    private String collectionBank; // 收款银行
+	@ApiModelProperty("收款银行账号")
+    private String collectionBankNum; // 收款银行账号
+	@ApiModelProperty("收款方式key")
+    private String collectionTypeKey; // 收款方式key
+	@ApiModelProperty("收款方式value")
+    private String collectionTypeValue; // 收款方式value
+	@ApiModelProperty("付款方名称")
+    private String payerName; // 付款方名称
+	@ApiModelProperty("收款金额")
+    private BigDecimal collectionMoney; // 收款金额
+	@ApiModelProperty("打款凭证Url")
+    private String paymentVoucherUrl; // 打款凭证Url
+	@ApiModelProperty("汇款确认书Url")
+    private String remittanceConfirmationUrl; // 汇款确认书Url
+	@ApiModelProperty("余额")
+    private BigDecimal balance; // 余额
+	@ApiModelProperty("分公司sid")
+    private String useOrgSid; // 分公司sid
+    @ApiModelProperty("认款状态")
+    private Integer subscriptionState; // 认款状态
+}
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationDetailsVo.java
new file mode 100644
index 0000000000..b38c8ec731
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationDetailsVo.java
@@ -0,0 +1,87 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.buscollectionconfirmation;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-buscenter(销售相关) <br/>
+ * File: BusCollectionConfirmationVo.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.buscollectionconfirmation.BusCollectionConfirmationVo <br/>
+ * Description: 收款确认表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-12 17:57:01 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "收款确认表 视图数据对象", description = "收款确认表 视图数据对象")
+@Data
+public class BusCollectionConfirmationDetailsVo implements Vo {
+
+    
+	@ApiModelProperty("创建人接口")
+    private String createByName; // 创建人接口
+    
+	@ApiModelProperty("收款日期")
+    private String collectionDate; // 收款日期
+    
+	@ApiModelProperty("收款银行")
+    private String collectionBank; // 收款银行
+    
+	@ApiModelProperty("收款银行账号")
+    private String collectionBankNum; // 收款银行账号
+    
+	@ApiModelProperty("收款方式key")
+    private String collectionTypeKey; // 收款方式key
+    
+	@ApiModelProperty("收款方式value")
+    private String collectionTypeValue; // 收款方式value
+    
+	@ApiModelProperty("付款方名称")
+    private String payerName; // 付款方名称
+    
+	@ApiModelProperty("收款金额")
+    private String collectionMoney; // 收款金额
+    
+	@ApiModelProperty("打款凭证Url")
+    private String paymentVoucherUrl; // 打款凭证Url
+    
+	@ApiModelProperty("汇款确认书Url")
+    private String remittanceConfirmationUrl; // 汇款确认书Url
+    
+	@ApiModelProperty("余额")
+    private String balance; // 余额
+    
+	@ApiModelProperty("分公司sid")
+    private String useOrgSid; // 分公司sid
+}
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationDto.java
new file mode 100644
index 0000000000..e61590b140
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationDto.java
@@ -0,0 +1,83 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.buscollectionconfirmation;
+
+
+import com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedDto;
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Project: anrui-buscenter(销售相关) <br/>
+ * File: BusCollectionConfirmationDto.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.buscollectionconfirmation.BusCollectionConfirmationDto <br/>
+ * Description: 收款确认表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-12 17:57:01 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "收款确认表 数据传输对象", description = "收款确认表 数据传输对象")
+@Data
+public class BusCollectionConfirmationDto implements Dto {
+
+    @ApiModelProperty("收款确认单sid")
+    private String sid; // 收款确认单sid
+	@ApiModelProperty("创建人接口")
+    private String createByName; // 创建人接口
+	@ApiModelProperty("收款日期")
+    private String collectionDate; // 收款日期
+	@ApiModelProperty("收款银行")
+    private String collectionBank; // 收款银行
+	@ApiModelProperty("收款银行账号")
+    private String collectionBankNum; // 收款银行账号
+	@ApiModelProperty("收款方式key")
+    private String collectionTypeKey; // 收款方式key
+	@ApiModelProperty("收款方式value")
+    private String collectionTypeValue; // 收款方式value
+	@ApiModelProperty("付款方名称")
+    private String payerName; // 付款方名称
+	@ApiModelProperty("收款金额")
+    private String collectionMoney; // 收款金额
+	@ApiModelProperty("打款凭证Url")
+    private String paymentVoucherUrl; // 打款凭证Url
+	@ApiModelProperty("汇款确认书Url")
+    private String remittanceConfirmationUrl; // 汇款确认书Url
+	@ApiModelProperty("余额")
+    private String balance; // 余额
+	@ApiModelProperty("分公司sid")
+    private String useOrgSid; // 分公司sid
+    @ApiModelProperty("已选应收款项明细")
+    private List<BusSelectedReceivablesDetailedDto> busSelectedReceivablesDetailedDtos; // 已选应收款项明细
+}
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationFeign.java
new file mode 100644
index 0000000000..9d01cd5530
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationFeign.java
@@ -0,0 +1,74 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.buscollectionconfirmation;
+
+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 org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: anrui-buscenter(销售相关) <br/>
+ * File: BusCollectionConfirmationFeign.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.buscollectionconfirmation.BusCollectionConfirmationFeign <br/>
+ * Description: 收款确认表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-12 17:57:01 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "收款确认表")
+@FeignClient(
+        contextId = "anrui-buscenter-BusCollectionConfirmation",
+        name = "anrui-buscenter",
+        path = "buscollectionconfirmation",
+        fallback = BusCollectionConfirmationFeignFallback.class)
+public interface BusCollectionConfirmationFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<BusCollectionConfirmationVo>> listPage(@RequestBody PagerQuery<BusCollectionConfirmationQuery> pq);
+
+    @ApiOperation("新增或修改保存")
+    @PostMapping("/saveOrUpdate")
+    public ResultBean saveOrUpdate(@RequestBody BusCollectionConfirmationDto dto);
+      
+    @ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids);
+
+    @ApiOperation("编辑回显或详情")
+    @GetMapping("/fetchBySid/{sid}")
+    public ResultBean<BusCollectionConfirmationDetailsVo> fetchBySid(@PathVariable("sid") String sid);
+}
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationFeignFallback.java
new file mode 100644
index 0000000000..d381a4ac47
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationFeignFallback.java
@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.buscollectionconfirmation;
+
+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;
+
+/**
+ * Project: anrui-buscenter(销售相关) <br/>
+ * File: BusCollectionConfirmationFeignFallback.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.buscollectionconfirmation.BusCollectionConfirmationFeignFallback <br/>
+ * Description: 收款确认表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-12 17:57:01 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class BusCollectionConfirmationFeignFallback implements BusCollectionConfirmationFeign {
+
+	@Override
+	public ResultBean<PagerVo<BusCollectionConfirmationVo>> listPage(PagerQuery<BusCollectionConfirmationQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-buscenter/buscollectionconfirmation/listPage无法访问");
+	}
+
+	@Override
+	public ResultBean saveOrUpdate(BusCollectionConfirmationDto dto){
+		return ResultBean.fireFail().setMsg("接口anrui-buscenter/buscollectionconfirmation/saveOrUpdate无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口anrui-buscenter/buscollectionconfirmation/delBySids无法访问");
+	}
+
+	@Override
+	public ResultBean<BusCollectionConfirmationDetailsVo> fetchBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-buscenter/buscollectionconfirmation/fetchBySid无法访问");
+	}
+}
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationQuery.java
new file mode 100644
index 0000000000..200928c2fc
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationQuery.java
@@ -0,0 +1,60 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.buscollectionconfirmation;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-buscenter(销售相关) <br/>
+ * File: BusCollectionConfirmationQuery.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.buscollectionconfirmation.BusCollectionConfirmationQuery <br/>
+ * Description: 收款确认表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-12 17:57:01 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "收款确认表 查询条件", description = "收款确认表 查询条件")
+@Data
+public class BusCollectionConfirmationQuery implements Query {
+    
+	@ApiModelProperty("收款日期")
+    private String collectionDate; // 收款日期
+	@ApiModelProperty("收款银行")
+    private String collectionBank; // 收款银行
+	@ApiModelProperty("收款方式key")
+    private String collectionTypeKey; // 收款方式key
+    @ApiModelProperty("认款状态")
+    private String subscriptionState; // 认款状态
+}
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationVo.java
new file mode 100644
index 0000000000..5f4b4a41f9
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationVo.java
@@ -0,0 +1,68 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.buscollectionconfirmation;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-buscenter(销售相关) <br/>
+ * File: BusCollectionConfirmationVo.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.buscollectionconfirmation.BusCollectionConfirmationVo <br/>
+ * Description: 收款确认表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-12 17:57:01 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "收款确认表 视图数据对象", description = "收款确认表 视图数据对象")
+@Data
+public class BusCollectionConfirmationVo implements Vo {
+
+	@ApiModelProperty("收款日期")
+    private String collectionDate; // 收款日期
+	@ApiModelProperty("收款银行")
+    private String collectionBank; // 收款银行
+	@ApiModelProperty("收款银行账号")
+    private String collectionBankNum; // 收款银行账号
+	@ApiModelProperty("收款方式value")
+    private String collectionTypeValue; // 收款方式value
+	@ApiModelProperty("付款方名称")
+    private String payerName; // 付款方名称
+	@ApiModelProperty("收款金额")
+    private String collectionMoney; // 收款金额
+    @ApiModelProperty("备注")
+    private String remarks; // 备注
+    @ApiModelProperty("认款状态")
+    private String subscriptionState; // 认款状态
+}
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscustomerbill/BusCustomerBill.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscustomerbill/BusCustomerBill.java
new file mode 100644
index 0000000000..0fe51f3d5d
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscustomerbill/BusCustomerBill.java
@@ -0,0 +1,294 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.buscustomerbill;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: anrui-buscenter(销售相关) <br/>
+ * File: BusCustomerBill.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.buscustomerbill.BusCustomerBill <br/>
+ * Description: 客户账单表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-12 17:57:01 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "客户账单表", description = "客户账单表")
+@TableName("bus_customer_bill")
+public class BusCustomerBill extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    
+	@ApiModelProperty("创建人接口")
+    private String createByName; // 创建人接口
+    
+	@ApiModelProperty("合同sid")
+    private String contractSid; // 合同sid
+    
+	@ApiModelProperty("合同编号")
+    private String contractNo; // 合同编号
+    
+	@ApiModelProperty("客户sid")
+    private String customerSid; // 客户sid
+    
+	@ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+    
+	@ApiModelProperty("款项类型key")
+    private String paymentTypeKey; // 款项类型key
+    
+	@ApiModelProperty("款项类型value")
+    private String paymentTypeValue; // 款项类型value
+    
+	@ApiModelProperty("款项名称")
+    private String paymentName; // 款项名称
+    
+	@ApiModelProperty("款项状态")
+    private Integer paymentState; // 款项状态
+    
+	@ApiModelProperty("应收金额")
+    private BigDecimal receivableMoney; // 应收金额
+    
+	@ApiModelProperty("实收金额")
+    private BigDecimal netReceiptsMoney; // 实收金额
+    
+	@ApiModelProperty("未收金额")
+    private BigDecimal uncollectedMoney; // 未收金额
+    
+	@ApiModelProperty("生成时间")
+    private String generateDate; // 生成时间
+    
+	@ApiModelProperty("最新处理时间")
+    private String latestProcessingDate; // 最新处理时间
+    
+	@ApiModelProperty("分公司sid")
+    private String useOrgSid; // 分公司sid
+
+	/**
+	 * @return 创建人接口
+	 */
+	public String getCreateByName(){
+		return createByName;
+	}
+	
+	/**
+	 * @param createByName 创建人接口 to set
+	 */
+	public void setCreateByName(String createByName){
+		this.createByName = createByName;
+	}
+	/**
+	 * @return 合同sid
+	 */
+	public String getContractSid(){
+		return contractSid;
+	}
+	
+	/**
+	 * @param contractSid 合同sid to set
+	 */
+	public void setContractSid(String contractSid){
+		this.contractSid = contractSid;
+	}
+	/**
+	 * @return 合同编号
+	 */
+	public String getContractNo(){
+		return contractNo;
+	}
+	
+	/**
+	 * @param contractNo 合同编号 to set
+	 */
+	public void setContractNo(String contractNo){
+		this.contractNo = contractNo;
+	}
+	/**
+	 * @return 客户sid
+	 */
+	public String getCustomerSid(){
+		return customerSid;
+	}
+	
+	/**
+	 * @param customerSid 客户sid to set
+	 */
+	public void setCustomerSid(String customerSid){
+		this.customerSid = customerSid;
+	}
+	/**
+	 * @return 客户名称
+	 */
+	public String getCustomerName(){
+		return customerName;
+	}
+	
+	/**
+	 * @param customerName 客户名称 to set
+	 */
+	public void setCustomerName(String customerName){
+		this.customerName = customerName;
+	}
+	/**
+	 * @return 款项类型key
+	 */
+	public String getPaymentTypeKey(){
+		return paymentTypeKey;
+	}
+	
+	/**
+	 * @param paymentTypeKey 款项类型key to set
+	 */
+	public void setPaymentTypeKey(String paymentTypeKey){
+		this.paymentTypeKey = paymentTypeKey;
+	}
+	/**
+	 * @return 款项类型value
+	 */
+	public String getPaymentTypeValue(){
+		return paymentTypeValue;
+	}
+	
+	/**
+	 * @param paymentTypeValue 款项类型value to set
+	 */
+	public void setPaymentTypeValue(String paymentTypeValue){
+		this.paymentTypeValue = paymentTypeValue;
+	}
+	/**
+	 * @return 款项名称
+	 */
+	public String getPaymentName(){
+		return paymentName;
+	}
+	
+	/**
+	 * @param paymentName 款项名称 to set
+	 */
+	public void setPaymentName(String paymentName){
+		this.paymentName = paymentName;
+	}
+	/**
+	 * @return 款项状态
+	 */
+	public Integer getPaymentState(){
+		return paymentState;
+	}
+	
+	/**
+	 * @param paymentState 款项状态 to set
+	 */
+	public void setPaymentState(Integer paymentState){
+		this.paymentState = paymentState;
+	}
+	/**
+	 * @return 应收金额
+	 */
+	public BigDecimal getReceivableMoney(){
+		return receivableMoney;
+	}
+	
+	/**
+	 * @param receivableMoney 应收金额 to set
+	 */
+	public void setReceivableMoney(BigDecimal receivableMoney){
+		this.receivableMoney = receivableMoney;
+	}
+	/**
+	 * @return 实收金额
+	 */
+	public BigDecimal getNetReceiptsMoney(){
+		return netReceiptsMoney;
+	}
+	
+	/**
+	 * @param netReceiptsMoney 实收金额 to set
+	 */
+	public void setNetReceiptsMoney(BigDecimal netReceiptsMoney){
+		this.netReceiptsMoney = netReceiptsMoney;
+	}
+	/**
+	 * @return 未收金额
+	 */
+	public BigDecimal getUncollectedMoney(){
+		return uncollectedMoney;
+	}
+	
+	/**
+	 * @param uncollectedMoney 未收金额 to set
+	 */
+	public void setUncollectedMoney(BigDecimal uncollectedMoney){
+		this.uncollectedMoney = uncollectedMoney;
+	}
+	/**
+	 * @return 生成时间
+	 */
+	public String getGenerateDate(){
+		return generateDate;
+	}
+	
+	/**
+	 * @param generateDate 生成时间 to set
+	 */
+	public void setGenerateDate(String generateDate){
+		this.generateDate = generateDate;
+	}
+	/**
+	 * @return 最新处理时间
+	 */
+	public String getLatestProcessingDate(){
+		return latestProcessingDate;
+	}
+	
+	/**
+	 * @param latestProcessingDate 最新处理时间 to set
+	 */
+	public void setLatestProcessingDate(String latestProcessingDate){
+		this.latestProcessingDate = latestProcessingDate;
+	}
+	/**
+	 * @return 分公司sid
+	 */
+	public String getUseOrgSid(){
+		return useOrgSid;
+	}
+	
+	/**
+	 * @param useOrgSid 分公司sid to set
+	 */
+	public void setUseOrgSid(String useOrgSid){
+		this.useOrgSid = useOrgSid;
+	}
+}
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscustomerbill/BusCustomerBillDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscustomerbill/BusCustomerBillDto.java
new file mode 100644
index 0000000000..603cfc7012
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscustomerbill/BusCustomerBillDto.java
@@ -0,0 +1,99 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.buscustomerbill;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: anrui-buscenter(销售相关) <br/>
+ * File: BusCustomerBillDto.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.buscustomerbill.BusCustomerBillDto <br/>
+ * Description: 客户账单表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-12 17:57:01 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "客户账单表 数据传输对象", description = "客户账单表 数据传输对象")
+@Data
+public class BusCustomerBillDto implements Dto {
+
+    
+	@ApiModelProperty("创建人接口")
+    private String createByName; // 创建人接口
+    
+	@ApiModelProperty("合同sid")
+    private String contractSid; // 合同sid
+    
+	@ApiModelProperty("合同编号")
+    private String contractNo; // 合同编号
+    
+	@ApiModelProperty("客户sid")
+    private String customerSid; // 客户sid
+    
+	@ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+    
+	@ApiModelProperty("款项类型key")
+    private String paymentTypeKey; // 款项类型key
+    
+	@ApiModelProperty("款项类型value")
+    private String paymentTypeValue; // 款项类型value
+    
+	@ApiModelProperty("款项名称")
+    private String paymentName; // 款项名称
+    
+	@ApiModelProperty("款项状态")
+    private Integer paymentState; // 款项状态
+    
+	@ApiModelProperty("应收金额")
+    private String receivableMoney; // 应收金额
+    
+	@ApiModelProperty("实收金额")
+    private String netReceiptsMoney; // 实收金额
+    
+	@ApiModelProperty("未收金额")
+    private String uncollectedMoney; // 未收金额
+    
+	@ApiModelProperty("生成时间")
+    private String generateDate; // 生成时间
+    
+	@ApiModelProperty("最新处理时间")
+    private String latestProcessingDate; // 最新处理时间
+    
+	@ApiModelProperty("分公司sid")
+    private String useOrgSid; // 分公司sid
+}
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscustomerbill/BusCustomerBillFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscustomerbill/BusCustomerBillFeign.java
new file mode 100644
index 0000000000..4e7ee10c77
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscustomerbill/BusCustomerBillFeign.java
@@ -0,0 +1,94 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.buscustomerbill;
+
+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 org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: anrui-buscenter(销售相关) <br/>
+ * File: BusCustomerBillFeign.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.buscustomerbill.BusCustomerBillFeign <br/>
+ * Description: 客户账单表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-12 17:57:01 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "客户账单表")
+@FeignClient(
+        contextId = "anrui-buscenter-BusCustomerBill",
+        name = "anrui-buscenter",
+        path = "buscustomerbill",
+        fallback = BusCustomerBillFeignFallback.class)
+public interface BusCustomerBillFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<BusCustomerBillVo>> listPage(@RequestBody PagerQuery<BusCustomerBillQuery> pq);
+
+    @ApiOperation("根据条件查询所有数据列表")
+    @PostMapping("/listAll")
+    public ResultBean<List<BusCustomerBillVo>> listAll(@RequestBody BusCustomerBillQuery query);
+
+    @ApiOperation("所有数据列表")
+    @GetMapping("/list")
+    public ResultBean<List<BusCustomerBillVo>> list();
+
+    @ApiOperation("新增保存")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody BusCustomerBillDto dto);
+      
+    @ApiOperation("修改保存")
+    @PostMapping("/update/{sid}")
+    public ResultBean update(@RequestBody BusCustomerBillDto dto, @PathVariable("sid") String sid);
+
+    @ApiOperation("删除记录")
+    @GetMapping("/del/{ids}")
+    public ResultBean del(@PathVariable("ids") String ids);
+      
+    @ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids);
+
+    @ApiOperation("获取一条记录")
+    @GetMapping("/fetch/{id}")
+    public ResultBean<BusCustomerBillVo> fetch(@PathVariable("id") String id);
+      
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchBySid/{sid}")
+    public ResultBean<BusCustomerBillVo> fetchBySid(@PathVariable("sid") String sid);
+}
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscustomerbill/BusCustomerBillFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscustomerbill/BusCustomerBillFeignFallback.java
new file mode 100644
index 0000000000..f38a441bf8
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscustomerbill/BusCustomerBillFeignFallback.java
@@ -0,0 +1,100 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.buscustomerbill;
+
+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;
+
+/**
+ * Project: anrui-buscenter(销售相关) <br/>
+ * File: BusCustomerBillFeignFallback.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.buscustomerbill.BusCustomerBillFeignFallback <br/>
+ * Description: 客户账单表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-12 17:57:01 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class BusCustomerBillFeignFallback implements BusCustomerBillFeign {
+
+	@Override
+	public ResultBean<PagerVo<BusCustomerBillVo>> listPage(PagerQuery<BusCustomerBillQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-buscenter/buscustomerbill/listPage无法访问");
+	}
+
+    @Override
+    public ResultBean<List<BusCustomerBillVo>> listAll(BusCustomerBillQuery query){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-buscenter/buscustomerbill/listAll无法访问");
+	}
+
+	@Override
+	public ResultBean<List<BusCustomerBillVo>> list(){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-buscenter/buscustomerbill/list无法访问");
+	}
+
+	@Override
+	public ResultBean save(BusCustomerBillDto dto){
+		return ResultBean.fireFail().setMsg("接口anrui-buscenter/buscustomerbill/save无法访问");
+	}
+
+	@Override
+	public ResultBean update(BusCustomerBillDto dto, String sid){
+		return ResultBean.fireFail().setMsg("接口anrui-buscenter/buscustomerbill/update无法访问");
+	}
+
+	@Override
+	public ResultBean del(String ids){
+		return ResultBean.fireFail().setMsg("接口anrui-buscenter/buscustomerbill/del无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口anrui-buscenter/buscustomerbill/delBySids无法访问");
+	}
+
+	@Override
+	public ResultBean<BusCustomerBillVo> fetch(String id){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-buscenter/buscustomerbill/fetch无法访问");
+	}
+
+	@Override
+	public ResultBean<BusCustomerBillVo> fetchBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-buscenter/buscustomerbill/fetchBySid无法访问");
+	}
+}
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscustomerbill/BusCustomerBillQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscustomerbill/BusCustomerBillQuery.java
new file mode 100644
index 0000000000..92af0ebdfb
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscustomerbill/BusCustomerBillQuery.java
@@ -0,0 +1,96 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.buscustomerbill;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-buscenter(销售相关) <br/>
+ * File: BusCustomerBillQuery.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.buscustomerbill.BusCustomerBillQuery <br/>
+ * Description: 客户账单表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-12 17:57:01 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "客户账单表 查询条件", description = "客户账单表 查询条件")
+@Data
+public class BusCustomerBillQuery implements Query {
+
+	@ApiModelProperty("创建人接口")
+    private String createByName; // 创建人接口
+    
+	@ApiModelProperty("合同sid")
+    private String contractSid; // 合同sid
+    
+	@ApiModelProperty("合同编号")
+    private String contractNo; // 合同编号
+    
+	@ApiModelProperty("客户sid")
+    private String customerSid; // 客户sid
+    
+	@ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+    
+	@ApiModelProperty("款项类型key")
+    private String paymentTypeKey; // 款项类型key
+    
+	@ApiModelProperty("款项类型value")
+    private String paymentTypeValue; // 款项类型value
+    
+	@ApiModelProperty("款项名称")
+    private String paymentName; // 款项名称
+    
+	@ApiModelProperty("款项状态")
+    private Integer paymentState; // 款项状态
+    
+	@ApiModelProperty("应收金额")
+    private String receivableMoney; // 应收金额
+    
+	@ApiModelProperty("实收金额")
+    private String netReceiptsMoney; // 实收金额
+    
+	@ApiModelProperty("未收金额")
+    private String uncollectedMoney; // 未收金额
+    
+	@ApiModelProperty("生成时间")
+    private String generateDate; // 生成时间
+    
+	@ApiModelProperty("最新处理时间")
+    private String latestProcessingDate; // 最新处理时间
+    
+	@ApiModelProperty("分公司sid")
+    private String useOrgSid; // 分公司sid
+}
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscustomerbill/BusCustomerBillVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscustomerbill/BusCustomerBillVo.java
new file mode 100644
index 0000000000..192f15d154
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscustomerbill/BusCustomerBillVo.java
@@ -0,0 +1,97 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.buscustomerbill;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-buscenter(销售相关) <br/>
+ * File: BusCustomerBillVo.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.buscustomerbill.BusCustomerBillVo <br/>
+ * Description: 客户账单表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-12 17:57:01 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "客户账单表 视图数据对象", description = "客户账单表 视图数据对象")
+@Data
+public class BusCustomerBillVo implements Vo {
+
+    
+	@ApiModelProperty("创建人接口")
+    private String createByName; // 创建人接口
+    
+	@ApiModelProperty("合同sid")
+    private String contractSid; // 合同sid
+    
+	@ApiModelProperty("合同编号")
+    private String contractNo; // 合同编号
+    
+	@ApiModelProperty("客户sid")
+    private String customerSid; // 客户sid
+    
+	@ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+    
+	@ApiModelProperty("款项类型key")
+    private String paymentTypeKey; // 款项类型key
+    
+	@ApiModelProperty("款项类型value")
+    private String paymentTypeValue; // 款项类型value
+    
+	@ApiModelProperty("款项名称")
+    private String paymentName; // 款项名称
+    
+	@ApiModelProperty("款项状态")
+    private Integer paymentState; // 款项状态
+    
+	@ApiModelProperty("应收金额")
+    private String receivableMoney; // 应收金额
+    
+	@ApiModelProperty("实收金额")
+    private String netReceiptsMoney; // 实收金额
+    
+	@ApiModelProperty("未收金额")
+    private String uncollectedMoney; // 未收金额
+    
+	@ApiModelProperty("生成时间")
+    private String generateDate; // 生成时间
+    
+	@ApiModelProperty("最新处理时间")
+    private String latestProcessingDate; // 最新处理时间
+    
+	@ApiModelProperty("分公司sid")
+    private String useOrgSid; // 分公司sid
+}
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscustomerbilldetailed/BusCustomerBillDetailed.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscustomerbilldetailed/BusCustomerBillDetailed.java
new file mode 100644
index 0000000000..4d3d6dd4b7
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscustomerbilldetailed/BusCustomerBillDetailed.java
@@ -0,0 +1,278 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.buscustomerbilldetailed;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: anrui-buscenter(销售相关) <br/>
+ * File: BusCustomerBillDetailed.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.buscustomerbilldetailed.BusCustomerBillDetailed <br/>
+ * Description: 客户账单明细表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-12 17:57:01 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "客户账单明细表", description = "客户账单明细表")
+@TableName("bus_customer_bill_detailed")
+public class BusCustomerBillDetailed extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    
+	@ApiModelProperty("创建人接口")
+    private String createByName; // 创建人接口
+    
+	@ApiModelProperty("合同sid")
+    private String contractSid; // 合同sid
+    
+	@ApiModelProperty("合同编号")
+    private String contractNo; // 合同编号
+    
+	@ApiModelProperty("客户sid")
+    private String customerSid; // 客户sid
+    
+	@ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+    
+	@ApiModelProperty("款项类型key")
+    private String paymentTypeKey; // 款项类型key
+    
+	@ApiModelProperty("款项类型value")
+    private String paymentTypeValue; // 款项类型value
+    
+	@ApiModelProperty("款项名称")
+    private String paymentName; // 款项名称
+    
+	@ApiModelProperty("款项状态")
+    private Integer paymentState; // 款项状态
+    
+	@ApiModelProperty("应收金额")
+    private BigDecimal receivableMoney; // 应收金额
+    
+	@ApiModelProperty("实收金额")
+    private BigDecimal netReceiptsMoney; // 实收金额
+    
+	@ApiModelProperty("未收金额")
+    private BigDecimal uncollectedMoney; // 未收金额
+    
+	@ApiModelProperty("生成时间")
+    private String generateDate; // 生成时间
+    
+	@ApiModelProperty("分公司sid")
+    private String useOrgSid; // 分公司sid
+
+	/**
+	 * @return 创建人接口
+	 */
+	public String getCreateByName(){
+		return createByName;
+	}
+	
+	/**
+	 * @param createByName 创建人接口 to set
+	 */
+	public void setCreateByName(String createByName){
+		this.createByName = createByName;
+	}
+	/**
+	 * @return 合同sid
+	 */
+	public String getContractSid(){
+		return contractSid;
+	}
+	
+	/**
+	 * @param contractSid 合同sid to set
+	 */
+	public void setContractSid(String contractSid){
+		this.contractSid = contractSid;
+	}
+	/**
+	 * @return 合同编号
+	 */
+	public String getContractNo(){
+		return contractNo;
+	}
+	
+	/**
+	 * @param contractNo 合同编号 to set
+	 */
+	public void setContractNo(String contractNo){
+		this.contractNo = contractNo;
+	}
+	/**
+	 * @return 客户sid
+	 */
+	public String getCustomerSid(){
+		return customerSid;
+	}
+	
+	/**
+	 * @param customerSid 客户sid to set
+	 */
+	public void setCustomerSid(String customerSid){
+		this.customerSid = customerSid;
+	}
+	/**
+	 * @return 客户名称
+	 */
+	public String getCustomerName(){
+		return customerName;
+	}
+	
+	/**
+	 * @param customerName 客户名称 to set
+	 */
+	public void setCustomerName(String customerName){
+		this.customerName = customerName;
+	}
+	/**
+	 * @return 款项类型key
+	 */
+	public String getPaymentTypeKey(){
+		return paymentTypeKey;
+	}
+	
+	/**
+	 * @param paymentTypeKey 款项类型key to set
+	 */
+	public void setPaymentTypeKey(String paymentTypeKey){
+		this.paymentTypeKey = paymentTypeKey;
+	}
+	/**
+	 * @return 款项类型value
+	 */
+	public String getPaymentTypeValue(){
+		return paymentTypeValue;
+	}
+	
+	/**
+	 * @param paymentTypeValue 款项类型value to set
+	 */
+	public void setPaymentTypeValue(String paymentTypeValue){
+		this.paymentTypeValue = paymentTypeValue;
+	}
+	/**
+	 * @return 款项名称
+	 */
+	public String getPaymentName(){
+		return paymentName;
+	}
+	
+	/**
+	 * @param paymentName 款项名称 to set
+	 */
+	public void setPaymentName(String paymentName){
+		this.paymentName = paymentName;
+	}
+	/**
+	 * @return 款项状态
+	 */
+	public Integer getPaymentState(){
+		return paymentState;
+	}
+	
+	/**
+	 * @param paymentState 款项状态 to set
+	 */
+	public void setPaymentState(Integer paymentState){
+		this.paymentState = paymentState;
+	}
+	/**
+	 * @return 应收金额
+	 */
+	public BigDecimal getReceivableMoney(){
+		return receivableMoney;
+	}
+	
+	/**
+	 * @param receivableMoney 应收金额 to set
+	 */
+	public void setReceivableMoney(BigDecimal receivableMoney){
+		this.receivableMoney = receivableMoney;
+	}
+	/**
+	 * @return 实收金额
+	 */
+	public BigDecimal getNetReceiptsMoney(){
+		return netReceiptsMoney;
+	}
+	
+	/**
+	 * @param netReceiptsMoney 实收金额 to set
+	 */
+	public void setNetReceiptsMoney(BigDecimal netReceiptsMoney){
+		this.netReceiptsMoney = netReceiptsMoney;
+	}
+	/**
+	 * @return 未收金额
+	 */
+	public BigDecimal getUncollectedMoney(){
+		return uncollectedMoney;
+	}
+	
+	/**
+	 * @param uncollectedMoney 未收金额 to set
+	 */
+	public void setUncollectedMoney(BigDecimal uncollectedMoney){
+		this.uncollectedMoney = uncollectedMoney;
+	}
+	/**
+	 * @return 生成时间
+	 */
+	public String getGenerateDate(){
+		return generateDate;
+	}
+	
+	/**
+	 * @param generateDate 生成时间 to set
+	 */
+	public void setGenerateDate(String generateDate){
+		this.generateDate = generateDate;
+	}
+	/**
+	 * @return 分公司sid
+	 */
+	public String getUseOrgSid(){
+		return useOrgSid;
+	}
+	
+	/**
+	 * @param useOrgSid 分公司sid to set
+	 */
+	public void setUseOrgSid(String useOrgSid){
+		this.useOrgSid = useOrgSid;
+	}
+}
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscustomerbilldetailed/BusCustomerBillDetailedDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscustomerbilldetailed/BusCustomerBillDetailedDto.java
new file mode 100644
index 0000000000..93712a7403
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscustomerbilldetailed/BusCustomerBillDetailedDto.java
@@ -0,0 +1,94 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.buscustomerbilldetailed;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-buscenter(销售相关) <br/>
+ * File: BusCustomerBillDetailedDto.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.buscustomerbilldetailed.BusCustomerBillDetailedDto <br/>
+ * Description: 客户账单明细表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-12 17:57:01 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "客户账单明细表 数据传输对象", description = "客户账单明细表 数据传输对象")
+@Data
+public class BusCustomerBillDetailedDto implements Dto {
+
+    
+	@ApiModelProperty("创建人接口")
+    private String createByName; // 创建人接口
+    
+	@ApiModelProperty("合同sid")
+    private String contractSid; // 合同sid
+    
+	@ApiModelProperty("合同编号")
+    private String contractNo; // 合同编号
+    
+	@ApiModelProperty("客户sid")
+    private String customerSid; // 客户sid
+    
+	@ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+    
+	@ApiModelProperty("款项类型key")
+    private String paymentTypeKey; // 款项类型key
+    
+	@ApiModelProperty("款项类型value")
+    private String paymentTypeValue; // 款项类型value
+    
+	@ApiModelProperty("款项名称")
+    private String paymentName; // 款项名称
+    
+	@ApiModelProperty("款项状态")
+    private Integer paymentState; // 款项状态
+    
+	@ApiModelProperty("应收金额")
+    private String receivableMoney; // 应收金额
+    
+	@ApiModelProperty("实收金额")
+    private String netReceiptsMoney; // 实收金额
+    
+	@ApiModelProperty("未收金额")
+    private String uncollectedMoney; // 未收金额
+    
+	@ApiModelProperty("生成时间")
+    private String generateDate; // 生成时间
+    
+	@ApiModelProperty("分公司sid")
+    private String useOrgSid; // 分公司sid
+}
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscustomerbilldetailed/BusCustomerBillDetailedFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscustomerbilldetailed/BusCustomerBillDetailedFeign.java
new file mode 100644
index 0000000000..60612e1ea6
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscustomerbilldetailed/BusCustomerBillDetailedFeign.java
@@ -0,0 +1,94 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.buscustomerbilldetailed;
+
+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 org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: anrui-buscenter(销售相关) <br/>
+ * File: BusCustomerBillDetailedFeign.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.buscustomerbilldetailed.BusCustomerBillDetailedFeign <br/>
+ * Description: 客户账单明细表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-12 17:57:01 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "客户账单明细表")
+@FeignClient(
+        contextId = "anrui-buscenter-BusCustomerBillDetailed",
+        name = "anrui-buscenter",
+        path = "buscustomerbilldetailed",
+        fallback = BusCustomerBillDetailedFeignFallback.class)
+public interface BusCustomerBillDetailedFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<BusCustomerBillDetailedVo>> listPage(@RequestBody PagerQuery<BusCustomerBillDetailedQuery> pq);
+
+    @ApiOperation("根据条件查询所有数据列表")
+    @PostMapping("/listAll")
+    public ResultBean<List<BusCustomerBillDetailedVo>> listAll(@RequestBody BusCustomerBillDetailedQuery query);
+
+    @ApiOperation("所有数据列表")
+    @GetMapping("/list")
+    public ResultBean<List<BusCustomerBillDetailedVo>> list();
+
+    @ApiOperation("新增保存")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody BusCustomerBillDetailedDto dto);
+      
+    @ApiOperation("修改保存")
+    @PostMapping("/update/{sid}")
+    public ResultBean update(@RequestBody BusCustomerBillDetailedDto dto, @PathVariable("sid") String sid);
+
+    @ApiOperation("删除记录")
+    @GetMapping("/del/{ids}")
+    public ResultBean del(@PathVariable("ids") String ids);
+      
+    @ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids);
+
+    @ApiOperation("获取一条记录")
+    @GetMapping("/fetch/{id}")
+    public ResultBean<BusCustomerBillDetailedVo> fetch(@PathVariable("id") String id);
+      
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchBySid/{sid}")
+    public ResultBean<BusCustomerBillDetailedVo> fetchBySid(@PathVariable("sid") String sid);
+}
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscustomerbilldetailed/BusCustomerBillDetailedFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscustomerbilldetailed/BusCustomerBillDetailedFeignFallback.java
new file mode 100644
index 0000000000..d7c573bde9
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscustomerbilldetailed/BusCustomerBillDetailedFeignFallback.java
@@ -0,0 +1,100 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.buscustomerbilldetailed;
+
+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;
+
+/**
+ * Project: anrui-buscenter(销售相关) <br/>
+ * File: BusCustomerBillDetailedFeignFallback.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.buscustomerbilldetailed.BusCustomerBillDetailedFeignFallback <br/>
+ * Description: 客户账单明细表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-12 17:57:01 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class BusCustomerBillDetailedFeignFallback implements BusCustomerBillDetailedFeign {
+
+	@Override
+	public ResultBean<PagerVo<BusCustomerBillDetailedVo>> listPage(PagerQuery<BusCustomerBillDetailedQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-buscenter/buscustomerbilldetailed/listPage无法访问");
+	}
+
+    @Override
+    public ResultBean<List<BusCustomerBillDetailedVo>> listAll(BusCustomerBillDetailedQuery query){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-buscenter/buscustomerbilldetailed/listAll无法访问");
+	}
+
+	@Override
+	public ResultBean<List<BusCustomerBillDetailedVo>> list(){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-buscenter/buscustomerbilldetailed/list无法访问");
+	}
+
+	@Override
+	public ResultBean save(BusCustomerBillDetailedDto dto){
+		return ResultBean.fireFail().setMsg("接口anrui-buscenter/buscustomerbilldetailed/save无法访问");
+	}
+
+	@Override
+	public ResultBean update(BusCustomerBillDetailedDto dto, String sid){
+		return ResultBean.fireFail().setMsg("接口anrui-buscenter/buscustomerbilldetailed/update无法访问");
+	}
+
+	@Override
+	public ResultBean del(String ids){
+		return ResultBean.fireFail().setMsg("接口anrui-buscenter/buscustomerbilldetailed/del无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口anrui-buscenter/buscustomerbilldetailed/delBySids无法访问");
+	}
+
+	@Override
+	public ResultBean<BusCustomerBillDetailedVo> fetch(String id){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-buscenter/buscustomerbilldetailed/fetch无法访问");
+	}
+
+	@Override
+	public ResultBean<BusCustomerBillDetailedVo> fetchBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-buscenter/buscustomerbilldetailed/fetchBySid无法访问");
+	}
+}
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscustomerbilldetailed/BusCustomerBillDetailedQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscustomerbilldetailed/BusCustomerBillDetailedQuery.java
new file mode 100644
index 0000000000..df64a183a0
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscustomerbilldetailed/BusCustomerBillDetailedQuery.java
@@ -0,0 +1,94 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.buscustomerbilldetailed;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-buscenter(销售相关) <br/>
+ * File: BusCustomerBillDetailedQuery.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.buscustomerbilldetailed.BusCustomerBillDetailedQuery <br/>
+ * Description: 客户账单明细表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-12 17:57:01 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "客户账单明细表 查询条件", description = "客户账单明细表 查询条件")
+@Data
+public class BusCustomerBillDetailedQuery implements Query {
+
+    
+	@ApiModelProperty("创建人接口")
+    private String createByName; // 创建人接口
+    
+	@ApiModelProperty("合同sid")
+    private String contractSid; // 合同sid
+    
+	@ApiModelProperty("合同编号")
+    private String contractNo; // 合同编号
+    
+	@ApiModelProperty("客户sid")
+    private String customerSid; // 客户sid
+    
+	@ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+    
+	@ApiModelProperty("款项类型key")
+    private String paymentTypeKey; // 款项类型key
+    
+	@ApiModelProperty("款项类型value")
+    private String paymentTypeValue; // 款项类型value
+    
+	@ApiModelProperty("款项名称")
+    private String paymentName; // 款项名称
+    
+	@ApiModelProperty("款项状态")
+    private Integer paymentState; // 款项状态
+    
+	@ApiModelProperty("应收金额")
+    private String receivableMoney; // 应收金额
+    
+	@ApiModelProperty("实收金额")
+    private String netReceiptsMoney; // 实收金额
+    
+	@ApiModelProperty("未收金额")
+    private String uncollectedMoney; // 未收金额
+    
+	@ApiModelProperty("生成时间")
+    private String generateDate; // 生成时间
+    
+	@ApiModelProperty("分公司sid")
+    private String useOrgSid; // 分公司sid
+}
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscustomerbilldetailed/BusCustomerBillDetailedVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscustomerbilldetailed/BusCustomerBillDetailedVo.java
new file mode 100644
index 0000000000..24bccc9f3a
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscustomerbilldetailed/BusCustomerBillDetailedVo.java
@@ -0,0 +1,94 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.buscustomerbilldetailed;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-buscenter(销售相关) <br/>
+ * File: BusCustomerBillDetailedVo.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.buscustomerbilldetailed.BusCustomerBillDetailedVo <br/>
+ * Description: 客户账单明细表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-12 17:57:01 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "客户账单明细表 视图数据对象", description = "客户账单明细表 视图数据对象")
+@Data
+public class BusCustomerBillDetailedVo implements Vo {
+
+    
+	@ApiModelProperty("创建人接口")
+    private String createByName; // 创建人接口
+    
+	@ApiModelProperty("合同sid")
+    private String contractSid; // 合同sid
+    
+	@ApiModelProperty("合同编号")
+    private String contractNo; // 合同编号
+    
+	@ApiModelProperty("客户sid")
+    private String customerSid; // 客户sid
+    
+	@ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+    
+	@ApiModelProperty("款项类型key")
+    private String paymentTypeKey; // 款项类型key
+    
+	@ApiModelProperty("款项类型value")
+    private String paymentTypeValue; // 款项类型value
+    
+	@ApiModelProperty("款项名称")
+    private String paymentName; // 款项名称
+    
+	@ApiModelProperty("款项状态")
+    private Integer paymentState; // 款项状态
+    
+	@ApiModelProperty("应收金额")
+    private String receivableMoney; // 应收金额
+    
+	@ApiModelProperty("实收金额")
+    private String netReceiptsMoney; // 实收金额
+    
+	@ApiModelProperty("未收金额")
+    private String uncollectedMoney; // 未收金额
+    
+	@ApiModelProperty("生成时间")
+    private String generateDate; // 生成时间
+    
+	@ApiModelProperty("分公司sid")
+    private String useOrgSid; // 分公司sid
+}
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailed.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailed.java
new file mode 100644
index 0000000000..b489ed70e1
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailed.java
@@ -0,0 +1,262 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: anrui-buscenter(销售相关) <br/>
+ * File: BusSelectedReceivablesDetailed.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailed <br/>
+ * Description: 已选应收款项明细表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-12 17:57:00 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "已选应收款项明细表", description = "已选应收款项明细表")
+@TableName("bus_selected_receivables_detailed")
+public class BusSelectedReceivablesDetailed extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    
+	@ApiModelProperty("创建人接口")
+    private String createByName; // 创建人接口
+    
+	@ApiModelProperty("合同sid")
+    private String contractSid; // 合同sid
+    
+	@ApiModelProperty("合同编号")
+    private String contractNo; // 合同编号
+    
+	@ApiModelProperty("客户sid")
+    private String customerSid; // 客户sid
+    
+	@ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+    
+	@ApiModelProperty("车架号")
+    private String VIN; // 车架号
+    
+	@ApiModelProperty("分公司sid")
+    private String useOrgSid; // 分公司sid
+    
+	@ApiModelProperty("联系电话")
+    private String customerPhone; // 联系电话
+    
+	@ApiModelProperty("应收项目名称")
+    private String receivablesName; // 应收项目名称
+    
+	@ApiModelProperty("当前应收金额")
+    private BigDecimal currentReceivableMoney; // 当前应收金额
+    
+	@ApiModelProperty("认款金额")
+    private BigDecimal subscriptionMoney; // 认款金额
+    
+	@ApiModelProperty("认款申请日期")
+    private String subscriptionDate; // 认款申请日期
+    
+	@ApiModelProperty("收款确认单sid")
+    private String collSid; // 收款确认单sid
+
+	/**
+	 * @return 创建人接口
+	 */
+	public String getCreateByName(){
+		return createByName;
+	}
+	
+	/**
+	 * @param createByName 创建人接口 to set
+	 */
+	public void setCreateByName(String createByName){
+		this.createByName = createByName;
+	}
+	/**
+	 * @return 合同sid
+	 */
+	public String getContractSid(){
+		return contractSid;
+	}
+	
+	/**
+	 * @param contractSid 合同sid to set
+	 */
+	public void setContractSid(String contractSid){
+		this.contractSid = contractSid;
+	}
+	/**
+	 * @return 合同编号
+	 */
+	public String getContractNo(){
+		return contractNo;
+	}
+	
+	/**
+	 * @param contractNo 合同编号 to set
+	 */
+	public void setContractNo(String contractNo){
+		this.contractNo = contractNo;
+	}
+	/**
+	 * @return 客户sid
+	 */
+	public String getCustomerSid(){
+		return customerSid;
+	}
+	
+	/**
+	 * @param customerSid 客户sid to set
+	 */
+	public void setCustomerSid(String customerSid){
+		this.customerSid = customerSid;
+	}
+	/**
+	 * @return 客户名称
+	 */
+	public String getCustomerName(){
+		return customerName;
+	}
+	
+	/**
+	 * @param customerName 客户名称 to set
+	 */
+	public void setCustomerName(String customerName){
+		this.customerName = customerName;
+	}
+	/**
+	 * @return 车架号
+	 */
+	public String getVIN(){
+		return VIN;
+	}
+	
+	/**
+	 * @param VIN 车架号 to set
+	 */
+	public void setVIN(String VIN){
+		this.VIN = VIN;
+	}
+	/**
+	 * @return 分公司sid
+	 */
+	public String getUseOrgSid(){
+		return useOrgSid;
+	}
+	
+	/**
+	 * @param useOrgSid 分公司sid to set
+	 */
+	public void setUseOrgSid(String useOrgSid){
+		this.useOrgSid = useOrgSid;
+	}
+	/**
+	 * @return 联系电话
+	 */
+	public String getCustomerPhone(){
+		return customerPhone;
+	}
+	
+	/**
+	 * @param customerPhone 联系电话 to set
+	 */
+	public void setCustomerPhone(String customerPhone){
+		this.customerPhone = customerPhone;
+	}
+	/**
+	 * @return 应收项目名称
+	 */
+	public String getReceivablesName(){
+		return receivablesName;
+	}
+	
+	/**
+	 * @param receivablesName 应收项目名称 to set
+	 */
+	public void setReceivablesName(String receivablesName){
+		this.receivablesName = receivablesName;
+	}
+	/**
+	 * @return 当前应收金额
+	 */
+	public BigDecimal getCurrentReceivableMoney(){
+		return currentReceivableMoney;
+	}
+	
+	/**
+	 * @param currentReceivableMoney 当前应收金额 to set
+	 */
+	public void setCurrentReceivableMoney(BigDecimal currentReceivableMoney){
+		this.currentReceivableMoney = currentReceivableMoney;
+	}
+	/**
+	 * @return 认款金额
+	 */
+	public BigDecimal getSubscriptionMoney(){
+		return subscriptionMoney;
+	}
+	
+	/**
+	 * @param subscriptionMoney 认款金额 to set
+	 */
+	public void setSubscriptionMoney(BigDecimal subscriptionMoney){
+		this.subscriptionMoney = subscriptionMoney;
+	}
+	/**
+	 * @return 认款申请日期
+	 */
+	public String getSubscriptionDate(){
+		return subscriptionDate;
+	}
+	
+	/**
+	 * @param subscriptionDate 认款申请日期 to set
+	 */
+	public void setSubscriptionDate(String subscriptionDate){
+		this.subscriptionDate = subscriptionDate;
+	}
+	/**
+	 * @return 收款确认单sid
+	 */
+	public String getCollSid(){
+		return collSid;
+	}
+	
+	/**
+	 * @param collSid 收款确认单sid to set
+	 */
+	public void setCollSid(String collSid){
+		this.collSid = collSid;
+	}
+}
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedDto.java
new file mode 100644
index 0000000000..8b4a9eee4e
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedDto.java
@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-buscenter(销售相关) <br/>
+ * File: BusSelectedReceivablesDetailedDto.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedDto <br/>
+ * Description: 已选应收款项明细表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-12 17:57:00 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "已选应收款项明细表 数据传输对象", description = "已选应收款项明细表 数据传输对象")
+@Data
+public class BusSelectedReceivablesDetailedDto implements Dto {
+
+	@ApiModelProperty("创建人接口")
+    private String createByName; // 创建人接口
+	@ApiModelProperty("合同sid")
+    private String contractSid; // 合同sid
+	@ApiModelProperty("合同编号")
+    private String contractNo; // 合同编号
+	@ApiModelProperty("客户sid")
+    private String customerSid; // 客户sid
+	@ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+	@ApiModelProperty("车架号")
+    private String VIN; // 车架号
+	@ApiModelProperty("分公司sid")
+    private String useOrgSid; // 分公司sid
+	@ApiModelProperty("联系电话")
+    private String customerPhone; // 联系电话
+	@ApiModelProperty("应收项目名称")
+    private String receivablesName; // 应收项目名称
+	@ApiModelProperty("当前应收金额")
+    private String currentReceivableMoney; // 当前应收金额
+	@ApiModelProperty("认款金额")
+    private String subscriptionMoney; // 认款金额
+	@ApiModelProperty("认款申请日期")
+    private String subscriptionDate; // 认款申请日期
+	@ApiModelProperty("收款确认单sid")
+    private String collSid; // 收款确认单sid
+}
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedFeign.java
new file mode 100644
index 0000000000..d9de288247
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedFeign.java
@@ -0,0 +1,94 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed;
+
+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 org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: anrui-buscenter(销售相关) <br/>
+ * File: BusSelectedReceivablesDetailedFeign.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedFeign <br/>
+ * Description: 已选应收款项明细表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-12 17:57:00 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "已选应收款项明细表")
+@FeignClient(
+        contextId = "anrui-buscenter-BusSelectedReceivablesDetailed",
+        name = "anrui-buscenter",
+        path = "busselectedreceivablesdetailed",
+        fallback = BusSelectedReceivablesDetailedFeignFallback.class)
+public interface BusSelectedReceivablesDetailedFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<BusSelectedReceivablesDetailedVo>> listPage(@RequestBody PagerQuery<BusSelectedReceivablesDetailedQuery> pq);
+
+    @ApiOperation("根据条件查询所有数据列表")
+    @PostMapping("/listAll")
+    public ResultBean<List<BusSelectedReceivablesDetailedVo>> listAll(@RequestBody BusSelectedReceivablesDetailedQuery query);
+
+    @ApiOperation("所有数据列表")
+    @GetMapping("/list")
+    public ResultBean<List<BusSelectedReceivablesDetailedVo>> list();
+
+    @ApiOperation("新增保存")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody BusSelectedReceivablesDetailedDto dto);
+      
+    @ApiOperation("修改保存")
+    @PostMapping("/update/{sid}")
+    public ResultBean update(@RequestBody BusSelectedReceivablesDetailedDto dto, @PathVariable("sid") String sid);
+
+    @ApiOperation("删除记录")
+    @GetMapping("/del/{ids}")
+    public ResultBean del(@PathVariable("ids") String ids);
+      
+    @ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids);
+
+    @ApiOperation("获取一条记录")
+    @GetMapping("/fetch/{id}")
+    public ResultBean<BusSelectedReceivablesDetailedVo> fetch(@PathVariable("id") String id);
+      
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchBySid/{sid}")
+    public ResultBean<BusSelectedReceivablesDetailedVo> fetchBySid(@PathVariable("sid") String sid);
+}
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedFeignFallback.java
new file mode 100644
index 0000000000..48ac78469d
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedFeignFallback.java
@@ -0,0 +1,100 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed;
+
+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;
+
+/**
+ * Project: anrui-buscenter(销售相关) <br/>
+ * File: BusSelectedReceivablesDetailedFeignFallback.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedFeignFallback <br/>
+ * Description: 已选应收款项明细表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-12 17:57:00 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class BusSelectedReceivablesDetailedFeignFallback implements BusSelectedReceivablesDetailedFeign {
+
+	@Override
+	public ResultBean<PagerVo<BusSelectedReceivablesDetailedVo>> listPage(PagerQuery<BusSelectedReceivablesDetailedQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-buscenter/busselectedreceivablesdetailed/listPage无法访问");
+	}
+
+    @Override
+    public ResultBean<List<BusSelectedReceivablesDetailedVo>> listAll(BusSelectedReceivablesDetailedQuery query){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-buscenter/busselectedreceivablesdetailed/listAll无法访问");
+	}
+
+	@Override
+	public ResultBean<List<BusSelectedReceivablesDetailedVo>> list(){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-buscenter/busselectedreceivablesdetailed/list无法访问");
+	}
+
+	@Override
+	public ResultBean save(BusSelectedReceivablesDetailedDto dto){
+		return ResultBean.fireFail().setMsg("接口anrui-buscenter/busselectedreceivablesdetailed/save无法访问");
+	}
+
+	@Override
+	public ResultBean update(BusSelectedReceivablesDetailedDto dto, String sid){
+		return ResultBean.fireFail().setMsg("接口anrui-buscenter/busselectedreceivablesdetailed/update无法访问");
+	}
+
+	@Override
+	public ResultBean del(String ids){
+		return ResultBean.fireFail().setMsg("接口anrui-buscenter/busselectedreceivablesdetailed/del无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口anrui-buscenter/busselectedreceivablesdetailed/delBySids无法访问");
+	}
+
+	@Override
+	public ResultBean<BusSelectedReceivablesDetailedVo> fetch(String id){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-buscenter/busselectedreceivablesdetailed/fetch无法访问");
+	}
+
+	@Override
+	public ResultBean<BusSelectedReceivablesDetailedVo> fetchBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-buscenter/busselectedreceivablesdetailed/fetchBySid无法访问");
+	}
+}
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedQuery.java
new file mode 100644
index 0000000000..9c92d78170
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedQuery.java
@@ -0,0 +1,91 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-buscenter(销售相关) <br/>
+ * File: BusSelectedReceivablesDetailedQuery.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedQuery <br/>
+ * Description: 已选应收款项明细表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-12 17:57:00 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "已选应收款项明细表 查询条件", description = "已选应收款项明细表 查询条件")
+@Data
+public class BusSelectedReceivablesDetailedQuery implements Query {
+
+    
+	@ApiModelProperty("创建人接口")
+    private String createByName; // 创建人接口
+    
+	@ApiModelProperty("合同sid")
+    private String contractSid; // 合同sid
+    
+	@ApiModelProperty("合同编号")
+    private String contractNo; // 合同编号
+    
+	@ApiModelProperty("客户sid")
+    private String customerSid; // 客户sid
+    
+	@ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+    
+	@ApiModelProperty("车架号")
+    private String VIN; // 车架号
+    
+	@ApiModelProperty("分公司sid")
+    private String useOrgSid; // 分公司sid
+    
+	@ApiModelProperty("联系电话")
+    private String customerPhone; // 联系电话
+    
+	@ApiModelProperty("应收项目名称")
+    private String receivablesName; // 应收项目名称
+    
+	@ApiModelProperty("当前应收金额")
+    private String currentReceivableMoney; // 当前应收金额
+    
+	@ApiModelProperty("认款金额")
+    private String subscriptionMoney; // 认款金额
+    
+	@ApiModelProperty("认款申请日期")
+    private String subscriptionDate; // 认款申请日期
+    
+	@ApiModelProperty("收款确认单sid")
+    private String collSid; // 收款确认单sid
+}
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedVo.java
new file mode 100644
index 0000000000..e92122366a
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedVo.java
@@ -0,0 +1,91 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-buscenter(销售相关) <br/>
+ * File: BusSelectedReceivablesDetailedVo.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedVo <br/>
+ * Description: 已选应收款项明细表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-12 17:57:00 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "已选应收款项明细表 视图数据对象", description = "已选应收款项明细表 视图数据对象")
+@Data
+public class BusSelectedReceivablesDetailedVo implements Vo {
+
+    
+	@ApiModelProperty("创建人接口")
+    private String createByName; // 创建人接口
+    
+	@ApiModelProperty("合同sid")
+    private String contractSid; // 合同sid
+    
+	@ApiModelProperty("合同编号")
+    private String contractNo; // 合同编号
+    
+	@ApiModelProperty("客户sid")
+    private String customerSid; // 客户sid
+    
+	@ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+    
+	@ApiModelProperty("车架号")
+    private String VIN; // 车架号
+    
+	@ApiModelProperty("分公司sid")
+    private String useOrgSid; // 分公司sid
+    
+	@ApiModelProperty("联系电话")
+    private String customerPhone; // 联系电话
+    
+	@ApiModelProperty("应收项目名称")
+    private String receivablesName; // 应收项目名称
+    
+	@ApiModelProperty("当前应收金额")
+    private String currentReceivableMoney; // 当前应收金额
+    
+	@ApiModelProperty("认款金额")
+    private String subscriptionMoney; // 认款金额
+    
+	@ApiModelProperty("认款申请日期")
+    private String subscriptionDate; // 认款申请日期
+    
+	@ApiModelProperty("收款确认单sid")
+    private String collSid; // 收款确认单sid
+}
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailed.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailed.java
new file mode 100644
index 0000000000..7c3ff53e04
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailed.java
@@ -0,0 +1,214 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: anrui-buscenter(销售相关) <br/>
+ * File: BusUncollectedReceivablesDetailed.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailed <br/>
+ * Description: 应收未收款项明细表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-12 17:57:01 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "应收未收款项明细表", description = "应收未收款项明细表")
+@TableName("bus_uncollected_receivables_detailed")
+public class BusUncollectedReceivablesDetailed extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    
+	@ApiModelProperty("创建人接口")
+    private String createByName; // 创建人接口
+    
+	@ApiModelProperty("合同sid")
+    private String contractSid; // 合同sid
+    
+	@ApiModelProperty("合同编号")
+    private String contractNo; // 合同编号
+    
+	@ApiModelProperty("客户sid")
+    private String customerSid; // 客户sid
+    
+	@ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+    
+	@ApiModelProperty("车架号")
+    private String VIN; // 车架号
+    
+	@ApiModelProperty("分公司sid")
+    private String useOrgSid; // 分公司sid
+    
+	@ApiModelProperty("联系电话")
+    private String customerPhone; // 联系电话
+    
+	@ApiModelProperty("应收项目名称")
+    private String receivablesName; // 应收项目名称
+    
+	@ApiModelProperty("当前应收金额")
+    private BigDecimal currentReceivableMoney; // 当前应收金额
+
+	/**
+	 * @return 创建人接口
+	 */
+	public String getCreateByName(){
+		return createByName;
+	}
+	
+	/**
+	 * @param createByName 创建人接口 to set
+	 */
+	public void setCreateByName(String createByName){
+		this.createByName = createByName;
+	}
+	/**
+	 * @return 合同sid
+	 */
+	public String getContractSid(){
+		return contractSid;
+	}
+	
+	/**
+	 * @param contractSid 合同sid to set
+	 */
+	public void setContractSid(String contractSid){
+		this.contractSid = contractSid;
+	}
+	/**
+	 * @return 合同编号
+	 */
+	public String getContractNo(){
+		return contractNo;
+	}
+	
+	/**
+	 * @param contractNo 合同编号 to set
+	 */
+	public void setContractNo(String contractNo){
+		this.contractNo = contractNo;
+	}
+	/**
+	 * @return 客户sid
+	 */
+	public String getCustomerSid(){
+		return customerSid;
+	}
+	
+	/**
+	 * @param customerSid 客户sid to set
+	 */
+	public void setCustomerSid(String customerSid){
+		this.customerSid = customerSid;
+	}
+	/**
+	 * @return 客户名称
+	 */
+	public String getCustomerName(){
+		return customerName;
+	}
+	
+	/**
+	 * @param customerName 客户名称 to set
+	 */
+	public void setCustomerName(String customerName){
+		this.customerName = customerName;
+	}
+	/**
+	 * @return 车架号
+	 */
+	public String getVIN(){
+		return VIN;
+	}
+	
+	/**
+	 * @param VIN 车架号 to set
+	 */
+	public void setVIN(String VIN){
+		this.VIN = VIN;
+	}
+	/**
+	 * @return 分公司sid
+	 */
+	public String getUseOrgSid(){
+		return useOrgSid;
+	}
+	
+	/**
+	 * @param useOrgSid 分公司sid to set
+	 */
+	public void setUseOrgSid(String useOrgSid){
+		this.useOrgSid = useOrgSid;
+	}
+	/**
+	 * @return 联系电话
+	 */
+	public String getCustomerPhone(){
+		return customerPhone;
+	}
+	
+	/**
+	 * @param customerPhone 联系电话 to set
+	 */
+	public void setCustomerPhone(String customerPhone){
+		this.customerPhone = customerPhone;
+	}
+	/**
+	 * @return 应收项目名称
+	 */
+	public String getReceivablesName(){
+		return receivablesName;
+	}
+	
+	/**
+	 * @param receivablesName 应收项目名称 to set
+	 */
+	public void setReceivablesName(String receivablesName){
+		this.receivablesName = receivablesName;
+	}
+	/**
+	 * @return 当前应收金额
+	 */
+	public BigDecimal getCurrentReceivableMoney(){
+		return currentReceivableMoney;
+	}
+	
+	/**
+	 * @param currentReceivableMoney 当前应收金额 to set
+	 */
+	public void setCurrentReceivableMoney(BigDecimal currentReceivableMoney){
+		this.currentReceivableMoney = currentReceivableMoney;
+	}
+}
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedDto.java
new file mode 100644
index 0000000000..047988a1f0
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedDto.java
@@ -0,0 +1,82 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-buscenter(销售相关) <br/>
+ * File: BusUncollectedReceivablesDetailedDto.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedDto <br/>
+ * Description: 应收未收款项明细表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-12 17:57:01 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "应收未收款项明细表 数据传输对象", description = "应收未收款项明细表 数据传输对象")
+@Data
+public class BusUncollectedReceivablesDetailedDto implements Dto {
+
+    
+	@ApiModelProperty("创建人接口")
+    private String createByName; // 创建人接口
+    
+	@ApiModelProperty("合同sid")
+    private String contractSid; // 合同sid
+    
+	@ApiModelProperty("合同编号")
+    private String contractNo; // 合同编号
+    
+	@ApiModelProperty("客户sid")
+    private String customerSid; // 客户sid
+    
+	@ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+    
+	@ApiModelProperty("车架号")
+    private String VIN; // 车架号
+    
+	@ApiModelProperty("分公司sid")
+    private String useOrgSid; // 分公司sid
+    
+	@ApiModelProperty("联系电话")
+    private String customerPhone; // 联系电话
+    
+	@ApiModelProperty("应收项目名称")
+    private String receivablesName; // 应收项目名称
+    
+	@ApiModelProperty("当前应收金额")
+    private String currentReceivableMoney; // 当前应收金额
+}
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedFeign.java
new file mode 100644
index 0000000000..3b529e9532
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedFeign.java
@@ -0,0 +1,94 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed;
+
+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 org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: anrui-buscenter(销售相关) <br/>
+ * File: BusUncollectedReceivablesDetailedFeign.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedFeign <br/>
+ * Description: 应收未收款项明细表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-12 17:57:01 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "应收未收款项明细表")
+@FeignClient(
+        contextId = "anrui-buscenter-BusUncollectedReceivablesDetailed",
+        name = "anrui-buscenter",
+        path = "busuncollectedreceivablesdetailed",
+        fallback = BusUncollectedReceivablesDetailedFeignFallback.class)
+public interface BusUncollectedReceivablesDetailedFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<BusUncollectedReceivablesDetailedVo>> listPage(@RequestBody PagerQuery<BusUncollectedReceivablesDetailedQuery> pq);
+
+    @ApiOperation("根据条件查询所有数据列表")
+    @PostMapping("/listAll")
+    public ResultBean<List<BusUncollectedReceivablesDetailedVo>> listAll(@RequestBody BusUncollectedReceivablesDetailedQuery query);
+
+    @ApiOperation("所有数据列表")
+    @GetMapping("/list")
+    public ResultBean<List<BusUncollectedReceivablesDetailedVo>> list();
+
+    @ApiOperation("新增保存")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody BusUncollectedReceivablesDetailedDto dto);
+      
+    @ApiOperation("修改保存")
+    @PostMapping("/update/{sid}")
+    public ResultBean update(@RequestBody BusUncollectedReceivablesDetailedDto dto, @PathVariable("sid") String sid);
+
+    @ApiOperation("删除记录")
+    @GetMapping("/del/{ids}")
+    public ResultBean del(@PathVariable("ids") String ids);
+      
+    @ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids);
+
+    @ApiOperation("获取一条记录")
+    @GetMapping("/fetch/{id}")
+    public ResultBean<BusUncollectedReceivablesDetailedVo> fetch(@PathVariable("id") String id);
+      
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchBySid/{sid}")
+    public ResultBean<BusUncollectedReceivablesDetailedVo> fetchBySid(@PathVariable("sid") String sid);
+}
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedFeignFallback.java
new file mode 100644
index 0000000000..176d3e171f
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedFeignFallback.java
@@ -0,0 +1,100 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed;
+
+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;
+
+/**
+ * Project: anrui-buscenter(销售相关) <br/>
+ * File: BusUncollectedReceivablesDetailedFeignFallback.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedFeignFallback <br/>
+ * Description: 应收未收款项明细表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-12 17:57:01 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class BusUncollectedReceivablesDetailedFeignFallback implements BusUncollectedReceivablesDetailedFeign {
+
+	@Override
+	public ResultBean<PagerVo<BusUncollectedReceivablesDetailedVo>> listPage(PagerQuery<BusUncollectedReceivablesDetailedQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-buscenter/busuncollectedreceivablesdetailed/listPage无法访问");
+	}
+
+    @Override
+    public ResultBean<List<BusUncollectedReceivablesDetailedVo>> listAll(BusUncollectedReceivablesDetailedQuery query){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-buscenter/busuncollectedreceivablesdetailed/listAll无法访问");
+	}
+
+	@Override
+	public ResultBean<List<BusUncollectedReceivablesDetailedVo>> list(){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-buscenter/busuncollectedreceivablesdetailed/list无法访问");
+	}
+
+	@Override
+	public ResultBean save(BusUncollectedReceivablesDetailedDto dto){
+		return ResultBean.fireFail().setMsg("接口anrui-buscenter/busuncollectedreceivablesdetailed/save无法访问");
+	}
+
+	@Override
+	public ResultBean update(BusUncollectedReceivablesDetailedDto dto, String sid){
+		return ResultBean.fireFail().setMsg("接口anrui-buscenter/busuncollectedreceivablesdetailed/update无法访问");
+	}
+
+	@Override
+	public ResultBean del(String ids){
+		return ResultBean.fireFail().setMsg("接口anrui-buscenter/busuncollectedreceivablesdetailed/del无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口anrui-buscenter/busuncollectedreceivablesdetailed/delBySids无法访问");
+	}
+
+	@Override
+	public ResultBean<BusUncollectedReceivablesDetailedVo> fetch(String id){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-buscenter/busuncollectedreceivablesdetailed/fetch无法访问");
+	}
+
+	@Override
+	public ResultBean<BusUncollectedReceivablesDetailedVo> fetchBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-buscenter/busuncollectedreceivablesdetailed/fetchBySid无法访问");
+	}
+}
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedQuery.java
new file mode 100644
index 0000000000..d72e1d8bd5
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedQuery.java
@@ -0,0 +1,82 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-buscenter(销售相关) <br/>
+ * File: BusUncollectedReceivablesDetailedQuery.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedQuery <br/>
+ * Description: 应收未收款项明细表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-12 17:57:01 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "应收未收款项明细表 查询条件", description = "应收未收款项明细表 查询条件")
+@Data
+public class BusUncollectedReceivablesDetailedQuery implements Query {
+
+    
+	@ApiModelProperty("创建人接口")
+    private String createByName; // 创建人接口
+    
+	@ApiModelProperty("合同sid")
+    private String contractSid; // 合同sid
+    
+	@ApiModelProperty("合同编号")
+    private String contractNo; // 合同编号
+    
+	@ApiModelProperty("客户sid")
+    private String customerSid; // 客户sid
+    
+	@ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+    
+	@ApiModelProperty("车架号")
+    private String VIN; // 车架号
+    
+	@ApiModelProperty("分公司sid")
+    private String useOrgSid; // 分公司sid
+    
+	@ApiModelProperty("联系电话")
+    private String customerPhone; // 联系电话
+    
+	@ApiModelProperty("应收项目名称")
+    private String receivablesName; // 应收项目名称
+    
+	@ApiModelProperty("当前应收金额")
+    private String currentReceivableMoney; // 当前应收金额
+}
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedVo.java
new file mode 100644
index 0000000000..a7f086cceb
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedVo.java
@@ -0,0 +1,82 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-buscenter(销售相关) <br/>
+ * File: BusUncollectedReceivablesDetailedVo.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedVo <br/>
+ * Description: 应收未收款项明细表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-12 17:57:01 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "应收未收款项明细表 视图数据对象", description = "应收未收款项明细表 视图数据对象")
+@Data
+public class BusUncollectedReceivablesDetailedVo implements Vo {
+
+    
+	@ApiModelProperty("创建人接口")
+    private String createByName; // 创建人接口
+    
+	@ApiModelProperty("合同sid")
+    private String contractSid; // 合同sid
+    
+	@ApiModelProperty("合同编号")
+    private String contractNo; // 合同编号
+    
+	@ApiModelProperty("客户sid")
+    private String customerSid; // 客户sid
+    
+	@ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+    
+	@ApiModelProperty("车架号")
+    private String VIN; // 车架号
+    
+	@ApiModelProperty("分公司sid")
+    private String useOrgSid; // 分公司sid
+    
+	@ApiModelProperty("联系电话")
+    private String customerPhone; // 联系电话
+    
+	@ApiModelProperty("应收项目名称")
+    private String receivablesName; // 应收项目名称
+    
+	@ApiModelProperty("当前应收金额")
+    private String currentReceivableMoney; // 当前应收金额
+}
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationMapper.java
new file mode 100644
index 0000000000..01f9a53fed
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationMapper.java
@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.biz.buscollectionconfirmation;
+
+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 org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.anrui.buscenter.api.buscollectionconfirmation.BusCollectionConfirmation;
+import com.yxt.anrui.buscenter.api.buscollectionconfirmation.BusCollectionConfirmationVo;
+
+import java.util.List;
+
+/**
+ * Project: anrui-buscenter(销售相关) <br/>
+ * File: BusCollectionConfirmationMapper.java <br/>
+ * Class: com.yxt.anrui.buscenter.biz.buscollectionconfirmation.BusCollectionConfirmationMapper <br/>
+ * Description: 收款确认表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-12 17:57:01 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface BusCollectionConfirmationMapper extends BaseMapper<BusCollectionConfirmation> {
+
+	//@Update("update bus_collection_confirmation set name=#{msg} where id=#{id}")
+	//IPage<BusCollectionConfirmationVo> voPage(IPage<BusCollectionConfirmation> page, @Param(Constants.WRAPPER) QueryWrapper<BusCollectionConfirmation> qw);
+	
+	IPage<BusCollectionConfirmationVo> selectPageVo(IPage<BusCollectionConfirmation> page, @Param(Constants.WRAPPER) Wrapper<BusCollectionConfirmation> qw);
+	
+	List<BusCollectionConfirmationVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BusCollectionConfirmation> qw);
+	
+	@Select("select * from bus_collection_confirmation")
+	List<BusCollectionConfirmationVo> selectListVo();
+}
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationMapper.xml
new file mode 100644
index 0000000000..d4f730bad0
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationMapper.xml
@@ -0,0 +1,13 @@
+<?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.buscenter.biz.buscollectionconfirmation.BusCollectionConfirmationMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selectPageVo" resultType="com.yxt.anrui.buscenter.api.buscollectionconfirmation.BusCollectionConfirmationVo">
+		SELECT * FROM bus_collection_confirmation <where> ${ew.sqlSegment} </where>
+	</select>
+	
+	<select id="selectListAllVo" resultType="com.yxt.anrui.buscenter.api.buscollectionconfirmation.BusCollectionConfirmationVo">
+		SELECT * FROM bus_collection_confirmation <where> ${ew.sqlSegment} </where>
+	</select>
+</mapper>
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationRest.java
new file mode 100644
index 0000000000..7c0f8fcf47
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationRest.java
@@ -0,0 +1,91 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.biz.buscollectionconfirmation;
+
+import com.yxt.anrui.buscenter.api.buscollectionconfirmation.*;
+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.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: anrui-buscenter(销售相关) <br/>
+ * File: BusCollectionConfirmationFeignFallback.java <br/>
+ * Class: com.yxt.anrui.buscenter.biz.buscollectionconfirmation.BusCollectionConfirmationRest <br/>
+ * Description: 收款确认表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-12 17:57:01 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "收款确认表")
+@RestController("com.yxt.anrui.buscenter.biz.buscollectionconfirmation.BusCollectionConfirmationRest")
+@RequestMapping("/buscollectionconfirmation")
+public class BusCollectionConfirmationRest implements BusCollectionConfirmationFeign {
+
+	@Autowired
+	private BusCollectionConfirmationService busCollectionConfirmationService;
+
+	@Override
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<BusCollectionConfirmationVo>> listPage(@RequestBody PagerQuery<BusCollectionConfirmationQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<BusCollectionConfirmationVo> pv = busCollectionConfirmationService.listPageVo(pq);
+		return rb.success().setData(pv);
+	}
+
+	@Override
+	@ApiOperation("新增或修改保存")
+	@PostMapping("/saveOrUpdate")
+	public ResultBean saveOrUpdate(@RequestBody BusCollectionConfirmationDto dto){
+		return busCollectionConfirmationService.saveOrUpdateAllDto(dto);
+	}
+
+	@Override
+	@ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		ResultBean rb = ResultBean.fireFail();
+		busCollectionConfirmationService.delBySids(sids);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchBySid/{sid}")
+    public ResultBean<BusCollectionConfirmationDetailsVo> fetchBySid(@PathVariable("sid") String sid){
+		return busCollectionConfirmationService.fetchByAllSid(sid);
+	}
+}
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationService.java
new file mode 100644
index 0000000000..c3635e05c1
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationService.java
@@ -0,0 +1,134 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.biz.buscollectionconfirmation;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.buscenter.api.buscollectionconfirmation.*;
+import org.apache.commons.lang3.StringUtils;
+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 org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: anrui-buscenter(销售相关) <br/>
+ * File: BusCollectionConfirmationService.java <br/>
+ * Class: com.yxt.anrui.buscenter.biz.buscollectionconfirmation.BusCollectionConfirmationService <br/>
+ * Description: 收款确认表 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-12 17:57:01 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class BusCollectionConfirmationService extends MybatisBaseService<BusCollectionConfirmationMapper, BusCollectionConfirmation> {
+	public PagerVo<BusCollectionConfirmation> listPage(PagerQuery<BusCollectionConfirmationQuery> pq) {
+		BusCollectionConfirmationQuery query = pq.getParams();
+		QueryWrapper<BusCollectionConfirmation> qw = createQueryWrapper(query);
+		IPage<BusCollectionConfirmation> page = PagerUtil.queryToPage(pq);
+		IPage<BusCollectionConfirmation> pagging = baseMapper.selectPage(page, qw);
+		PagerVo<BusCollectionConfirmation> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
+	public List<BusCollectionConfirmation> listAll(BusCollectionConfirmationQuery query) {
+		QueryWrapper<BusCollectionConfirmation> qw = createQueryWrapper(query);
+		return baseMapper.selectList(qw);
+	}
+	private QueryWrapper<BusCollectionConfirmation> createQueryWrapper(BusCollectionConfirmationQuery query) {
+		// todo: 这里根据具体业务调整查询条件
+		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+		QueryWrapper<BusCollectionConfirmation> qw = new QueryWrapper<>();
+
+		if (StringUtils.isNotBlank(query.getCollectionDate())) {
+			qw.eq("collectionDate", query.getCollectionDate());
+		}
+		if (StringUtils.isNotBlank(query.getCollectionBank())) {
+			qw.eq("collectionBank", query.getCollectionBank());
+		}
+		if (StringUtils.isNotBlank(query.getCollectionTypeKey())) {
+			qw.eq("collectionTypeKey", query.getCollectionTypeKey());
+		}
+		if (StringUtils.isNotBlank(query.getSubscriptionState())) {
+			qw.eq("subscriptionState", query.getSubscriptionState());
+		}
+		return qw;
+	}
+	
+	public PagerVo<BusCollectionConfirmationVo> listPageVo(PagerQuery<BusCollectionConfirmationQuery> pq) {
+		BusCollectionConfirmationQuery query = pq.getParams();
+		QueryWrapper<BusCollectionConfirmation> qw = createQueryWrapper(query);
+		IPage<BusCollectionConfirmation> page = PagerUtil.queryToPage(pq);
+		IPage<BusCollectionConfirmationVo> pagging = baseMapper.selectPageVo(page, qw);
+		PagerVo<BusCollectionConfirmationVo> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
+	
+	public List<BusCollectionConfirmationVo> listAllVo(BusCollectionConfirmationQuery query) {
+		QueryWrapper<BusCollectionConfirmation> qw = createQueryWrapper(query);
+		return baseMapper.selectListAllVo(qw);
+	}
+	
+	public List<BusCollectionConfirmationVo> listVo() {
+		return baseMapper.selectListVo();
+	}
+	
+	public void saveOrUpdateDto(BusCollectionConfirmationDto dto){
+		BusCollectionConfirmation entity = new BusCollectionConfirmation();
+		dto.fillEntity(entity);
+		this.saveOrUpdate(entity);
+	}
+	
+	public BusCollectionConfirmationVo fetchByIdVo(String id){
+		BusCollectionConfirmation entity = this.fetchById(id);
+		BusCollectionConfirmationVo vo = new BusCollectionConfirmationVo();
+		BeanUtil.copyProperties(entity, vo);
+		return vo;
+	}
+
+	public ResultBean saveOrUpdateAllDto(BusCollectionConfirmationDto dto) {
+		ResultBean rb = ResultBean.fireFail();
+		String sid = dto.getSid();
+		if (StringUtils.isBlank(sid)){
+
+		}
+		return null;
+	}
+
+	public ResultBean<BusCollectionConfirmationDetailsVo> fetchByAllSid(String sid) {
+		ResultBean rb = ResultBean.fireFail();
+		return null;
+	}
+}
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscustomerbill/BusCustomerBillMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscustomerbill/BusCustomerBillMapper.java
new file mode 100644
index 0000000000..eb7ea32854
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscustomerbill/BusCustomerBillMapper.java
@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.biz.buscustomerbill;
+
+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 org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.anrui.buscenter.api.buscustomerbill.BusCustomerBill;
+import com.yxt.anrui.buscenter.api.buscustomerbill.BusCustomerBillVo;
+
+import java.util.List;
+
+/**
+ * Project: anrui-buscenter(销售相关) <br/>
+ * File: BusCustomerBillMapper.java <br/>
+ * Class: com.yxt.anrui.buscenter.biz.buscustomerbill.BusCustomerBillMapper <br/>
+ * Description: 客户账单表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-12 17:57:01 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface BusCustomerBillMapper extends BaseMapper<BusCustomerBill> {
+
+	//@Update("update bus_customer_bill set name=#{msg} where id=#{id}")
+	//IPage<BusCustomerBillVo> voPage(IPage<BusCustomerBill> page, @Param(Constants.WRAPPER) QueryWrapper<BusCustomerBill> qw);
+	
+	IPage<BusCustomerBillVo> selectPageVo(IPage<BusCustomerBill> page, @Param(Constants.WRAPPER) Wrapper<BusCustomerBill> qw);
+	
+	List<BusCustomerBillVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BusCustomerBill> qw);
+	
+	@Select("select * from bus_customer_bill")
+	List<BusCustomerBillVo> selectListVo();
+}
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscustomerbill/BusCustomerBillMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscustomerbill/BusCustomerBillMapper.xml
new file mode 100644
index 0000000000..bd0d37e115
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscustomerbill/BusCustomerBillMapper.xml
@@ -0,0 +1,13 @@
+<?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.buscenter.biz.buscustomerbill.BusCustomerBillMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selectPageVo" resultType="com.yxt.anrui.buscenter.api.buscustomerbill.BusCustomerBillVo">
+		SELECT * FROM bus_customer_bill <where> ${ew.sqlSegment} </where>
+	</select>
+	
+	<select id="selectListAllVo" resultType="com.yxt.anrui.buscenter.api.buscustomerbill.BusCustomerBillVo">
+		SELECT * FROM bus_customer_bill <where> ${ew.sqlSegment} </where>
+	</select>
+</mapper>
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscustomerbill/BusCustomerBillRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscustomerbill/BusCustomerBillRest.java
new file mode 100644
index 0000000000..e402bd85a8
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscustomerbill/BusCustomerBillRest.java
@@ -0,0 +1,144 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.biz.buscustomerbill;
+
+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.web.bind.annotation.*;
+
+import java.util.List;
+import com.yxt.anrui.buscenter.api.buscustomerbill.BusCustomerBill;
+import com.yxt.anrui.buscenter.api.buscustomerbill.BusCustomerBillQuery;
+import com.yxt.anrui.buscenter.api.buscustomerbill.BusCustomerBillVo;
+import com.yxt.anrui.buscenter.api.buscustomerbill.BusCustomerBillDto;
+import com.yxt.anrui.buscenter.api.buscustomerbill.BusCustomerBillFeign;
+
+/**
+ * Project: anrui-buscenter(销售相关) <br/>
+ * File: BusCustomerBillFeignFallback.java <br/>
+ * Class: com.yxt.anrui.buscenter.biz.buscustomerbill.BusCustomerBillRest <br/>
+ * Description: 客户账单表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-12 17:57:01 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "客户账单表")
+@RestController("com.yxt.anrui.buscenter.biz.buscustomerbill.BusCustomerBillRest")
+@RequestMapping("/buscustomerbill")
+public class BusCustomerBillRest implements BusCustomerBillFeign {
+
+	@Autowired
+	private BusCustomerBillService busCustomerBillService;
+
+	@Override
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<BusCustomerBillVo>> listPage(@RequestBody PagerQuery<BusCustomerBillQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<BusCustomerBillVo> pv = busCustomerBillService.listPageVo(pq);
+		return rb.success().setData(pv);
+	}
+
+	@Override
+	@ApiOperation("根据条件查询所有数据列表")
+	@PostMapping("/listAll")
+	public ResultBean<List<BusCustomerBillVo>> listAll(@RequestBody BusCustomerBillQuery query){
+		ResultBean rb = ResultBean.fireFail();
+		List<BusCustomerBillVo> list = busCustomerBillService.listAllVo(query);
+		return rb.success().setData(list);
+	}
+
+	@Override
+	@ApiOperation("所有数据列表")
+	@GetMapping("/list")
+	public ResultBean<List<BusCustomerBillVo>> list(){
+		ResultBean rb = ResultBean.fireFail();
+		List<BusCustomerBillVo> list = busCustomerBillService.listVo();
+		return rb.success().setData(list);
+	}
+
+	@Override
+	@ApiOperation("新增保存")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody BusCustomerBillDto dto){
+		ResultBean rb = ResultBean.fireFail();
+		busCustomerBillService.saveOrUpdateDto(dto);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("修改保存")
+	@PostMapping("/update/{sid}")
+	public ResultBean update(@RequestBody BusCustomerBillDto dto, @PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		busCustomerBillService.updateBySid(dto.toMap(),sid);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("删除记录")
+	@GetMapping("/del/{ids}")
+	public ResultBean del(@PathVariable("ids") String ids){
+		ResultBean rb = ResultBean.fireFail();
+		busCustomerBillService.delByIds(ids);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		ResultBean rb = ResultBean.fireFail();
+		busCustomerBillService.delBySids(sids);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("获取一条记录")
+	@GetMapping("/fetch/{id}")
+	public ResultBean<BusCustomerBillVo> fetch(@PathVariable("id") String id){
+		ResultBean rb = ResultBean.fireFail();
+		BusCustomerBillVo vo = busCustomerBillService.fetchByIdVo(id);
+		return rb.success().setData(vo);
+	}
+
+	@Override
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchBySid/{sid}")
+    public ResultBean<BusCustomerBillVo> fetchBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		BusCustomerBillVo vo =new BusCustomerBillVo();
+		return rb.success().setData(vo);
+	}
+}
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscustomerbill/BusCustomerBillService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscustomerbill/BusCustomerBillService.java
new file mode 100644
index 0000000000..564502c34d
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscustomerbill/BusCustomerBillService.java
@@ -0,0 +1,172 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.biz.buscustomerbill;
+
+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.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.buscenter.api.buscustomerbill.BusCustomerBill;
+import com.yxt.anrui.buscenter.api.buscustomerbill.BusCustomerBillQuery;
+import com.yxt.anrui.buscenter.api.buscustomerbill.BusCustomerBillVo;
+import com.yxt.anrui.buscenter.api.buscustomerbill.BusCustomerBillDto;
+import com.yxt.anrui.buscenter.api.buscustomerbill.BusCustomerBillFeign;
+
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: anrui-buscenter(销售相关) <br/>
+ * File: BusCustomerBillService.java <br/>
+ * Class: com.yxt.anrui.buscenter.biz.buscustomerbill.BusCustomerBillService <br/>
+ * Description: 客户账单表 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-12 17:57:01 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class BusCustomerBillService extends MybatisBaseService<BusCustomerBillMapper, BusCustomerBill> {
+	public PagerVo<BusCustomerBill> listPage(PagerQuery<BusCustomerBillQuery> pq) {
+		BusCustomerBillQuery query = pq.getParams();
+		QueryWrapper<BusCustomerBill> qw = createQueryWrapper(query);
+		IPage<BusCustomerBill> page = PagerUtil.queryToPage(pq);
+		IPage<BusCustomerBill> pagging = baseMapper.selectPage(page, qw);
+		PagerVo<BusCustomerBill> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
+	public List<BusCustomerBill> listAll(BusCustomerBillQuery query) {
+		QueryWrapper<BusCustomerBill> qw = createQueryWrapper(query);
+		return baseMapper.selectList(qw);
+	}
+	private QueryWrapper<BusCustomerBill> createQueryWrapper(BusCustomerBillQuery query) {
+		// todo: 这里根据具体业务调整查询条件
+		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+		QueryWrapper<BusCustomerBill> qw = new QueryWrapper<>();
+
+
+		if (StringUtils.isNotBlank(query.getCreateByName())) {
+			qw.eq("createByName", query.getCreateByName());
+		}
+
+		if (StringUtils.isNotBlank(query.getContractSid())) {
+			qw.eq("contractSid", query.getContractSid());
+		}
+
+		if (StringUtils.isNotBlank(query.getContractNo())) {
+			qw.eq("contractNo", query.getContractNo());
+		}
+
+		if (StringUtils.isNotBlank(query.getCustomerSid())) {
+			qw.eq("customerSid", query.getCustomerSid());
+		}
+
+		if (StringUtils.isNotBlank(query.getCustomerName())) {
+			qw.eq("customerName", query.getCustomerName());
+		}
+
+		if (StringUtils.isNotBlank(query.getPaymentTypeKey())) {
+			qw.eq("paymentTypeKey", query.getPaymentTypeKey());
+		}
+
+		if (StringUtils.isNotBlank(query.getPaymentTypeValue())) {
+			qw.eq("paymentTypeValue", query.getPaymentTypeValue());
+		}
+
+		if (StringUtils.isNotBlank(query.getPaymentName())) {
+			qw.eq("paymentName", query.getPaymentName());
+		}
+
+		if (query.getPaymentState() != null) {
+			qw.eq("paymentState", query.getPaymentState());
+		}
+
+		if (query.getReceivableMoney() != null) {
+			qw.eq("receivableMoney", query.getReceivableMoney());
+		}
+
+		if (query.getNetReceiptsMoney() != null) {
+			qw.eq("netReceiptsMoney", query.getNetReceiptsMoney());
+		}
+
+		if (query.getUncollectedMoney() != null) {
+			qw.eq("uncollectedMoney", query.getUncollectedMoney());
+		}
+
+		if (StringUtils.isNotBlank(query.getGenerateDate())) {
+			qw.eq("generateDate", query.getGenerateDate());
+		}
+
+		if (StringUtils.isNotBlank(query.getLatestProcessingDate())) {
+			qw.eq("latestProcessingDate", query.getLatestProcessingDate());
+		}
+
+		if (StringUtils.isNotBlank(query.getUseOrgSid())) {
+			qw.eq("useOrgSid", query.getUseOrgSid());
+		}
+		return qw;
+	}
+	
+	public PagerVo<BusCustomerBillVo> listPageVo(PagerQuery<BusCustomerBillQuery> pq) {
+		BusCustomerBillQuery query = pq.getParams();
+		QueryWrapper<BusCustomerBill> qw = createQueryWrapper(query);
+		IPage<BusCustomerBill> page = PagerUtil.queryToPage(pq);
+		IPage<BusCustomerBillVo> pagging = baseMapper.selectPageVo(page, qw);
+		PagerVo<BusCustomerBillVo> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
+	
+	public List<BusCustomerBillVo> listAllVo(BusCustomerBillQuery query) {
+		QueryWrapper<BusCustomerBill> qw = createQueryWrapper(query);
+		return baseMapper.selectListAllVo(qw);
+	}
+	
+	public List<BusCustomerBillVo> listVo() {
+		return baseMapper.selectListVo();
+	}
+	
+	public void saveOrUpdateDto(BusCustomerBillDto dto){
+		BusCustomerBill entity = new BusCustomerBill();
+		dto.fillEntity(entity);
+		this.saveOrUpdate(entity);
+	}
+	
+	public BusCustomerBillVo fetchByIdVo(String id){
+		BusCustomerBill entity = this.fetchById(id);
+		BusCustomerBillVo vo = new BusCustomerBillVo();
+		BeanUtil.copyProperties(entity, vo);
+		return vo;
+	}
+}
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscustomerbilldetailed/BusCustomerBillDetailedMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscustomerbilldetailed/BusCustomerBillDetailedMapper.java
new file mode 100644
index 0000000000..cc5c893ade
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscustomerbilldetailed/BusCustomerBillDetailedMapper.java
@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.biz.buscustomerbilldetailed;
+
+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 org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.anrui.buscenter.api.buscustomerbilldetailed.BusCustomerBillDetailed;
+import com.yxt.anrui.buscenter.api.buscustomerbilldetailed.BusCustomerBillDetailedVo;
+
+import java.util.List;
+
+/**
+ * Project: anrui-buscenter(销售相关) <br/>
+ * File: BusCustomerBillDetailedMapper.java <br/>
+ * Class: com.yxt.anrui.buscenter.biz.buscustomerbilldetailed.BusCustomerBillDetailedMapper <br/>
+ * Description: 客户账单明细表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-12 17:57:01 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface BusCustomerBillDetailedMapper extends BaseMapper<BusCustomerBillDetailed> {
+
+	//@Update("update bus_customer_bill_detailed set name=#{msg} where id=#{id}")
+	//IPage<BusCustomerBillDetailedVo> voPage(IPage<BusCustomerBillDetailed> page, @Param(Constants.WRAPPER) QueryWrapper<BusCustomerBillDetailed> qw);
+	
+	IPage<BusCustomerBillDetailedVo> selectPageVo(IPage<BusCustomerBillDetailed> page, @Param(Constants.WRAPPER) Wrapper<BusCustomerBillDetailed> qw);
+	
+	List<BusCustomerBillDetailedVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BusCustomerBillDetailed> qw);
+	
+	@Select("select * from bus_customer_bill_detailed")
+	List<BusCustomerBillDetailedVo> selectListVo();
+}
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscustomerbilldetailed/BusCustomerBillDetailedMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscustomerbilldetailed/BusCustomerBillDetailedMapper.xml
new file mode 100644
index 0000000000..95983d8df3
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscustomerbilldetailed/BusCustomerBillDetailedMapper.xml
@@ -0,0 +1,13 @@
+<?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.buscenter.biz.buscustomerbilldetailed.BusCustomerBillDetailedMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selectPageVo" resultType="com.yxt.anrui.buscenter.api.buscustomerbilldetailed.BusCustomerBillDetailedVo">
+		SELECT * FROM bus_customer_bill_detailed <where> ${ew.sqlSegment} </where>
+	</select>
+	
+	<select id="selectListAllVo" resultType="com.yxt.anrui.buscenter.api.buscustomerbilldetailed.BusCustomerBillDetailedVo">
+		SELECT * FROM bus_customer_bill_detailed <where> ${ew.sqlSegment} </where>
+	</select>
+</mapper>
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscustomerbilldetailed/BusCustomerBillDetailedRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscustomerbilldetailed/BusCustomerBillDetailedRest.java
new file mode 100644
index 0000000000..a734e29773
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscustomerbilldetailed/BusCustomerBillDetailedRest.java
@@ -0,0 +1,144 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.biz.buscustomerbilldetailed;
+
+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.web.bind.annotation.*;
+
+import java.util.List;
+import com.yxt.anrui.buscenter.api.buscustomerbilldetailed.BusCustomerBillDetailed;
+import com.yxt.anrui.buscenter.api.buscustomerbilldetailed.BusCustomerBillDetailedQuery;
+import com.yxt.anrui.buscenter.api.buscustomerbilldetailed.BusCustomerBillDetailedVo;
+import com.yxt.anrui.buscenter.api.buscustomerbilldetailed.BusCustomerBillDetailedDto;
+import com.yxt.anrui.buscenter.api.buscustomerbilldetailed.BusCustomerBillDetailedFeign;
+
+/**
+ * Project: anrui-buscenter(销售相关) <br/>
+ * File: BusCustomerBillDetailedFeignFallback.java <br/>
+ * Class: com.yxt.anrui.buscenter.biz.buscustomerbilldetailed.BusCustomerBillDetailedRest <br/>
+ * Description: 客户账单明细表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-12 17:57:01 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "客户账单明细表")
+@RestController("com.yxt.anrui.buscenter.biz.buscustomerbilldetailed.BusCustomerBillDetailedRest")
+@RequestMapping("/buscustomerbilldetailed")
+public class BusCustomerBillDetailedRest implements BusCustomerBillDetailedFeign {
+
+	@Autowired
+	private BusCustomerBillDetailedService busCustomerBillDetailedService;
+
+	@Override
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<BusCustomerBillDetailedVo>> listPage(@RequestBody PagerQuery<BusCustomerBillDetailedQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<BusCustomerBillDetailedVo> pv = busCustomerBillDetailedService.listPageVo(pq);
+		return rb.success().setData(pv);
+	}
+
+	@Override
+	@ApiOperation("根据条件查询所有数据列表")
+	@PostMapping("/listAll")
+	public ResultBean<List<BusCustomerBillDetailedVo>> listAll(@RequestBody BusCustomerBillDetailedQuery query){
+		ResultBean rb = ResultBean.fireFail();
+		List<BusCustomerBillDetailedVo> list = busCustomerBillDetailedService.listAllVo(query);
+		return rb.success().setData(list);
+	}
+
+	@Override
+	@ApiOperation("所有数据列表")
+	@GetMapping("/list")
+	public ResultBean<List<BusCustomerBillDetailedVo>> list(){
+		ResultBean rb = ResultBean.fireFail();
+		List<BusCustomerBillDetailedVo> list = busCustomerBillDetailedService.listVo();
+		return rb.success().setData(list);
+	}
+
+	@Override
+	@ApiOperation("新增保存")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody BusCustomerBillDetailedDto dto){
+		ResultBean rb = ResultBean.fireFail();
+		busCustomerBillDetailedService.saveOrUpdateDto(dto);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("修改保存")
+	@PostMapping("/update/{sid}")
+	public ResultBean update(@RequestBody BusCustomerBillDetailedDto dto, @PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		busCustomerBillDetailedService.updateBySid(dto.toMap(),sid);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("删除记录")
+	@GetMapping("/del/{ids}")
+	public ResultBean del(@PathVariable("ids") String ids){
+		ResultBean rb = ResultBean.fireFail();
+		busCustomerBillDetailedService.delByIds(ids);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		ResultBean rb = ResultBean.fireFail();
+		busCustomerBillDetailedService.delBySids(sids);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("获取一条记录")
+	@GetMapping("/fetch/{id}")
+	public ResultBean<BusCustomerBillDetailedVo> fetch(@PathVariable("id") String id){
+		ResultBean rb = ResultBean.fireFail();
+		BusCustomerBillDetailedVo vo = busCustomerBillDetailedService.fetchByIdVo(id);
+		return rb.success().setData(vo);
+	}
+
+	@Override
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchBySid/{sid}")
+    public ResultBean<BusCustomerBillDetailedVo> fetchBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		BusCustomerBillDetailedVo vo = new BusCustomerBillDetailedVo();
+		return rb.success().setData(vo);
+	}
+}
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscustomerbilldetailed/BusCustomerBillDetailedService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscustomerbilldetailed/BusCustomerBillDetailedService.java
new file mode 100644
index 0000000000..8d0853fecc
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscustomerbilldetailed/BusCustomerBillDetailedService.java
@@ -0,0 +1,168 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.biz.buscustomerbilldetailed;
+
+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.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.buscenter.api.buscustomerbilldetailed.BusCustomerBillDetailed;
+import com.yxt.anrui.buscenter.api.buscustomerbilldetailed.BusCustomerBillDetailedQuery;
+import com.yxt.anrui.buscenter.api.buscustomerbilldetailed.BusCustomerBillDetailedVo;
+import com.yxt.anrui.buscenter.api.buscustomerbilldetailed.BusCustomerBillDetailedDto;
+import com.yxt.anrui.buscenter.api.buscustomerbilldetailed.BusCustomerBillDetailedFeign;
+
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: anrui-buscenter(销售相关) <br/>
+ * File: BusCustomerBillDetailedService.java <br/>
+ * Class: com.yxt.anrui.buscenter.biz.buscustomerbilldetailed.BusCustomerBillDetailedService <br/>
+ * Description: 客户账单明细表 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-12 17:57:01 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class BusCustomerBillDetailedService extends MybatisBaseService<BusCustomerBillDetailedMapper, BusCustomerBillDetailed> {
+	public PagerVo<BusCustomerBillDetailed> listPage(PagerQuery<BusCustomerBillDetailedQuery> pq) {
+		BusCustomerBillDetailedQuery query = pq.getParams();
+		QueryWrapper<BusCustomerBillDetailed> qw = createQueryWrapper(query);
+		IPage<BusCustomerBillDetailed> page = PagerUtil.queryToPage(pq);
+		IPage<BusCustomerBillDetailed> pagging = baseMapper.selectPage(page, qw);
+		PagerVo<BusCustomerBillDetailed> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
+	public List<BusCustomerBillDetailed> listAll(BusCustomerBillDetailedQuery query) {
+		QueryWrapper<BusCustomerBillDetailed> qw = createQueryWrapper(query);
+		return baseMapper.selectList(qw);
+	}
+	private QueryWrapper<BusCustomerBillDetailed> createQueryWrapper(BusCustomerBillDetailedQuery query) {
+		// todo: 这里根据具体业务调整查询条件
+		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+		QueryWrapper<BusCustomerBillDetailed> qw = new QueryWrapper<>();
+
+
+		if (StringUtils.isNotBlank(query.getCreateByName())) {
+			qw.eq("createByName", query.getCreateByName());
+		}
+
+		if (StringUtils.isNotBlank(query.getContractSid())) {
+			qw.eq("contractSid", query.getContractSid());
+		}
+
+		if (StringUtils.isNotBlank(query.getContractNo())) {
+			qw.eq("contractNo", query.getContractNo());
+		}
+
+		if (StringUtils.isNotBlank(query.getCustomerSid())) {
+			qw.eq("customerSid", query.getCustomerSid());
+		}
+
+		if (StringUtils.isNotBlank(query.getCustomerName())) {
+			qw.eq("customerName", query.getCustomerName());
+		}
+
+		if (StringUtils.isNotBlank(query.getPaymentTypeKey())) {
+			qw.eq("paymentTypeKey", query.getPaymentTypeKey());
+		}
+
+		if (StringUtils.isNotBlank(query.getPaymentTypeValue())) {
+			qw.eq("paymentTypeValue", query.getPaymentTypeValue());
+		}
+
+		if (StringUtils.isNotBlank(query.getPaymentName())) {
+			qw.eq("paymentName", query.getPaymentName());
+		}
+
+		if (query.getPaymentState() != null) {
+			qw.eq("paymentState", query.getPaymentState());
+		}
+
+		if (query.getReceivableMoney() != null) {
+			qw.eq("receivableMoney", query.getReceivableMoney());
+		}
+
+		if (query.getNetReceiptsMoney() != null) {
+			qw.eq("netReceiptsMoney", query.getNetReceiptsMoney());
+		}
+
+		if (query.getUncollectedMoney() != null) {
+			qw.eq("uncollectedMoney", query.getUncollectedMoney());
+		}
+
+		if (StringUtils.isNotBlank(query.getGenerateDate())) {
+			qw.eq("generateDate", query.getGenerateDate());
+		}
+
+		if (StringUtils.isNotBlank(query.getUseOrgSid())) {
+			qw.eq("useOrgSid", query.getUseOrgSid());
+		}
+		return qw;
+	}
+	
+	public PagerVo<BusCustomerBillDetailedVo> listPageVo(PagerQuery<BusCustomerBillDetailedQuery> pq) {
+		BusCustomerBillDetailedQuery query = pq.getParams();
+		QueryWrapper<BusCustomerBillDetailed> qw = createQueryWrapper(query);
+		IPage<BusCustomerBillDetailed> page = PagerUtil.queryToPage(pq);
+		IPage<BusCustomerBillDetailedVo> pagging = baseMapper.selectPageVo(page, qw);
+		PagerVo<BusCustomerBillDetailedVo> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
+	
+	public List<BusCustomerBillDetailedVo> listAllVo(BusCustomerBillDetailedQuery query) {
+		QueryWrapper<BusCustomerBillDetailed> qw = createQueryWrapper(query);
+		return baseMapper.selectListAllVo(qw);
+	}
+	
+	public List<BusCustomerBillDetailedVo> listVo() {
+		return baseMapper.selectListVo();
+	}
+	
+	public void saveOrUpdateDto(BusCustomerBillDetailedDto dto){
+		BusCustomerBillDetailed entity = new BusCustomerBillDetailed();
+		dto.fillEntity(entity);
+		this.saveOrUpdate(entity);
+	}
+	
+	public BusCustomerBillDetailedVo fetchByIdVo(String id){
+		BusCustomerBillDetailed entity = this.fetchById(id);
+		BusCustomerBillDetailedVo vo = new BusCustomerBillDetailedVo();
+		BeanUtil.copyProperties(entity, vo);
+		return vo;
+	}
+}
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedMapper.java
new file mode 100644
index 0000000000..3dda5b98c0
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedMapper.java
@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.biz.busselectedreceivablesdetailed;
+
+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 org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailed;
+import com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedVo;
+
+import java.util.List;
+
+/**
+ * Project: anrui-buscenter(销售相关) <br/>
+ * File: BusSelectedReceivablesDetailedMapper.java <br/>
+ * Class: com.yxt.anrui.buscenter.biz.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedMapper <br/>
+ * Description: 已选应收款项明细表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-12 17:57:00 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface BusSelectedReceivablesDetailedMapper extends BaseMapper<BusSelectedReceivablesDetailed> {
+
+	//@Update("update bus_selected_receivables_detailed set name=#{msg} where id=#{id}")
+	//IPage<BusSelectedReceivablesDetailedVo> voPage(IPage<BusSelectedReceivablesDetailed> page, @Param(Constants.WRAPPER) QueryWrapper<BusSelectedReceivablesDetailed> qw);
+	
+	IPage<BusSelectedReceivablesDetailedVo> selectPageVo(IPage<BusSelectedReceivablesDetailed> page, @Param(Constants.WRAPPER) Wrapper<BusSelectedReceivablesDetailed> qw);
+	
+	List<BusSelectedReceivablesDetailedVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BusSelectedReceivablesDetailed> qw);
+	
+	@Select("select * from bus_selected_receivables_detailed")
+	List<BusSelectedReceivablesDetailedVo> selectListVo();
+}
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedMapper.xml
new file mode 100644
index 0000000000..ea583bec99
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedMapper.xml
@@ -0,0 +1,13 @@
+<?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.buscenter.biz.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selectPageVo" resultType="com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedVo">
+		SELECT * FROM bus_selected_receivables_detailed <where> ${ew.sqlSegment} </where>
+	</select>
+	
+	<select id="selectListAllVo" resultType="com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedVo">
+		SELECT * FROM bus_selected_receivables_detailed <where> ${ew.sqlSegment} </where>
+	</select>
+</mapper>
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedRest.java
new file mode 100644
index 0000000000..3bfc1459e2
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedRest.java
@@ -0,0 +1,144 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.biz.busselectedreceivablesdetailed;
+
+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.web.bind.annotation.*;
+
+import java.util.List;
+import com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailed;
+import com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedQuery;
+import com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedVo;
+import com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedDto;
+import com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedFeign;
+
+/**
+ * Project: anrui-buscenter(销售相关) <br/>
+ * File: BusSelectedReceivablesDetailedFeignFallback.java <br/>
+ * Class: com.yxt.anrui.buscenter.biz.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedRest <br/>
+ * Description: 已选应收款项明细表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-12 17:57:00 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "已选应收款项明细表")
+@RestController("com.yxt.anrui.buscenter.biz.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedRest")
+@RequestMapping("/busselectedreceivablesdetailed")
+public class BusSelectedReceivablesDetailedRest implements BusSelectedReceivablesDetailedFeign {
+
+	@Autowired
+	private BusSelectedReceivablesDetailedService busSelectedReceivablesDetailedService;
+
+	@Override
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<BusSelectedReceivablesDetailedVo>> listPage(@RequestBody PagerQuery<BusSelectedReceivablesDetailedQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<BusSelectedReceivablesDetailedVo> pv = busSelectedReceivablesDetailedService.listPageVo(pq);
+		return rb.success().setData(pv);
+	}
+
+	@Override
+	@ApiOperation("根据条件查询所有数据列表")
+	@PostMapping("/listAll")
+	public ResultBean<List<BusSelectedReceivablesDetailedVo>> listAll(@RequestBody BusSelectedReceivablesDetailedQuery query){
+		ResultBean rb = ResultBean.fireFail();
+		List<BusSelectedReceivablesDetailedVo> list = busSelectedReceivablesDetailedService.listAllVo(query);
+		return rb.success().setData(list);
+	}
+
+	@Override
+	@ApiOperation("所有数据列表")
+	@GetMapping("/list")
+	public ResultBean<List<BusSelectedReceivablesDetailedVo>> list(){
+		ResultBean rb = ResultBean.fireFail();
+		List<BusSelectedReceivablesDetailedVo> list = busSelectedReceivablesDetailedService.listVo();
+		return rb.success().setData(list);
+	}
+
+	@Override
+	@ApiOperation("新增保存")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody BusSelectedReceivablesDetailedDto dto){
+		ResultBean rb = ResultBean.fireFail();
+		busSelectedReceivablesDetailedService.saveOrUpdateDto(dto);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("修改保存")
+	@PostMapping("/update/{sid}")
+	public ResultBean update(@RequestBody BusSelectedReceivablesDetailedDto dto, @PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		busSelectedReceivablesDetailedService.updateBySid(dto.toMap(),sid);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("删除记录")
+	@GetMapping("/del/{ids}")
+	public ResultBean del(@PathVariable("ids") String ids){
+		ResultBean rb = ResultBean.fireFail();
+		busSelectedReceivablesDetailedService.delByIds(ids);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		ResultBean rb = ResultBean.fireFail();
+		busSelectedReceivablesDetailedService.delBySids(sids);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("获取一条记录")
+	@GetMapping("/fetch/{id}")
+	public ResultBean<BusSelectedReceivablesDetailedVo> fetch(@PathVariable("id") String id){
+		ResultBean rb = ResultBean.fireFail();
+		BusSelectedReceivablesDetailedVo vo = busSelectedReceivablesDetailedService.fetchByIdVo(id);
+		return rb.success().setData(vo);
+	}
+
+	@Override
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchBySid/{sid}")
+    public ResultBean<BusSelectedReceivablesDetailedVo> fetchBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		BusSelectedReceivablesDetailedVo vo = new BusSelectedReceivablesDetailedVo();
+		return rb.success().setData(vo);
+	}
+}
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedService.java
new file mode 100644
index 0000000000..378cc57127
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedService.java
@@ -0,0 +1,164 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.biz.busselectedreceivablesdetailed;
+
+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.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.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailed;
+import com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedQuery;
+import com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedVo;
+import com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedDto;
+import com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedFeign;
+
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: anrui-buscenter(销售相关) <br/>
+ * File: BusSelectedReceivablesDetailedService.java <br/>
+ * Class: com.yxt.anrui.buscenter.biz.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedService <br/>
+ * Description: 已选应收款项明细表 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-12 17:57:00 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class BusSelectedReceivablesDetailedService extends MybatisBaseService<BusSelectedReceivablesDetailedMapper, BusSelectedReceivablesDetailed> {
+	public PagerVo<BusSelectedReceivablesDetailed> listPage(PagerQuery<BusSelectedReceivablesDetailedQuery> pq) {
+		BusSelectedReceivablesDetailedQuery query = pq.getParams();
+		QueryWrapper<BusSelectedReceivablesDetailed> qw = createQueryWrapper(query);
+		IPage<BusSelectedReceivablesDetailed> page = PagerUtil.queryToPage(pq);
+		IPage<BusSelectedReceivablesDetailed> pagging = baseMapper.selectPage(page, qw);
+		PagerVo<BusSelectedReceivablesDetailed> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
+	public List<BusSelectedReceivablesDetailed> listAll(BusSelectedReceivablesDetailedQuery query) {
+		QueryWrapper<BusSelectedReceivablesDetailed> qw = createQueryWrapper(query);
+		return baseMapper.selectList(qw);
+	}
+	private QueryWrapper<BusSelectedReceivablesDetailed> createQueryWrapper(BusSelectedReceivablesDetailedQuery query) {
+		// todo: 这里根据具体业务调整查询条件
+		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+		QueryWrapper<BusSelectedReceivablesDetailed> qw = new QueryWrapper<>();
+
+
+		if (StringUtils.isNotBlank(query.getCreateByName())) {
+			qw.eq("createByName", query.getCreateByName());
+		}
+
+		if (StringUtils.isNotBlank(query.getContractSid())) {
+			qw.eq("contractSid", query.getContractSid());
+		}
+
+		if (StringUtils.isNotBlank(query.getContractNo())) {
+			qw.eq("contractNo", query.getContractNo());
+		}
+
+		if (StringUtils.isNotBlank(query.getCustomerSid())) {
+			qw.eq("customerSid", query.getCustomerSid());
+		}
+
+		if (StringUtils.isNotBlank(query.getCustomerName())) {
+			qw.eq("customerName", query.getCustomerName());
+		}
+
+		if (StringUtils.isNotBlank(query.getVIN())) {
+			qw.eq("VIN", query.getVIN());
+		}
+
+		if (StringUtils.isNotBlank(query.getUseOrgSid())) {
+			qw.eq("useOrgSid", query.getUseOrgSid());
+		}
+
+		if (StringUtils.isNotBlank(query.getCustomerPhone())) {
+			qw.eq("customerPhone", query.getCustomerPhone());
+		}
+
+		if (StringUtils.isNotBlank(query.getReceivablesName())) {
+			qw.eq("receivablesName", query.getReceivablesName());
+		}
+
+		if (query.getCurrentReceivableMoney() != null) {
+			qw.eq("currentReceivableMoney", query.getCurrentReceivableMoney());
+		}
+
+		if (query.getSubscriptionMoney() != null) {
+			qw.eq("subscriptionMoney", query.getSubscriptionMoney());
+		}
+
+		if (StringUtils.isNotBlank(query.getSubscriptionDate())) {
+			qw.eq("subscriptionDate", query.getSubscriptionDate());
+		}
+
+		if (StringUtils.isNotBlank(query.getCollSid())) {
+			qw.eq("collSid", query.getCollSid());
+		}
+		return qw;
+	}
+	
+	public PagerVo<BusSelectedReceivablesDetailedVo> listPageVo(PagerQuery<BusSelectedReceivablesDetailedQuery> pq) {
+		BusSelectedReceivablesDetailedQuery query = pq.getParams();
+		QueryWrapper<BusSelectedReceivablesDetailed> qw = createQueryWrapper(query);
+		IPage<BusSelectedReceivablesDetailed> page = PagerUtil.queryToPage(pq);
+		IPage<BusSelectedReceivablesDetailedVo> pagging = baseMapper.selectPageVo(page, qw);
+		PagerVo<BusSelectedReceivablesDetailedVo> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
+	
+	public List<BusSelectedReceivablesDetailedVo> listAllVo(BusSelectedReceivablesDetailedQuery query) {
+		QueryWrapper<BusSelectedReceivablesDetailed> qw = createQueryWrapper(query);
+		return baseMapper.selectListAllVo(qw);
+	}
+	
+	public List<BusSelectedReceivablesDetailedVo> listVo() {
+		return baseMapper.selectListVo();
+	}
+	
+	public void saveOrUpdateDto(BusSelectedReceivablesDetailedDto dto){
+		BusSelectedReceivablesDetailed entity = new BusSelectedReceivablesDetailed();
+		dto.fillEntity(entity);
+		this.saveOrUpdate(entity);
+	}
+	
+	public BusSelectedReceivablesDetailedVo fetchByIdVo(String id){
+		BusSelectedReceivablesDetailed entity = this.fetchById(id);
+		BusSelectedReceivablesDetailedVo vo = new BusSelectedReceivablesDetailedVo();
+		BeanUtil.copyProperties(entity, vo);
+		return vo;
+	}
+}
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedMapper.java
new file mode 100644
index 0000000000..b772a53f8a
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedMapper.java
@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.biz.busuncollectedreceivablesdetailed;
+
+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 org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailed;
+import com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedVo;
+
+import java.util.List;
+
+/**
+ * Project: anrui-buscenter(销售相关) <br/>
+ * File: BusUncollectedReceivablesDetailedMapper.java <br/>
+ * Class: com.yxt.anrui.buscenter.biz.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedMapper <br/>
+ * Description: 应收未收款项明细表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-12 17:57:01 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface BusUncollectedReceivablesDetailedMapper extends BaseMapper<BusUncollectedReceivablesDetailed> {
+
+	//@Update("update bus_uncollected_receivables_detailed set name=#{msg} where id=#{id}")
+	//IPage<BusUncollectedReceivablesDetailedVo> voPage(IPage<BusUncollectedReceivablesDetailed> page, @Param(Constants.WRAPPER) QueryWrapper<BusUncollectedReceivablesDetailed> qw);
+	
+	IPage<BusUncollectedReceivablesDetailedVo> selectPageVo(IPage<BusUncollectedReceivablesDetailed> page, @Param(Constants.WRAPPER) Wrapper<BusUncollectedReceivablesDetailed> qw);
+	
+	List<BusUncollectedReceivablesDetailedVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BusUncollectedReceivablesDetailed> qw);
+	
+	@Select("select * from bus_uncollected_receivables_detailed")
+	List<BusUncollectedReceivablesDetailedVo> selectListVo();
+}
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedMapper.xml
new file mode 100644
index 0000000000..77e855d8b6
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedMapper.xml
@@ -0,0 +1,13 @@
+<?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.buscenter.biz.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selectPageVo" resultType="com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedVo">
+		SELECT * FROM bus_uncollected_receivables_detailed <where> ${ew.sqlSegment} </where>
+	</select>
+	
+	<select id="selectListAllVo" resultType="com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedVo">
+		SELECT * FROM bus_uncollected_receivables_detailed <where> ${ew.sqlSegment} </where>
+	</select>
+</mapper>
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedRest.java
new file mode 100644
index 0000000000..a8d157688c
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedRest.java
@@ -0,0 +1,144 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.biz.busuncollectedreceivablesdetailed;
+
+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.web.bind.annotation.*;
+
+import java.util.List;
+import com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailed;
+import com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedQuery;
+import com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedVo;
+import com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedDto;
+import com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedFeign;
+
+/**
+ * Project: anrui-buscenter(销售相关) <br/>
+ * File: BusUncollectedReceivablesDetailedFeignFallback.java <br/>
+ * Class: com.yxt.anrui.buscenter.biz.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedRest <br/>
+ * Description: 应收未收款项明细表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-12 17:57:01 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "应收未收款项明细表")
+@RestController("com.yxt.anrui.buscenter.biz.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedRest")
+@RequestMapping("/busuncollectedreceivablesdetailed")
+public class BusUncollectedReceivablesDetailedRest implements BusUncollectedReceivablesDetailedFeign {
+
+	@Autowired
+	private BusUncollectedReceivablesDetailedService busUncollectedReceivablesDetailedService;
+
+	@Override
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<BusUncollectedReceivablesDetailedVo>> listPage(@RequestBody PagerQuery<BusUncollectedReceivablesDetailedQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<BusUncollectedReceivablesDetailedVo> pv = busUncollectedReceivablesDetailedService.listPageVo(pq);
+		return rb.success().setData(pv);
+	}
+
+	@Override
+	@ApiOperation("根据条件查询所有数据列表")
+	@PostMapping("/listAll")
+	public ResultBean<List<BusUncollectedReceivablesDetailedVo>> listAll(@RequestBody BusUncollectedReceivablesDetailedQuery query){
+		ResultBean rb = ResultBean.fireFail();
+		List<BusUncollectedReceivablesDetailedVo> list = busUncollectedReceivablesDetailedService.listAllVo(query);
+		return rb.success().setData(list);
+	}
+
+	@Override
+	@ApiOperation("所有数据列表")
+	@GetMapping("/list")
+	public ResultBean<List<BusUncollectedReceivablesDetailedVo>> list(){
+		ResultBean rb = ResultBean.fireFail();
+		List<BusUncollectedReceivablesDetailedVo> list = busUncollectedReceivablesDetailedService.listVo();
+		return rb.success().setData(list);
+	}
+
+	@Override
+	@ApiOperation("新增保存")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody BusUncollectedReceivablesDetailedDto dto){
+		ResultBean rb = ResultBean.fireFail();
+		busUncollectedReceivablesDetailedService.saveOrUpdateDto(dto);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("修改保存")
+	@PostMapping("/update/{sid}")
+	public ResultBean update(@RequestBody BusUncollectedReceivablesDetailedDto dto, @PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		busUncollectedReceivablesDetailedService.updateBySid(dto.toMap(),sid);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("删除记录")
+	@GetMapping("/del/{ids}")
+	public ResultBean del(@PathVariable("ids") String ids){
+		ResultBean rb = ResultBean.fireFail();
+		busUncollectedReceivablesDetailedService.delByIds(ids);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		ResultBean rb = ResultBean.fireFail();
+		busUncollectedReceivablesDetailedService.delBySids(sids);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("获取一条记录")
+	@GetMapping("/fetch/{id}")
+	public ResultBean<BusUncollectedReceivablesDetailedVo> fetch(@PathVariable("id") String id){
+		ResultBean rb = ResultBean.fireFail();
+		BusUncollectedReceivablesDetailedVo vo = busUncollectedReceivablesDetailedService.fetchByIdVo(id);
+		return rb.success().setData(vo);
+	}
+
+	@Override
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchBySid/{sid}")
+    public ResultBean<BusUncollectedReceivablesDetailedVo> fetchBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		BusUncollectedReceivablesDetailedVo vo = new BusUncollectedReceivablesDetailedVo();
+		return rb.success().setData(vo);
+	}
+}
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedService.java
new file mode 100644
index 0000000000..64ffb5a4df
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedService.java
@@ -0,0 +1,152 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.biz.busuncollectedreceivablesdetailed;
+
+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.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.buscenter.api.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailed;
+import com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedQuery;
+import com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedVo;
+import com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedDto;
+import com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedFeign;
+
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: anrui-buscenter(销售相关) <br/>
+ * File: BusUncollectedReceivablesDetailedService.java <br/>
+ * Class: com.yxt.anrui.buscenter.biz.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedService <br/>
+ * Description: 应收未收款项明细表 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-12 17:57:01 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class BusUncollectedReceivablesDetailedService extends MybatisBaseService<BusUncollectedReceivablesDetailedMapper, BusUncollectedReceivablesDetailed> {
+	public PagerVo<BusUncollectedReceivablesDetailed> listPage(PagerQuery<BusUncollectedReceivablesDetailedQuery> pq) {
+		BusUncollectedReceivablesDetailedQuery query = pq.getParams();
+		QueryWrapper<BusUncollectedReceivablesDetailed> qw = createQueryWrapper(query);
+		IPage<BusUncollectedReceivablesDetailed> page = PagerUtil.queryToPage(pq);
+		IPage<BusUncollectedReceivablesDetailed> pagging = baseMapper.selectPage(page, qw);
+		PagerVo<BusUncollectedReceivablesDetailed> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
+	public List<BusUncollectedReceivablesDetailed> listAll(BusUncollectedReceivablesDetailedQuery query) {
+		QueryWrapper<BusUncollectedReceivablesDetailed> qw = createQueryWrapper(query);
+		return baseMapper.selectList(qw);
+	}
+	private QueryWrapper<BusUncollectedReceivablesDetailed> createQueryWrapper(BusUncollectedReceivablesDetailedQuery query) {
+		// todo: 这里根据具体业务调整查询条件
+		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+		QueryWrapper<BusUncollectedReceivablesDetailed> qw = new QueryWrapper<>();
+
+
+		if (StringUtils.isNotBlank(query.getCreateByName())) {
+			qw.eq("createByName", query.getCreateByName());
+		}
+
+		if (StringUtils.isNotBlank(query.getContractSid())) {
+			qw.eq("contractSid", query.getContractSid());
+		}
+
+		if (StringUtils.isNotBlank(query.getContractNo())) {
+			qw.eq("contractNo", query.getContractNo());
+		}
+
+		if (StringUtils.isNotBlank(query.getCustomerSid())) {
+			qw.eq("customerSid", query.getCustomerSid());
+		}
+
+		if (StringUtils.isNotBlank(query.getCustomerName())) {
+			qw.eq("customerName", query.getCustomerName());
+		}
+
+		if (StringUtils.isNotBlank(query.getVIN())) {
+			qw.eq("VIN", query.getVIN());
+		}
+
+		if (StringUtils.isNotBlank(query.getUseOrgSid())) {
+			qw.eq("useOrgSid", query.getUseOrgSid());
+		}
+
+		if (StringUtils.isNotBlank(query.getCustomerPhone())) {
+			qw.eq("customerPhone", query.getCustomerPhone());
+		}
+
+		if (StringUtils.isNotBlank(query.getReceivablesName())) {
+			qw.eq("receivablesName", query.getReceivablesName());
+		}
+
+		if (query.getCurrentReceivableMoney() != null) {
+			qw.eq("currentReceivableMoney", query.getCurrentReceivableMoney());
+		}
+		return qw;
+	}
+	
+	public PagerVo<BusUncollectedReceivablesDetailedVo> listPageVo(PagerQuery<BusUncollectedReceivablesDetailedQuery> pq) {
+		BusUncollectedReceivablesDetailedQuery query = pq.getParams();
+		QueryWrapper<BusUncollectedReceivablesDetailed> qw = createQueryWrapper(query);
+		IPage<BusUncollectedReceivablesDetailed> page = PagerUtil.queryToPage(pq);
+		IPage<BusUncollectedReceivablesDetailedVo> pagging = baseMapper.selectPageVo(page, qw);
+		PagerVo<BusUncollectedReceivablesDetailedVo> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
+	
+	public List<BusUncollectedReceivablesDetailedVo> listAllVo(BusUncollectedReceivablesDetailedQuery query) {
+		QueryWrapper<BusUncollectedReceivablesDetailed> qw = createQueryWrapper(query);
+		return baseMapper.selectListAllVo(qw);
+	}
+	
+	public List<BusUncollectedReceivablesDetailedVo> listVo() {
+		return baseMapper.selectListVo();
+	}
+	
+	public void saveOrUpdateDto(BusUncollectedReceivablesDetailedDto dto){
+		BusUncollectedReceivablesDetailed entity = new BusUncollectedReceivablesDetailed();
+		dto.fillEntity(entity);
+		this.saveOrUpdate(entity);
+	}
+	
+	public BusUncollectedReceivablesDetailedVo fetchByIdVo(String id){
+		BusUncollectedReceivablesDetailed entity = this.fetchById(id);
+		BusUncollectedReceivablesDetailedVo vo = new BusUncollectedReceivablesDetailedVo();
+		BeanUtil.copyProperties(entity, vo);
+		return vo;
+	}
+}
\ No newline at end of file

From 4a212e42054f7c34e676746c4a75e8db905d01e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9F=B3=E5=AE=B6=E5=BA=84=E5=B8=82=E5=AE=87=E4=BF=A1?=
 =?UTF-8?q?=E9=80=9A=E7=94=B5=E5=AD=90=E6=9C=89=E9=99=90=E5=85=AC=E5=8F=B8?=
 <yxt@yxtsoft.com>
Date: Wed, 13 Apr 2022 13:34:46 +0800
Subject: [PATCH 03/15] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E8=87=B3=20'=E5=B7=A5=E4=BD=9C=E8=AE=A1=E5=88=92'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../安瑞信息化平台工作内容.xlsx    | Bin 53837 -> 101396 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/工作计划/安瑞信息化平台工作内容.xlsx b/工作计划/安瑞信息化平台工作内容.xlsx
index 1d9d6b292f4f49162e0dfd288171a1b7aecafc9a..26f580cc145cdad4aab29b9e57e445f6819e723e 100644
GIT binary patch
literal 101396
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%0D&hj-T{ekE22AD)o-
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
B4nqI{

delta 48249
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


From 9e2c25516f9d8b22ec4b3eaa27012a0cbd86dd01 Mon Sep 17 00:00:00 2001
From: hanlinghao <2969694837@qq.com>
Date: Wed, 13 Apr 2022 14:02:34 +0800
Subject: [PATCH 04/15] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=A1=A3=E6=A1=88?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E5=AE=A2=E6=88=B7=E6=84=8F=E5=90=91?=
 =?UTF-8?q?=E8=BD=A6=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppModelVeDetailVo.java                   |  18 +-
 .../BaseVehmodelConfigFeign.java              |   7 +
 .../BaseVehmodelConfigFeignFallback.java      |   5 +
 .../BaseVehmodelConfigMapper.java             |   2 +
 .../BaseVehmodelConfigMapper.xml              |  28 +-
 .../BaseVehmodelConfigRest.java               |   6 +
 .../BaseVehmodelConfigService.java            |  10 +-
 .../BusCollectionConfirmationFeign.java       |   6 +
 .../biz/busdeposit/BusDepositService.java     |   8 +
 .../crmcustomerfile/CrmCustomerFileFeign.java |  16 +-
 .../CrmCustomerFileFeignFallback.java         |  10 +
 .../crmcustomertemp/CrmCustomerTempFeign.java |   8 +
 .../CrmCustomerTempFeignFallback.java         |   5 +
 .../AppCrmVehicledemandDetailsVo.java         |  43 ++-
 .../AppCrmVehicledemandDto.java               |  55 +--
 .../AppCrmVehicledemandVo.java                |  26 +-
 .../crmvehicledemand/CrmVehicledemand.java    |   2 +-
 .../CrmVehicledemandFeign.java                |  32 +-
 .../CrmVehicledemandFeignFallback.java        | 160 +++++----
 .../CrmCustomerFileMapper.java                |  28 +-
 .../crmcustomerfile/CrmCustomerFileMapper.xml |  58 ++-
 .../crmcustomerfile/CrmCustomerFileRest.java  |  11 +
 .../CrmCustomerFileService.java               | 336 +++++++++++-------
 .../CrmCustomerTempMapper.java                |   8 +
 .../crmcustomertemp/CrmCustomerTempMapper.xml |  39 +-
 .../crmcustomertemp/CrmCustomerTempRest.java  |  12 +
 .../CrmCustomerTempService.java               |  13 +-
 .../CrmVehicledemandMapper.java               |  35 +-
 .../CrmVehicledemandMapper.xml                |  75 ++--
 .../CrmVehicledemandRest.java                 |  89 +++--
 .../CrmVehicledemandService.java              | 128 +++++--
 .../anrui/crm/biz/crmvisit/CrmVisitRest.java  |   9 +-
 32 files changed, 869 insertions(+), 419 deletions(-)

diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/AppModelVeDetailVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/AppModelVeDetailVo.java
index 7be79f440c..8c33f60ede 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/AppModelVeDetailVo.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/AppModelVeDetailVo.java
@@ -1,10 +1,26 @@
 package com.yxt.anrui.base.api.basevehmodelconfig;
 
+import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 
 @Data
-public class AppModelVeDetailVo {
+public class AppModelVeDetailVo implements Vo {
+
+    @ApiModelProperty("车型名称")
+    private String modelName;
+
+    @ApiModelProperty("品牌sid")
+    private String brandSid;
+
+    @ApiModelProperty("品牌名称")
+    private String brandName;
+
+    @ApiModelProperty("销售指导价")
+    private BigDecimal saleReferencePrice;
+
 
 }
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeign.java
index bde8a09ec2..8988a4b965 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeign.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeign.java
@@ -101,4 +101,11 @@ public interface BaseVehmodelConfigFeign {
     @ApiOperation("手机端车型询价")
     @PostMapping("/getAppVehicleInquiryVo/{modelSid}")
     public ResultBean<AppBusVehicleInquiryVo> getAppVehicleInquiryVo(@PathVariable("modelSid") String modelSid, @PathVariable("configSid") String configSid);
+
+    @ApiOperation("意向车型查询车型数据")
+    @GetMapping("/getAppCommonlyUsedModelDetails/{userSid}/{modelSid}/{configSid}")
+    public ResultBean<AppModelVeDetailVo> getAppIntentionVehicleVo(@RequestParam("userSid") String userSid,
+                                                                     @RequestParam("modelSid") String modelSid, @RequestParam("configSid") String configSid);
+
+
 }
\ No newline at end of file
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeignFallback.java
index b582fcf451..3aa0bb48e1 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeignFallback.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeignFallback.java
@@ -96,4 +96,9 @@ public class BaseVehmodelConfigFeignFallback implements BaseVehmodelConfigFeign
         return null;
     }
 
+    @Override
+    public ResultBean<AppModelVeDetailVo> getAppIntentionVehicleVo(String userSid, String modelSid, String configSid) {
+        return null;
+    }
+
 }
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.java
index 5bf857e138..969ebd9067 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.java
@@ -110,4 +110,6 @@ public interface BaseVehmodelConfigMapper extends BaseMapper<BaseVehmodelConfig>
     BaseVehmodelConfigVo checkSave(@Param("modelSid") String modelSid, @Param("configurationItemsSid") String configurationItemsSid);
 
     BaseVehmodelConfig getBySid(String sid);
+
+    AppModelVeDetailVo getAppIntentionVehicleVo(@Param("useOrg") String useOrg, @Param("modelSid") String modelSid, @Param("configSid") String configSid);
 }
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml
index ff7e510ead..87aa51bc8d 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml
@@ -65,8 +65,8 @@
                bmc.brandName,
                bvc.guidedPrice
         FROM base_vehmodel_config bvc
-                     LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
-                     LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
+                 LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
+                 LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
         WHERE bvm.sid = #{modelSid}
         GROUP BY bvm.sid
     </select>
@@ -82,7 +82,7 @@
     <select id="getConfigNumByModelSid" resultType="java.lang.String">
         SELECT count(*)
         FROM base_vehmodel_config bvc
-                     LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
+                 LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
         WHERE bvc.modelSid = #{modelSid}
     </select>
 
@@ -126,8 +126,8 @@
                bmc.configuringBao,
                bmc.otherConfig
         FROM base_vehmodel_config bvc
-                     LEFT JOIN base_vehicle_model bvm ON bvc.`modelSid` = bvm.`sid`
-                     LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.`sid`
+                 LEFT JOIN base_vehicle_model bvm ON bvc.`modelSid` = bvm.`sid`
+                 LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.`sid`
         WHERE bvm.sid = #{modelSid}
           AND bmc.sid = #{configSid}
     </select>
@@ -145,7 +145,21 @@
                bvc.`manufactorSettlementPrice`,
                bvc.`guidedPrice`
         FROM base_vehmodel_config bvc
-                     LEFT JOIN base_vehicle_model bvm ON bvc.`modelSid` = bvm.`sid`
-                     LEFT JOIN base_model_config bmc ON bvc.`configurationItemsSid` = bmc.`sid`
+                 LEFT JOIN base_vehicle_model bvm ON bvc.`modelSid` = bvm.`sid`
+                 LEFT JOIN base_model_config bmc ON bvc.`configurationItemsSid` = bmc.`sid`
+    </select>
+
+    <select id="getAppIntentionVehicleVo"
+            resultType="com.yxt.anrui.base.api.basevehmodelconfig.AppModelVeDetailVo">
+        SELECT bvm.vehicleAlias,
+               bvm.brandName,
+               bvm.carBrand    AS brandSid,
+               bvc.guidedPrice AS saleReferencePrice
+        FROM base_vehmodel_config bvc
+                 LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
+                 LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
+        WHERE bvc.modelSid = #{modelSid}
+          AND bvc.configurationItemsSid = #{configSid}
+          AND bvc.useOrg = #{useOrg}
     </select>
 </mapper>
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigRest.java
index 7e3e9fe687..4b10b7b089 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigRest.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigRest.java
@@ -146,4 +146,10 @@ public class BaseVehmodelConfigRest implements BaseVehmodelConfigFeign {
 
         return null;
     }
+
+    @Override
+    public ResultBean<AppModelVeDetailVo> getAppIntentionVehicleVo(String userSid, String modelSid, String configSid) {
+        AppModelVeDetailVo vo = baseVehmodelConfigService.getAppIntentionVehicleVo(userSid,modelSid,configSid);
+        return new ResultBean<AppModelVeDetailVo>().success().setData(vo);
+    }
 }
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java
index b422e34db4..198c1b9954 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java
@@ -35,6 +35,7 @@ import com.yxt.anrui.base.api.basevehicle.ConfigInfo;
 import com.yxt.anrui.base.api.basevehmodelconfig.*;
 import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService;
 import com.yxt.anrui.base.biz.basevehicleappendix.BaseVehicleAppendixService;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.DateUtils;
@@ -68,7 +69,8 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
 
     @Autowired
     private FileUploadComponent fileUploadComponent;
-
+    @Autowired
+    private SysOrganizationFeign sysOrganizationFeign;
     @Autowired
     private BaseModelConfigService baseModelConfigService;
 
@@ -368,4 +370,10 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
     public BaseVehmodelConfig getBySid(String sid) {
         return baseMapper.getBySid(sid);
     }
+
+    public AppModelVeDetailVo getAppIntentionVehicleVo(String userSid, String modelSid, String configSid) {
+        String useOrg = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData().getSid();
+        AppModelVeDetailVo vo = baseMapper.getAppIntentionVehicleVo(useOrg,modelSid,configSid);
+        return vo;
+    }
 }
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationFeign.java
index 9d01cd5530..19c45f9f1a 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationFeign.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationFeign.java
@@ -71,4 +71,10 @@ public interface BusCollectionConfirmationFeign {
     @ApiOperation("编辑回显或详情")
     @GetMapping("/fetchBySid/{sid}")
     public ResultBean<BusCollectionConfirmationDetailsVo> fetchBySid(@PathVariable("sid") String sid);
+
+    /*                            App接口                                               */
+
+    @ApiOperation("手机端—获取款项确认列表")
+    @PostMapping("/getCollectionConfirmList")
+    public ResultBean<PagerVo<AppBusCollectionConfirmationPageVo>> getCollectionConfirmList(@RequestBody PagerQuery<BusCollectionConfirmationQuery> pq);
 }
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositService.java
index 28ded49c35..29393fd680 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositService.java
@@ -7,9 +7,17 @@ import com.yxt.anrui.buscenter.api.busdeposit.BusDeposit;
 import com.yxt.anrui.buscenter.api.busdepositcustomer.AppBusDepositCustomerListVo;
 import com.yxt.anrui.buscenter.biz.busdepositcustomer.BusDepositCustomerService;
 import com.yxt.anrui.buscenter.biz.busdepositvehicle.BusDepositVehicleService;
+import com.yxt.anrui.buscenter.biz.busmaindeposit.BusMainDepositService;
+import com.yxt.anrui.buscenter.biz.flow.FlowableService;
+import com.yxt.anrui.crm.api.crmcustomer.CrmCustomer;
 import com.yxt.anrui.crm.api.crmcustomer.CrmCustomerFeign;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
+import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo;
+import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
 import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign;
+import com.yxt.anrui.portal.api.dictcommon.DictCommonVo;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerfile/CrmCustomerFileFeign.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerfile/CrmCustomerFileFeign.java
index 2bfe06263d..ea46b069eb 100644
--- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerfile/CrmCustomerFileFeign.java
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerfile/CrmCustomerFileFeign.java
@@ -59,6 +59,7 @@ public interface CrmCustomerFileFeign {
 
     /**
      * 客户资料初始化分页查询列表
+     *
      * @param pq
      * @return
      */
@@ -71,10 +72,11 @@ public interface CrmCustomerFileFeign {
      */
     @ApiOperation("保存上传的附件")
     @PostMapping("/saveCustomerFile")
-    public ResultBean saveCustomerFile(@RequestParam("staffName") String staffName,@RequestParam("staffSid") String staffSid,@RequestParam("sid") String sid,@RequestBody List<CrmFileDto> crmFileDtos);
+    public ResultBean saveCustomerFile(@RequestParam("staffName") String staffName, @RequestParam("staffSid") String staffSid, @RequestParam("sid") String sid, @RequestBody List<CrmFileDto> crmFileDtos);
 
     /**
      * 上传回显图片信息接口
+     *
      * @param sid
      * @return
      */
@@ -83,4 +85,16 @@ public interface CrmCustomerFileFeign {
     public ResultBean<CrmCustomerFileListVo> fetchFileListBySid(@PathVariable("sid") String sid);
 
 
+    @ApiOperation("初始化客户档案")
+    @ResponseBody
+    @GetMapping("/initCustomerArchives/{customerSid}/{userSid}")
+    public ResultBean<AppCrmCustomerTempArchivesVo> initCustomerArchives(@PathVariable("customerSid") String customerSid, @PathVariable("userSid") String userSid);
+
+
+    @ApiOperation("手机端保存客户档案")
+    @ResponseBody
+    @PutMapping("/saveCustomerArchives")
+    public ResultBean saveCustomerArchives(AppCrmCustomerTempArchivesDto dto);
+
+
 }
\ No newline at end of file
diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerfile/CrmCustomerFileFeignFallback.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerfile/CrmCustomerFileFeignFallback.java
index d03cee87a9..6815fa479a 100644
--- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerfile/CrmCustomerFileFeignFallback.java
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerfile/CrmCustomerFileFeignFallback.java
@@ -64,4 +64,14 @@ public class CrmCustomerFileFeignFallback implements CrmCustomerFileFeign {
 	public ResultBean<CrmCustomerFileListVo> fetchFileListBySid(String sid) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<AppCrmCustomerTempArchivesVo> initCustomerArchives(String customerSid, String userSid) {
+		return null;
+	}
+
+	@Override
+	public ResultBean saveCustomerArchives(AppCrmCustomerTempArchivesDto dto) {
+		return null;
+	}
 }
\ No newline at end of file
diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java
index 6faf85893f..226bdc21f8 100644
--- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java
@@ -4,6 +4,7 @@ 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.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -36,6 +37,7 @@ public interface CrmCustomerTempFeign {
 
     /**
      * 潜在客户管理的分页查询
+     *
      * @param pq
      * @return
      */
@@ -74,6 +76,7 @@ public interface CrmCustomerTempFeign {
 
     /**
      * pc潜在客户的批量删除
+     *
      * @param sid
      * @return
      */
@@ -83,6 +86,7 @@ public interface CrmCustomerTempFeign {
 
     /**
      * pc潜在客户的编辑回显
+     *
      * @param sid
      * @return
      */
@@ -123,5 +127,9 @@ public interface CrmCustomerTempFeign {
     @GetMapping("/getAppCustomerTempDetailsBySid")
     public ResultBean<AppCrmCustomerTempInfoVo> getAppCustomerTempDetailsBySid(@RequestParam("sid") String sid);
 
+    @ApiOperation("手机端-获取客户基础信息（新）")
+    @ResponseBody
+    @GetMapping("/customerTempDetailsBySid/{sid}")
+    public ResultBean<AppCrmCustomerTempBasicsDetailsVo> customerTempDetailsBySid(@RequestParam("sid") String sid);
 
 }
\ No newline at end of file
diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java
index de278d8ee4..0617e040ef 100644
--- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java
@@ -93,5 +93,10 @@ public class CrmCustomerTempFeignFallback implements CrmCustomerTempFeign {
 		return null;
 	}
 
+	@Override
+	public ResultBean<AppCrmCustomerTempBasicsDetailsVo> customerTempDetailsBySid(String sid) {
+		return null;
+	}
+
 
 }
\ No newline at end of file
diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicledemandDetailsVo.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicledemandDetailsVo.java
index 569446e159..f4d552c534 100644
--- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicledemandDetailsVo.java
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicledemandDetailsVo.java
@@ -11,34 +11,43 @@ import java.math.BigDecimal;
 @Data
 public class AppCrmVehicledemandDetailsVo implements Vo {
 
-    @ApiModelProperty("潜在客户信息sid")
-    private String customerSid;
+    @ApiModelProperty("意向车型sid")
+    private String intentionSid;
 
     @ApiModelProperty("购车方式")
     private String purchaseMethod;
 
-    @ApiModelProperty("车型sid")
-    private String modelSid;
+    @ApiModelProperty("购车方式value")
+    private String purchaseMethodValue;
+
+    @ApiModelProperty("备注")
+    private String remarks;
+
+    @ApiModelProperty("数量")
+    private String number;
 
-    @ApiModelProperty("车型名称")
-    private String modelName;
+    @ApiModelProperty("预计提车日期")
+    private String date;
 
-    @ApiModelProperty("品牌sid")
-    private String brandSid;
+    @ApiModelProperty("车型")
+    private String model;
 
-    @ApiModelProperty("品牌名称  ")
-    private String brandName;
+    @ApiModelProperty("指导价")
+    private String guidancePrice;
+
+    @ApiModelProperty("品牌")
+    private String brand;
 
     @ApiModelProperty("车型报价")
-    private String vehicleModelOffer;
+    private String price;
 
-    @ApiModelProperty("其它配置说明")
-    private String otherConfig;
+    @ApiModelProperty("换选装")
+    private String optionsConfig;
 
-    @ApiModelProperty("简述配置")
-    private String sketChconfiguration;
+    @ApiModelProperty("配置sid")
+    private String configSid;
 
-    @ApiModelProperty("存放地点")
-    private String storageLocation = "河北省石家庄市车辆投放处";
+    @ApiModelProperty("车型sid")
+    private String modelSid;
 
 }
diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicledemandDto.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicledemandDto.java
index 73e5f1baf5..0e708d143e 100644
--- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicledemandDto.java
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicledemandDto.java
@@ -6,57 +6,12 @@ import lombok.Data;
 
 @Data
 public class AppCrmVehicledemandDto implements Dto {
-
-    @ApiModelProperty("潜在客户信息sid")
+    @ApiModelProperty("客户sid")
     private String customerSid;
-
-    @ApiModelProperty("购车方式(1 : 全款 2 : 贷款")
-    private String purchaseMethod;
-
-    @ApiModelProperty("购车方式Value")
-    private String purchaseMethodValue;
-
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    @ApiModelProperty("配置sid")
+    private String configSid;
     @ApiModelProperty("车型sid")
     private String modelSid;
-
-    @ApiModelProperty("配置sid")
-    private String comonConfigSid;
-
-    @ApiModelProperty("车型名称")
-    private String modelName;
-
-    @ApiModelProperty("品牌sid")
-    private String brandSid;
-
-    @ApiModelProperty("品牌名称")
-    private String brandName;
-
-    @ApiModelProperty("车型报价")
-    private String vehicleModelOffer;
-
-    @ApiModelProperty("数量")
-    private String number;
-
-    @ApiModelProperty("预计提车日期  ")
-    private String estimatedPickupDate;
-
-    @ApiModelProperty("是否意向（0为非意向，1为意向）")
-    private String states;
-
-    @ApiModelProperty("备注")
-    private String remarks;
-
-    /*********金融需求字段******/
-
-    @ApiModelProperty("首付比例")
-    private String down_payment_proportion;
-
-    @ApiModelProperty("资方sid")
-    private String capitalSid;
-
-    @ApiModelProperty("资方名称")
-    private String capitalName;
-
-
-
 }
diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicledemandVo.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicledemandVo.java
index 590e774aff..7b5aa38129 100644
--- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicledemandVo.java
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicledemandVo.java
@@ -1,11 +1,11 @@
 package com.yxt.anrui.crm.api.crmvehicledemand;
 
-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;
-import org.springframework.format.annotation.DateTimeFormat;
+
 
 import java.util.Date;
 
@@ -16,26 +16,20 @@ public class AppCrmVehicledemandVo implements Vo {
     @ApiModelProperty("车辆需求sid")
     private String sid;
 
-    @ApiModelProperty("车型名称")
-    private String modelName;
-
     @ApiModelProperty("品牌名称")
     private String brandName;
 
-    @ApiModelProperty("添加时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date createTime;
+    @ApiModelProperty("车型名称")
+    private String modelName;
 
-    @ApiModelProperty("车型指导价")
-    private String vehicleModelOffer;
+    @ApiModelProperty("创建时间")
+    private String createTime;
 
-    @ApiModelProperty("车型sid")
-    private String modelSid;
+    @ApiModelProperty("销售指导价")
+    private String guidancePrice;
 
-    @ApiModelProperty("配置sid")
-    private String comonConfigSid;
+    @ApiModelProperty("购车方式value")
+    private String purchaseType;
 
-    @ApiModelProperty("购车方式")
-    private String purchaseMethodValue;
 
 }
diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemand.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemand.java
index da7a83cb11..13e6c350af 100644
--- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemand.java
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemand.java
@@ -59,7 +59,7 @@ public class CrmVehicledemand extends BaseEntity {
     private String vehicleModelOffer;
 
     @ApiModelProperty("数量")
-    private Integer number;
+    private String number;
 
     @ApiModelProperty("预计提车日期  ")
     private String estimatedPickupDate;
diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandFeign.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandFeign.java
index b3773b10e5..d1c683360e 100644
--- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandFeign.java
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandFeign.java
@@ -71,6 +71,7 @@ public interface CrmVehicledemandFeign {
 
     /**
      * 意向车型的批量删除
+     *
      * @param sid
      * @return
      */
@@ -84,6 +85,7 @@ public interface CrmVehicledemandFeign {
 
     /**
      * 意向车型的编辑回显
+     *
      * @param sid
      * @return
      */
@@ -94,24 +96,34 @@ public interface CrmVehicledemandFeign {
 
     /********************************** App接口 *********************************/
 
-
-    @ApiOperation("App根据跟进记录sid查询车辆需求列表")
+    @ApiOperation("手机端-获取意向车型列表（新）")
     @ResponseBody
     @PostMapping("/getVisitListSid")
     public ResultBean<PagerVo<AppCrmVehicledemandVo>> getVisitListSid(@RequestBody PagerQuery<AppCrmVehicledemandQuery> pagerQuery);
 
-    @ApiOperation("App根据sid查询车辆需求")
-    @GetMapping("/selectBySid/{sid}")
-    public ResultBean<AppCrmVehicledemandDetailsVo> selectBySid(@PathVariable("sid") String sid);
+    @ApiOperation("手机端-新增意向车型（新）")
+    @ResponseBody
+    @PostMapping("/addVisitDemands")
+    public ResultBean addVisitDemands(@RequestBody AppCrmVehicledemandDto appCrmVehicleDemandDto);
 
-    @ApiOperation("App根据车型sid删除车型信息")
-    @GetMapping("/delBySid/{sid}")
-    public ResultBean delBySid(@PathVariable("sid") String sid);
+    @ApiOperation("手机端-初始化意向车型（新）")
+    @GetMapping("/initVisitDemands/{intentionSid}")
+    public ResultBean<AppCrmVehicledemandDetailsVo> initVisitDemands(@PathVariable("intentionSid") String intentionSid);
 
-    @ApiOperation("App新增车辆需求")
+    @ApiOperation("手机端-修改意向车型（新）")
     @ResponseBody
     @PostMapping("/saveVisitDemands")
-    public ResultBean saveVisitDemands(@RequestBody AppCrmVehicledemandDto appCrmVehicledemandDto);
+    public ResultBean saveVisitDemands(@RequestBody AppCrmVehicleDemandUpdateDto appCrmVehicleDemandUpdateDto);
+
+    @ApiOperation("手机端-意向车型详情（新）")
+    @ResponseBody
+    @GetMapping("/intendedModel/{sid}")
+    public ResultBean<AppCrmVehicleDemandParticularsVo> intendedModel(@PathVariable("sid") String sid);
+
+
+    @ApiOperation("App根据车型sid删除车型信息")
+    @GetMapping("/delBySid/{sid}")
+    public ResultBean delBySid(@PathVariable("sid") String sid);
 
     @ApiOperation("App根据sid查询意向车型详情")
     @GetMapping("/getAppIntendedModel/{sid}")
diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandFeignFallback.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandFeignFallback.java
index 9ef8dc6bad..d26aff6df7 100644
--- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandFeignFallback.java
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandFeignFallback.java
@@ -23,78 +23,90 @@ import java.util.List;
 @Component
 public class CrmVehicledemandFeignFallback implements CrmVehicledemandFeign {
 
-	@Override
-	public ResultBean<PagerVo<CrmVehicledemandVo>> listPage(PagerQuery<CrmVehicledemandQuery> pq){
-		ResultBean rb = ResultBean.fireFail();
-		return rb.setMsg("接口anrui-crm/crmvehicledemand/listPage无法访问");
-	}
-
-    @Override
-    public ResultBean<List<CrmVehicledemandVo>> listAll(CrmVehicledemandQuery query){
-		ResultBean rb = ResultBean.fireFail();
-		return rb.setMsg("接口anrui-crm/crmvehicledemand/listAll无法访问");
-	}
-
-	@Override
-	public ResultBean<List<CrmVehicledemandVo>> list(){
-		ResultBean rb = ResultBean.fireFail();
-		return rb.setMsg("接口anrui-crm/crmvehicledemand/list无法访问");
-	}
-
-	@Override
-	public ResultBean save(CrmVehicledemandDto dto){
-		return ResultBean.fireFail().setMsg("接口anrui-crm/crmvehicledemand/save无法访问");
-	}
-      
-    @Override
-	public ResultBean update(CrmVehicledemandDto dto,String sid){
-		return ResultBean.fireFail().setMsg("接口anrui-crm/crmvehicledemand/update无法访问");
-	}
-
-	@Override
-	public ResultBean del(String ids){
-		return ResultBean.fireFail().setMsg("接口anrui-crm/crmvehicledemand/del无法访问");
-	}
-
-	@Override
-	public ResultBean<CrmVehicledemandVo> fetch(String id){
-		ResultBean rb = ResultBean.fireFail();
-		return rb.setMsg("接口anrui-crm/crmvehicledemand/fetch无法访问");
-	}
-
-	@Override
-	public ResultBean<CrmVehicledemandVo> fetchSid(String sid) {
-		return null;
-	}
-
-	@Override
-	public ResultBean<PagerVo<AppCrmVehicledemandVo>> getVisitListSid(PagerQuery<AppCrmVehicledemandQuery> pagerQuery) {
-		return null;
-	}
-
-
-	@Override
-	public ResultBean<AppCrmVehicledemandDetailsVo> selectBySid(String sid) {
-		return null;
-	}
-
-	@Override
-	public ResultBean delBySid(String sid) {
-		return null;
-	}
-
-	@Override
-	public ResultBean saveVisitDemands(AppCrmVehicledemandDto appCrmVehicledemandDto) {
-		return null;
-	}
-
-	@Override
-	public ResultBean<AppIntendedModelVo> getAppIntendedModel(String sid) {
-		return null;
-	}
-
-	@Override
-	public ResultBean<AppIntendedModelDetailedVo> getAppIntendedModelDetailed(String sid) {
-		return null;
-	}
+    @Override
+    public ResultBean<PagerVo<CrmVehicledemandVo>> listPage(PagerQuery<CrmVehicledemandQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        return rb.setMsg("接口anrui-crm/crmvehicledemand/listPage无法访问");
+    }
+
+    @Override
+    public ResultBean<List<CrmVehicledemandVo>> listAll(CrmVehicledemandQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        return rb.setMsg("接口anrui-crm/crmvehicledemand/listAll无法访问");
+    }
+
+    @Override
+    public ResultBean<List<CrmVehicledemandVo>> list() {
+        ResultBean rb = ResultBean.fireFail();
+        return rb.setMsg("接口anrui-crm/crmvehicledemand/list无法访问");
+    }
+
+    @Override
+    public ResultBean save(CrmVehicledemandDto dto) {
+        return ResultBean.fireFail().setMsg("接口anrui-crm/crmvehicledemand/save无法访问");
+    }
+
+    @Override
+    public ResultBean update(CrmVehicledemandDto dto, String sid) {
+        return ResultBean.fireFail().setMsg("接口anrui-crm/crmvehicledemand/update无法访问");
+    }
+
+    @Override
+    public ResultBean del(String ids) {
+        return ResultBean.fireFail().setMsg("接口anrui-crm/crmvehicledemand/del无法访问");
+    }
+
+    @Override
+    public ResultBean<CrmVehicledemandVo> fetch(String id) {
+        ResultBean rb = ResultBean.fireFail();
+        return rb.setMsg("接口anrui-crm/crmvehicledemand/fetch无法访问");
+    }
+
+    @Override
+    public ResultBean<CrmVehicledemandVo> fetchSid(String sid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean delBySid(String sid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<AppIntendedModelVo> getAppIntendedModel(String sid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<AppIntendedModelDetailedVo> getAppIntendedModelDetailed(String sid) {
+        return null;
+    }
+
+
+    //app
+
+    @Override
+    public ResultBean<PagerVo<AppCrmVehicledemandVo>> getVisitListSid(PagerQuery<AppCrmVehicledemandQuery> pagerQuery) {
+        return null;
+    }
+
+    @Override
+    public ResultBean addVisitDemands(AppCrmVehicledemandDto appCrmVehicleDemandDto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<AppCrmVehicledemandDetailsVo> initVisitDemands(String intentionSid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean saveVisitDemands(AppCrmVehicleDemandUpdateDto appCrmVehicleDemandUpdateDto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<AppCrmVehicleDemandParticularsVo> intendedModel(String sid) {
+        return null;
+    }
 }
\ No newline at end of file
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileMapper.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileMapper.java
index dbb6ff276f..0d22d45b12 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileMapper.java
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileMapper.java
@@ -29,6 +29,9 @@ 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.crm.api.crmcustomerfile.AppCrmCustomerTempArchivesVo;
+import com.yxt.anrui.crm.api.crmcustomerfile.AppCustomerArchivesDataVo;
+import com.yxt.anrui.crm.api.crmfile.CrmFile;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -53,13 +56,20 @@ import java.util.List;
 @Mapper
 public interface CrmCustomerFileMapper extends BaseMapper<CrmCustomerFile> {
 
-	//@Update("update crm_customer_file set name=#{msg} where id=#{id}")
-	//IPage<CrmCustomerFileVo> voPage(IPage<CrmCustomerFile> page, @Param(Constants.WRAPPER) QueryWrapper<CrmCustomerFile> qw);
-	
-	IPage<CrmCustomerFileVo> selectPageVo(IPage<CrmCustomerFile> page, @Param(Constants.WRAPPER) Wrapper<CrmCustomerFile> qw);
-	
-	List<CrmCustomerFileVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<CrmCustomerFile> qw);
-	
-	@Select("select * from crm_customer_file")
-	List<CrmCustomerFileVo> selectListVo();
+    //@Update("update crm_customer_file set name=#{msg} where id=#{id}")
+    //IPage<CrmCustomerFileVo> voPage(IPage<CrmCustomerFile> page, @Param(Constants.WRAPPER) QueryWrapper<CrmCustomerFile> qw);
+
+    IPage<CrmCustomerFileVo> selectPageVo(IPage<CrmCustomerFile> page, @Param(Constants.WRAPPER) Wrapper<CrmCustomerFile> qw);
+
+    List<CrmCustomerFileVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<CrmCustomerFile> qw);
+
+    @Select("select * from crm_customer_file")
+    List<CrmCustomerFileVo> selectListVo();
+
+    List<AppCustomerArchivesDataVo> selectByCustomerSid(@Param("customerSid") String customerSid);
+
+    List<CrmFile> selArchivesFileImageBySid(@Param("sid") String sid);
+
+    // 查询数据库是否存在该类型
+    Integer selectBySid(@Param("sid") String sid);
 }
\ No newline at end of file
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileMapper.xml b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileMapper.xml
index 5a4b9586ad..ae4fade2e3 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileMapper.xml
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileMapper.xml
@@ -1,20 +1,46 @@
 <?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.crm.biz.crmcustomerfile.CrmCustomerFileMapper">
-<!--    <where> ${ew.sqlSegment} </where>-->
-<!--    ${ew.customSqlSegment} -->
-	<select id="selectPageVo" resultType="com.yxt.anrui.crm.api.crmcustomerfile.CrmCustomerFileVo">
-		SELECT
-		ccf.sid,
-		ccf.attachType,
-		ccf.fileName,
-		(SELECT cf.name FROM crm_file cf WHERE cf.linkSid = ccf.`sid` GROUP BY cf.`createTime` DESC LIMIT 1) NAME,
-		(SELECT MAX(cf.`createTime`) FROM crm_file cf WHERE cf.linkSid = ccf.`sid`) createTime
-		FROM
-		crm_customer_file ccf   <where> ${ew.sqlSegment} </where>
-	</select>
-	
-	<select id="selectListAllVo" resultType="com.yxt.anrui.crm.api.crmcustomerfile.CrmCustomerFileVo">
-		SELECT * FROM crm_customer_file <where> ${ew.sqlSegment} </where>
-	</select>
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.anrui.crm.api.crmcustomerfile.CrmCustomerFileVo">
+        SELECT
+        ccf.sid,
+        ccf.attachType,
+        ccf.fileName,
+        (SELECT cf.name FROM crm_file cf WHERE cf.linkSid = ccf.`sid` GROUP BY cf.`createTime` DESC LIMIT 1) NAME,
+        (SELECT MAX(cf.`createTime`) FROM crm_file cf WHERE cf.linkSid = ccf.`sid`) createTime
+        FROM
+        crm_customer_file ccf
+        <where>${ew.sqlSegment}</where>
+    </select>
+
+    <select id="selectListAllVo" resultType="com.yxt.anrui.crm.api.crmcustomerfile.CrmCustomerFileVo">
+        SELECT * FROM crm_customer_file
+        <where>${ew.sqlSegment}</where>
+    </select>
+
+    <select id="selectByCustomerSid"
+            resultType="com.yxt.anrui.crm.api.crmcustomerfile.AppCustomerArchivesDataVo">
+        SELECT ccf.sid,
+               ccf.dataType AS KEY,
+	        ccf.fileName AS title,
+	        ( SELECT MAX( cf.`createTime` ) FROM crm_file cf WHERE cf.linkSid = ccf.`sid` ) AS createTime
+        FROM
+            crm_customer_file ccf
+        WHERE
+            ccf.linkSid = #{customerSid}
+    </select>
+    <select id="selArchivesFileImageBySid" resultType="com.yxt.anrui.crm.api.crmfile.CrmFile">
+        select *
+        from crm_file cf
+        where cf.linkSid = #{sid}
+    </select>
+
+    <select id="selectBySid" resultType="java.lang.Integer">
+        select count(*)
+        from crm_customer_file ccf
+        where ccf.linkSid = #{sid}
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileRest.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileRest.java
index cc3b504e7f..7147c7fb4e 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileRest.java
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileRest.java
@@ -26,6 +26,7 @@
 package com.yxt.anrui.crm.biz.crmcustomerfile;
 
 import com.yxt.anrui.crm.api.crmcustomerfile.*;
+import com.yxt.anrui.crm.api.crmcustomerfile.AppCrmCustomerTempArchivesDto;
 import com.yxt.anrui.crm.api.crmfile.CrmFileDto;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -75,4 +76,14 @@ public class CrmCustomerFileRest implements CrmCustomerFileFeign {
     public ResultBean<CrmCustomerFileListVo> fetchFileListBySid(String sid) {
         return crmCustomerFileService.fetchFileListBySid(sid);
     }
+
+    @Override
+    public ResultBean<AppCrmCustomerTempArchivesVo> initCustomerArchives(String customerSid, String userSid) {
+        return crmCustomerFileService.initCustomerArchives(customerSid,userSid);
+    }
+
+    @Override
+    public ResultBean saveCustomerArchives(AppCrmCustomerTempArchivesDto dto) {
+        return crmCustomerFileService.saveCustomerArchives(dto);
+    }
 }
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileService.java
index ed3b89e0f2..267c889718 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileService.java
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileService.java
@@ -30,15 +30,18 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basedatalist.BaseDataListFeign;
 import com.yxt.anrui.base.api.basedatalist.BaseDataListVo;
-import com.yxt.anrui.base.api.commonappendix.CommonAppendix;
-import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign;
 import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum;
 import com.yxt.anrui.crm.api.crmcustomerfile.*;
+import com.yxt.anrui.crm.api.crmcustomerfile.AppCrmCustomerTempArchivesDto;
+import com.yxt.anrui.crm.api.crmcustomerfile.AppCustomerArchivesDataDto;
 import com.yxt.anrui.crm.api.crmfile.CrmFile;
 import com.yxt.anrui.crm.api.crmfile.CrmFileDetailsVo;
 import com.yxt.anrui.crm.api.crmfile.CrmFileDto;
 import com.yxt.anrui.crm.biz.crmfile.CrmFileService;
+import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo;
 import com.yxt.common.base.config.component.FileUploadComponent;
+import com.yxt.common.base.utils.DateUtils;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -49,6 +52,9 @@ import com.yxt.common.core.vo.PagerVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -68,121 +74,213 @@ import java.util.List;
 @Service
 public class CrmCustomerFileService extends MybatisBaseService<CrmCustomerFileMapper, CrmCustomerFile> {
 
-	@Autowired
-	BaseDataListFeign baseDataListFeign;
-	@Autowired
-	private CrmFileService crmFileService;
-	@Autowired
-	private FileUploadComponent fileUploadComponent;
-
-	public PagerVo<CrmCustomerFile> listPage(PagerQuery<CrmCustomerFileQuery> pq) {
-		CrmCustomerFileQuery query = pq.getParams();
-		QueryWrapper<CrmCustomerFile> qw = createQueryWrapper(query);
-		IPage<CrmCustomerFile> page = PagerUtil.queryToPage(pq);
-		IPage<CrmCustomerFile> pagging = baseMapper.selectPage(page, qw);
-		PagerVo<CrmCustomerFile> p = PagerUtil.pageToVo(pagging, null);
-		return p;
-	}
-	public List<CrmCustomerFile> listAll(CrmCustomerFileQuery query) {
-		QueryWrapper<CrmCustomerFile> qw = createQueryWrapper(query);
-		return baseMapper.selectList(qw);
-	}
-	private QueryWrapper<CrmCustomerFile> createQueryWrapper(CrmCustomerFileQuery query) {
-		// todo: 这里根据具体业务调整查询条件
-		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
-		QueryWrapper<CrmCustomerFile> qw = new QueryWrapper<>();
-
-		qw.eq("linkSid", query.getCustomerSid());
-		if (StringUtils.isNotBlank(query.getFileName())) {
-			qw.like("fileName", query.getFileName());
-		}
-		if (StringUtils.isNotBlank(query.getAttachType())) {
-			qw.like("attachType", query.getAttachType());
-		}
-		return qw;
-	}
-	
-	public PagerVo<CrmCustomerFileVo> listPageVo(PagerQuery<CrmCustomerFileQuery> pq) {
-		QueryWrapper<CrmCustomerFile> qw = createQueryWrapper(pq.getParams());
-		IPage<CrmCustomerFile> page = PagerUtil.queryToPage(pq);
-		IPage<CrmCustomerFileVo> pagging = baseMapper.selectPageVo(page, qw);
-		PagerVo<CrmCustomerFileVo> p = PagerUtil.pageToVo(pagging, null);
-		List<CrmCustomerFileVo> records = p.getRecords();
-		if (records.size() == 0){
-			fetchByDataTypeKey(pq.getParams().getCustomerSid());
-			IPage<CrmCustomerFileVo> paging = baseMapper.selectPageVo(page, qw);
-			PagerVo<CrmCustomerFileVo> g = PagerUtil.pageToVo(paging, null);
-			return g;
-		}
-		return p;
-	}
-
-	/**
-	 * 根据资料类别key查询资料清单列表并保存到客户资料初始化表中
-	 */
-	private void fetchByDataTypeKey(String customerSid) {
-		ResultBean<List<BaseDataListVo>> bean = baseDataListFeign.selectDataList("客户");
-		List<BaseDataListVo> data = bean.getData();
-		for (BaseDataListVo datum : data) {
-			CrmCustomerFile crmCustomerFile = new CrmCustomerFile();
-			datum.fromEntity(crmCustomerFile);
-			crmCustomerFile.setLinkSid(customerSid);
-			this.save(crmCustomerFile);
-		}
-	}
-
-	public List<CrmCustomerFileVo> listAllVo(CrmCustomerFileQuery query) {
-		QueryWrapper<CrmCustomerFile> qw = createQueryWrapper(query);
-		return baseMapper.selectListAllVo(qw);
-	}
-	
-	public List<CrmCustomerFileVo> listVo() {
-		return baseMapper.selectListVo();
-	}
-
-	public CrmCustomerFileVo fetchByIdVo(String id){
-		CrmCustomerFile entity = this.fetchById(id);
-		CrmCustomerFileVo vo = new CrmCustomerFileVo();
-		BeanUtil.copyProperties(entity, vo);
-		return vo;
-	}
-
-	public ResultBean<CrmCustomerFileListVo> fetchFileListBySid(String sid) {
-		ResultBean rb = ResultBean.fireFail();
-		CrmCustomerFileListVo crmCustomerFileListVo = new CrmCustomerFileListVo();
-		CrmCustomerFile crmCustomerFile = this.fetchBySid(sid);
-		crmCustomerFileListVo.setAttachType(crmCustomerFile.getAttachType());
-		crmCustomerFileListVo.setFileName(crmCustomerFile.getFileName());
-		List<CrmFileDetailsVo> crmFileVos = crmFileService.fetchByLinkSid(sid);
-		if (crmFileVos.size() == 0){
-			return rb.success().setData(crmCustomerFileListVo);
-		}
-		for (CrmFileDetailsVo crmFileVo : crmFileVos) {
-			String fileName = crmFileVo.getFileName();
-			fileName=fileName.substring(0,fileName.lastIndexOf('_'));
-			crmFileVo.setFileName(fileName);
-		}
-		crmCustomerFileListVo.setCrmFileDetailsVoList(crmFileVos);
-		return rb.success().setData(crmCustomerFileListVo);
-	}
-
-	public ResultBean saveCustomerFile(String staffName,String staffSid,String sid, List<CrmFileDto> crmFileDtos) {
-		ResultBean rb = ResultBean.fireFail();
-		for (CrmFileDto crmFileDto : crmFileDtos) {
-			String filePath = crmFileDto.getFilePath();
-			if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
-				filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
-			}
-			CrmFile crmFile = new CrmFile();
-			crmFileDto.fillEntity(crmFile);
-			crmFile.setFilePath(filePath);
-			crmFile.setLinkSid(sid);
-			crmFile.setCreateBySid(staffSid);
-			crmFile.setCreateTime(new Date());
-			crmFile.setAttachType(CommonAttachTypeEnum.CUSTOMER_FILE.getAttachType());
-			crmFile.setName(staffName);
-			crmFileService.save(crmFile);
-		}
-		return rb.success();
-	}
+    @Autowired
+    BaseDataListFeign baseDataListFeign;
+    @Autowired
+    private CrmFileService crmFileService;
+    @Autowired
+    private FileUploadComponent fileUploadComponent;
+    @Autowired
+    SysUserFeign sysUserFeign;
+
+    public PagerVo<CrmCustomerFile> listPage(PagerQuery<CrmCustomerFileQuery> pq) {
+        CrmCustomerFileQuery query = pq.getParams();
+        QueryWrapper<CrmCustomerFile> qw = createQueryWrapper(query);
+        IPage<CrmCustomerFile> page = PagerUtil.queryToPage(pq);
+        IPage<CrmCustomerFile> pagging = baseMapper.selectPage(page, qw);
+        PagerVo<CrmCustomerFile> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public List<CrmCustomerFile> listAll(CrmCustomerFileQuery query) {
+        QueryWrapper<CrmCustomerFile> qw = createQueryWrapper(query);
+        return baseMapper.selectList(qw);
+    }
+
+    private QueryWrapper<CrmCustomerFile> createQueryWrapper(CrmCustomerFileQuery query) {
+        // todo: 这里根据具体业务调整查询条件
+        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+        QueryWrapper<CrmCustomerFile> qw = new QueryWrapper<>();
+
+        qw.eq("linkSid", query.getCustomerSid());
+        if (StringUtils.isNotBlank(query.getFileName())) {
+            qw.like("fileName", query.getFileName());
+        }
+        if (StringUtils.isNotBlank(query.getAttachType())) {
+            qw.like("attachType", query.getAttachType());
+        }
+        return qw;
+    }
+
+    public PagerVo<CrmCustomerFileVo> listPageVo(PagerQuery<CrmCustomerFileQuery> pq) {
+        QueryWrapper<CrmCustomerFile> qw = createQueryWrapper(pq.getParams());
+        IPage<CrmCustomerFile> page = PagerUtil.queryToPage(pq);
+        IPage<CrmCustomerFileVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<CrmCustomerFileVo> p = PagerUtil.pageToVo(pagging, null);
+        List<CrmCustomerFileVo> records = p.getRecords();
+        if (records.size() == 0) {
+            fetchByDataTypeKey(pq.getParams().getCustomerSid());
+            IPage<CrmCustomerFileVo> paging = baseMapper.selectPageVo(page, qw);
+            PagerVo<CrmCustomerFileVo> g = PagerUtil.pageToVo(paging, null);
+            return g;
+        }
+        return p;
+    }
+
+    /**
+     * 根据资料类别key查询资料清单列表并保存到客户资料初始化表中
+     */
+    private void fetchByDataTypeKey(String customerSid) {
+        ResultBean<List<BaseDataListVo>> bean = baseDataListFeign.selectDataList("客户");
+        List<BaseDataListVo> data = bean.getData();
+        for (BaseDataListVo datum : data) {
+            CrmCustomerFile crmCustomerFile = new CrmCustomerFile();
+            datum.fromEntity(crmCustomerFile);
+            crmCustomerFile.setLinkSid(customerSid);
+            this.save(crmCustomerFile);
+        }
+    }
+
+    public List<CrmCustomerFileVo> listAllVo(CrmCustomerFileQuery query) {
+        QueryWrapper<CrmCustomerFile> qw = createQueryWrapper(query);
+        return baseMapper.selectListAllVo(qw);
+    }
+
+    public List<CrmCustomerFileVo> listVo() {
+        return baseMapper.selectListVo();
+    }
+
+    public CrmCustomerFileVo fetchByIdVo(String id) {
+        CrmCustomerFile entity = this.fetchById(id);
+        CrmCustomerFileVo vo = new CrmCustomerFileVo();
+        BeanUtil.copyProperties(entity, vo);
+        return vo;
+    }
+
+    public ResultBean<CrmCustomerFileListVo> fetchFileListBySid(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        CrmCustomerFileListVo crmCustomerFileListVo = new CrmCustomerFileListVo();
+        CrmCustomerFile crmCustomerFile = this.fetchBySid(sid);
+        crmCustomerFileListVo.setAttachType(crmCustomerFile.getAttachType());
+        crmCustomerFileListVo.setFileName(crmCustomerFile.getFileName());
+        List<CrmFileDetailsVo> crmFileVos = crmFileService.fetchByLinkSid(sid);
+        if (crmFileVos.size() == 0) {
+            return rb.success().setData(crmCustomerFileListVo);
+        }
+        for (CrmFileDetailsVo crmFileVo : crmFileVos) {
+            String fileName = crmFileVo.getFileName();
+            fileName = fileName.substring(0, fileName.lastIndexOf('_'));
+            crmFileVo.setFileName(fileName);
+        }
+        crmCustomerFileListVo.setCrmFileDetailsVoList(crmFileVos);
+        return rb.success().setData(crmCustomerFileListVo);
+    }
+
+    public ResultBean saveCustomerFile(String staffName, String staffSid, String sid, List<CrmFileDto> crmFileDtos) {
+        ResultBean rb = ResultBean.fireFail();
+        for (CrmFileDto crmFileDto : crmFileDtos) {
+            String filePath = crmFileDto.getFilePath();
+            if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
+            }
+            CrmFile crmFile = new CrmFile();
+            crmFileDto.fillEntity(crmFile);
+            crmFile.setFilePath(filePath);
+            crmFile.setLinkSid(sid);
+            crmFile.setCreateBySid(staffSid);
+            crmFile.setCreateTime(new Date());
+            crmFile.setAttachType(CommonAttachTypeEnum.CUSTOMER_FILE.getAttachType());
+            crmFile.setName(staffName);
+            crmFileService.save(crmFile);
+        }
+        return rb.success();
+    }
+
+    public ResultBean<AppCrmCustomerTempArchivesVo> initCustomerArchives(String customerSid, String userSid) {
+        ResultBean rb = ResultBean.fireFail();
+        fetchByDataTypeKey(customerSid);
+        AppCrmCustomerTempArchivesVo vo = new AppCrmCustomerTempArchivesVo();
+        List<AppCustomerArchivesDataVo> dataVos = baseMapper.selectByCustomerSid(customerSid);
+        for (AppCustomerArchivesDataVo appCustomerArchivesDataVo : dataVos) {
+            String createTime = appCustomerArchivesDataVo.getCreateTime();
+            Date date = DateUtils.dateStrConvertDate(createTime, "yyyy-MM-dd HH:mm:ss");
+            long time = date.getTime();
+            String s = String.valueOf(time);
+            appCustomerArchivesDataVo.setLastUploadTime(s);
+            String sid = appCustomerArchivesDataVo.getSid();
+            List<CrmFile> listVo = baseMapper.selArchivesFileImageBySid(sid);
+            List<String> list = new ArrayList<>();
+            for (CrmFile crmFile : listVo) {
+                String url = fileUploadComponent.getUrlPrefix() + crmFile.getFilePath();
+                list.add(url);
+            }
+            appCustomerArchivesDataVo.setFiles(list);
+        }
+        return rb.success().setData(vo);
+    }
+
+    public ResultBean saveCustomerArchives(AppCrmCustomerTempArchivesDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        AppUserOrgInfoVo data = sysUserFeign.getUserOrgInfoByUserSid(dto.getUserSid()).getData();
+        List<AppCustomerArchivesDataDto> archivesDataDtos = dto.getData();
+        for (AppCustomerArchivesDataDto datum : archivesDataDtos) {
+            if (datum.isChange() == true) {
+                // 先查询库里key集合是否为空 ？
+                List<AppCustomerArchivesDataVo> dataVos = baseMapper.selectByCustomerSid(dto.getCustomerSid());
+                for (AppCustomerArchivesDataVo appCustomerArchivesDataVo : dataVos) {
+                    String sid = appCustomerArchivesDataVo.getSid();
+                    Integer count = baseMapper.selectBySid(sid);
+                    if (count <= 0) {
+                        //不存在 直接新增保存 并更新时间为当前提交的时间
+                        List<String> files = datum.getFiles();
+                        for (String file : files) {
+                            if (file.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                                file = file.replace(fileUploadComponent.getUrlPrefix(), "");
+                            }
+                            CrmFile crmFile = new CrmFile();
+                            crmFile.setFilePath(file);
+                            crmFile.setLinkSid(sid);
+                            crmFile.setCreateBySid(data.getStaffSid());
+                            crmFile.setCreateTime(new Date());
+                            crmFile.setAttachType(CommonAttachTypeEnum.CUSTOMER_FILE.getAttachType());
+                            crmFile.setName(data.getStaffName());
+                            crmFileService.save(crmFile);
+                        }
+
+                    } else {
+                        // 存在 需要判断是否是当天的 如果不是当天的 false
+                        String createTime = appCustomerArchivesDataVo.getCreateTime();
+                        Date date = DateUtils.dateStrConvertDate(createTime, "yyyy-MM-dd");
+                        boolean b = DateUtils.compTime(date, new Date());
+                        if (b) {
+                            //如果是当天的  并新增 提交时间为当前提交时间
+                            List<String> files = datum.getFiles();
+                            for (String file : files) {
+                                //删除之前的附件并且删除服务器上的
+                                crmFileService.deleteFilesOss(file);
+                                //新增
+                                if (file.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                                    file = file.replace(fileUploadComponent.getUrlPrefix(), "");
+                                }
+                                CrmFile crmFile = new CrmFile();
+                                crmFile.setFilePath(file);
+                                crmFile.setLinkSid(sid);
+                                crmFile.setCreateBySid(data.getStaffSid());
+                                crmFile.setCreateTime(new Date());
+                                crmFile.setAttachType(CommonAttachTypeEnum.CUSTOMER_FILE.getAttachType());
+                                crmFile.setName(data.getStaffName());
+                                crmFileService.save(crmFile);
+                            }
+                        } else {
+                            return rb.fail().setMsg("提示：身份证是在 " + appCustomerArchivesDataVo.getCreateTime() + "日上传的，仅支持当天进行修改删除");
+                        }
+
+                    }
+                }
+            }
+        }
+        return rb.success();
+    }
+
+
 }
\ No newline at end of file
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.java
index 04207cb23a..280e99b381 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.java
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.java
@@ -103,4 +103,12 @@ public interface CrmCustomerTempMapper extends BaseMapper<CrmCustomerTemp> {
      * @return
      */
     CrmCustomerTempVo selectByWx(@Param("orgSid") String orgSid, @Param("staffSid") String staffSid, @Param("weixin") String weixin);
+
+    /**
+     * 获取客户基础信息
+     *
+     * @param sid
+     * @return
+     */
+    AppCrmCustomerTempBasicsDetailsVo customerTempDetailsBySid(String sid);
 }
\ No newline at end of file
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml
index 2c4d332c68..be8f84654e 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml
@@ -85,9 +85,18 @@
     </select>
 
     <select id="selectRemindCustomerTempList" resultType="com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo">
-        SELECT createBySid,sid,name,isOnRemindkey,staffSid,remind_remark,mobile,customerType,level
+        SELECT createBySid,
+               sid,
+               name,
+               isOnRemindkey,
+               staffSid,
+               remind_remark,
+               mobile,
+               customerType,
+               level
         FROM crm_customer_temp
-        WHERE isOnRemindkey=1 AND remind_day=#{remindDay}
+        WHERE isOnRemindkey = 1
+          AND remind_day = #{remindDay}
         ORDER BY createBySid ASC
     </select>
 
@@ -121,4 +130,30 @@
           and staffSid = #{staffSid}
           and weixin = #{weixin}
     </select>
+    <!--获取客户基础信息-->
+    <select id="customerTempDetailsBySid"
+            resultType="com.yxt.anrui.crm.api.crmcustomertemp.AppCrmCustomerTempBasicsDetailsVo">
+        SELECT cct.customerType,
+               cct.customerTypeKey,
+               cct.`name`,
+               cct.mobile,
+               cct.weiXin,
+               cct.companyName,
+               concat_ws(cct.city, cct.province, cct.county) AS addressNss,
+               cct.address,
+               cct.`level`,
+               cct.birthday,
+               cct.sex,
+               cct.certificateType                           AS idType,
+               cct.IDNumber                                  AS idNumber,
+               cct.endDate                                   AS idDate,
+               cct.e_mail                                    AS email,
+               cct.emergencyContact                          AS name2,
+               cct.emergencyMobile                           AS mobile2,
+               cct.source,
+               cct.customerClass                             AS classification,
+               cct.remarks
+        FROM crm_customer_temp cct
+        WHERE cct.sid = #{sid}
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java
index d735e27a9c..3c1bbc3835 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java
@@ -201,4 +201,16 @@ public class CrmCustomerTempRest implements CrmCustomerTempFeign {
         return crmCustomerTempService.getAppCustomerTempDetailsBySid(sid);
     }
 
+    /**
+     * 获取客户基础信息
+     *
+     * @param sid
+     * @return
+     */
+    @Override
+    public ResultBean<AppCrmCustomerTempBasicsDetailsVo> customerTempDetailsBySid(String sid) {
+        AppCrmCustomerTempBasicsDetailsVo vo = crmCustomerTempService.customerTempDetailsBySid(sid);
+        return new ResultBean<AppCrmCustomerTempBasicsDetailsVo>().success().setData(vo);
+    }
+
 }
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java
index 00dd57f15b..0e6f9a257a 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java
@@ -647,7 +647,7 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
                 }
 
             }
-        } else if (StringUtils.isNotBlank(weixin)){
+        } else if (StringUtils.isNotBlank(weixin)) {
             String staffSid = sysUserInfoVo.getStaffSid();
             //根据客户的微信号以及当前登录者所在部门的sid和登录者所关联的员工sid查询
             CrmCustomerTempVo crmCustomerTempVo = baseMapper.selectByWx(orgSid, staffSid, weixin);
@@ -764,4 +764,15 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
         crmBusinessService.updateByCusSid(crmBusinessDto, sid);
         return rb.success().setMsg("更新成功");
     }
+
+    /**
+     * 获取客户基础信息
+     *
+     * @param sid
+     * @return
+     */
+    public AppCrmCustomerTempBasicsDetailsVo customerTempDetailsBySid(String sid) {
+        AppCrmCustomerTempBasicsDetailsVo vo = baseMapper.customerTempDetailsBySid(sid);
+        return vo;
+    }
 }
\ No newline at end of file
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.java
index c1642b4bbe..7af7539f98 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.java
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.java
@@ -1,6 +1,7 @@
 package com.yxt.anrui.crm.biz.crmvehicledemand;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
@@ -40,13 +41,8 @@ public interface CrmVehicledemandMapper extends BaseMapper<CrmVehicledemand> {
 
     List<CrmVehicledemandVo> fetchByCustomerSid(String customerSid);
 
-	List<AppCrmVehicledemandVo> selectVisitSid(String visitSid);
-
     List<AppCrmVehicledemandVo> selectCustomerSid(String customerSid);
 
-    AppCrmVehicledemandDetailsVo selectBySid(String sid);
-
-    IPage<AppCrmVehicledemandVo> getVisitListSid(IPage<AppCrmVehicledemandQuery> page, @Param("visitSid") String visitSid);
 
     @Update("update crm_vehicledemand set states = 0 where sid = #{sid}")
     int delBySid(String sid);
@@ -60,8 +56,35 @@ public interface CrmVehicledemandMapper extends BaseMapper<CrmVehicledemand> {
     List<CrmVehicledemandVo> fetchAllByCustomerSid(String sid);
 
     @Select("select * from crm_vehicledemand where modelSid = #{modelSid} and customerSid = #{customerSid} and states = 1")
-    CrmVehicledemandVo fetchYXByModelSid(@Param("modelSid") String modelSid,@Param("customerSid") String customerSid);
+    CrmVehicledemandVo fetchYXByModelSid(@Param("modelSid") String modelSid, @Param("customerSid") String customerSid);
 
     @Select("select * from crm_vehicledemand where modelSid = #{modelSid} ORDER BY createTime DESC LIMIT 1")
     CrmVehicledemandVo fetchByModelSid(String modelSid);
+
+
+    /**
+     * 获取意向车型列表
+     *
+     * @param page
+     * @param qw
+     * @return
+     */
+    IPage<AppCrmVehicledemandVo> getVisitListSid(IPage<AppCrmVehicledemandQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppCrmVehicledemandVo> qw);
+
+
+    /**
+     * 初始化意向车型
+     *
+     * @param intentionSid
+     * @return
+     */
+    AppCrmVehicledemandDetailsVo selectBySid(@Param("intentionSid") String intentionSid);
+
+    /**
+     * 意向车型详情
+     *
+     * @param sid
+     * @return
+     */
+    AppCrmVehicleDemandParticularsVo intendedModel(@Param("sid") String sid);
 }
\ No newline at end of file
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml
index c54809633d..765657d7ad 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml
@@ -35,31 +35,6 @@
           AND cvcd.states = 1
     </select>
 
-    <select id="selectBySid" resultType="com.yxt.anrui.crm.api.crmvehicledemand.AppCrmVehicledemandDetailsVo">
-        SELECT cv.sid,
-               cv.purchaseMethod,
-               cv.modelSid,
-               cv.modelName,
-               cv.brandSid,
-               cv.brandName,
-               cv.vehicleModelOffer,
-               cv.sketChconfiguration,
-               cv.otherConfig
-        FROM crm_vehicledemand cv
-        WHERE cv.sid = #{sid}
-    </select>
-    <select id="getVisitListSid" resultType="com.yxt.anrui.crm.api.crmvehicledemand.AppCrmVehicledemandVo">
-        SELECT cvcd.sid,
-               cvcd.createTime,
-               cvcd.modelName,
-               cvcd.brandName,
-               cvcd.vehicleModelOffer
-        FROM crm_visit cv
-                 LEFT JOIN crm_visit_demand cvd ON cv.sid = cvd.visitSid
-                 LEFT JOIN crm_vehicledemand cvcd ON cvcd.sid = cvd.demandSid
-        WHERE cv.sid = #{visitSid}
-    </select>
-
     <select id="selectByCustomerSid" resultType="com.yxt.anrui.crm.api.crmvehicledemand.AppCrmVehicledemandVo">
         SELECT cvcd.sid,
                cvcd.brandName,
@@ -87,4 +62,54 @@
         WHERE customerSid = #{sid}
     </select>
 
+    <!--获取意向车型列表-->
+    <select id="getVisitListSid" resultType="com.yxt.anrui.crm.api.crmvehicledemand.AppCrmVehicledemandVo">
+        SELECT
+        DISTINCT cvcd.sid,
+        cvcd.modelName,
+        cvcd.brandName,
+        cvcd.createTime,
+        cvcd.saleReferencePrice AS guidancePrice,
+        cvcd.purchaseMethodValue AS purchaseType
+        FROM
+        crm_visit cv
+        LEFT JOIN crm_visit_demand cvd ON cv.sid = cvd.visitSid
+        LEFT JOIN crm_vehicledemand cvcd ON cvcd.sid = cvd.demandSid
+        <where>${ew.sqlSegment}</where>
+    </select>
+
+    <!--初始化意向车型-->
+    <select id="selectBySid" resultType="com.yxt.anrui.crm.api.crmvehicledemand.AppCrmVehicledemandDetailsVo">
+        SELECT cv.sid                 AS intentionSid,
+               cv.purchaseMethod,
+               cv.purchaseMethodValue,
+               cv.modelSid,
+               cv.modelName           AS model,
+               cv.brandSid,
+               cv.brandName           AS brand,
+               cv.saleReferencePrice  AS guidancePrice,
+               cv.vehicleModelOffer   AS price,
+               cv.comonConfigSid      AS configSid,
+               cv.remarks,
+               cv.estimatedPickupDate AS `date`
+        FROM crm_vehicledemand cv
+        WHERE cv.sid = #{intentionSid}
+    </select>
+
+    <!--意向车型详情-->
+    <select id="intendedModel"
+            resultType="com.yxt.anrui.crm.api.crmvehicledemand.AppCrmVehicleDemandParticularsVo">
+        SELECT cv.purchaseMethodValue AS type,
+               cv.modelSid,
+               cv.modelName           AS model,
+               cv.brandName           AS brand,
+               cv.saleReferencePrice  AS price,
+               cv.vehicleModelOffer   AS quotation,
+               cv.comonConfigSid      AS configSid,
+               cv.remarks,
+               cv.estimatedPickupDate AS `date`
+        FROM crm_vehicledemand cv
+        WHERE cv.sid = #{sid}
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandRest.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandRest.java
index 4ed5654670..d900e3257a 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandRest.java
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandRest.java
@@ -1,10 +1,6 @@
 package com.yxt.anrui.crm.biz.crmvehicledemand;
 
-import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yxt.anrui.base.api.basevehiclemodel.AppVehicleModelBySidVo;
-import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign;
-import com.yxt.anrui.crm.api.crmcustomertemp.AppCrmCustomerTempVo;
 import com.yxt.anrui.crm.api.crmvehicledemand.*;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
@@ -91,21 +87,6 @@ public class CrmVehicledemandRest implements CrmVehicledemandFeign {
         return rb.success().setData(vo);
     }
 
-    @Override
-    public ResultBean<PagerVo<AppCrmVehicledemandVo>> getVisitListSid(PagerQuery<AppCrmVehicledemandQuery> pagerQuery) {
-        PagerVo<AppCrmVehicledemandVo> page = new PagerVo<>();
-        IPage<AppCrmVehicledemandVo> iPage = crmVehicledemandService.getVisitListSid(pagerQuery);
-        PagerVo<AppCrmVehicledemandVo> pagerVo = PagerUtil.pageToVo(iPage, page);
-        return new ResultBean<PagerVo<AppCrmVehicledemandVo>>().success().setData(pagerVo);
-    }
-
-
-    @Override
-    public ResultBean<AppCrmVehicledemandDetailsVo> selectBySid(String sid) {
-        AppCrmVehicledemandDetailsVo vos = crmVehicledemandService.selectBySid(sid);
-        return new ResultBean<AppCrmVehicledemandDetailsVo>().success().setData(vos);
-    }
-
     @Override
     public ResultBean delBySid(String sid) {
         ResultBean rb = ResultBean.fireFail();
@@ -117,12 +98,6 @@ public class CrmVehicledemandRest implements CrmVehicledemandFeign {
 
     }
 
-    @Override
-    public ResultBean saveVisitDemands(AppCrmVehicledemandDto appCrmVehicledemandDto) {
-        ResultBean rb = ResultBean.fireFail();
-        crmVehicledemandService.saveVisitDemands(appCrmVehicledemandDto);
-        return rb.success();
-    }
 
     @Override
     public ResultBean<AppIntendedModelVo> getAppIntendedModel(String sid) {
@@ -135,4 +110,68 @@ public class CrmVehicledemandRest implements CrmVehicledemandFeign {
         AppIntendedModelDetailedVo vo = crmVehicledemandService.getAppIntendedModelDetailed(sid);
         return new ResultBean<AppIntendedModelDetailedVo>().success().setData(vo);
     }
+
+    /**
+     * 获取意向车型列表
+     *
+     * @param pagerQuery
+     * @return
+     */
+    @Override
+    public ResultBean<PagerVo<AppCrmVehicledemandVo>> getVisitListSid(PagerQuery<AppCrmVehicledemandQuery> pagerQuery) {
+        PagerVo<AppCrmVehicledemandVo> page = new PagerVo<>();
+        IPage<AppCrmVehicledemandVo> iPage = crmVehicledemandService.getVisitListSid(pagerQuery);
+        PagerVo<AppCrmVehicledemandVo> pagerVo = PagerUtil.pageToVo(iPage, page);
+        return new ResultBean<PagerVo<AppCrmVehicledemandVo>>().success().setData(pagerVo);
+    }
+
+    /**
+     * 新增意向车型
+     *
+     * @param appCrmVehicleDemandDto
+     * @return
+     */
+    @Override
+    public ResultBean addVisitDemands(AppCrmVehicledemandDto appCrmVehicleDemandDto) {
+        ResultBean rb = ResultBean.fireFail();
+        crmVehicledemandService.addVisitDemands(appCrmVehicleDemandDto);
+        return rb.success();
+    }
+
+    /**
+     * 初始化意向车型
+     *
+     * @param intentionSid
+     * @return
+     */
+    @Override
+    public ResultBean<AppCrmVehicledemandDetailsVo> initVisitDemands(String intentionSid) {
+        AppCrmVehicledemandDetailsVo vo = crmVehicledemandService.initVisitDemands(intentionSid);
+        return new ResultBean<AppCrmVehicledemandDetailsVo>().success().setData(vo);
+    }
+
+    /**
+     * 修改意向车型
+     *
+     * @param appCrmVehicleDemandUpdateDto
+     * @return
+     */
+    @Override
+    public ResultBean saveVisitDemands(AppCrmVehicleDemandUpdateDto appCrmVehicleDemandUpdateDto) {
+        ResultBean rb = ResultBean.fireFail();
+        crmVehicledemandService.saveVisitDemands(appCrmVehicleDemandUpdateDto);
+        return rb.success();
+    }
+
+    /**
+     * 意向车型详情
+     *
+     * @param sid
+     * @return
+     */
+    @Override
+    public ResultBean<AppCrmVehicleDemandParticularsVo> intendedModel(String sid) {
+        AppCrmVehicleDemandParticularsVo vo = crmVehicledemandService.intendedModel(sid);
+        return new ResultBean<AppCrmVehicleDemandParticularsVo>().success().setData(vo);
+    }
 }
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java
index 3f991eb748..0545f1b3a1 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java
@@ -4,6 +4,8 @@ import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign;
+import com.yxt.anrui.base.api.basevehmodelconfig.AppModelVeDetailVo;
+import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigFeign;
 import com.yxt.anrui.crm.api.crmfindemand.CrmFindemand;
 import com.yxt.anrui.crm.api.crmfindemand.CrmFindemandDto;
 import com.yxt.anrui.crm.api.crmfindemand.CrmFindemandVo;
@@ -19,10 +21,12 @@ import com.yxt.common.core.vo.PagerVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
+import java.util.UUID;
 
 /**
  * Project: anrui-crm(客户管理) <br/>
@@ -43,6 +47,9 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
     @Autowired
     private BaseVehicleModelFeign baseVehicleModelFeign;
 
+    @Autowired
+    BaseVehmodelConfigFeign baseVehmodelConfigFeign;
+
     @Autowired
     private CrmVehicleFinanceService crmVehicleFinanceService;
 
@@ -73,7 +80,6 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
         if (StringUtils.isNotBlank(query.getBrandName())) {
             qw.eq("brandName", query.getBrandName());
         }
-
         if (StringUtils.isNotBlank(query.getModelName())) {
             qw.eq("modelName", query.getModelName());
         }
@@ -97,7 +103,7 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
         IPage<CrmVehicledemandVo> pagging = baseMapper.selectPageVo(page, qw);
         PagerVo<CrmVehicledemandVo> p = PagerUtil.pageToVo(pagging, null);
         List<CrmVehicledemandVo> records = pagging.getRecords();
-        if (records.size() > 0){
+        if (records.size() > 0) {
             for (CrmVehicledemandVo record : records) {
                 String createTime = record.getCreateTime();
                 String date = createTime.substring(0, 10);
@@ -149,37 +155,6 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
         return appCrmVehicledemandVos;
     }
 
-    public AppCrmVehicledemandDetailsVo selectBySid(String sid) {
-        AppCrmVehicledemandDetailsVo appCrmVehicledemandDetailsVo = baseMapper.selectBySid(sid);
-        String vehicleModelOffer = appCrmVehicledemandDetailsVo.getVehicleModelOffer();
-        appCrmVehicledemandDetailsVo.setVehicleModelOffer(vehicleModelOffer + "万元");
-        return appCrmVehicledemandDetailsVo;
-    }
-
-    public IPage<AppCrmVehicledemandVo> getVisitListSid(PagerQuery<AppCrmVehicledemandQuery> pagerQuery) {
-        String visitSid = pagerQuery.getParams().getVisitSid();
-        IPage<AppCrmVehicledemandQuery> page = PagerUtil.queryToPage(pagerQuery);
-        IPage<AppCrmVehicledemandVo> iPage = baseMapper.getVisitListSid(page, visitSid);
-        return iPage;
-    }
-
-    public int delBySid(String sid) {
-        return baseMapper.delBySid(sid);
-    }
-
-    public ResultBean saveVisitDemands(AppCrmVehicledemandDto appCrmVehicledemandDto) {
-        ResultBean rb = ResultBean.fireFail();
-        String states = "1";
-        appCrmVehicledemandDto.setStates(states);
-        CrmVehicledemand entity = new CrmVehicledemand();
-        appCrmVehicledemandDto.fillEntity(entity);
-        int count = baseMapper.insert(entity);
-        if (count > 0) {
-            return rb.success();
-        }
-        return rb.fail();
-    }
-
     public AppIntendedModelVo getAppIntendedModel(String sid) {
         AppIntendedModelVo vo = baseMapper.getAppIntendedModel(sid);
         String customerSid = vo.getCustomerSid();
@@ -197,6 +172,10 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
         return vo;
     }
 
+    public int delBySid(String sid) {
+        return baseMapper.delBySid(sid);
+    }
+
     public AppIntendedModelDetailedVo getAppIntendedModelDetailed(String sid) {
         AppIntendedModelDetailedVo vo = baseMapper.getAppIntendedModelDetailed(sid);
         return vo;
@@ -211,7 +190,7 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
         String modelSid = dto.getModelSid();
         String customerSid = dto.getCustomerSid();
         //查询该车型是否为意向车型
-        CrmVehicledemandVo crmVehicledemandVo = baseMapper.fetchYXByModelSid(modelSid,customerSid);
+        CrmVehicledemandVo crmVehicledemandVo = baseMapper.fetchYXByModelSid(modelSid, customerSid);
         CrmFindemandDto crmFindemandDto = dto.getCrmFindemandDto();
         if (crmVehicledemandVo == null) {
             CrmVehicledemandVo crmVehicledemandVo1 = baseMapper.fetchByModelSid(modelSid);
@@ -302,4 +281,85 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
             crmFindemandService.save(crmFindemand);
         }
     }
+
+    public IPage<AppCrmVehicledemandVo> getVisitListSid(PagerQuery<AppCrmVehicledemandQuery> pagerQuery) {
+        IPage<AppCrmVehicledemandQuery> page = PagerUtil.queryToPage(pagerQuery);
+        QueryWrapper<AppCrmVehicledemandVo> qw = createVisitListQueryWrapper(pagerQuery.getParams());
+        IPage<AppCrmVehicledemandVo> iPage = baseMapper.getVisitListSid(page, qw);
+        return iPage;
+    }
+
+    private QueryWrapper<AppCrmVehicledemandVo> createVisitListQueryWrapper(AppCrmVehicledemandQuery pagerQuery) {
+        QueryWrapper<AppCrmVehicledemandVo> qw = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(pagerQuery.getVisitSid())) {
+            qw.eq("cv.sid", pagerQuery.getVisitSid());
+        }
+        return qw;
+    }
+
+    /**
+     * 手机端-新增意向车型（新）
+     *
+     * @param appCrmVehicleDemandDto
+     * @return
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public ResultBean addVisitDemands(AppCrmVehicledemandDto appCrmVehicleDemandDto) {
+        ResultBean rb = ResultBean.fireFail();
+        String modelSid = appCrmVehicleDemandDto.getModelSid();
+        String configSid = appCrmVehicleDemandDto.getConfigSid();
+        String userSid = appCrmVehicleDemandDto.getUserSid();
+        AppModelVeDetailVo data = baseVehmodelConfigFeign.getAppIntentionVehicleVo(modelSid, configSid, userSid).getData();
+        CrmVehicledemand entity = new CrmVehicledemand();
+        entity.setCustomerSid(UUID.randomUUID().toString());
+        entity.setModelSid(modelSid);
+        entity.setModelName(data.getModelName());
+        entity.setBrandSid(data.getBrandSid());
+        entity.setBrandName(data.getBrandName());
+        entity.setSaleReferencePrice(data.getSaleReferencePrice());
+        appCrmVehicleDemandDto.fillEntity(entity);
+        baseMapper.insert(entity);
+        return rb.success();
+    }
+
+    /**
+     * 初始化意向车型
+     *
+     * @param intentionSid
+     * @return
+     */
+    public AppCrmVehicledemandDetailsVo initVisitDemands(String intentionSid) {
+        AppCrmVehicledemandDetailsVo appCrmVehicledemandDetailsVo = baseMapper.selectBySid(intentionSid);
+        return appCrmVehicledemandDetailsVo;
+    }
+
+    /**
+     * 修改意向车型
+     *
+     * @param appCrmVehicleDemandUpdateDto
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public ResultBean saveVisitDemands(AppCrmVehicleDemandUpdateDto appCrmVehicleDemandUpdateDto) {
+        ResultBean rb = ResultBean.fireFail();
+        String sid = appCrmVehicleDemandUpdateDto.getIntentionSid();
+        CrmVehicledemand entity = fetchBySid(sid);
+        entity.setPurchaseMethod(appCrmVehicleDemandUpdateDto.getPurchaseMethod());
+        entity.setPurchaseMethodValue(appCrmVehicleDemandUpdateDto.getPurchaseMethodValue());
+        entity.setRemarks(appCrmVehicleDemandUpdateDto.getRemarks());
+        entity.setNumber(appCrmVehicleDemandUpdateDto.getNumber());
+        entity.setEstimatedPickupDate(appCrmVehicleDemandUpdateDto.getDate());
+        baseMapper.updateById(entity);
+        return rb.success();
+    }
+
+    /**
+     * 意向车型详情
+     *
+     * @param sid
+     * @return
+     */
+    public AppCrmVehicleDemandParticularsVo intendedModel(String sid) {
+        AppCrmVehicleDemandParticularsVo appCrmVehicleDemandParticularsVo = baseMapper.intendedModel(sid);
+        return appCrmVehicleDemandParticularsVo;
+    }
 }
\ No newline at end of file
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvisit/CrmVisitRest.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvisit/CrmVisitRest.java
index 92805d0776..dee12aa829 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvisit/CrmVisitRest.java
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvisit/CrmVisitRest.java
@@ -108,7 +108,7 @@ public class CrmVisitRest implements CrmVisitFeign {
             }
             //往跟进记录和车型需求关联表中添加
             List<CrmVehicledemandVo> crmVehicledemandVos = crmVehicledemandService.fetchByCustomerSid(customerSid);
-            if (crmVehicledemandVos.size() > 0){
+            if (crmVehicledemandVos.size() > 0) {
                 for (CrmVehicledemandVo crmVehicledemandVo : crmVehicledemandVos) {
                     CrmVisitDemand crmVisitDemand = new CrmVisitDemand();
                     crmVisitDemand.setVisitSid(entity.getSid());
@@ -204,7 +204,8 @@ public class CrmVisitRest implements CrmVisitFeign {
 
     @Override
     public ResultBean<AppCrmVisitListVo> getAppVisitListByCustomerSid(String userSid, String customerSid) {
-        return new ResultBean<AppCrmVisitListVo>().success().setData(crmVisitService.getAppVisitListByCustomerSid(userSid, customerSid));
+        AppCrmVisitListVo vo = crmVisitService.getAppVisitListByCustomerSid(userSid, customerSid);
+        return new ResultBean<AppCrmVisitListVo>().success().setData(vo);
     }
 
     @Override
@@ -223,8 +224,8 @@ public class CrmVisitRest implements CrmVisitFeign {
     }
 
     @Override
-    public ResultBean updateAppendixUrl(String s,String sid) {
-        crmVisitService.updateAppendixUrl(s,sid);
+    public ResultBean updateAppendixUrl(String s, String sid) {
+        crmVisitService.updateAppendixUrl(s, sid);
         return ResultBean.fireSuccess();
     }
 }

From d72b80929bc7cad5dcacc100cb54fb916e6ee35b Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Wed, 13 Apr 2022 14:20:43 +0800
Subject: [PATCH 05/15] =?UTF-8?q?=E6=AC=BE=E9=A1=B9=E5=9F=BA=E7=A1=80?=
 =?UTF-8?q?=E5=A2=9E=E5=88=A0=E6=94=B9=E6=9F=A5=E6=8E=A5=E5=8F=A3=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../commonappendix/CommonAttachTypeEnum.java  |   4 +-
 .../BusCollectionConfirmationAppendixDto.java |  42 ++++++
 .../BusCollectionConfirmationDetailsVo.java   |  17 +--
 .../BusCollectionConfirmationDto.java         |   6 +
 .../BusCollectionConfirmationVo.java          |   2 +
 .../BusCollectionConfirmationRest.java        |   4 +-
 .../BusCollectionConfirmationService.java     | 127 ++++++++++++------
 .../BusSelectedReceivablesDetailedMapper.java |   7 +
 ...BusSelectedReceivablesDetailedService.java |   8 ++
 9 files changed, 164 insertions(+), 53 deletions(-)
 create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationAppendixDto.java

diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAttachTypeEnum.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAttachTypeEnum.java
index d544b52f76..188c07750c 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAttachTypeEnum.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAttachTypeEnum.java
@@ -42,7 +42,9 @@ public enum CommonAttachTypeEnum {
     ADVANCE_GIN("0005", "提前开票附件"),
     CUSTOMER_FILE("0006", "客户资料附件"),
     ARREARS("0007", "欠款提车附件"),
-    SCENESIGN("0008", "现场签署附件");
+    SCENESIGN("0008", "现场签署附件"),
+    PAYMENT_VOUCHER("0009", "打款凭证附件"),
+    REMITTAN_CECONFIRMATION("0010", "汇款确认书附件");
     /**
      * 附件类型
      */
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationAppendixDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationAppendixDto.java
new file mode 100644
index 0000000000..e28da55338
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationAppendixDto.java
@@ -0,0 +1,42 @@
+package com.yxt.anrui.buscenter.api.buscollectionconfirmation;
+
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-base(安瑞基础信息模块) <br/>
+ * File: CommonAppendixDto.java <br/>
+ * Class: com.yxt.anrui.base.api.commonappendix.CommonAppendixDto <br/>
+ * Description: 公共附件表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-10-28 08:59:25 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "公共附件表 数据传输对象", description = "公共附件表 数据传输对象")
+@Data
+public class BusCollectionConfirmationAppendixDto implements Dto {
+
+    @ApiModelProperty("上传人sid")
+    private String createBySid;
+    @ApiModelProperty("上传人姓名")
+    private String name;
+	@ApiModelProperty("文件名")
+    private String fileName;
+	@ApiModelProperty("文件类型")
+    private String fileType;
+	@ApiModelProperty("关联业务对象sid")
+    private String linkSid;
+	@ApiModelProperty("附件类型")
+    private String attachType;
+	@ApiModelProperty("文件大小")
+    private String fileSize;
+	@ApiModelProperty("文件的路径")
+    private String filePath;
+}
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationDetailsVo.java
index b38c8ec731..e4386a5d11 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationDetailsVo.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationDetailsVo.java
@@ -26,11 +26,15 @@
 package com.yxt.anrui.buscenter.api.buscollectionconfirmation;
 
 
+import com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedDto;
+import com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedVo;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * Project: anrui-buscenter(销售相关) <br/>
  * File: BusCollectionConfirmationVo.java <br/>
@@ -51,37 +55,28 @@ public class BusCollectionConfirmationDetailsVo implements Vo {
     
 	@ApiModelProperty("创建人接口")
     private String createByName; // 创建人接口
-    
 	@ApiModelProperty("收款日期")
     private String collectionDate; // 收款日期
-    
 	@ApiModelProperty("收款银行")
     private String collectionBank; // 收款银行
-    
 	@ApiModelProperty("收款银行账号")
     private String collectionBankNum; // 收款银行账号
-    
 	@ApiModelProperty("收款方式key")
     private String collectionTypeKey; // 收款方式key
-    
 	@ApiModelProperty("收款方式value")
     private String collectionTypeValue; // 收款方式value
-    
 	@ApiModelProperty("付款方名称")
     private String payerName; // 付款方名称
-    
 	@ApiModelProperty("收款金额")
     private String collectionMoney; // 收款金额
-    
 	@ApiModelProperty("打款凭证Url")
     private String paymentVoucherUrl; // 打款凭证Url
-    
 	@ApiModelProperty("汇款确认书Url")
     private String remittanceConfirmationUrl; // 汇款确认书Url
-    
 	@ApiModelProperty("余额")
     private String balance; // 余额
-    
 	@ApiModelProperty("分公司sid")
     private String useOrgSid; // 分公司sid
+    @ApiModelProperty("已选应收款项明细")
+    private List<BusSelectedReceivablesDetailedVo> busSelectedReceivablesDetailedVos; // 已选应收款项明细
 }
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationDto.java
index e61590b140..6f8c3aa680 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationDto.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationDto.java
@@ -54,6 +54,8 @@ public class BusCollectionConfirmationDto implements Dto {
 
     @ApiModelProperty("收款确认单sid")
     private String sid; // 收款确认单sid
+    @ApiModelProperty("业务员sid")
+    private String staffSid; // 业务员sid
 	@ApiModelProperty("创建人接口")
     private String createByName; // 创建人接口
 	@ApiModelProperty("收款日期")
@@ -80,4 +82,8 @@ public class BusCollectionConfirmationDto implements Dto {
     private String useOrgSid; // 分公司sid
     @ApiModelProperty("已选应收款项明细")
     private List<BusSelectedReceivablesDetailedDto> busSelectedReceivablesDetailedDtos; // 已选应收款项明细
+    @ApiModelProperty("打款凭证附件")
+    private List<BusCollectionConfirmationAppendixDto> paymentVoucherAppendixs; // 打款凭证附件
+    @ApiModelProperty("汇款确认书附件")
+    private List<BusCollectionConfirmationAppendixDto> remittanceConfirmationAppendixs; // 汇款确认书附件
 }
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationVo.java
index 5f4b4a41f9..dd48fba2a4 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationVo.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationVo.java
@@ -49,6 +49,8 @@ import lombok.Data;
 @Data
 public class BusCollectionConfirmationVo implements Vo {
 
+    @ApiModelProperty("收款确认单sid")
+    private String sid; // 收款确认单sid
 	@ApiModelProperty("收款日期")
     private String collectionDate; // 收款日期
 	@ApiModelProperty("收款银行")
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationRest.java
index 7c0f8fcf47..6716c4f444 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationRest.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationRest.java
@@ -77,9 +77,7 @@ public class BusCollectionConfirmationRest implements BusCollectionConfirmationF
 	@ApiOperation("根据sid批量删除")
     @PostMapping("/delBySids")
     public ResultBean delBySids(@RequestBody String[] sids){
-		ResultBean rb = ResultBean.fireFail();
-		busCollectionConfirmationService.delBySids(sids);
-		return rb.success();
+		return busCollectionConfirmationService.delAllBySids(sids);
 	}
 
 	@Override
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationService.java
index c3635e05c1..f19c4c613f 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationService.java
@@ -28,7 +28,16 @@ package com.yxt.anrui.buscenter.biz.buscollectionconfirmation;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.base.api.commonappendix.CommonAppendix;
+import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto;
+import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign;
+import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum;
 import com.yxt.anrui.buscenter.api.buscollectionconfirmation.*;
+import com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailed;
+import com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedDto;
+import com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedVo;
+import com.yxt.anrui.buscenter.biz.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedService;
+import com.yxt.common.base.config.component.FileUploadComponent;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -36,6 +45,7 @@ import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -55,18 +65,14 @@ import java.util.List;
  */
 @Service
 public class BusCollectionConfirmationService extends MybatisBaseService<BusCollectionConfirmationMapper, BusCollectionConfirmation> {
-	public PagerVo<BusCollectionConfirmation> listPage(PagerQuery<BusCollectionConfirmationQuery> pq) {
-		BusCollectionConfirmationQuery query = pq.getParams();
-		QueryWrapper<BusCollectionConfirmation> qw = createQueryWrapper(query);
-		IPage<BusCollectionConfirmation> page = PagerUtil.queryToPage(pq);
-		IPage<BusCollectionConfirmation> pagging = baseMapper.selectPage(page, qw);
-		PagerVo<BusCollectionConfirmation> p = PagerUtil.pageToVo(pagging, null);
-		return p;
-	}
-	public List<BusCollectionConfirmation> listAll(BusCollectionConfirmationQuery query) {
-		QueryWrapper<BusCollectionConfirmation> qw = createQueryWrapper(query);
-		return baseMapper.selectList(qw);
-	}
+
+	@Autowired
+	private BusSelectedReceivablesDetailedService busSelectedReceivablesDetailedService;
+	@Autowired
+	private CommonAppendixFeign commonAppendixFeign;
+	@Autowired
+	private FileUploadComponent fileUploadComponent;
+
 	private QueryWrapper<BusCollectionConfirmation> createQueryWrapper(BusCollectionConfirmationQuery query) {
 		// todo: 这里根据具体业务调整查询条件
 		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
@@ -96,39 +102,84 @@ public class BusCollectionConfirmationService extends MybatisBaseService<BusColl
 		return p;
 	}
 	
-	public List<BusCollectionConfirmationVo> listAllVo(BusCollectionConfirmationQuery query) {
-		QueryWrapper<BusCollectionConfirmation> qw = createQueryWrapper(query);
-		return baseMapper.selectListAllVo(qw);
-	}
-	
-	public List<BusCollectionConfirmationVo> listVo() {
-		return baseMapper.selectListVo();
-	}
-	
-	public void saveOrUpdateDto(BusCollectionConfirmationDto dto){
-		BusCollectionConfirmation entity = new BusCollectionConfirmation();
-		dto.fillEntity(entity);
-		this.saveOrUpdate(entity);
-	}
-	
-	public BusCollectionConfirmationVo fetchByIdVo(String id){
-		BusCollectionConfirmation entity = this.fetchById(id);
-		BusCollectionConfirmationVo vo = new BusCollectionConfirmationVo();
-		BeanUtil.copyProperties(entity, vo);
-		return vo;
-	}
-
 	public ResultBean saveOrUpdateAllDto(BusCollectionConfirmationDto dto) {
 		ResultBean rb = ResultBean.fireFail();
+		BusCollectionConfirmation busCollectionConfirmation = new BusCollectionConfirmation();
+		List<BusSelectedReceivablesDetailedDto> busSelectedReceivablesDetailedDtos = dto.getBusSelectedReceivablesDetailedDtos();
+		CommonAppendixDto commonAppendixDto = new CommonAppendixDto();
+		List<BusCollectionConfirmationAppendixDto> paymentVoucherAppendixs = dto.getPaymentVoucherAppendixs();
+		List<BusCollectionConfirmationAppendixDto> remittanceConfirmationAppendixs = dto.getRemittanceConfirmationAppendixs();
+		String sid1 = busCollectionConfirmation.getSid();
 		String sid = dto.getSid();
-		if (StringUtils.isBlank(sid)){
-
+		if (StringUtils.isBlank(sid)){//新增
+			BeanUtil.copyProperties(dto,busCollectionConfirmation);
+			busCollectionConfirmation.setSid(sid1);
+			String payFilePath = "";
+			String remFilePath = "";
+			for (BusCollectionConfirmationAppendixDto paymentVoucherAppendix : paymentVoucherAppendixs) {
+				BeanUtil.copyProperties(paymentVoucherAppendix,commonAppendixDto);
+				payFilePath = commonAppendixDto.getFilePath();
+				if (payFilePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+					payFilePath = payFilePath.replace(fileUploadComponent.getUrlPrefix(), "");
+					commonAppendixDto.setLinkSid(sid1);
+					commonAppendixDto.setFilePath(payFilePath);
+					commonAppendixDto.setCreateBySid(dto.getStaffSid());
+					commonAppendixDto.setAttachType(CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType());
+					commonAppendixFeign.save(commonAppendixDto);
+				}
+				payFilePath += payFilePath + ",";
+			}
+			busCollectionConfirmation.setPaymentVoucherUrl(payFilePath.substring(0, payFilePath.length() - 1));
+			for (BusCollectionConfirmationAppendixDto remittanceConfirmationAppendix : remittanceConfirmationAppendixs) {
+				BeanUtil.copyProperties(remittanceConfirmationAppendix,commonAppendixDto);
+				remFilePath = commonAppendixDto.getFilePath();
+				if (remFilePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+					remFilePath = remFilePath.replace(fileUploadComponent.getUrlPrefix(), "");
+					commonAppendixDto.setLinkSid(sid1);
+					commonAppendixDto.setFilePath(remFilePath);
+					commonAppendixDto.setCreateBySid(dto.getStaffSid());
+					commonAppendixDto.setAttachType(CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType());
+					commonAppendixFeign.save(commonAppendixDto);
+				}
+				remFilePath += remFilePath + ",";
+			}
+			busCollectionConfirmation.setRemittanceConfirmationUrl(remFilePath.substring(0, remFilePath.length() - 1));
+			save(busCollectionConfirmation);
+			for (BusSelectedReceivablesDetailedDto busSelectedReceivablesDetailedDto : busSelectedReceivablesDetailedDtos) {
+				BusSelectedReceivablesDetailed busSelectedReceivablesDetailed = new BusSelectedReceivablesDetailed();
+				BeanUtil.copyProperties(busSelectedReceivablesDetailedDto,busSelectedReceivablesDetailed);
+				busSelectedReceivablesDetailed.setCollSid(sid1);
+				busSelectedReceivablesDetailedService.save(busSelectedReceivablesDetailed);
+			}
+			return rb.success().setMsg("添加成功");
+		}
+		updateBySid(dto,sid);
+		busSelectedReceivablesDetailedService.deleteByCollSid(sid);
+		for (BusSelectedReceivablesDetailedDto busSelectedReceivablesDetailedDto : busSelectedReceivablesDetailedDtos) {
+			BusSelectedReceivablesDetailed busSelectedReceivablesDetailed = new BusSelectedReceivablesDetailed();
+			BeanUtil.copyProperties(busSelectedReceivablesDetailedDto,busSelectedReceivablesDetailed);
+			busSelectedReceivablesDetailed.setCollSid(sid);
+			busSelectedReceivablesDetailedService.save(busSelectedReceivablesDetailed);
 		}
-		return null;
+		return rb.success().setMsg("修改成功");
 	}
 
 	public ResultBean<BusCollectionConfirmationDetailsVo> fetchByAllSid(String sid) {
 		ResultBean rb = ResultBean.fireFail();
-		return null;
+		BusCollectionConfirmationDetailsVo busCollectionConfirmationDetailsVo = new BusCollectionConfirmationDetailsVo();
+		BusCollectionConfirmation busCollectionConfirmation = fetchBySid(sid);
+		BeanUtil.copyProperties(busCollectionConfirmation,busCollectionConfirmationDetailsVo);
+		List<BusSelectedReceivablesDetailedVo> busSelectedReceivablesDetailedVos = busSelectedReceivablesDetailedService.fetchByCillSid(sid);
+		busCollectionConfirmationDetailsVo.setBusSelectedReceivablesDetailedVos(busSelectedReceivablesDetailedVos);
+		return rb.success().setData(busCollectionConfirmationDetailsVo);
+	}
+
+	public ResultBean delAllBySids(String[] sids) {
+		ResultBean rb = ResultBean.fireFail();
+		delBySids(sids);
+		for (String sid : sids) {
+			busSelectedReceivablesDetailedService.deleteByCollSid(sid);
+		}
+		return rb.success().setMsg("删除成功");
 	}
 }
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedMapper.java
index 3dda5b98c0..fe7174f927 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedMapper.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedMapper.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 org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -62,4 +63,10 @@ public interface BusSelectedReceivablesDetailedMapper extends BaseMapper<BusSele
 	
 	@Select("select * from bus_selected_receivables_detailed")
 	List<BusSelectedReceivablesDetailedVo> selectListVo();
+
+	@Delete("delete from bus_selected_receivables_detailed where collSid = #{sid}")
+    void deleteByCollSid(String sid);
+
+	@Select("select * from bus_selected_receivables_detailed where collSid = #{sid}")
+	List<BusSelectedReceivablesDetailedVo> fetchByCillSid(String sid);
 }
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedService.java
index 378cc57127..1c2125fd61 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedService.java
@@ -161,4 +161,12 @@ public class BusSelectedReceivablesDetailedService extends MybatisBaseService<Bu
 		BeanUtil.copyProperties(entity, vo);
 		return vo;
 	}
+
+	public void deleteByCollSid(String sid) {
+		baseMapper.deleteByCollSid(sid);
+	}
+
+	public List<BusSelectedReceivablesDetailedVo> fetchByCillSid(String sid) {
+		return baseMapper.fetchByCillSid(sid);
+	}
 }
\ No newline at end of file

From 3e0e340afb353ce9322e200d3fe3bbb511e1bc8b Mon Sep 17 00:00:00 2001
From: hanlinghao <2969694837@qq.com>
Date: Wed, 13 Apr 2022 14:34:16 +0800
Subject: [PATCH 06/15] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=A1=A3=E6=A1=88?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E5=AE=A2=E6=88=B7=E6=84=8F=E5=90=91?=
 =?UTF-8?q?=E8=BD=A6=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppBusCollectionConfirmationPageVo.java   | 35 +++++++++++++++++++
 .../AppBusCollectionConfirmationQuery.java    | 16 +++++++++
 2 files changed, 51 insertions(+)
 create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusCollectionConfirmationPageVo.java
 create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusCollectionConfirmationQuery.java

diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusCollectionConfirmationPageVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusCollectionConfirmationPageVo.java
new file mode 100644
index 0000000000..8f4671f246
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusCollectionConfirmationPageVo.java
@@ -0,0 +1,35 @@
+package com.yxt.anrui.buscenter.api.buscollectionconfirmation;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppBusCollectionConfirmationPageVo implements Vo {
+
+    @ApiModelProperty("确认单sid")
+    private String collectionBillSid;
+    @ApiModelProperty("收款账号")
+    private String collectionNum;
+    @ApiModelProperty("状态")
+    private String collectionBillState;
+    @ApiModelProperty("收款银行")
+    private String collectionBank;
+    @ApiModelProperty("收款类型")
+    private String collectionType;
+    @ApiModelProperty("收款时间")
+    private String collectionDate;
+    @ApiModelProperty("付款人")
+    private String paymentName;
+    @ApiModelProperty("收款金额")
+    private String collectionMoney;
+    @ApiModelProperty("备注")
+    private String remarks;
+    @ApiModelProperty("是否显示办理")
+    private boolean showHandle;
+    @ApiModelProperty("是否显示下载")
+    private boolean showDownload;
+    @ApiModelProperty("是否显示删除")
+    private boolean showDelete;
+
+}
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusCollectionConfirmationQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusCollectionConfirmationQuery.java
new file mode 100644
index 0000000000..e95dc71c0f
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusCollectionConfirmationQuery.java
@@ -0,0 +1,16 @@
+package com.yxt.anrui.buscenter.api.buscollectionconfirmation;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppBusCollectionConfirmationQuery implements Query {
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+
+    @ApiModelProperty("付款方名称")
+    private String name;
+
+}

From 3d6aa5d54c744c9d8f3f8ae947cce72bc2b20a6f Mon Sep 17 00:00:00 2001
From: hanlinghao <2969694837@qq.com>
Date: Wed, 13 Apr 2022 14:43:18 +0800
Subject: [PATCH 07/15] =?UTF-8?q?app=E6=AC=BE=E9=A1=B9=E7=A1=AE=E8=AE=A4?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BusCollectionConfirmationFeign.java       |   4 +-
 ...usCollectionConfirmationFeignFallback.java |   5 +
 .../BusCollectionConfirmationMapper.java      |  23 +-
 .../BusCollectionConfirmationMapper.xml       |   5 +
 .../BusCollectionConfirmationRest.java        |  61 +++--
 .../BusCollectionConfirmationService.java     | 252 ++++++++++--------
 6 files changed, 205 insertions(+), 145 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationFeign.java
index 19c45f9f1a..ca93366807 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationFeign.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationFeign.java
@@ -72,9 +72,9 @@ public interface BusCollectionConfirmationFeign {
     @GetMapping("/fetchBySid/{sid}")
     public ResultBean<BusCollectionConfirmationDetailsVo> fetchBySid(@PathVariable("sid") String sid);
 
-    /*                            App接口                                               */
+    /*---------------------App接口 ---------------------*/
 
     @ApiOperation("手机端—获取款项确认列表")
     @PostMapping("/getCollectionConfirmList")
-    public ResultBean<PagerVo<AppBusCollectionConfirmationPageVo>> getCollectionConfirmList(@RequestBody PagerQuery<BusCollectionConfirmationQuery> pq);
+    public ResultBean<PagerVo<AppBusCollectionConfirmationPageVo>> getCollectionConfirmList(@RequestBody PagerQuery<AppBusCollectionConfirmationQuery> pagerQuery);
 }
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationFeignFallback.java
index d381a4ac47..565c8ebb45 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationFeignFallback.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationFeignFallback.java
@@ -69,4 +69,9 @@ public class BusCollectionConfirmationFeignFallback implements BusCollectionConf
 		ResultBean rb = ResultBean.fireFail();
 		return rb.setMsg("接口anrui-buscenter/buscollectionconfirmation/fetchBySid无法访问");
 	}
+
+	@Override
+	public ResultBean<PagerVo<AppBusCollectionConfirmationPageVo>> getCollectionConfirmList(PagerQuery<AppBusCollectionConfirmationQuery> pagerQuery) {
+		return null;
+	}
 }
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationMapper.java
index 01f9a53fed..36d5ef937f 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationMapper.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationMapper.java
@@ -26,9 +26,12 @@
 package com.yxt.anrui.buscenter.biz.buscollectionconfirmation;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.buscenter.api.buscollectionconfirmation.AppBusCollectionConfirmationPageVo;
+import com.yxt.anrui.buscenter.api.buscollectionconfirmation.AppBusCollectionConfirmationQuery;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -53,13 +56,15 @@ import java.util.List;
 @Mapper
 public interface BusCollectionConfirmationMapper extends BaseMapper<BusCollectionConfirmation> {
 
-	//@Update("update bus_collection_confirmation set name=#{msg} where id=#{id}")
-	//IPage<BusCollectionConfirmationVo> voPage(IPage<BusCollectionConfirmation> page, @Param(Constants.WRAPPER) QueryWrapper<BusCollectionConfirmation> qw);
-	
-	IPage<BusCollectionConfirmationVo> selectPageVo(IPage<BusCollectionConfirmation> page, @Param(Constants.WRAPPER) Wrapper<BusCollectionConfirmation> qw);
-	
-	List<BusCollectionConfirmationVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BusCollectionConfirmation> qw);
-	
-	@Select("select * from bus_collection_confirmation")
-	List<BusCollectionConfirmationVo> selectListVo();
+    //@Update("update bus_collection_confirmation set name=#{msg} where id=#{id}")
+    //IPage<BusCollectionConfirmationVo> voPage(IPage<BusCollectionConfirmation> page, @Param(Constants.WRAPPER) QueryWrapper<BusCollectionConfirmation> qw);
+
+    IPage<BusCollectionConfirmationVo> selectPageVo(IPage<BusCollectionConfirmation> page, @Param(Constants.WRAPPER) Wrapper<BusCollectionConfirmation> qw);
+
+    List<BusCollectionConfirmationVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BusCollectionConfirmation> qw);
+
+    @Select("select * from bus_collection_confirmation")
+    List<BusCollectionConfirmationVo> selectListVo();
+
+    IPage<AppBusCollectionConfirmationPageVo> getCollectionConfirmList(IPage<AppBusCollectionConfirmationQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppBusCollectionConfirmationPageVo> qw);
 }
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationMapper.xml
index d4f730bad0..234282309a 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationMapper.xml
@@ -10,4 +10,9 @@
 	<select id="selectListAllVo" resultType="com.yxt.anrui.buscenter.api.buscollectionconfirmation.BusCollectionConfirmationVo">
 		SELECT * FROM bus_collection_confirmation <where> ${ew.sqlSegment} </where>
 	</select>
+
+    <select id="getCollectionConfirmList"
+            resultType="com.yxt.anrui.buscenter.api.buscollectionconfirmation.AppBusCollectionConfirmationPageVo">
+
+	</select>
 </mapper>
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationRest.java
index 6716c4f444..d7d206b068 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationRest.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationRest.java
@@ -25,6 +25,8 @@
  *********************************************************/
 package com.yxt.anrui.buscenter.biz.buscollectionconfirmation;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicleVo;
 import com.yxt.anrui.buscenter.api.buscollectionconfirmation.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -54,36 +56,49 @@ import java.util.List;
 @RequestMapping("/buscollectionconfirmation")
 public class BusCollectionConfirmationRest implements BusCollectionConfirmationFeign {
 
-	@Autowired
-	private BusCollectionConfirmationService busCollectionConfirmationService;
+    @Autowired
+    private BusCollectionConfirmationService busCollectionConfirmationService;
 
-	@Override
-	@ApiOperation("根据条件分页查询数据的列表")
-	@PostMapping("/listPage")
-	public ResultBean<PagerVo<BusCollectionConfirmationVo>> listPage(@RequestBody PagerQuery<BusCollectionConfirmationQuery> pq){
-		ResultBean rb = ResultBean.fireFail();
-		PagerVo<BusCollectionConfirmationVo> pv = busCollectionConfirmationService.listPageVo(pq);
-		return rb.success().setData(pv);
-	}
+    @Override
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<BusCollectionConfirmationVo>> listPage(@RequestBody PagerQuery<BusCollectionConfirmationQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<BusCollectionConfirmationVo> pv = busCollectionConfirmationService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
 
-	@Override
-	@ApiOperation("新增或修改保存")
-	@PostMapping("/saveOrUpdate")
-	public ResultBean saveOrUpdate(@RequestBody BusCollectionConfirmationDto dto){
-		return busCollectionConfirmationService.saveOrUpdateAllDto(dto);
-	}
+    @Override
+    @ApiOperation("新增或修改保存")
+    @PostMapping("/saveOrUpdate")
+    public ResultBean saveOrUpdate(@RequestBody BusCollectionConfirmationDto dto) {
+        return busCollectionConfirmationService.saveOrUpdateAllDto(dto);
+    }
 
-	@Override
-	@ApiOperation("根据sid批量删除")
+    @Override
+    @ApiOperation("根据sid批量删除")
     @PostMapping("/delBySids")
     public ResultBean delBySids(@RequestBody String[] sids){
 		return busCollectionConfirmationService.delAllBySids(sids);
 	}
 
-	@Override
-	@ApiOperation("根据SID获取一条记录")
+    @Override
+    @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchBySid/{sid}")
-    public ResultBean<BusCollectionConfirmationDetailsVo> fetchBySid(@PathVariable("sid") String sid){
-		return busCollectionConfirmationService.fetchByAllSid(sid);
-	}
+    public ResultBean<BusCollectionConfirmationDetailsVo> fetchBySid(@PathVariable("sid") String sid) {
+        return busCollectionConfirmationService.fetchByAllSid(sid);
+    }
+
+    /**
+     * 手机端—获取款项确认列表
+     *
+     * @param pagerQuery
+     * @return
+     */
+    @Override
+    public ResultBean<PagerVo<AppBusCollectionConfirmationPageVo>> getCollectionConfirmList(PagerQuery<AppBusCollectionConfirmationQuery> pagerQuery) {
+        ResultBean<PagerVo<AppBusCollectionConfirmationPageVo>> rb = ResultBean.fireFail();
+        IPage<AppBusCollectionConfirmationPageVo> page = busCollectionConfirmationService.getCollectionConfirmList(pagerQuery);
+        return null;
+    }
 }
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationService.java
index f19c4c613f..dea6cff2dc 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationService.java
@@ -28,6 +28,8 @@ package com.yxt.anrui.buscenter.biz.buscollectionconfirmation;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicleQuery;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicleVo;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendix;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign;
@@ -66,120 +68,148 @@ import java.util.List;
 @Service
 public class BusCollectionConfirmationService extends MybatisBaseService<BusCollectionConfirmationMapper, BusCollectionConfirmation> {
 
-	@Autowired
-	private BusSelectedReceivablesDetailedService busSelectedReceivablesDetailedService;
-	@Autowired
-	private CommonAppendixFeign commonAppendixFeign;
-	@Autowired
-	private FileUploadComponent fileUploadComponent;
+    @Autowired
+    private BusSelectedReceivablesDetailedService busSelectedReceivablesDetailedService;
+    @Autowired
+    private CommonAppendixFeign commonAppendixFeign;
+    @Autowired
+    private FileUploadComponent fileUploadComponent;
 
-	private QueryWrapper<BusCollectionConfirmation> createQueryWrapper(BusCollectionConfirmationQuery query) {
-		// todo: 这里根据具体业务调整查询条件
-		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
-		QueryWrapper<BusCollectionConfirmation> qw = new QueryWrapper<>();
+    private QueryWrapper<BusCollectionConfirmation> createQueryWrapper(BusCollectionConfirmationQuery query) {
+        // todo: 这里根据具体业务调整查询条件
+        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+        QueryWrapper<BusCollectionConfirmation> qw = new QueryWrapper<>();
 
-		if (StringUtils.isNotBlank(query.getCollectionDate())) {
-			qw.eq("collectionDate", query.getCollectionDate());
-		}
-		if (StringUtils.isNotBlank(query.getCollectionBank())) {
-			qw.eq("collectionBank", query.getCollectionBank());
-		}
-		if (StringUtils.isNotBlank(query.getCollectionTypeKey())) {
-			qw.eq("collectionTypeKey", query.getCollectionTypeKey());
-		}
-		if (StringUtils.isNotBlank(query.getSubscriptionState())) {
-			qw.eq("subscriptionState", query.getSubscriptionState());
-		}
-		return qw;
-	}
-	
-	public PagerVo<BusCollectionConfirmationVo> listPageVo(PagerQuery<BusCollectionConfirmationQuery> pq) {
-		BusCollectionConfirmationQuery query = pq.getParams();
-		QueryWrapper<BusCollectionConfirmation> qw = createQueryWrapper(query);
-		IPage<BusCollectionConfirmation> page = PagerUtil.queryToPage(pq);
-		IPage<BusCollectionConfirmationVo> pagging = baseMapper.selectPageVo(page, qw);
-		PagerVo<BusCollectionConfirmationVo> p = PagerUtil.pageToVo(pagging, null);
-		return p;
-	}
-	
-	public ResultBean saveOrUpdateAllDto(BusCollectionConfirmationDto dto) {
-		ResultBean rb = ResultBean.fireFail();
-		BusCollectionConfirmation busCollectionConfirmation = new BusCollectionConfirmation();
-		List<BusSelectedReceivablesDetailedDto> busSelectedReceivablesDetailedDtos = dto.getBusSelectedReceivablesDetailedDtos();
-		CommonAppendixDto commonAppendixDto = new CommonAppendixDto();
-		List<BusCollectionConfirmationAppendixDto> paymentVoucherAppendixs = dto.getPaymentVoucherAppendixs();
-		List<BusCollectionConfirmationAppendixDto> remittanceConfirmationAppendixs = dto.getRemittanceConfirmationAppendixs();
-		String sid1 = busCollectionConfirmation.getSid();
-		String sid = dto.getSid();
-		if (StringUtils.isBlank(sid)){//新增
-			BeanUtil.copyProperties(dto,busCollectionConfirmation);
-			busCollectionConfirmation.setSid(sid1);
-			String payFilePath = "";
-			String remFilePath = "";
-			for (BusCollectionConfirmationAppendixDto paymentVoucherAppendix : paymentVoucherAppendixs) {
-				BeanUtil.copyProperties(paymentVoucherAppendix,commonAppendixDto);
-				payFilePath = commonAppendixDto.getFilePath();
-				if (payFilePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
-					payFilePath = payFilePath.replace(fileUploadComponent.getUrlPrefix(), "");
-					commonAppendixDto.setLinkSid(sid1);
-					commonAppendixDto.setFilePath(payFilePath);
-					commonAppendixDto.setCreateBySid(dto.getStaffSid());
-					commonAppendixDto.setAttachType(CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType());
-					commonAppendixFeign.save(commonAppendixDto);
-				}
-				payFilePath += payFilePath + ",";
-			}
-			busCollectionConfirmation.setPaymentVoucherUrl(payFilePath.substring(0, payFilePath.length() - 1));
-			for (BusCollectionConfirmationAppendixDto remittanceConfirmationAppendix : remittanceConfirmationAppendixs) {
-				BeanUtil.copyProperties(remittanceConfirmationAppendix,commonAppendixDto);
-				remFilePath = commonAppendixDto.getFilePath();
-				if (remFilePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
-					remFilePath = remFilePath.replace(fileUploadComponent.getUrlPrefix(), "");
-					commonAppendixDto.setLinkSid(sid1);
-					commonAppendixDto.setFilePath(remFilePath);
-					commonAppendixDto.setCreateBySid(dto.getStaffSid());
-					commonAppendixDto.setAttachType(CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType());
-					commonAppendixFeign.save(commonAppendixDto);
-				}
-				remFilePath += remFilePath + ",";
-			}
-			busCollectionConfirmation.setRemittanceConfirmationUrl(remFilePath.substring(0, remFilePath.length() - 1));
-			save(busCollectionConfirmation);
-			for (BusSelectedReceivablesDetailedDto busSelectedReceivablesDetailedDto : busSelectedReceivablesDetailedDtos) {
-				BusSelectedReceivablesDetailed busSelectedReceivablesDetailed = new BusSelectedReceivablesDetailed();
-				BeanUtil.copyProperties(busSelectedReceivablesDetailedDto,busSelectedReceivablesDetailed);
-				busSelectedReceivablesDetailed.setCollSid(sid1);
-				busSelectedReceivablesDetailedService.save(busSelectedReceivablesDetailed);
-			}
-			return rb.success().setMsg("添加成功");
-		}
-		updateBySid(dto,sid);
-		busSelectedReceivablesDetailedService.deleteByCollSid(sid);
-		for (BusSelectedReceivablesDetailedDto busSelectedReceivablesDetailedDto : busSelectedReceivablesDetailedDtos) {
-			BusSelectedReceivablesDetailed busSelectedReceivablesDetailed = new BusSelectedReceivablesDetailed();
-			BeanUtil.copyProperties(busSelectedReceivablesDetailedDto,busSelectedReceivablesDetailed);
-			busSelectedReceivablesDetailed.setCollSid(sid);
-			busSelectedReceivablesDetailedService.save(busSelectedReceivablesDetailed);
-		}
-		return rb.success().setMsg("修改成功");
-	}
+        if (StringUtils.isNotBlank(query.getCollectionDate())) {
+            qw.eq("collectionDate", query.getCollectionDate());
+        }
+        if (StringUtils.isNotBlank(query.getCollectionBank())) {
+            qw.eq("collectionBank", query.getCollectionBank());
+        }
+        if (StringUtils.isNotBlank(query.getCollectionTypeKey())) {
+            qw.eq("collectionTypeKey", query.getCollectionTypeKey());
+        }
+        if (StringUtils.isNotBlank(query.getSubscriptionState())) {
+            qw.eq("subscriptionState", query.getSubscriptionState());
+        }
+        return qw;
+    }
+
+    public PagerVo<BusCollectionConfirmationVo> listPageVo(PagerQuery<BusCollectionConfirmationQuery> pq) {
+        BusCollectionConfirmationQuery query = pq.getParams();
+        QueryWrapper<BusCollectionConfirmation> qw = createQueryWrapper(query);
+        IPage<BusCollectionConfirmation> page = PagerUtil.queryToPage(pq);
+        IPage<BusCollectionConfirmationVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<BusCollectionConfirmationVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public ResultBean saveOrUpdateAllDto(BusCollectionConfirmationDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        BusCollectionConfirmation busCollectionConfirmation = new BusCollectionConfirmation();
+        List<BusSelectedReceivablesDetailedDto> busSelectedReceivablesDetailedDtos = dto.getBusSelectedReceivablesDetailedDtos();
+        CommonAppendixDto commonAppendixDto = new CommonAppendixDto();
+        List<BusCollectionConfirmationAppendixDto> paymentVoucherAppendixs = dto.getPaymentVoucherAppendixs();
+        List<BusCollectionConfirmationAppendixDto> remittanceConfirmationAppendixs = dto.getRemittanceConfirmationAppendixs();
+        String sid1 = busCollectionConfirmation.getSid();
+        String sid = dto.getSid();
+        if (StringUtils.isBlank(sid)) {//新增
+            BeanUtil.copyProperties(dto, busCollectionConfirmation);
+            busCollectionConfirmation.setSid(sid1);
+            String payFilePath = "";
+            String remFilePath = "";
+            for (BusCollectionConfirmationAppendixDto paymentVoucherAppendix : paymentVoucherAppendixs) {
+                BeanUtil.copyProperties(paymentVoucherAppendix, commonAppendixDto);
+                payFilePath = commonAppendixDto.getFilePath();
+                if (payFilePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                    payFilePath = payFilePath.replace(fileUploadComponent.getUrlPrefix(), "");
+                    commonAppendixDto.setLinkSid(sid1);
+                    commonAppendixDto.setFilePath(payFilePath);
+                    commonAppendixDto.setCreateBySid(dto.getStaffSid());
+                    commonAppendixDto.setAttachType(CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType());
+                    commonAppendixFeign.save(commonAppendixDto);
+                }
+                payFilePath += payFilePath + ",";
+            }
+            busCollectionConfirmation.setPaymentVoucherUrl(payFilePath.substring(0, payFilePath.length() - 1));
+            for (BusCollectionConfirmationAppendixDto remittanceConfirmationAppendix : remittanceConfirmationAppendixs) {
+                BeanUtil.copyProperties(remittanceConfirmationAppendix, commonAppendixDto);
+                remFilePath = commonAppendixDto.getFilePath();
+                if (remFilePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                    remFilePath = remFilePath.replace(fileUploadComponent.getUrlPrefix(), "");
+                    commonAppendixDto.setLinkSid(sid1);
+                    commonAppendixDto.setFilePath(remFilePath);
+                    commonAppendixDto.setCreateBySid(dto.getStaffSid());
+                    commonAppendixDto.setAttachType(CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType());
+                    commonAppendixFeign.save(commonAppendixDto);
+                }
+                remFilePath += remFilePath + ",";
+            }
+            busCollectionConfirmation.setRemittanceConfirmationUrl(remFilePath.substring(0, remFilePath.length() - 1));
+            save(busCollectionConfirmation);
+            for (BusSelectedReceivablesDetailedDto busSelectedReceivablesDetailedDto : busSelectedReceivablesDetailedDtos) {
+                BusSelectedReceivablesDetailed busSelectedReceivablesDetailed = new BusSelectedReceivablesDetailed();
+                BeanUtil.copyProperties(busSelectedReceivablesDetailedDto, busSelectedReceivablesDetailed);
+                busSelectedReceivablesDetailed.setCollSid(sid1);
+                busSelectedReceivablesDetailedService.save(busSelectedReceivablesDetailed);
+            }
+            return rb.success().setMsg("添加成功");
+        }
+        updateBySid(dto, sid);
+        busSelectedReceivablesDetailedService.deleteByCollSid(sid);
+        for (BusSelectedReceivablesDetailedDto busSelectedReceivablesDetailedDto : busSelectedReceivablesDetailedDtos) {
+            BusSelectedReceivablesDetailed busSelectedReceivablesDetailed = new BusSelectedReceivablesDetailed();
+            BeanUtil.copyProperties(busSelectedReceivablesDetailedDto, busSelectedReceivablesDetailed);
+            busSelectedReceivablesDetailed.setCollSid(sid);
+            busSelectedReceivablesDetailedService.save(busSelectedReceivablesDetailed);
+        }
+        return rb.success().setMsg("修改成功");
+    }
 
-	public ResultBean<BusCollectionConfirmationDetailsVo> fetchByAllSid(String sid) {
-		ResultBean rb = ResultBean.fireFail();
-		BusCollectionConfirmationDetailsVo busCollectionConfirmationDetailsVo = new BusCollectionConfirmationDetailsVo();
-		BusCollectionConfirmation busCollectionConfirmation = fetchBySid(sid);
-		BeanUtil.copyProperties(busCollectionConfirmation,busCollectionConfirmationDetailsVo);
-		List<BusSelectedReceivablesDetailedVo> busSelectedReceivablesDetailedVos = busSelectedReceivablesDetailedService.fetchByCillSid(sid);
-		busCollectionConfirmationDetailsVo.setBusSelectedReceivablesDetailedVos(busSelectedReceivablesDetailedVos);
-		return rb.success().setData(busCollectionConfirmationDetailsVo);
-	}
+    public ResultBean<BusCollectionConfirmationDetailsVo> fetchByAllSid(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        BusCollectionConfirmationDetailsVo busCollectionConfirmationDetailsVo = new BusCollectionConfirmationDetailsVo();
+        BusCollectionConfirmation busCollectionConfirmation = fetchBySid(sid);
+        BeanUtil.copyProperties(busCollectionConfirmation, busCollectionConfirmationDetailsVo);
+        List<BusSelectedReceivablesDetailedVo> busSelectedReceivablesDetailedVos = busSelectedReceivablesDetailedService.fetchByCillSid(sid);
+        busCollectionConfirmationDetailsVo.setBusSelectedReceivablesDetailedVos(busSelectedReceivablesDetailedVos);
+        return rb.success().setData(busCollectionConfirmationDetailsVo);
+    }
 
-	public ResultBean delAllBySids(String[] sids) {
-		ResultBean rb = ResultBean.fireFail();
-		delBySids(sids);
-		for (String sid : sids) {
-			busSelectedReceivablesDetailedService.deleteByCollSid(sid);
+    public ResultBean delAllBySids(String[] sids) {
+        ResultBean rb = ResultBean.fireFail();
+        delBySids(sids);
+        for (String sid : sids) {
+            busSelectedReceivablesDetailedService.deleteByCollSid(sid);
+        }
+        return rb.success().setMsg("删除成功");
+    }
+
+    /**
+     * 手机端—获取款项确认列表
+     *
+     * @param pagerQuery
+     * @return
+     */
+    public IPage<AppBusCollectionConfirmationPageVo> getCollectionConfirmList(PagerQuery<AppBusCollectionConfirmationQuery> pagerQuery) {
+        IPage<AppBusCollectionConfirmationQuery> page = PagerUtil.queryToPage(pagerQuery);
+        QueryWrapper<AppBusCollectionConfirmationPageVo> qw = appBuildQueryWrapper(pagerQuery.getParams());
+        return baseMapper.getCollectionConfirmList(page,qw);
+    }
+
+    /**
+     * 构造条件
+     *
+     * @param pagerQuery 查询条件
+     * @return
+     */
+    private QueryWrapper<AppBusCollectionConfirmationPageVo> appBuildQueryWrapper(AppBusCollectionConfirmationQuery pagerQuery) {
+		QueryWrapper<AppBusCollectionConfirmationPageVo> qw = new QueryWrapper<>();
+		if (pagerQuery != null) {
+			if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getName())) {//车架号
+				qw.like("bv.vinNo", pagerQuery.getName());
+			}
 		}
-		return rb.success().setMsg("删除成功");
-	}
+		return qw;
+    }
 }
\ No newline at end of file

From b1ea79c25ae92d2ccff62257899d493a00de1104 Mon Sep 17 00:00:00 2001
From: alllenliufor3 <1009545232@qq.com>
Date: Tue, 12 Apr 2022 10:34:01 +0800
Subject: [PATCH 08/15] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=EF=BC=88=E7=A9=BA=E7=99=BD=EF=BC=89=E4=B8=8B=E8=BD=BD=E9=93=BE?=
 =?UTF-8?q?=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/biz/commoncontract/CommonContractService.java      | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
index 27296b4091..1e818e719c 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
@@ -683,7 +683,11 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
             }
             if (StringUtils.isNotBlank(future5.get())) {
                 printConfirmVo = new PrintConfirmVo();
-                printConfirmVo.setName(MessageFormat.format("《{0}》", ContractTemplateEnum.CARSALECONTRACTNEWBLANK.getName()));
+                // 待确认：现车或订车
+                // 现车
+//                printConfirmVo.setName(MessageFormat.format("《{0}》", ContractTemplateEnum.CARSALECONTRACTNEWBLANK.getName()));
+                // 订车
+                printConfirmVo.setName(MessageFormat.format("《{0}》", ContractTemplateEnum.CARSALECONTRACTBOOKBLANK.getName()));
                 printConfirmVo.setDownloadUrl(future5.get());
                 list.add(printConfirmVo);
             }

From 94a7c811d9a24a0a46ecab55f722fc9818c7e16d Mon Sep 17 00:00:00 2001
From: alllenliufor3 <1009545232@qq.com>
Date: Tue, 12 Apr 2022 11:04:25 +0800
Subject: [PATCH 09/15] =?UTF-8?q?=E5=AE=8C=E5=96=84=20=E5=85=A5=E8=B4=A6?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7code?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
index dd4ad580b3..4ad4d7b990 100644
--- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
+++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
@@ -14,7 +14,7 @@ public enum ProcDefEnum {
     ADVANCEGINVOICEAPPLY("提前开票申请流程","advance_ginvoiceapply:1:242664"),
     ARREARSCARRYVEHICLE("欠款提车审批流程","arrears_carryvehicle:1:232589"),
     VEHICLEAPPLY("排产申请流程","process_9egcg169:1:242660"),
-    RECORDAPPLICATION("入账申请","record_application_7y80d4r8"),
+    RECORDAPPLICATION("入账申请","record_application_7y80d4r8:1:265008"),
     ;
 
     ProcDefEnum(String proDefName, String proDefId) {

From 9d81b9866dfb837bcf831538bc875155930b470b Mon Sep 17 00:00:00 2001
From: alllenliufor3 <1009545232@qq.com>
Date: Wed, 13 Apr 2022 14:21:52 +0800
Subject: [PATCH 10/15] =?UTF-8?q?=E6=9B=B4=E6=94=B9=20=E5=B7=B2=E5=8A=9E?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=9A=84=E6=9F=A5=E8=AF=A2=E8=AF=AD=E5=8F=A5?=
 =?UTF-8?q?=EF=BC=88=E4=BF=AE=E6=94=B9=E5=BD=93=E5=89=8D=E7=8E=AF=E8=8A=82?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=8F=8A=E8=8A=82=E7=82=B9id=E7=9A=84?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../anrui/flowable/biz/flowtask/FlowTaskMapper.xml   | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskMapper.xml b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskMapper.xml
index b1a922cf94..2be929bd6a 100644
--- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskMapper.xml
+++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskMapper.xml
@@ -125,9 +125,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT * FROM (
             SELECT DISTINCT
             ahti.ID_,
-            /*ahti.NAME_,*/
+            ahti.NAME_,
             ahti.ASSIGNEE_,
             ahti.START_TIME_,
+            ahti.TASK_DEF_KEY_ taskDefKey,
             ahpi.START_USER_ID_,
             ahpi.END_ACT_ID_,
             ahpi.END_TIME_,
@@ -136,13 +137,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             arpd.KEY_ AS PROC_DEF_KEY_,
             arpd.NAME_ AS PROC_DEF_NAME_,
             arpd.VERSION_ AS PROC_DEF_VERSION_,
-            arpd.DEPLOYMENT_ID_ AS DEPLOYMENT_ID_,
-            sfl.taskDefKey AS  taskDefKey,
-            sfl.nodeState NAME_
+            arpd.DEPLOYMENT_ID_ AS DEPLOYMENT_ID_
+            /*sfl.taskDefKey AS  taskDefKey,*/
+            /*sfl.nodeState NAME_*/
             FROM ACT_HI_PROCINST ahpi
             INNER JOIN (SELECT PROC_INST_ID_ from ACT_HI_TASKINST WHERE ASSIGNEE_=#{userSid}  AND END_TIME_ IS NOT NULL)
             temp ON ahpi.PROC_INST_ID_=temp.PROC_INST_ID_
-            LEFT JOIN ACT_HI_TASKINST ahti on ahti.PROC_INST_ID_=temp.PROC_INST_ID_
+            /*LEFT JOIN ACT_HI_TASKINST ahti on ahti.PROC_INST_ID_=temp.PROC_INST_ID_*/
+            LEFT JOIN (SELECT * FROM (SELECT DISTINCT(ID_) ID_,NAME_,ASSIGNEE_,START_TIME_,TASK_DEF_KEY_,PROC_INST_ID_ FROM ACT_HI_TASKINST ORDER BY START_TIME_ DESC) t1  GROUP BY t1.PROC_INST_ID_) ahti ON ahti.PROC_INST_ID_ = temp.PROC_INST_ID_
             INNER JOIN `ACT_HI_VARINST` A0 ON ahpi.PROC_INST_ID_ = A0.PROC_INST_ID_
             LEFT JOIN ACT_RE_PROCDEF arpd ON ahpi.PROC_DEF_ID_ = arpd.ID_
             LEFT JOIN sys_form_link sfl ON ahpi.PROC_INST_ID_ = sfl.procInsId

From 45399458b449a240dfa64cca9862b1469b167a7a Mon Sep 17 00:00:00 2001
From: alllenliufor3 <1009545232@qq.com>
Date: Wed, 13 Apr 2022 14:22:42 +0800
Subject: [PATCH 11/15] =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E9=A9=B3=E5=9B=9E=E5=88=B0=E5=8F=91=E8=B5=B7=E7=8E=AF=E8=8A=82?=
 =?UTF-8?q?=EF=BC=8C=E8=AE=BE=E7=BD=AE=E5=8F=91=E8=B5=B7=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java
index 1786daa7db..21056d227c 100644
--- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java
+++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java
@@ -1003,6 +1003,10 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
         // 目的获取所有需要被跳转的节点 currentIds
         // 取其中一个父级任务，因为后续要么存在公共网关，要么就是串行公共线路
         UserTask oneUserTask = parentUserTaskList.get(0);
+        // 判断是否驳回到发起环节，设置发起人
+        if (oneUserTask.getIncomingFlows().get(0).getSourceRef().contains("start")) {
+            oneUserTask.setAssignee(historicTaskInstanceList.get(0).getAssignee());
+        }
         // 获取所有正常进行的任务节点 Key，这些任务不能直接使用，需要找出其中需要撤回的任务
         List<Task> runTaskList = taskService.createTaskQuery().processInstanceId(task.getProcessInstanceId()).list();
         List<String> runTaskKeyList = new ArrayList<>();

From adff723729fdfc66e310e33fca89864412822d33 Mon Sep 17 00:00:00 2001
From: alllenliufor3 <1009545232@qq.com>
Date: Wed, 13 Apr 2022 14:27:03 +0800
Subject: [PATCH 12/15] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E5=85=A5=E8=B4=A6?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E6=B5=81=E7=A8=8B=E7=9A=84=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BaseVehicleExecutionListener.java         |  23 ++
 .../yxt/anrui/scm/api/flow/FlowTaskVo.java    |  51 +++++
 .../com/yxt/anrui/scm/api/flow/Flowable.java  |   8 +
 .../scmapplyinbound/ScmApplyInboundDto.java   |   4 +
 .../scmapplyinbound/ScmApplyInboundFeign.java |  38 ++++
 .../ScmApplyInboundFeignFallback.java         |  38 ++++
 .../SubmitScmApplyInboundDto.java             |  28 +++
 .../anrui/scm/biz/flow/FlowableMapper.java    |  12 +
 .../yxt/anrui/scm/biz/flow/FlowableMapper.xml |   5 +
 .../anrui/scm/biz/flow/FlowableService.java   |  99 ++++++++
 .../ScmApplyInboundMapper.java                |   3 +
 .../scmapplyinbound/ScmApplyInboundMapper.xml |  14 +-
 .../scmapplyinbound/ScmApplyInboundRest.java  |  32 +++
 .../ScmApplyInboundService.java               | 211 +++++++++++++++++-
 14 files changed, 562 insertions(+), 4 deletions(-)
 create mode 100644 anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/listener/BaseVehicleExecutionListener.java
 create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/flow/FlowTaskVo.java
 create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/flow/Flowable.java
 create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/SubmitScmApplyInboundDto.java
 create mode 100644 anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/flow/FlowableMapper.java
 create mode 100644 anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/flow/FlowableMapper.xml
 create mode 100644 anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/flow/FlowableService.java

diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/listener/BaseVehicleExecutionListener.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/listener/BaseVehicleExecutionListener.java
new file mode 100644
index 0000000000..9d7494a2d4
--- /dev/null
+++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/listener/BaseVehicleExecutionListener.java
@@ -0,0 +1,23 @@
+package com.yxt.anrui.flowable.listener;
+
+import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.delegate.ExecutionListener;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author liuguohui
+ * @version 1.0
+ * @description 建立车辆库存台账
+ * @date 2022/04/11
+ */
+@Component
+public class BaseVehicleExecutionListener implements ExecutionListener {
+
+    @Override
+    public void notify(DelegateExecution execution) {
+        // 入账申请审批通过后，自动生成车辆库存台账
+        // TODO
+        System.out.println("入账申请审批通过后，自动生成车辆库存台账");
+
+    }
+}
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/flow/FlowTaskVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/flow/FlowTaskVo.java
new file mode 100644
index 0000000000..ad0de3ab5c
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/flow/FlowTaskVo.java
@@ -0,0 +1,51 @@
+package com.yxt.anrui.scm.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<>();
+
+}
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/flow/Flowable.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/flow/Flowable.java
new file mode 100644
index 0000000000..3dbad13ba3
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/flow/Flowable.java
@@ -0,0 +1,8 @@
+package com.yxt.anrui.scm.api.flow;
+
+import com.yxt.common.core.domain.BaseEntity;
+import lombok.Data;
+
+@Data
+public class Flowable extends BaseEntity {
+}
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundDto.java
index cd321ffdda..41a8903d25 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundDto.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundDto.java
@@ -32,6 +32,10 @@ public class ScmApplyInboundDto implements Dto {
 
     @ApiModelProperty("车辆入账单sid")
     private String sid;
+
+    @ApiModelProperty("用户sid")
+    @NotBlank(message = "用户sid不能为空")
+    private String userSid;
     
 	@ApiModelProperty("申请编号")
     @NotBlank(message = "申请编号不能为空")
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundFeign.java
index dbbee9ce5d..7e1d32552c 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundFeign.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundFeign.java
@@ -1,15 +1,18 @@
 package com.yxt.anrui.scm.api.scmapplyinbound;
 
+import com.yxt.anrui.scm.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-scm(进销存) <br/>
@@ -47,4 +50,39 @@ public interface ScmApplyInboundFeign {
     @ApiOperation("根据sid查询车辆入账单详情")
     @GetMapping("/fetchSid/{sid}")
     public ResultBean<ScmApplyInboundVo> fetchSid(@PathVariable("sid") String sid);
+
+    /*************************************************审批流程***************************************************/
+    @ApiOperation("提交入账申请")
+    @PostMapping("/submitRecordApplication")
+    public ResultBean submitRecordApplication(@RequestBody @Valid SubmitScmApplyInboundDto 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);
+
+
+    /*************************************************审批流程***************************************************/
+
 }
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundFeignFallback.java
index c4199dd09b..b1af2192b2 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundFeignFallback.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundFeignFallback.java
@@ -1,11 +1,13 @@
 package com.yxt.anrui.scm.api.scmapplyinbound;
 
+import com.yxt.anrui.scm.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-scm(进销存) <br/>
@@ -45,4 +47,40 @@ public class ScmApplyInboundFeignFallback implements ScmApplyInboundFeign {
 		ResultBean rb = ResultBean.fireFail();
 		return rb.setMsg("接口anrui-scm/scmapplyinbound/fetchSid无法访问");
 	}
+
+	@Override
+	public ResultBean submitRecordApplication(SubmitScmApplyInboundDto dto) {
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-scm/scmapplyinbound/submitRecordApplication无法访问");
+	}
+
+	@Override
+	public ResultBean complete(Map<String, Object> variables) {
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-scm/scmapplyinbound/complete无法访问");
+	}
+
+	@Override
+	public ResultBean revokeProcess(String userSid, String businessSid, FlowTaskVo flowTaskVo) {
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-scm/scmapplyinbound/revokeProcess无法访问");
+	}
+
+	@Override
+	public ResultBean taskReject(String businessSid, FlowTaskVo flowTaskVo) {
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-scm/scmapplyinbound/taskReject无法访问");
+	}
+
+	@Override
+	public ResultBean breakProcess(String businessSid, FlowTaskVo flowTaskVo) {
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-scm/scmapplyinbound/breakProcess无法访问");
+	}
+
+	@Override
+	public ResultBean flowRecord(String procInsId, String deployId) {
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-scm/scmapplyinbound/flowRecord无法访问");
+	}
 }
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/SubmitScmApplyInboundDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/SubmitScmApplyInboundDto.java
new file mode 100644
index 0000000000..e3de17007f
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/SubmitScmApplyInboundDto.java
@@ -0,0 +1,28 @@
+package com.yxt.anrui.scm.api.scmapplyinbound;
+
+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 SubmitScmApplyInboundDto extends ScmApplyInboundDto{
+
+    @ApiModelProperty("业务sid")
+    private String businessSid;
+
+    @ApiModelProperty("意见")
+    private String comment;
+
+    @ApiModelProperty("流程实例id")
+    private String instanceId;
+
+    @ApiModelProperty("任务id")
+    private String taskId;
+}
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/flow/FlowableMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/flow/FlowableMapper.java
new file mode 100644
index 0000000000..de95f23617
--- /dev/null
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/flow/FlowableMapper.java
@@ -0,0 +1,12 @@
+package com.yxt.anrui.scm.biz.flow;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.anrui.buscenter.api.flow.Flowable;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.Map;
+
+@Mapper
+public interface FlowableMapper extends BaseMapper<Flowable> {
+
+}
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/flow/FlowableMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/flow/FlowableMapper.xml
new file mode 100644
index 0000000000..0dc22fb778
--- /dev/null
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/flow/FlowableMapper.xml
@@ -0,0 +1,5 @@
+<?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.scm.biz.flow.FlowableMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/flow/FlowableService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/flow/FlowableService.java
new file mode 100644
index 0000000000..1c09c2acb7
--- /dev/null
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/flow/FlowableService.java
@@ -0,0 +1,99 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.biz.flow;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.yxt.anrui.buscenter.api.flow.*;
+import com.yxt.anrui.flowable.api.flowdefinition.FlowDefinitionFeign;
+import com.yxt.anrui.flowable.api.flowtask.FlowTask;
+import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
+import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
+import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFlowStateEnum;
+import com.yxt.anrui.flowable.api.utils.ProcessStateEnum;
+import com.yxt.anrui.flowable.sqloperationsymbol.BusinessTaskParam;
+import com.yxt.anrui.flowable.sqloperationsymbol.BusinessTaskQuery;
+import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
+import com.yxt.anrui.flowable.sqloperationsymbol.SQLOperationSymbol;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.DateUtils;
+import com.yxt.common.base.utils.StringUtils;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.*;
+
+/**
+ * Project: anrui-parent <br/>
+ * File: FlowableService.java <br/>
+ * Class: com.yxt.anrui.scm.biz.flow.FlowableService <br/>
+ * Description: <描述类的功能>. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021/10/23 上午11:14 <br/>
+ *
+ * @author popo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable> {
+    @Autowired
+    private FlowDefinitionFeign flowDefinitionFeign;
+    @Autowired
+    private FlowTaskFeign flowTaskFeign;
+
+    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) {
+
+        variables.put("procDefId",procDefId);
+        variables.put("userSid",userSid);
+        BusinessVariables bv= BusinessVariables.builder().build();
+        bv.setDetailUrl("");
+        bv.setHandleUrl("");
+        bv.setFormVariables(variables);
+        ResultBean<FlowTask> rb = flowDefinitionFeign.businessStart(bv);
+        if (!rb.getSuccess()) {
+            return rb;
+        }
+        String  procId = rb.getData().getProcInsId();
+        List<LatestTaskVo> list = flowTaskFeign.getLatestTasks(procId).getData();
+        String nodeState = list.get(0).getName_();
+        String task_def_key_ = list.get(0).getTask_def_key_();
+        Map<String, String> map = new HashMap<>();
+        map.put("sid", variables.get("businessSid").toString());
+        map.put("nodeState", nodeState);
+        map.put("procInsId", rb.getData().getProcInsId());
+        map.put("taskDefKey", task_def_key_);
+        return new ResultBean().success().setData(map);
+    }
+}
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundMapper.java
index 3cb96fcd0c..310d009f52 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundMapper.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundMapper.java
@@ -12,6 +12,7 @@ import com.yxt.anrui.scm.api.scmapplyinbound.ScmApplyInbound;
 import com.yxt.anrui.scm.api.scmapplyinbound.ScmApplyInboundVo;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * Project: anrui-scm(进销存) <br/>
@@ -38,4 +39,6 @@ public interface ScmApplyInboundMapper extends BaseMapper<ScmApplyInbound> {
 	
 	@Select("select * from scm_apply_inbound")
 	List<ScmApplyInboundVo> selectListVo();
+
+	int updateFlowFiled(Map<String, Object> map);
 }
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundMapper.xml
index fdb4f1dc7d..7e323a12f2 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundMapper.xml
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundMapper.xml
@@ -4,7 +4,7 @@
 <!--    <where> ${ew.sqlSegment} </where>-->
 <!--    ${ew.customSqlSegment} -->
 	<select id="selectPageVo" resultType="com.yxt.anrui.scm.api.scmapplyinbound.ScmApplyInboundListVo">
-		SELECT id, sid, applicationCode, applicationDate, purchaseOrderNo, modelName,
+		SELECT id, sid, applicationCode, applicationDate, purchaseOrderNo, modelName,nodeState,
 		       (select count(1) from scm_apply_inbound_vehicle where applySid=scm_apply_inbound.sid) vehicleNum
 		FROM scm_apply_inbound
 		<where> ${ew.sqlSegment} </where>
@@ -14,4 +14,16 @@
 	<select id="selectListAllVo" resultType="com.yxt.anrui.scm.api.scmapplyinbound.ScmApplyInboundVo">
 		SELECT * FROM scm_apply_inbound <where> ${ew.sqlSegment} </where>
 	</select>
+
+	<update id="updateFlowFiled" parameterType="java.util.Map">
+		UPDATE scm_apply_inbound
+		SET nodeState=#{nodeState}, taskDefKey=#{taskDefKey}
+		<if test="procDefId != null and procDefId != ''">
+			, procDefId=#{procDefId}
+		</if>
+		<if test="procInsId != null and procInsId != ''">
+			, procInsId=#{procInsId}
+		</if>
+		WHERE sid=#{sid}
+	</update>
 </mapper>
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundRest.java
index c50a763c48..8949ad82a2 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundRest.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundRest.java
@@ -1,6 +1,7 @@
 package com.yxt.anrui.scm.biz.scmapplyinbound;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.yxt.anrui.scm.api.flow.FlowTaskVo;
 import com.yxt.anrui.scm.api.scmapplyinbound.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -10,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * Project: anrui-scm(进销存) <br/>
@@ -55,4 +57,34 @@ public class ScmApplyInboundRest implements ScmApplyInboundFeign {
 	public ResultBean<ScmApplyInboundVo> fetchSid(String sid) {
 		return new ResultBean().success().setData(scmApplyInboundService.selectBySid(sid));
 	}
+
+	@Override
+	public ResultBean submitRecordApplication(SubmitScmApplyInboundDto dto) {
+		return new ResultBean().success().setData(scmApplyInboundService.submitRecordApplication(dto));
+	}
+
+	@Override
+	public ResultBean complete(Map<String, Object> variables) {
+		return scmApplyInboundService.complete(variables);
+	}
+
+	@Override
+	public ResultBean revokeProcess(String userSid, String businessSid, FlowTaskVo flowTaskVo) {
+		return scmApplyInboundService.revokeProcess(userSid, businessSid, flowTaskVo);
+	}
+
+	@Override
+	public ResultBean taskReject(String businessSid, FlowTaskVo flowTaskVo) {
+		return scmApplyInboundService.taskReject(businessSid, flowTaskVo);
+	}
+
+	@Override
+	public ResultBean breakProcess(String businessSid, FlowTaskVo flowTaskVo) {
+		return scmApplyInboundService.breakProcess(businessSid, flowTaskVo);
+	}
+
+	@Override
+	public ResultBean flowRecord(String procInsId, String deployId) {
+		return scmApplyInboundService.flowRecord(procInsId, deployId);
+	}
 }
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
index d2414df03e..00d8e3022a 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
@@ -3,10 +3,19 @@ package com.yxt.anrui.scm.biz.scmapplyinbound;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
+import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
+import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFlowStateEnum;
+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.sysstafforg.SysStaffOrgFeign;
+import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.scm.api.flow.FlowTaskVo;
 import com.yxt.anrui.scm.api.scmapplyinbound.*;
-import com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicle;
 import com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicleDto;
 import com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicleVo;
+import com.yxt.anrui.scm.biz.flow.FlowableService;
 import com.yxt.anrui.scm.biz.scmapplyinboundvehicle.ScmApplyInboundVehicleService;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -19,7 +28,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.UUID;
 import java.util.stream.Collectors;
 
@@ -41,6 +52,14 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
 
 	@Autowired
 	private ScmApplyInboundVehicleService scmApplyInboundVehicleService;
+	@Autowired
+	private SysUserFeign sysUserFeign;
+	@Autowired
+	private SysStaffOrgFeign sysStaffOrgFeign;
+	@Autowired
+	private FlowableService flowableService;
+	@Autowired
+	private FlowTaskFeign flowTaskFeign;
 
 	public PagerVo<ScmApplyInbound> listPage(PagerQuery<ScmApplyInboundQuery> pq) {
 		ScmApplyInboundQuery query = pq.getParams();
@@ -119,7 +138,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
 			save(inboundVehicle);
 			// 保存车辆列表
 			scmApplyInboundVehicleService.saveApplyInboundVehicleList(vehicleList, inboundVehicle.getSid(), inboundVehicle.getModelSid());
-			return new ResultBean().success().setMsg("保存成功");
+			return new ResultBean().success().setMsg("保存成功").setData(inboundVehicle.getSid());
 		} else { // 修改
 			// 采购订单下线日期一旦维护，二次确认，则不能修改   TODO
 			// 验证数据库是否重复
@@ -134,7 +153,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
 			updateById(scmApplyInbound);
 			// 更新车辆列表信息
 			scmApplyInboundVehicleService.updateApplyInboundVehicleList(vehicleList);
-			return new ResultBean().success().setMsg("修改成功");
+			return new ResultBean().success().setMsg("修改成功").setData(dto.getSid());
 		}
 	}
 
@@ -151,4 +170,190 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
 		vo.setInboundVehicleList(list);
 		return vo;
 	}
+
+	/**
+	 * 检查用户是否设置部门
+	 *
+	 * @param userSid
+	 * @return 返回部门sid
+	 */
+	private String checkUserOrg(String userSid) {
+		String orgSid = "";
+		String staffSid = sysUserFeign.selectBySid(userSid).getData().getStaffSid();
+		ResultBean<String> resultBean = sysStaffOrgFeign.getSysStaffOrgSidListByStaffSid(staffSid);
+		if (resultBean.getSuccess()) {
+			orgSid = resultBean.getData();
+		}
+		return orgSid;
+	}
+
+	/**
+	 * 更新流程相关的状态
+	 * @param map
+	 * @return
+	 */
+	private int updateFlowFiled(Map<String, Object> map) {
+		return baseMapper.updateFlowFiled(map);
+	}
+
+	/**
+	 * 提交入账申请
+	 * @param dto
+	 * @return
+	 */
+	public ResultBean submitRecordApplication(SubmitScmApplyInboundDto dto) {
+		String orgSid = checkUserOrg(dto.getUserSid());
+		ResultBean resultBean = saveOrUpdateApplyInBound(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())) { // 新提交
+			ResultBean resultBean1 = flowableService.businessStart(ProcDefEnum.RECORDAPPLICATION.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.RECORDAPPLICATION.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 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 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);
+	}
 }
\ No newline at end of file

From 378dfdd31391f0cfb17df938bb6225d4ea1a8c79 Mon Sep 17 00:00:00 2001
From: hanlinghao <2969694837@qq.com>
Date: Wed, 13 Apr 2022 14:54:18 +0800
Subject: [PATCH 13/15] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=A1=A3=E6=A1=88?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E5=AE=A2=E6=88=B7=E6=84=8F=E5=90=91?=
 =?UTF-8?q?=E8=BD=A6=E5=9E=8Bvo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppCrmCustomerTempBasicsDetailsVo.java    | 86 +++++++++++++++++++
 .../AppCrmVehicleDemandParticularsVo.java     | 42 +++++++++
 .../AppCrmVehicleDemandUpdateDto.java         | 28 ++++++
 3 files changed, 156 insertions(+)
 create mode 100644 anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/AppCrmCustomerTempBasicsDetailsVo.java
 create mode 100644 anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicleDemandParticularsVo.java
 create mode 100644 anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicleDemandUpdateDto.java

diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/AppCrmCustomerTempBasicsDetailsVo.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/AppCrmCustomerTempBasicsDetailsVo.java
new file mode 100644
index 0000000000..ae36b8aebf
--- /dev/null
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/AppCrmCustomerTempBasicsDetailsVo.java
@@ -0,0 +1,86 @@
+package com.yxt.anrui.crm.api.crmcustomertemp;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppCrmCustomerTempBasicsDetailsVo implements Vo {
+
+    @ApiModelProperty("客户类型")
+    private String customerTypeKey;
+
+    @ApiModelProperty("客户类型value")
+    private String customerType;
+
+    @ApiModelProperty("客户名称")
+    private String name;
+
+    @ApiModelProperty("联系电话")
+    private String mobile;
+
+    @ApiModelProperty("微信号")
+    private String weiXin;
+
+    @ApiModelProperty("公司名称")
+    private String companyName;
+
+    @ApiModelProperty("客户地址")
+    private String addressNss;
+
+    @ApiModelProperty("详细地址")
+    private String address;
+
+    @ApiModelProperty("客户级别")
+    private String level;
+
+    @ApiModelProperty("客户生日")
+    private String birthday;
+
+    @ApiModelProperty("性别")
+    private String sex;
+
+    @ApiModelProperty("证件类型")
+    private String idType;
+
+    @ApiModelProperty("证件编码")
+    private String idNumber;
+
+    @ApiModelProperty("证件有效期")
+    private String idDate;
+
+    @ApiModelProperty("电子邮箱")
+    private String email;
+
+    @ApiModelProperty("紧急联系人")
+    private String name2;
+
+    @ApiModelProperty("紧急联系电话")
+    private String mobile2;
+
+    @ApiModelProperty("客户来源value")
+    private String source;
+
+    @ApiModelProperty("客户分类value")
+    private String classification;
+
+    @ApiModelProperty("客户类型value")
+    private String remarks;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicleDemandParticularsVo.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicleDemandParticularsVo.java
new file mode 100644
index 0000000000..c745ce5ea5
--- /dev/null
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicleDemandParticularsVo.java
@@ -0,0 +1,42 @@
+package com.yxt.anrui.crm.api.crmvehicledemand;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppCrmVehicleDemandParticularsVo implements Vo {
+    @ApiModelProperty("购车方式value")
+    private String type;
+
+    @ApiModelProperty("车型sid")
+    private String modelSid;
+
+    @ApiModelProperty("车型名称")
+    private String modelName;
+
+    @ApiModelProperty("销售指导价")
+    private String price;
+
+    @ApiModelProperty("品牌")
+    private String brand;
+
+    @ApiModelProperty("配置sid")
+    private String configSid;
+
+    @ApiModelProperty("数量")
+    private String number;
+
+    @ApiModelProperty("车型报价")
+    private String quotation;
+
+    @ApiModelProperty("换选装")
+    private String optionsConfig;
+
+    @ApiModelProperty("预计提车日期")
+    private String date;
+
+    @ApiModelProperty("备注")
+    private String remarks;
+
+}
diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicleDemandUpdateDto.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicleDemandUpdateDto.java
new file mode 100644
index 0000000000..cd64646804
--- /dev/null
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicleDemandUpdateDto.java
@@ -0,0 +1,28 @@
+package com.yxt.anrui.crm.api.crmvehicledemand;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.models.auth.In;
+import lombok.Data;
+
+@Data
+public class AppCrmVehicleDemandUpdateDto implements Dto {
+
+    @ApiModelProperty("购车方式类型")
+    private String purchaseMethod;
+
+    @ApiModelProperty("购车方式value")
+    private String purchaseMethodValue;
+
+    @ApiModelProperty("备注")
+    private String remarks;
+
+    @ApiModelProperty("数量")
+    private String number;
+
+    @ApiModelProperty("提车日期")
+    private String date;
+
+    @ApiModelProperty("意向车型sid")
+    private String intentionSid;
+}

From 048e0236fa8652944cc98733e6201dfaf471100f Mon Sep 17 00:00:00 2001
From: hanlinghao <2969694837@qq.com>
Date: Wed, 13 Apr 2022 15:08:25 +0800
Subject: [PATCH 14/15] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=A1=A3=E6=A1=88?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppCrmCustomerTempArchivesDto.java        | 21 +++++++++++++++
 .../AppCrmCustomerTempArchivesVo.java         | 19 ++++++++++++++
 .../AppCustomerArchivesDataDto.java           | 26 +++++++++++++++++++
 .../AppCustomerArchivesDataVo.java            | 25 ++++++++++++++++++
 4 files changed, 91 insertions(+)
 create mode 100644 anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerfile/AppCrmCustomerTempArchivesDto.java
 create mode 100644 anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerfile/AppCrmCustomerTempArchivesVo.java
 create mode 100644 anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerfile/AppCustomerArchivesDataDto.java
 create mode 100644 anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerfile/AppCustomerArchivesDataVo.java

diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerfile/AppCrmCustomerTempArchivesDto.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerfile/AppCrmCustomerTempArchivesDto.java
new file mode 100644
index 0000000000..99fad25fe8
--- /dev/null
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerfile/AppCrmCustomerTempArchivesDto.java
@@ -0,0 +1,21 @@
+package com.yxt.anrui.crm.api.crmcustomerfile;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AppCrmCustomerTempArchivesDto implements Dto {
+
+    @ApiModelProperty("客户sid")
+    private String customerSid;
+
+    @ApiModelProperty("客户档案数据")
+    private List<AppCustomerArchivesDataDto> data;
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+
+}
diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerfile/AppCrmCustomerTempArchivesVo.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerfile/AppCrmCustomerTempArchivesVo.java
new file mode 100644
index 0000000000..5a2f1473f7
--- /dev/null
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerfile/AppCrmCustomerTempArchivesVo.java
@@ -0,0 +1,19 @@
+package com.yxt.anrui.crm.api.crmcustomerfile;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+import java.util.List;
+
+
+@Data
+public class AppCrmCustomerTempArchivesVo implements Vo {
+
+    private String customerSid;
+
+    private List<AppCustomerArchivesDataVo> data;
+
+    private String userSid;
+
+
+}
diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerfile/AppCustomerArchivesDataDto.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerfile/AppCustomerArchivesDataDto.java
new file mode 100644
index 0000000000..2ce7d90db2
--- /dev/null
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerfile/AppCustomerArchivesDataDto.java
@@ -0,0 +1,26 @@
+package com.yxt.anrui.crm.api.crmcustomerfile;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AppCustomerArchivesDataDto implements Dto {
+
+    @ApiModelProperty("是否修改了图片，是 需要验证是否可以提交")
+    private boolean isChange;
+
+    @ApiModelProperty("文件的key")
+    private String key;
+
+    @ApiModelProperty("文件的类型")
+    private String title;
+
+    @ApiModelProperty("图片的集合")
+    private List<String> files;
+
+    @ApiModelProperty("图片上传的时间")
+    private String lastUploadTime;
+}
diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerfile/AppCustomerArchivesDataVo.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerfile/AppCustomerArchivesDataVo.java
new file mode 100644
index 0000000000..8ced4a43ea
--- /dev/null
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerfile/AppCustomerArchivesDataVo.java
@@ -0,0 +1,25 @@
+package com.yxt.anrui.crm.api.crmcustomerfile;
+
+import com.yxt.anrui.crm.api.crmfile.CrmFile;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AppCustomerArchivesDataVo implements Vo {
+
+    @ApiModelProperty("附件关联sid")
+    private String sid;
+    @ApiModelProperty("文件名称")
+    private String title;
+    @ApiModelProperty("类型")
+    private String key;
+    @ApiModelProperty("附件list")
+    private List<String> files;
+    @ApiModelProperty("最后上传时间")
+    private String createTime;
+    @ApiModelProperty("最后上传时间戳")
+    private String lastUploadTime;
+}

From 41acd9b21c34ceab753bef0496164d7161e94a67 Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Wed, 13 Apr 2022 23:44:41 +0800
Subject: [PATCH 15/15] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E5=BA=93?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9=E5=90=8C=E6=84=8F=E3=80=81=E9=A9=B3=E5=9B=9E?=
 =?UTF-8?q?=E3=80=81=E7=BB=88=E6=AD=A2=E3=80=81=E6=92=A4=E5=9B=9E=E5=8F=8A?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BC=96=E8=BE=91=E5=9B=9E=E6=98=BE=E5=92=8C?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BF=9D=E5=AD=98=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/basevehicle/BaseVehicleReturnVo.java  |   7 +-
 .../biz/basevehicle/BaseVehicleMapper.xml     |   6 +-
 .../anrui/flowable/api/utils/ProcDefEnum.java |   1 +
 .../biz/flowtask/FlowTaskService.java         |   4 +-
 .../ScmVehicleActualDetailsVo.java            |   2 +-
 .../ScmVehicleActualSalesFeign.java           |   3 +-
 .../ScmVehicleActualSalesFeignFallback.java   |   2 +-
 .../scmvehiclereturn/ScmVehicleReturn.java    |   5 +
 .../ScmVehicleReturnDetailsVo.java            |  35 ++++
 .../scmvehiclereturn/ScmVehicleReturnDto.java |   4 +
 .../ScmVehicleReturnFeign.java                |  27 ++-
 .../ScmVehicleReturnFlowDto.java              |  53 ++++++
 .../ScmVehicleReturnFlowQuery.java            |  28 +++
 .../ScmVehicleReturnQuery.java                |   3 +
 .../scmvehiclereturn/ScmVehicleReturnVo.java  |   3 -
 .../ScmVehicleReturnDetailssVo.java           |  24 +++
 .../ScmVehicleActualSalesRest.java            |   4 +-
 .../ScmVehicleActualSalesService.java         |  10 +-
 .../ScmVehicleReturnMapper.java               |   2 +
 .../ScmVehicleReturnMapper.xml                |   9 +-
 .../ScmVehicleReturnRest.java                 |  30 ++-
 .../ScmVehicleReturnService.java              | 179 ++++++++++++++++--
 .../ScmVehicleReturnDetailsMapper.java        |   3 +
 .../ScmVehicleReturnDetailsMapper.xml         |   6 +
 .../ScmVehicleReturnDetailsService.java       |   5 +
 25 files changed, 415 insertions(+), 40 deletions(-)
 create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnDetailsVo.java
 create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnFlowDto.java
 create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnFlowQuery.java
 create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturndetails/ScmVehicleReturnDetailssVo.java

diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleReturnVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleReturnVo.java
index 7e1ea885cf..0383e6f23a 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleReturnVo.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleReturnVo.java
@@ -16,7 +16,7 @@ public class BaseVehicleReturnVo implements Vo {
     @ApiModelProperty(value = "品牌")
     private String brandName;
     @ApiModelProperty(value = "车型")
-    private String modelName;
+    private String vehicleAlias;
     @ApiModelProperty(value = "车架号")
     private String vinNo;
     @ApiModelProperty(value = "颜色")
@@ -26,5 +26,10 @@ public class BaseVehicleReturnVo implements Vo {
     @ApiModelProperty(value = "销售指导价")
     private String guidedPrice;
 
+    @ApiModelProperty(value = "常用配置")
+    private String configName;
+    @ApiModelProperty(value = "入库日期")
+    private String priceDate;
+
 
 }
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
index 723bcd3edd..42104fda6b 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
@@ -567,11 +567,13 @@
         <!--车架号-->
         bv.vinNo,
         <!--颜色-->
-        bmc.carColor,
+        bmc.carColor color,
         <!--存放地点-->
         bv.location,
         <!--销售指导价-->
-        bv.guidedPrice
+        bv.guidedPrice,
+        bmc.configName,
+        DATE_FORMAT(bv.priceDate, '%Y-%m-%d') as priceDate
         FROM base_vehicle bv
                  LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
                  LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
index 4ad4d7b990..6018bd88aa 100644
--- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
+++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
@@ -15,6 +15,7 @@ public enum ProcDefEnum {
     ARREARSCARRYVEHICLE("欠款提车审批流程","arrears_carryvehicle:1:232589"),
     VEHICLEAPPLY("排产申请流程","process_9egcg169:1:242660"),
     RECORDAPPLICATION("入账申请","record_application_7y80d4r8:1:265008"),
+    SCMVEHICLERETURN("采购退库", "process_lcgh2q0g:4:235004"),
     ;
 
     ProcDefEnum(String proDefName, String proDefId) {
diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java
index 21056d227c..21c0869127 100644
--- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java
+++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java
@@ -740,8 +740,8 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
     public ResultBean<FlowTask> businessComplete(BusinessVariables dto) {
         ResultBean<FlowTask> rb = new ResultBean<>();
         Map<String, Object> formVariables = dto.getFormVariables();
-        formVariables.put("handleUrl", dto.getHandleUrl());
-        formVariables.put("detailUrl", dto.getDetailUrl());
+//        formVariables.put("handleUrl", dto.getHandleUrl());
+//        formVariables.put("detailUrl", dto.getDetailUrl());
         Object taskId_obj = formVariables.get("taskId");
         String taskId = null;
         if (taskId_obj == null) {
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleactualdetails/ScmVehicleActualDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleactualdetails/ScmVehicleActualDetailsVo.java
index 3816086e2e..aa65c24134 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleactualdetails/ScmVehicleActualDetailsVo.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleactualdetails/ScmVehicleActualDetailsVo.java
@@ -21,7 +21,7 @@ public class ScmVehicleActualDetailsVo implements Vo {
     @ApiModelProperty(value = "车型名称")
     private String modelName;
     @ApiModelProperty(value = "入库日期")
-    private Date inboundDate;
+    private String inboundDate;
     @ApiModelProperty(value = "入库价")
     private String inboundPrice;
 }
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleactualsales/ScmVehicleActualSalesFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleactualsales/ScmVehicleActualSalesFeign.java
index 7b63fb8f14..7d53dcf5bc 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleactualsales/ScmVehicleActualSalesFeign.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleactualsales/ScmVehicleActualSalesFeign.java
@@ -37,8 +37,7 @@ public interface ScmVehicleActualSalesFeign {
     @ApiOperation("初始化")
     @GetMapping("/details")
     @ResponseBody
-    ResultBean<ScmVehicleActualSalesDetailsVo> details(@RequestParam(value = "sid") String sid,
-                                                       @RequestParam(value = "name") String name);
+    ResultBean<ScmVehicleActualSalesDetailsVo> details(@RequestParam(value = "sid", required = false) String sid);
 
 
 }
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleactualsales/ScmVehicleActualSalesFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleactualsales/ScmVehicleActualSalesFeignFallback.java
index 743fe8c4fc..67405b8193 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleactualsales/ScmVehicleActualSalesFeignFallback.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleactualsales/ScmVehicleActualSalesFeignFallback.java
@@ -28,7 +28,7 @@ public class ScmVehicleActualSalesFeignFallback implements ScmVehicleActualSales
     }
 
     @Override
-    public ResultBean<ScmVehicleActualSalesDetailsVo> details(String sid, String name) {
+    public ResultBean<ScmVehicleActualSalesDetailsVo> details(String sid) {
         return null;
     }
 }
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturn.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturn.java
index 45d03f0f96..b290bfe594 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturn.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturn.java
@@ -4,6 +4,8 @@ import com.yxt.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * @Author dimengzhe
  * @Date 2022/4/6 16:12
@@ -18,6 +20,9 @@ public class ScmVehicleReturn extends BaseEntity {
     private String applicationName;
     @ApiModelProperty(value = "退库原因")
     private String reason;
+    @ApiModelProperty(value = "费用")
+    private BigDecimal money;
     @ApiModelProperty(value = "节点状态")
     private String nodeState;
+
 }
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnDetailsVo.java
new file mode 100644
index 0000000000..ab4c418fde
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnDetailsVo.java
@@ -0,0 +1,35 @@
+package com.yxt.anrui.scm.api.scmvehiclereturn;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.yxt.anrui.scm.api.scmvehiclereturndetails.ScmVehicleReturnDetailssVo;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/4/13 11:18
+ * @Description
+ */
+@Data
+public class ScmVehicleReturnDetailsVo implements Vo {
+    private static final long serialVersionUID = -5246040124624468517L;
+
+    @ApiModelProperty(value = "申请编号")
+    private String applicationCode;
+    @ApiModelProperty(value = "申请人")
+    private String name;
+    @ApiModelProperty(value = "申请日期")
+    private String createTime;
+    @ApiModelProperty(value = "退库原因")
+    private String reason;
+    @ApiModelProperty(value = "费用")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private String money;
+    @ApiModelProperty(value = "车辆列表")
+    private List<ScmVehicleReturnDetailssVo> voList = new ArrayList<>();
+}
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnDto.java
index 522b5cfd01..532ed2d0a2 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnDto.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnDto.java
@@ -19,6 +19,8 @@ public class ScmVehicleReturnDto implements Dto {
     private static final long serialVersionUID = -276598777097000627L;
     @ApiModelProperty(value = "sid")
     private String sid;
+    @ApiModelProperty(value = "申请编号")
+    private String applicationCode;
     @ApiModelProperty(value = "申请人sid", required = true)
     private String userSid;
     @ApiModelProperty(value = "申请人", required = true)
@@ -28,6 +30,8 @@ public class ScmVehicleReturnDto implements Dto {
     private Date createTime;
     @ApiModelProperty(value = "退库原因", required = true)
     private String reason;
+    @ApiModelProperty(value = "费用")
+    private String money;
     @ApiModelProperty(value = "车辆列表")
     private List<ScmVehicleReturnDetailsDto> detailsList;
 }
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnFeign.java
index d4826ece84..32e4f167f8 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnFeign.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnFeign.java
@@ -5,9 +5,7 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * @Author dimengzhe
@@ -31,8 +29,31 @@ public interface ScmVehicleReturnFeign {
     @ResponseBody
     ResultBean saveOrUpdate(@RequestBody ScmVehicleReturnDto scmVehicleReturnDto);
 
+    @ApiOperation("初始化回显")
+    @GetMapping("/details")
+    @ResponseBody
+    ResultBean<ScmVehicleReturnDetailsVo> details(@RequestParam(value = "sid", required = false) String sid);
+
+
     @ApiOperation("提交")
     @PostMapping("/submitVehicleReturn")
     @ResponseBody
     ResultBean submitVehicleReturn(@RequestBody ScmVehicleReturnDto scmVehicleReturnDto);
+
+    @ApiOperation(value = "办理（同意）")
+    @PostMapping("/complete")
+    public ResultBean complete(@RequestBody ScmVehicleReturnFlowQuery scmVehicleReturnFlowQuery);
+
+    @ApiOperation(value = "驳回任务")
+    @PostMapping("/reject")
+    ResultBean reject(@RequestBody ScmVehicleReturnFlowDto dto);
+
+    @ApiOperation(value = "终止任务")
+    @PostMapping("/breakProcess")
+    ResultBean breakProcess(@RequestBody ScmVehicleReturnFlowDto dto);
+
+    @ApiOperation(value = "撤回任务")
+    @PostMapping("/revokeProcess")
+    ResultBean revokeProcess(@RequestBody ScmVehicleReturnFlowDto dto);
+
 }
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnFlowDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnFlowDto.java
new file mode 100644
index 0000000000..b0dcee3539
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnFlowDto.java
@@ -0,0 +1,53 @@
+package com.yxt.anrui.scm.api.scmvehiclereturn;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/4/13 10:48
+ * @Description
+ */
+@Data
+public class ScmVehicleReturnFlowDto implements Serializable {
+    private static final long serialVersionUID = -1771287589587315324L;
+
+    @ApiModelProperty(value = "业务sid")
+    private String businessSid;
+
+    @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<>();
+
+}
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnFlowQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnFlowQuery.java
new file mode 100644
index 0000000000..15eb84185c
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnFlowQuery.java
@@ -0,0 +1,28 @@
+package com.yxt.anrui.scm.api.scmvehiclereturn;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/4/12 22:18
+ * @Description
+ */
+@Data
+public class ScmVehicleReturnFlowQuery implements Query {
+    private static final long serialVersionUID = -3164237568589023489L;
+
+    @ApiModelProperty(value = "处理意见")
+    private String comment;
+    @ApiModelProperty(value = "流程id")
+    private String instanceId;
+    @ApiModelProperty(value = "环节id")
+    private String taskId;
+    @ApiModelProperty(value = "用户sid")
+    private String userSid;
+    @ApiModelProperty(value = "业务sid")
+    private String businessSid;
+
+
+}
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnQuery.java
index 44ec1a1e7d..088175aef0 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnQuery.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnQuery.java
@@ -18,5 +18,8 @@ public class ScmVehicleReturnQuery implements Query {
     @ApiModelProperty(value = "结束日期")
     private String applyDateEnd;
 
+    @ApiModelProperty(value = "节点状态")
+    private String nodeState;
+
 
 }
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnVo.java
index 6ccd375e3d..546058f5af 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnVo.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnVo.java
@@ -28,7 +28,4 @@ public class ScmVehicleReturnVo implements Vo {
     @ApiModelProperty(value = "台数")
     private Integer num;
 
-    @ApiModelProperty(value = "流程状态")
-    private Integer flowState;
-
 }
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturndetails/ScmVehicleReturnDetailssVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturndetails/ScmVehicleReturnDetailssVo.java
new file mode 100644
index 0000000000..161a86f25a
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturndetails/ScmVehicleReturnDetailssVo.java
@@ -0,0 +1,24 @@
+package com.yxt.anrui.scm.api.scmvehiclereturndetails;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/4/13 11:31
+ * @Description
+ */
+@Data
+public class ScmVehicleReturnDetailssVo implements Vo {
+    private static final long serialVersionUID = 5418774062719853985L;
+
+    @ApiModelProperty(value = "车架号")
+    private String vinNo;
+    @ApiModelProperty(value = "车型名称")
+    private String modelName;
+    @ApiModelProperty(value = "常用配置")
+    private String configName;
+    @ApiModelProperty(value = "入库日期")
+    private String inboundDate;
+}
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleactualsales/ScmVehicleActualSalesRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleactualsales/ScmVehicleActualSalesRest.java
index 5b9eedb884..bed5bce219 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleactualsales/ScmVehicleActualSalesRest.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleactualsales/ScmVehicleActualSalesRest.java
@@ -40,7 +40,7 @@ public class ScmVehicleActualSalesRest implements ScmVehicleActualSalesFeign {
     }
 
     @Override
-    public ResultBean<ScmVehicleActualSalesDetailsVo> details(String sid, String name) {
-        return scmVehicleActualSalesService.details(sid, name);
+    public ResultBean<ScmVehicleActualSalesDetailsVo> details(String sid) {
+        return scmVehicleActualSalesService.details(sid);
     }
 }
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleactualsales/ScmVehicleActualSalesService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleactualsales/ScmVehicleActualSalesService.java
index 59e3fa6e41..e61e75a848 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleactualsales/ScmVehicleActualSalesService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleactualsales/ScmVehicleActualSalesService.java
@@ -158,15 +158,17 @@ public class ScmVehicleActualSalesService extends MybatisBaseService<ScmVehicleA
      * @param sid 未售买断sid
      * @return
      */
-    public ResultBean<ScmVehicleActualSalesDetailsVo> details(String sid, String name) {
+    public ResultBean<ScmVehicleActualSalesDetailsVo> details(String sid) {
         ResultBean<ScmVehicleActualSalesDetailsVo> rb = ResultBean.fireFail();
-        ScmVehicleActualSales scmVehicleActualSales = fetchBySid(sid);
         ScmVehicleActualSalesDetailsVo vo = new ScmVehicleActualSalesDetailsVo();
-        if (scmVehicleActualSales == null) {
+        if (StringUtils.isBlank(sid)) {
             //申请日期即为当天
             vo.setCreateTime(DateUtil.today());
-            vo.setApplicationName(name);
         } else {
+            ScmVehicleActualSales scmVehicleActualSales = fetchBySid(sid);
+            if (scmVehicleActualSales == null) {
+                return rb.setMsg("该未售买断数据不存在");
+            }
             vo = baseMapper.details(sid);
             List<ScmVehicleActualDetailsVo> voList = scmVehicleActualDetailsService.detailsList(sid);
         }
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnMapper.java
index 9532932994..c2a73d6456 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnMapper.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnMapper.java
@@ -5,6 +5,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.scm.api.scmvehiclereturn.ScmVehicleReturn;
+import com.yxt.anrui.scm.api.scmvehiclereturn.ScmVehicleReturnDetailsVo;
 import com.yxt.anrui.scm.api.scmvehiclereturn.ScmVehicleReturnVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -29,4 +30,5 @@ public interface ScmVehicleReturnMapper extends BaseMapper<ScmVehicleReturn> {
                          @Param("procInstSid") String procInstSid, @Param("nodeSid") String nodeSid);
 
 
+    ScmVehicleReturnDetailsVo details(String sid);
 }
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnMapper.xml
index 9777b25d69..d6e72b2a03 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnMapper.xml
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnMapper.xml
@@ -5,8 +5,9 @@
         select sr.sid,
                sr.applicationCode,
                sr.applicationName,
-               sr.modifyTime,
+               DATE_FORMAT(sr.createTime, '%Y-%m-%d')                                               as createTime,
                sr.reason,
+               sr.nodeState,
                (select count(*) from scm_vehicle_return_details sd where sd.vehicleOutSid = sr.sid) as num
         from scm_vehicle_return sr
             ${ew.customSqlSegment}
@@ -20,4 +21,10 @@
             nodeSid=#{nodeSid}
         where sid = #{businessSid}
     </update>
+
+    <select id="details" resultType="com.yxt.anrui.scm.api.scmvehiclereturn.ScmVehicleReturnDetailsVo">
+        select sid, DATE_FORMAT(createTime, '%Y-%m-%d') as createTime, reason, applicationName as name, money
+        from scm_vehicle_return
+        where sid = #{sid}
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnRest.java
index caac17a4c6..dd1523dec4 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnRest.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnRest.java
@@ -1,9 +1,6 @@
 package com.yxt.anrui.scm.biz.scmvehiclereturn;
 
-import com.yxt.anrui.scm.api.scmvehiclereturn.ScmVehicleReturnDto;
-import com.yxt.anrui.scm.api.scmvehiclereturn.ScmVehicleReturnFeign;
-import com.yxt.anrui.scm.api.scmvehiclereturn.ScmVehicleReturnQuery;
-import com.yxt.anrui.scm.api.scmvehiclereturn.ScmVehicleReturnVo;
+import com.yxt.anrui.scm.api.scmvehiclereturn.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -37,8 +34,33 @@ public class ScmVehicleReturnRest implements ScmVehicleReturnFeign {
         return scmVehicleReturnService.saveOrUpdateVehicleReturn(scmVehicleReturnDto);
     }
 
+    @Override
+    public ResultBean<ScmVehicleReturnDetailsVo> details(String sid) {
+        return scmVehicleReturnService.details(sid);
+    }
+
     @Override
     public ResultBean submitVehicleReturn(ScmVehicleReturnDto scmVehicleReturnDto) {
         return scmVehicleReturnService.submitVehicleReturn(scmVehicleReturnDto);
     }
+
+    @Override
+    public ResultBean complete(ScmVehicleReturnFlowQuery scmVehicleReturnFlowQuery) {
+        return scmVehicleReturnService.complete(scmVehicleReturnFlowQuery);
+    }
+
+    @Override
+    public ResultBean reject(ScmVehicleReturnFlowDto dto) {
+        return scmVehicleReturnService.reject(dto);
+    }
+
+    @Override
+    public ResultBean breakProcess(ScmVehicleReturnFlowDto dto) {
+        return scmVehicleReturnService.breakProcess(dto);
+    }
+
+    @Override
+    public ResultBean revokeProcess(ScmVehicleReturnFlowDto dto) {
+        return scmVehicleReturnService.revokeProcess(dto);
+    }
 }
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java
index 936192f977..064456ea81 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java
@@ -1,18 +1,26 @@
 package com.yxt.anrui.scm.biz.scmvehiclereturn;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
+import com.yxt.anrui.flowable.api.flowtask.FlowTask;
+import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
+import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo;
+import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
 import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFeign;
+import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFlowStateEnum;
 import com.yxt.anrui.flowable.api.sysformlink.SysFormStateVo;
 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.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
-import com.yxt.anrui.scm.api.scmvehiclereturn.ScmVehicleReturn;
-import com.yxt.anrui.scm.api.scmvehiclereturn.ScmVehicleReturnDto;
-import com.yxt.anrui.scm.api.scmvehiclereturn.ScmVehicleReturnQuery;
-import com.yxt.anrui.scm.api.scmvehiclereturn.ScmVehicleReturnVo;
+import com.yxt.anrui.scm.api.scmvehiclereturn.*;
 import com.yxt.anrui.scm.api.scmvehiclereturndetails.ScmVehicleReturnDetails;
+import com.yxt.anrui.scm.api.scmvehiclereturndetails.ScmVehicleReturnDetailssVo;
 import com.yxt.anrui.scm.biz.scmvehiclereturndetails.ScmVehicleReturnDetailsService;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -25,6 +33,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.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -47,6 +56,8 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
     private SysStaffOrgFeign sysStaffOrgFeign;
     @Autowired
     private FlowableFeign flowableFeign;
+    @Autowired
+    private FlowTaskFeign flowTaskFeign;
 
     /**
      * 采购退库新增编辑
@@ -61,7 +72,11 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
         if (StringUtils.isBlank(sid)) {
             //新增
             ScmVehicleReturn scmVehicleReturn = new ScmVehicleReturn();
-            BeanUtils.copyProperties(scmVehicleReturnDto, scmVehicleReturn, scmVehicleReturn.getSid());
+            BeanUtils.copyProperties(scmVehicleReturnDto, scmVehicleReturn, "sid");
+            String money = scmVehicleReturnDto.getMoney();
+            BigDecimal mo = new BigDecimal(money);
+            scmVehicleReturn.setMoney(mo);
+            scmVehicleReturn.setApplicationName(scmVehicleReturnDto.getName());
             boolean isSave = save(scmVehicleReturn);
             if (!isSave) {
                 return rb.setMsg("保存失败");
@@ -77,7 +92,16 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
             if (checkCouldChange(sid)) {
                 return rb.setMsg("该条信息不可更改");
             }
-            int i = updateBySid(scmVehicleReturnDto, sid);
+            ScmVehicleReturn scmVehicleReturn = fetchBySid(sid);
+            if (scmVehicleReturn == null) {
+                return rb.setMsg("该申请不存在");
+            }
+            BeanUtil.copyProperties(scmVehicleReturnDto, scmVehicleReturn, "id", "sid");
+            String money = scmVehicleReturnDto.getMoney();
+            BigDecimal mo = new BigDecimal(money);
+            scmVehicleReturn.setMoney(mo);
+            scmVehicleReturn.setApplicationName(scmVehicleReturnDto.getName());
+            baseMapper.updateById(scmVehicleReturn);
             //查询details中是否有关于return的该条sid数据
             List<ScmVehicleReturnDetails> scmVehicleReturnDetailsList = scmVehicleReturnDetailsService.selectByReturnSid(sid);
             if (scmVehicleReturnDetailsList.size() > 0) {
@@ -119,9 +143,6 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
                 if (resultBean.getSuccess() && resultBean.getData() != null) {
                     SysFormStateVo formState = resultBean.getData();
                     voList.get(i).setNodeState(formState.getNodeState());
-                    voList.get(i).setFlowState(formState.getFlowState());
-                } else {
-                    voList.get(i).setFlowState(0);
                 }
             }
         }
@@ -138,7 +159,14 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
         QueryWrapper<ScmVehicleReturnVo> qw = new QueryWrapper<>();
         if (params != null) {
             //申请日期
-            //状态
+            qw.apply(StringUtils.isNotBlank(params.getApplyDateStart()), "date_format (sr.createTime,'%Y-%m-%d') >= date_format('" + params.getApplyDateStart() + "','%Y-%m-%d')").
+                    apply(StringUtils.isNotBlank(params.getApplyDateEnd()), "date_format (sr.createTime,'%Y-%m-%d') <= date_format('" + params.getApplyDateEnd() + "','%Y-%m-%d')"
+                    );
+            //状态:模糊查询
+            if(StringUtils.isNotBlank(params.getNodeState())){
+                qw.like("sr.nodeState", params.getNodeState());
+            }
+
         }
         return qw;
     }
@@ -153,12 +181,12 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
             variables.put("businessSid", businessSid);
             variables.put("isLoan", true);
             variables.put("orgSid", orgSid);//部门sid
-            ResultBean businessResultBean = flowableFeign.businessStart(ProcDefEnum.ORDERDEPOSITAPPROVE.getProDefId(), scmVehicleReturnDto.getUserSid(), variables);
-            if (resultBean.getSuccess() && resultBean.getData() != null) {
-                Map<String, String> map = (Map<String, String>) resultBean.getData();
+            ResultBean businessResultBean = flowableFeign.businessStart(ProcDefEnum.SCMVEHICLERETURN.getProDefId(), scmVehicleReturnDto.getUserSid(), variables);
+            if (businessResultBean.getSuccess() && businessResultBean.getData() != null) {
+                Map<String, String> map = (Map<String, String>) businessResultBean.getData();
                 //更新退库业务表中的流程状态
                 modifyFlowState(businessSid,
-                        ProcDefEnum.ORDERDEPOSITAPPROVE.getProDefId(),//procDefId
+                        ProcDefEnum.SCMVEHICLERETURN.getProDefId(),//procDefId
                         map.get("nodeState"),//state
                         map.get("procInsId"),//procInstSid
                         map.get("taskDefKey")//nodeSid
@@ -196,4 +224,127 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
                 procInsId,//procInstSid
                 taskDefKey);
     }
+
+    /**
+     * 办理流程
+     *
+     * @param scmVehicleReturnFlowQuery 查询条件
+     * @return
+     */
+    public ResultBean complete(ScmVehicleReturnFlowQuery scmVehicleReturnFlowQuery) {
+        ResultBean rb = ResultBean.fireFail();
+        //查询对象转换为map集合
+        Map<String, Object> variables = Convert.toMap(String.class, Object.class, scmVehicleReturnFlowQuery);
+        BusinessVariables bv = BusinessVariables.builder().build();
+        bv.setFormVariables(variables);
+        ResultBean<FlowTask> resultBean = flowTaskFeign.businessComplete(bv);
+        if (!resultBean.getSuccess()) {
+            return resultBean;
+        }
+        String nodeState = "";
+        String taskDefKey = "";
+        Map<String, Object> map = new HashMap<>();
+        map.put("businessSid", 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";
+                map.put("flowState", SysFormLinkFlowStateEnum.FINISH.getCode());
+            }
+        }
+        map.put("nodeState", nodeState);
+        map.put("taskDefKey", taskDefKey);
+        sysFormLinkFeign.updateFiled(map);
+        return new ResultBean().success();
+    }
+
+    /**
+     * 驳回任务
+     *
+     * @param dto
+     * @return
+     */
+    public ResultBean reject(ScmVehicleReturnFlowDto dto) {
+        FlowTaskVo flowTaskVo = new FlowTaskVo();
+        BeanUtil.copyProperties(dto, flowTaskVo);
+        ResultBean<List<LatestTaskVo>> resultBean = flowTaskFeign.taskReject(flowTaskVo);
+        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> map = new HashMap<>();
+        map.put("businessSid", dto.getBusinessSid());
+        map.put("nodeState", nodeState);
+        map.put("taskDefKey", taskDefKey);
+        if (incomingSourceRef.contains("start")) {
+            map.put("flowState", SysFormLinkFlowStateEnum.REJECT.getCode());
+        }
+        sysFormLinkFeign.updateFiled(map);
+        return new ResultBean().success();
+    }
+
+    public ResultBean breakProcess(ScmVehicleReturnFlowDto dto) {
+        FlowTaskVo flowTaskVo = new FlowTaskVo();
+        BeanUtil.copyProperties(dto, flowTaskVo);
+        ResultBean resultBean = flowTaskFeign.breakProcess(flowTaskVo);
+        if (!resultBean.getSuccess()) {
+            return resultBean;
+        }
+        Map<String, Object> map = new HashMap<>();
+        map.put("businessSid", dto.getBusinessSid());
+        map.put("nodeState", String.valueOf(resultBean.getData()));
+        map.put("taskDefKey", "Event_end");
+        map.put("flowState", SysFormLinkFlowStateEnum.BREAK.getCode());
+        sysFormLinkFeign.updateFiled(map);
+        return resultBean.success();
+    }
+
+    public ResultBean revokeProcess(ScmVehicleReturnFlowDto dto) {
+        FlowTaskVo flowTaskVo = new FlowTaskVo();
+        BeanUtil.copyProperties(dto, flowTaskVo);
+        ResultBean<List<LatestTaskVo>> resultBean = flowTaskFeign.revokeProcess(flowTaskVo);
+        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> map = new HashMap<>();
+        map.put("businessSid", dto.getBusinessSid());
+        if (inComingSourceRef.contains("start")) {
+            map.put("nodeState", SysFormLinkFlowStateEnum.UNCOMMITTED.getState());
+            map.put("taskDefKey", taskDefKey);
+            map.put("flowState", SysFormLinkFlowStateEnum.UNCOMMITTED.getCode());
+        } else {
+            map.put("nodeState", nodeState);
+            map.put("taskDefKey", taskDefKey);
+        }
+        sysFormLinkFeign.updateFiled(map);
+        return new ResultBean().success();
+    }
+
+    public ResultBean<ScmVehicleReturnDetailsVo> details(String sid) {
+        ResultBean<ScmVehicleReturnDetailsVo> rb = ResultBean.fireFail();
+        ScmVehicleReturnDetailsVo vo = new ScmVehicleReturnDetailsVo();
+        if (StringUtils.isBlank(sid)) {
+            //申请日期即为当天
+            vo.setCreateTime(DateUtil.today());
+            vo.setApplicationCode("CGTK" + DateUtil.format(DateUtil.date(), "yyyyMMdd"));
+        } else {
+            ScmVehicleReturn ScmVehicleReturn = fetchBySid(sid);
+            if (ScmVehicleReturn == null) {
+                return rb.setMsg("该采购退库申请不存在");
+            }
+            vo = baseMapper.details(sid);
+            List<ScmVehicleReturnDetailssVo> voList = scmVehicleReturnDetailsService.detailsList(sid);
+            vo.setVoList(voList);
+        }
+        return rb.success().setData(vo);
+    }
 }
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturndetails/ScmVehicleReturnDetailsMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturndetails/ScmVehicleReturnDetailsMapper.java
index dd10097645..372a1b12c8 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturndetails/ScmVehicleReturnDetailsMapper.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturndetails/ScmVehicleReturnDetailsMapper.java
@@ -2,6 +2,7 @@ package com.yxt.anrui.scm.biz.scmvehiclereturndetails;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yxt.anrui.scm.api.scmvehiclereturndetails.ScmVehicleReturnDetails;
+import com.yxt.anrui.scm.api.scmvehiclereturndetails.ScmVehicleReturnDetailssVo;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -30,4 +31,6 @@ public interface ScmVehicleReturnDetailsMapper extends BaseMapper<ScmVehicleRetu
     int deleteByReturnSid(String sid);
 
     List<String> selectVinNoList(String sid);
+
+    List<ScmVehicleReturnDetailssVo> detailsList(String sid);
 }
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturndetails/ScmVehicleReturnDetailsMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturndetails/ScmVehicleReturnDetailsMapper.xml
index bab35954ce..58a5601d3b 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturndetails/ScmVehicleReturnDetailsMapper.xml
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturndetails/ScmVehicleReturnDetailsMapper.xml
@@ -18,4 +18,10 @@
         from scm_vehicle_return_details
         where vehicleOutSid = #{sid}
     </select>
+
+    <select id="detailsList" resultType="com.yxt.anrui.scm.api.scmvehiclereturndetails.ScmVehicleReturnDetailssVo">
+        select sid, vinNo, modelName, DATE_FORMAT(inboundDate, '%Y-%m-%d') as inboundDate, configName
+        from scm_vehicle_return_details
+        where vehicleOutSid = #{sid}
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturndetails/ScmVehicleReturnDetailsService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturndetails/ScmVehicleReturnDetailsService.java
index d2b865828f..0adf692a5c 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturndetails/ScmVehicleReturnDetailsService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturndetails/ScmVehicleReturnDetailsService.java
@@ -2,6 +2,7 @@ package com.yxt.anrui.scm.biz.scmvehiclereturndetails;
 
 import com.yxt.anrui.scm.api.scmvehiclereturndetails.ScmVehicleReturnDetails;
 import com.yxt.anrui.scm.api.scmvehiclereturndetails.ScmVehicleReturnDetailsDto;
+import com.yxt.anrui.scm.api.scmvehiclereturndetails.ScmVehicleReturnDetailssVo;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.core.result.ResultBean;
 import org.springframework.beans.BeanUtils;
@@ -61,4 +62,8 @@ public class ScmVehicleReturnDetailsService extends MybatisBaseService<ScmVehicl
         List<String> vinNoList = baseMapper.selectVinNoList(sid);
         return rb.success().setData(vinNoList);
     }
+
+    public List<ScmVehicleReturnDetailssVo> detailsList(String sid) {
+        return baseMapper.detailsList(sid);
+    }
 }