Merge remote-tracking branch 'origin/master'

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

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

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

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

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", "汇款确认书附件");
     /**
      * 附件类型
      */

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`

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

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>

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

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

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

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

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

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; // 认款状态
+}

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

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationDetailsVo.java

@@ -0,0 +1,82 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _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.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/>
+ * 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
+    @ApiModelProperty("已选应收款项明细")
+    private List<BusSelectedReceivablesDetailedVo> busSelectedReceivablesDetailedVos; // 已选应收款项明细
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationDto.java

@@ -0,0 +1,89 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _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("业务员sid")
+    private String staffSid; // 业务员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; // 已选应收款项明细
+    @ApiModelProperty("打款凭证附件")
+    private List<BusCollectionConfirmationAppendixDto> paymentVoucherAppendixs; // 打款凭证附件
+    @ApiModelProperty("汇款确认书附件")
+    private List<BusCollectionConfirmationAppendixDto> remittanceConfirmationAppendixs; // 汇款确认书附件
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationFeign.java

@@ -0,0 +1,80 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _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);
+
+    /*---------------------App接口 ---------------------*/
+
+    @ApiOperation("手机端—获取款项确认列表")
+    @PostMapping("/getCollectionConfirmList")
+    public ResultBean<PagerVo<AppBusCollectionConfirmationPageVo>> getCollectionConfirmList(@RequestBody PagerQuery<AppBusCollectionConfirmationQuery> pagerQuery);
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationFeignFallback.java

@@ -0,0 +1,77 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _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无法访问");
+	}
+
+	@Override
+	public ResultBean<PagerVo<AppBusCollectionConfirmationPageVo>> getCollectionConfirmList(PagerQuery<AppBusCollectionConfirmationQuery> pagerQuery) {
+		return null;
+	}
+}

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; // 认款状态
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationVo.java

@@ -0,0 +1,70 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _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("收款确认单sid")
+    private String sid; // 收款确认单sid
+	@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; // 认款状态
+}

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

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

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

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无法访问");
+	}
+}

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

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

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

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

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

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无法访问");
+	}
+}

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

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

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

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

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

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无法访问");
+	}
+}

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

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

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

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; // 当前应收金额
+}

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

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无法访问");
+	}
+}

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; // 当前应收金额
+}

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; // 当前应收金额
+}

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationMapper.java

@@ -0,0 +1,70 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _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.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;
+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();
+
+    IPage<AppBusCollectionConfirmationPageVo> getCollectionConfirmList(IPage<AppBusCollectionConfirmationQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppBusCollectionConfirmationPageVo> qw);
+}

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationMapper.xml

@@ -0,0 +1,18 @@
+<?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>
+
+    <select id="getCollectionConfirmList"
+            resultType="com.yxt.anrui.buscenter.api.buscollectionconfirmation.AppBusCollectionConfirmationPageVo">
+
+	</select>
+</mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationRest.java

@@ -0,0 +1,104 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+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;
+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){
+		return busCollectionConfirmationService.delAllBySids(sids);
+	}
+
+    @Override
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchBySid/{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;
+    }
+}

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationService.java

@@ -0,0 +1,215 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _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.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;
+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;
+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;
+
+/**
+ * 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> {
+
+    @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<>();
+
+        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 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 qw;
+    }
+}

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();
+}

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>

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

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

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();
+}

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>

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

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

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;

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedMapper.java

@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _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.Delete;
+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();
+
+	@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);
+}

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>

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

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedService.java

@@ -0,0 +1,172 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _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;
+	}
+
+	public void deleteByCollSid(String sid) {
+		baseMapper.deleteByCollSid(sid);
+	}
+
+	public List<BusSelectedReceivablesDetailedVo> fetchByCillSid(String sid) {
+		return baseMapper.fetchByCillSid(sid);
+	}
+}

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();
+}

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>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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;

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}")

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

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

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>

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

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();
+    }
+
+
 }

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

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>

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

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

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

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>

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

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

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

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

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

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

@@ -14,7 +14,8 @@ 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"),
+    SCMVEHICLERETURN("采购退库", "process_lcgh2q0g:4:235004"),
     ;
 
     ProcDefEnum(String proDefName, String proDefId) {

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